Update app.py

app.py

@@ -162,6 +162,44 @@ def calculate_generation_params(lyrics):
         'has_chorus': sections['chorus'] > 0
     }
 
+def create_temp_file(content, prefix, suffix=".txt"):
+    temp_file = tempfile.NamedTemporaryFile(delete=False, mode="w", prefix=prefix, suffix=suffix)
+    content = content.strip() + "\n\n"
+    content = content.replace("\r\n", "\n").replace("\r", "\n")
+    temp_file.write(content)
+    temp_file.close()
+    logging.debug(f"Temporary file created: {temp_file.name}")
+    return temp_file.name
+
+def empty_output_folder(output_dir):
+    try:
+        shutil.rmtree(output_dir)
+        os.makedirs(output_dir)
+        logging.info(f"Output folder cleaned: {output_dir}")
+    except Exception as e:
+        logging.error(f"Error cleaning output folder: {e}")
+        raise
+
+def get_last_mp3_file(output_dir):
+    mp3_files = [f for f in os.listdir(output_dir) if f.endswith('.mp3')]
+    if not mp3_files:
+        logging.warning("No MP3 files found")
+        return None
+    
+    mp3_files_with_path = [os.path.join(output_dir, f) for f in mp3_files]
+    mp3_files_with_path.sort(key=os.path.getmtime, reverse=True)
+    return mp3_files_with_path[0]
+
+def get_audio_duration(file_path):
+    try:
+        import librosa
+        duration = librosa.get_duration(path=file_path)
+        return duration
+    except Exception as e:
+        logging.error(f"Failed to get audio duration: {e}")
+        return None
+
+
 def detect_and_select_model(text):
     if re.search(r'[\u3131-\u318E\uAC00-\uD7A3]', text):
         return "m-a-p/YuE-s1-7B-anneal-jp-kr-cot"
@@ -238,42 +276,7 @@ def initialize_system():
 def get_cached_file_path(content_hash, prefix):
     return create_temp_file(content_hash, prefix)
 
-def empty_output_folder(output_dir):
-    try:
-        shutil.rmtree(output_dir)
-        os.makedirs(output_dir)
-        logging.info(f"Output folder cleaned: {output_dir}")
-    except Exception as e:
-        logging.error(f"Error cleaning output folder: {e}")
-        raise
 
-def create_temp_file(content, prefix, suffix=".txt"):
-    temp_file = tempfile.NamedTemporaryFile(delete=False, mode="w", prefix=prefix, suffix=suffix)
-    content = content.strip() + "\n\n"
-    content = content.replace("\r\n", "\n").replace("\r", "\n")
-    temp_file.write(content)
-    temp_file.close()
-    logging.debug(f"Temporary file created: {temp_file.name}")
-    return temp_file.name
-
-def get_last_mp3_file(output_dir):
-    mp3_files = [f for f in os.listdir(output_dir) if f.endswith('.mp3')]
-    if not mp3_files:
-        logging.warning("No MP3 files found")
-        return None
-    
-    mp3_files_with_path = [os.path.join(output_dir, f) for f in mp3_files]
-    mp3_files_with_path.sort(key=os.path.getmtime, reverse=True)
-    return mp3_files_with_path[0]
-
-def get_audio_duration(file_path):
-    try:
-        import librosa
-        duration = librosa.get_duration(path=file_path)
-        return duration
-    except Exception as e:
-        logging.error(f"Failed to get audio duration: {e}")
-        return None
 
 def optimize_model_selection(lyrics, genre):
     model_path = detect_and_select_model(lyrics)
@@ -316,7 +319,15 @@ def infer(genre_txt_content, lyrics_txt_content, num_segments, max_new_tokens):
     lyrics_txt_path = None
     
     try:
-        model_path, config, params = optimize_model_selection(lyrics_txt_content, genre_txt_content)
+        # ---- (1) 화면에는 보이지 않지만, 마지막에 [chorus] bye 삽입 ----
+        forced_line = "[chorus] bye"
+        tmp_lyrics = lyrics_txt_content.strip()
+        # 이미 'bye'가 들어있는지 확인 (원한다면 조건 추가/삭제 가능)
+        if forced_line.lower() not in tmp_lyrics.lower():
+            tmp_lyrics += "\n" + forced_line
+        
+        # ---- (2) 강제 삽입된 tmp_lyrics를 통해 모델 최적화/설정 ----
+        model_path, config, params = optimize_model_selection(tmp_lyrics, genre_txt_content)
         logging.info(f"Selected model: {model_path}")
         logging.info(f"Lyrics analysis: {params}")
         
@@ -336,7 +347,8 @@ def infer(genre_txt_content, lyrics_txt_content, num_segments, max_new_tokens):
         logging.info(f"Using segments: {actual_num_segments}, tokens: {actual_max_tokens}")
         
         genre_txt_path = create_temp_file(genre_txt_content, prefix="genre_")
-        lyrics_txt_path = create_temp_file(lyrics_txt_content, prefix="lyrics_")
+        # tmp_lyrics(강제 추가된 문자열)을 임시 파일로 저장
+        lyrics_txt_path = create_temp_file(tmp_lyrics, prefix="lyrics_")
         
         output_dir = "./output"
         os.makedirs(output_dir, exist_ok=True)