Update app.py

app.py

@@ -20,7 +20,6 @@ logging.basicConfig(
     ]
 )
 
-
 # 가사 분석 함수
 def analyze_lyrics(lyrics):
     # 줄 단위로 분리
@@ -162,7 +161,6 @@ def install_flash_attn():
         except ImportError:
             logging.info("Installing flash-attn...")
             
-        # CUDA 12.1용 직접 설치 시도
         try:
             subprocess.run(
                 ["pip", "install", "flash-attn", "--no-build-isolation"],
@@ -179,18 +177,6 @@ def install_flash_attn():
         logging.warning(f"Failed to install flash-attn: {e}")
         return False
 
-# ... (나머지 코드는 동일) ...
-
-# 서버 설정으로 실행 부분만 수정
-demo.queue(max_size=20).launch(
-    server_name="0.0.0.0",
-    server_port=7860,
-    share=True,
-    show_api=True,
-    show_error=True,
-    max_threads=2  # concurrency_count 대신 max_threads 사용
-)
-
 def initialize_system():
     optimize_gpu_settings()
     has_flash_attn = install_flash_attn()
@@ -214,6 +200,38 @@ def initialize_system():
         logging.error(f"Directory error: {e}")
         raise
 
+@lru_cache(maxsize=100)
+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 infer(genre_txt_content, lyrics_txt_content, num_segments, max_new_tokens):
     try:
         # 모델 선택 및 설정
@@ -299,130 +317,109 @@ def infer(genre_txt_content, lyrics_txt_content, num_segments, max_new_tokens):
             except Exception as e:
                 logging.warning(f"Failed to remove temporary file {file}: {e}")
 
-@lru_cache(maxsize=100)
-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]
-
-
-# Gradio 인터페이스
-with gr.Blocks() as demo:
-    with gr.Column():
-        gr.Markdown("# YuE: Open Music Foundation Models for Full-Song Generation (Multi-Language Support)")
-
-        
-        with gr.Row():
-            with gr.Column():
-                genre_txt = gr.Textbox(
-                    label="Genre",
-                    placeholder="Enter music genre and style descriptions..."
-                )
-                lyrics_txt = gr.Textbox(
-                    label="Lyrics (Supports English, Korean, Japanese, Chinese)",
-                    placeholder="Enter song lyrics with [verse], [chorus], [bridge] tags...",
-                    lines=10
-                )
-                
-            with gr.Column():
-                num_segments = gr.Number(
-                    label="Number of Song Segments (Auto-adjusted based on lyrics)",
-                    value=2,
-                    minimum=1,
-                    maximum=4,
-                    step=1,
-                    interactive=False
-                )
-                max_new_tokens = gr.Slider(
-                    label="Max New Tokens (Auto-adjusted based on lyrics)",
-                    minimum=500,
-                    maximum=32000,
-                    step=500,
-                    value=4000,
-                    interactive=False
-                )
-                submit_btn = gr.Button("Generate Music", variant="primary")
-                music_out = gr.Audio(label="Generated Audio")
-
-        # 다국어 예제
-        gr.Examples(
-            examples=[
-                # 영어 예제
-                [
-                    "female blues airy vocal bright vocal piano sad romantic guitar jazz",
-                    """[verse]
-In the quiet of the evening, shadows start to fall
-Whispers of the night wind echo through the hall
-Lost within the silence, I hear your gentle voice
-Guiding me back homeward, making my heart rejoice
-
-[chorus]
-Don't let this moment fade, hold me close tonight
-With you here beside me, everything's alright
-Can't imagine life alone, don't want to let you go
-Stay with me forever, let our love just flow
-
-                    """
+def main():
+    # Gradio 인터페이스
+    with gr.Blocks() as demo:
+        with gr.Column():
+            gr.Markdown("# YuE: Open Music Foundation Models for Full-Song Generation (Multi-Language Support)")
+            gr.HTML("""
+            <div style="display:flex;column-gap:4px;">
+                <a href="https://github.com/multimodal-art-projection/YuE">
+                    <img src='https://img.shields.io/badge/GitHub-Repo-blue'>
+                </a> 
+                <a href="https://map-yue.github.io">
+                    <img src='https://img.shields.io/badge/Project-Page-green'>
+                </a>
+            </div>
+            """)
+            
+            with gr.Row():
+                with gr.Column():
+                    genre_txt = gr.Textbox(
+                        label="Genre",
+                        placeholder="Enter music genre and style descriptions..."
+                    )
+                    lyrics_txt = gr.Textbox(
+                        label="Lyrics (Supports English, Korean, Japanese, Chinese)",
+                        placeholder="Enter song lyrics with [verse], [chorus], [bridge] tags...",
+                        lines=10
+                    )
+                    
+                with gr.Column():
+                    num_segments = gr.Number(
+                        label="Number of Song Segments (Auto-adjusted based on lyrics)",
+                        value=2,
+                        minimum=1,
+                        maximum=4,
+                        step=1,
+                        interactive=False
+                    )
+                    max_new_tokens = gr.Slider(
+                        label="Max New Tokens (Auto-adjusted based on lyrics)",
+                        minimum=500,
+                        maximum=32000,
+                        step=500,
+                        value=4000,
+                        interactive=False
+                    )
+                    submit_btn = gr.Button("Generate Music", variant="primary")
+                    music_out = gr.Audio(label="Generated Audio")
+
+            # 다국어 예제
+            gr.Examples(
+                examples=[
+                    # 영어 예제
+                    [
+                        "female blues airy vocal bright vocal piano sad romantic guitar jazz",
+                        """[verse]
+    In the quiet of the evening, shadows start to fall
+    Whispers of the night wind echo through the hall
+    Lost within the silence, I hear your gentle voice
+    Guiding me back homeward, making my heart rejoice
+
+    [chorus]
+    Don't let this moment fade, hold me close tonight
+    With you here beside me, everything's alright
+    Can't imagine life alone, don't want to let you go
+    Stay with me forever, let our love just flow
+
+                        """
+                    ],
+                    # 한국어 예제
+                    [
+                        "K-pop bright energetic synth dance electronic",
+                        """[verse]
+    빛나는 별들처럼 우리의 꿈이
+    저 하늘을 수놓아 반짝이네
+    함께라면 어디든 갈 수 있어
+    우리의 이야기가 시작되네
+
+    [chorus]
+    달려가자 더 높이 더 멀리
+    두려움은 없어 너와 함께라면
+    영원히 계속될 우리의 노래
+    이 순간을 기억해 forever
+
+                        """
+                    ]
                 ],
-                # 한국어 예제
-                [
-                    "K-pop bright energetic synth dance electronic",
-                    """[verse]
-빛나는 별들처럼 우리의 꿈이
-저 하늘을 수놓아 반짝이네
-함께라면 어디든 갈 수 있어
-우리의 이야기가 시작되네
-
-[chorus]
-달려가자 더 높이 더 멀리
-두려움은 없어 너와 함께라면
-영원히 계속될 우리의 노래
-이 순간을 기억해 forever
+                inputs=[genre_txt, lyrics_txt]
+            )
 
-                    """
-                ]
-            ],
-            inputs=[genre_txt, lyrics_txt]
+        # 시스템 초기화
+        initialize_system()
+        
+        # 이벤트 핸들러
+        submit_btn.click(
+            fn=infer,
+            inputs=[genre_txt, lyrics_txt, num_segments, max_new_tokens],
+            outputs=[music_out]
         )
 
-    # 시스템 초기화
-    initialize_system()
-    
-    # 이벤트 핸들러
-    submit_btn.click(
-        fn=infer,
-        inputs=[genre_txt, lyrics_txt, num_segments, max_new_tokens],
-        outputs=[music_out]
-    )
+        return demo
 
-# 서버 설정으로 실행
 if __name__ == "__main__":
+    demo = main()
     demo.queue(max_size=20).launch(
         server_name="0.0.0.0",
         server_port=7860,