Update app.py

app.py

@@ -61,64 +61,91 @@ def analyze_lyrics(lyrics, repeat_chorus=2):
         'chorus': [],
         'bridge': []
     }
+    last_section = None
 
-    for line in lines:
+    # 마지막 섹션 태그 찾기
+    for i, line in enumerate(lines):
+        if '[verse]' in line.lower() or '[chorus]' in line.lower() or '[bridge]' in line.lower():
+            last_section = i
+
+    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
+            last_section_start = i + 1
             continue
         elif '[chorus]' in lower_line:
+            if current_section:
+                section_lines[current_section].extend(lines[last_section_start:i])
             current_section = 'chorus'
             sections['chorus'] += 1
+            last_section_start = i + 1
             continue
         elif '[bridge]' in lower_line:
+            if current_section:
+                section_lines[current_section].extend(lines[last_section_start:i])
             current_section = 'bridge'
             sections['bridge'] += 1
+            last_section_start = i + 1
             continue
 
-        if current_section:
-            section_lines[current_section].append(line)
+    # 마지막 섹션의 라인들 추가
+    if current_section and last_section_start < len(lines):
+        section_lines[current_section].extend(lines[last_section_start:])
 
-    if sections['chorus'] == 1 and repeat_chorus > 1:
-        chorus_block = section_lines['chorus'][:]
+    # 코러스 반복 처리
+    if sections['chorus'] > 0 and repeat_chorus > 1:
+        original_chorus = 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, section_lines
+            section_lines['chorus'].extend(original_chorus)
+
+    # 섹션별 라인 수 확인 로깅
+    logging.info(f"Section line counts - Verse: {len(section_lines['verse'])}, "
+                f"Chorus: {len(section_lines['chorus'])}, "
+                f"Bridge: {len(section_lines['bridge'])}")
+
+    return sections, (sections['verse'] + sections['chorus'] + sections['bridge']), len(lines), section_lines
 
 def calculate_generation_params(lyrics):
     sections, total_sections, total_lines, section_lines = analyze_lyrics(lyrics)
     
+    # 기본 시간 계산 (초 단위)
     time_per_line = {
-        'verse': 4,
-        'chorus': 6,
-        'bridge': 5
+        'verse': 4,    # verse는 한 줄당 4초
+        'chorus': 6,   # chorus는 한 줄당 6초
+        'bridge': 5    # bridge는 한 줄당 5초
     }
     
+    # 각 섹션별 예상 시간 계산 (마지막 섹션 포함)
     section_durations = {}
     for section_type in ['verse', 'chorus', 'bridge']:
-        if isinstance(section_lines[section_type], list):
-            section_durations[section_type] = len(section_lines[section_type]) * time_per_line[section_type]
-        else:
-            section_durations[section_type] = section_lines[section_type] * time_per_line[section_type]
+        lines_count = len(section_lines[section_type])
+        section_durations[section_type] = lines_count * time_per_line[section_type]
     
+    # 전체 시간 계산 (여유 시간 추가)
     total_duration = sum(duration for duration in section_durations.values())
-    total_duration = max(60, total_duration)
+    total_duration = max(60, int(total_duration * 1.2))  # 20% 여유 시간 추가
     
+    # 토큰 계산 (마지막 섹션을 위한 추가 토큰)
     base_tokens = 3000
     tokens_per_line = 200
+    extra_tokens = 1000  # 마지막 섹션을 위한 추가 토큰
     
-    total_tokens = base_tokens + (total_lines * tokens_per_line)
+    total_tokens = base_tokens + (total_lines * tokens_per_line) + extra_tokens
     
+    # 세그먼트 수 계산 (마지막 섹션을 위한 추가 세그먼트)
     if sections['chorus'] > 0:
-        num_segments = 3
+        num_segments = 4  # 코러스가 있는 경우 4개 세그먼트
     else:
-        num_segments = 2
+        num_segments = 3  # 코러스가 없는 경우 3개 세그먼트
     
-    max_tokens = min(8000, total_tokens)
+    # 토큰 수 제한 (더 큰 제한)
+    max_tokens = min(12000, total_tokens)  # 최대 토큰 수 증가
     
     return {
         'max_tokens': max_tokens,
@@ -255,14 +282,17 @@ 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))
-            actual_num_segments = min(4, params['num_segments'] + 1)
+            actual_max_tokens = min(12000, int(config['max_tokens'] * 1.3))  # 30% 더 많은 토큰
+            actual_num_segments = min(5, params['num_segments'] + 2)  # 추가 세그먼트
         else:
-            actual_max_tokens = config['max_tokens']
-            actual_num_segments = params['num_segments']
+            actual_max_tokens = min(10000, int(config['max_tokens'] * 1.2))
+            actual_num_segments = min(4, params['num_segments'] + 1)
+        
+
 
         logging.info(f"Estimated duration: {estimated_duration} seconds")
         logging.info(f"Has chorus sections: {has_chorus}")