Update app.py

app.py

@@ -423,50 +423,93 @@ def optimize_model_selection(lyrics, genre):
     return model_path, model_config[model_path], params
 
 def main():
-    with gr.Blocks() as demo:
-        with gr.Column():
-            gr.Markdown("# Open SUNO: 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
-                    )
+    with gr.Blocks(theme=gr.themes.Soft(
+        primary_hue="indigo",
+        secondary_hue="purple",
+        neutral_hue="slate",
+        font=["Arial", "sans-serif"]
+    )) as demo:
+        with gr.Column(elem_id="main-container"):
+            # 헤더 섹션
+            with gr.Row(elem_id="header"):
+                gr.Markdown(
+                    """
+                    # 🎵 Open SUNO: AI Music Generator
+                    ### Create complete songs from your lyrics in multiple languages
+                    """,
+                    elem_id="title"
+                )
+
+            # 메인 컨텐츠를 탭으로 구성
+            with gr.Tabs() as tabs:
+                # 생성 탭
+                with gr.TabItem("✨ Create Music", id="create"):
                     with gr.Row():
-                        duration_info = gr.Label(label="Estimated Duration")
-                        sections_info = gr.Label(label="Section Information")
-                    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]
+                        # 입력 섹션
+                        with gr.Column(scale=1):
+                            genre_txt = gr.Textbox(
+                                label="🎸 Music Genre & Style",
+                                placeholder="e.g., K-pop bright energetic synth dance electronic...",
+                                elem_id="genre-input"
+                            )
+                            lyrics_txt = gr.Textbox(
+                                label="📝 Lyrics",
+                                placeholder="Enter lyrics with section tags: [verse], [chorus], [bridge]...",
+                                lines=10,
+                                elem_id="lyrics-input"
+                            )
+                            
+                            # 정보 표시 섹션
+                            with gr.Row():
+                                with gr.Column(scale=1):
+                                    duration_info = gr.Label(
+                                        label="⏱️ Estimated Duration",
+                                        elem_id="duration-info"
+                                    )
+                                with gr.Column(scale=1):
+                                    sections_info = gr.Label(
+                                        label="📊 Section Analysis",
+                                        elem_id="sections-info"
+                                    )
+                            
+                            # 생성 버튼
+                            submit_btn = gr.Button(
+                                "🎼 Generate Music",
+                                variant="primary",
+                                elem_id="generate-btn"
+                            )
+
+                        # 출력 섹션
+                        with gr.Column(scale=1):
+                            music_out = gr.Audio(
+                                label="🎵 Generated Music",
+                                elem_id="music-output"
+                            )
+                            
+                            # 진행 상태 표시
+                            progress = gr.Textbox(
+                                label="Generation Status",
+                                interactive=False,
+                                elem_id="progress-status"
+                            )
+
+                # 히스토리 탭
+                with gr.TabItem("📚 History", id="history"):
+                    history_list = gr.Dataset(
+                        components=[gr.Audio, gr.Textbox, gr.Textbox],
+                        headers=["Generated Music", "Genre", "Lyrics"],
+                        samples=[],
+                        elem_id="history-list"
+                    )
+                    gr.Markdown("*Click on any entry to play the music*")
+
+            # 예제 섹션
+            with gr.Accordion("📖 Examples", open=False):
+                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
@@ -474,41 +517,50 @@ 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]
-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]
-다시 한 번 내게 말해줘
-
-[verse]
 어두운 밤을 지날 때마다
 
 [chorus]
 다시 한 번 내게 말해줘
 """
-                    ]
-                ],
-                inputs=[genre_txt, lyrics_txt]
-            )
-
+                        ]
+                    ],
+                    inputs=[genre_txt, lyrics_txt]
+                )
+
+            # 도움말 및 설명 섹션
+            with gr.Accordion("ℹ️ Help & Information", open=False):
+                gr.Markdown(
+                    """
+                    ### 🎵 How to Use
+                    1. **Enter Genre & Style**: Describe the musical style you want (e.g., "K-pop", "Jazz", "Rock")
+                    2. **Input Lyrics**: Write your lyrics using section tags:
+                        - Use `[verse]` for verses
+                        - Use `[chorus]` for choruses
+                        - Use `[bridge]` for bridges
+                    3. **Generate**: Click the Generate button and wait for your music!
+
+                    ### 🌏 Supported Languages
+                    - English
+                    - Korean (한국어)
+                    - Japanese (日本語)
+                    - Chinese (中文)
+
+                    ### ⚡ Tips
+                    - Be specific with your genre descriptions
+                    - Include emotion and instrument preferences
+                    - Make sure to properly tag your lyrics sections
+                    - For best results, include both verse and chorus sections
+                    """
+                )
+
+        # 시스템 초기화
         initialize_system()
 
         def update_info(lyrics):
@@ -518,31 +570,39 @@ Stay with me forever, let our love just flow"""
             duration = params['estimated_duration']
             sections = params['sections']
             return (
-                f"Estimated duration: {duration:.1f} seconds",
-                f"Verses: {sections['verse']}, Chorus: {sections['chorus']} (Expected full length including chorus)"
+                f"⏱️ Estimated: {duration:.1f} seconds",
+                f"📊 Verses: {sections['verse']}, Chorus: {sections['chorus']}"
             )
 
+        def update_history(audio, genre, lyrics):
+            return history_list.update(samples=[[audio, genre, lyrics]] + history_list.samples)
+
+        # 이벤트 핸들러
         lyrics_txt.change(
             fn=update_info,
             inputs=[lyrics_txt],
             outputs=[duration_info, sections_info]
         )
         
+        def generate_with_progress(genre, lyrics, num_segments, max_tokens):
+            progress.update(value="🎵 Starting generation...")
+            try:
+                result = infer(genre, lyrics, num_segments, max_tokens)
+                if result:
+                    progress.update(value="✅ Generation complete!")
+                    update_history(result, genre, lyrics)
+                    return result
+                else:
+                    progress.update(value="❌ Generation failed")
+                    return None
+            except Exception as e:
+                progress.update(value=f"❌ Error: {str(e)}")
+                return None
+
         submit_btn.click(
-            fn=infer,
+            fn=generate_with_progress,
             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,
-        share=True,
-        show_api=True,
-        show_error=True,
-        max_threads=8
-    )
+        return demo