Update app.py

app.py

@@ -36,41 +36,45 @@ def analyze_lyrics(lyrics, repeat_chorus=2):
         'chorus': [],
         'bridge': []
     }
+    
+    # 마지막 섹션을 추적하기 위한 변수
+    last_section_start = 0
 
-    for line in lines:
+    for i, line in enumerate(lines):
         lower_line = line.lower()
         if '[verse]' in lower_line:
+            if current_section:  # 이전 섹션의 라인들 저장
+                section_lines[current_section].extend(lines[last_section_start:i])
             current_section = 'verse'
             sections['verse'] += 1
-            continue
+            last_section_start = i + 1
         elif '[chorus]' in lower_line:
+            if current_section:
+                section_lines[current_section].extend(lines[last_section_start:i])
             current_section = 'chorus'
             sections['chorus'] += 1
-            continue
+            last_section_start = i + 1
         elif '[bridge]' in lower_line:
+            if current_section:
+                section_lines[current_section].extend(lines[last_section_start:i])
             current_section = 'bridge'
             sections['bridge'] += 1
-            continue
+            last_section_start = i + 1
 
-        # 현재 섹션에 라인 추가
-        if current_section:
-            section_lines[current_section].append(line)
+    # 마지막 섹션의 라인들 추가
+    if current_section:
+        section_lines[current_section].extend(lines[last_section_start:])
 
-    # 만약 코러스가 1회만 있고, repeat_chorus > 1이면 반복해서 붙이기
-    # chorus 섹션 전체 블록을 복제
+    # 코러스 반복 처리
     if sections['chorus'] == 1 and repeat_chorus > 1:
         chorus_block = section_lines['chorus'][:]
         for _ in range(repeat_chorus - 1):
             section_lines['chorus'].extend(chorus_block)
     
-    # 라인 수 재계산
+    # 전체 라인 수 재계산
     new_total_lines = sum(len(section_lines[sec]) for sec in section_lines)
     
-    return sections, (sections['verse'] + sections['chorus'] + sections['bridge']), new_total_lines, {
-        'verse': len(section_lines['verse']),
-        'chorus': len(section_lines['chorus']),
-        'bridge': len(section_lines['bridge'])
-    }
+    return sections, (sections['verse'] + sections['chorus'] + sections['bridge']), new_total_lines, section_lines
 
 
 def calculate_generation_params(lyrics):
@@ -302,14 +306,14 @@ def infer(genre_txt_content, lyrics_txt_content, num_segments, max_new_tokens):
         has_chorus = params['sections']['chorus'] > 0
         estimated_duration = params.get('estimated_duration', 90)
 
-
-        # 토큰 수와 세그먼트 수 조정
+        # 세그먼트 수 조정
         if has_chorus:
-            actual_max_tokens = min(8000, int(config['max_tokens'] * 1.2))  # 20% 증가, 최대 8000
-            actual_num_segments = 3
+            actual_num_segments = min(4, actual_num_segments + 1)  # 세그먼트 하나 추가
+            actual_max_tokens = min(8000, int(config['max_tokens'] * 1.3))  # 30% 증가
         else:
-            actual_max_tokens = config['max_tokens']
-            actual_num_segments = 2
+            actual_num_segments = min(3, actual_num_segments + 1)
+            actual_max_tokens = min(8000, int(config['max_tokens'] * 1.2))
+