Update ui/components.py

ui/components.py

@@ -1,11 +1,3 @@
-"""
-ACE-Step: A Step Towards Music Generation Foundation Model
-
-https://github.com/ace-step/ACE-Step
-
-Apache 2.0 License
-"""
-
 import gradio as gr
 import librosa
 import os
@@ -15,18 +7,19 @@ import numpy as np
 import json
 from typing import Dict, List, Tuple, Optional
 
-# OpenAI 클라이언트 초기화
+# [MODIFIED] OpenAI 라이브러리 사용 방식 수정
 try:
+    import openai
     api_key = os.getenv("LLM_API") or os.getenv("OPENAI_API_KEY")
     if api_key:
-        from openai import OpenAI
-        client = OpenAI(api_key=api_key)
+        openai.api_key = api_key
+        client_available = True
         print("✅ OpenAI API client initialized successfully")
     else:
-        client = None
+        client_available = False
         print("⚠️ Warning: No OpenAI API key found. AI lyrics generation will be disabled.")
 except Exception as e:
-    client = None
+    client_available = False
     print(f"❌ Warning: Failed to initialize OpenAI client: {e}")
 
 TAG_DEFAULT = "funk, pop, soul, rock, melodic, guitar, drums, bass, keyboard, percussion, 105 BPM, energetic, upbeat, groovy, vibrant, dynamic, duet, male and female vocals"
@@ -120,7 +113,8 @@ def generate_lyrics_with_ai(prompt: str, genre: str, song_style: str) -> str:
     """AI를 사용하여 가사 생성"""
     print(f"🎵 generate_lyrics_with_ai called with: prompt='{prompt}', genre='{genre}', style='{song_style}'")
     
-    if not client:
+    # [MODIFIED] client_available 체크 + openai API 호출로 변경
+    if not client_available:
         print("❌ OpenAI client not available, returning default lyrics")
         return LYRIC_DEFAULT
     
@@ -152,7 +146,8 @@ def generate_lyrics_with_ai(prompt: str, genre: str, song_style: str) -> str:
         
         print(f"📝 Sending request to OpenAI...")
         
-        response = client.chat.completions.create(
+        # [MODIFIED] openai.ChatCompletion 사용
+        response = openai.ChatCompletion.create(
             model="gpt-4o-mini",
             messages=[
                 {"role": "system", "content": LYRIC_SYSTEM_PROMPT},
@@ -701,33 +696,37 @@ def create_text2music_ui(
 
         with gr.Column():
             outputs, input_params_json = create_output_ui()
-            
-            # retake, repainting, edit, extend 탭들은 기존 코드와 동일...
-            # (여기서는 생략하지만 실제로는 포함되어야 함)
+            # (retake, repainting, edit, extend 등 탭들은 생략)
+
+    # [MODIFIED] 아래부터는 @gr.on(...) 대신 최신 이벤트 바인딩 방식으로 연결
+
+    # 1) Audio2Audio 토글
+    def _toggle_audio2audio(x):
+        return (gr.update(visible=x), gr.update(visible=x))
 
-    # ============ 모든 UI 생성 완료 후 이벤트 핸들러 연결 ============
-    
-    # 1. Audio2Audio 토글
     ui['audio2audio_enable'].change(
-        fn=lambda x: (gr.update(visible=x), gr.update(visible=x)),
+        fn=_toggle_audio2audio,
         inputs=[ui['audio2audio_enable']],
         outputs=[ui['ref_audio_input'], ui['ref_audio_strength']]
     )
     
-    # 2. 장르 프리셋 변경
-    @gr.on(triggers=[ui['genre_preset'].change], inputs=[ui['genre_preset'], ui['song_style']], outputs=[ui['prompt']])
+    # 2) 장르 변경 핸들러
     def update_tags_for_genre(genre, style):
         print(f"🎵 Genre changed: {genre}, Style: {style}")
         if genre == "Custom":
             return TAG_DEFAULT
-        
         tags = GENRE_PRESETS.get(genre, TAG_DEFAULT)
         if style in SONG_STYLES:
             tags = f"{tags}, {SONG_STYLES[style]}"
         return tags
     
-    # 3. 곡 스타일 변경
-    @gr.on(triggers=[ui['song_style'].change], inputs=[ui['genre_preset'], ui['song_style']], outputs=[ui['prompt']])
+    ui['genre_preset'].change(
+        fn=update_tags_for_genre,
+        inputs=[ui['genre_preset'], ui['song_style']],
+        outputs=[ui['prompt']]
+    )
+    
+    # 3) 곡 스타일 변경 핸들러
     def update_tags_for_style(genre, style):
         print(f"🎤 Style changed: {style}, Genre: {genre}")
         if genre == "Custom":
@@ -739,41 +738,58 @@ def create_text2music_ui(
             return f"{base_tags}, {SONG_STYLES[style]}"
         return base_tags
     
-    # 4. 품질 프리셋 변경
-    @gr.on(triggers=[ui['quality_preset'].change], inputs=[ui['quality_preset']], 
-           outputs=[ui['preset_description'], ui['infer_step'], ui['guidance_scale'], 
-                   ui['scheduler_type'], ui['omega_scale'], ui['use_erg_diffusion'], ui['use_erg_tag']])
+    ui['song_style'].change(
+        fn=update_tags_for_style,
+        inputs=[ui['genre_preset'], ui['song_style']],
+        outputs=[ui['prompt']]
+    )
+    
+    # 4) 품질 프리셋 변경
     def update_quality_settings(preset):
         print(f"⚡ Quality preset: {preset}")
         if preset not in QUALITY_PRESETS:
             return ("", 150, 15.0, "euler", 10.0, True, True)
         
         p = QUALITY_PRESETS[preset]
-        return (p["description"], p["infer_step"], p["guidance_scale"], 
-                p["scheduler_type"], p["omega_scale"], p["use_erg_diffusion"], p["use_erg_tag"])
+        return (
+            p["description"], 
+            p["infer_step"], 
+            p["guidance_scale"], 
+            p["scheduler_type"], 
+            p["omega_scale"], 
+            p["use_erg_diffusion"], 
+            p["use_erg_tag"]
+        )
     
-    # 5. AI 작사 버튼
-    @gr.on(triggers=[ui['generate_lyrics_btn'].click], 
-           inputs=[ui['lyric_prompt'], ui['genre_preset'], ui['song_style']], 
-           outputs=[ui['lyrics']])
+    ui['quality_preset'].change(
+        fn=update_quality_settings,
+        inputs=[ui['quality_preset']],
+        outputs=[
+            ui['preset_description'], 
+            ui['infer_step'], 
+            ui['guidance_scale'], 
+            ui['scheduler_type'], 
+            ui['omega_scale'], 
+            ui['use_erg_diffusion'], 
+            ui['use_erg_tag']
+        ]
+    )
+
+    # 5) AI 작사
     def generate_lyrics_handler(prompt, genre, style):
         print(f"🤖 Generate lyrics: {prompt}")
         if not prompt or prompt.strip() == "":
-            gr.Warning("작사 주제를 입력해주세요!")
-            return ui['lyrics'].value
-        
+            # Gradio 최신 버전에서는 gr.Warning 대신 이벤트 바인딩 후 return이 기본
+            return "⚠️ 작사 주제를 입력해주세요!"
         return generate_lyrics_with_ai(prompt, genre, style)
     
-    # 6. Random 버튼
-    @gr.on(triggers=[ui['random_bnt'].click], 
-           inputs=[ui['genre_preset'], ui['song_style']], 
-           outputs=[ui['audio_duration'], ui['prompt'], ui['lyrics'], ui['infer_step'], 
-                   ui['guidance_scale'], ui['scheduler_type'], ui['cfg_type'], ui['omega_scale'],
-                   ui['manual_seeds'], ui['guidance_interval'], ui['guidance_interval_decay'],
-                   ui['min_guidance_scale'], ui['use_erg_tag'], ui['use_erg_lyric'], 
-                   ui['use_erg_diffusion'], ui['oss_steps'], ui['guidance_scale_text'],
-                   ui['guidance_scale_lyric'], ui['audio2audio_enable'], ui['ref_audio_strength'],
-                   ui['ref_audio_input']])
+    ui['generate_lyrics_btn'].click(
+        fn=generate_lyrics_handler,
+        inputs=[ui['lyric_prompt'], ui['genre_preset'], ui['song_style']],
+        outputs=[ui['lyrics']]
+    )
+
+    # 6) Random 버튼
     def random_generation(genre, style):
         print("🎲 Random generation")
         if genre == "Custom":
@@ -789,27 +805,75 @@ def create_text2music_ui(
         
         new_lyrics = generate_lyrics_with_ai(theme, genre, style)
         
-        return [duration, tags, new_lyrics, 150, 15.0, "euler", "apg", 10.0,
-                str(random.randint(1, 10000)), 0.5, 0.0, 3.0, True, False, True,
-                None, 0.0, 0.0, False, 0.5, None]
+        return [
+            duration, 
+            tags, 
+            new_lyrics, 
+            150, 15.0, 
+            "euler", 
+            "apg", 
+            10.0,
+            str(random.randint(1, 10000)), 
+            0.5, 
+            0.0, 
+            3.0, 
+            True, 
+            False, 
+            True,
+            None, 
+            0.0, 
+            0.0, 
+            False, 
+            0.5, 
+            None
+        ]
     
-    # 7. 메인 생성 버튼
+    ui['random_bnt'].click(
+        fn=random_generation,
+        inputs=[ui['genre_preset'], ui['song_style']],
+        outputs=[
+            ui['audio_duration'], 
+            ui['prompt'], 
+            ui['lyrics'], 
+            ui['infer_step'], 
+            ui['guidance_scale'], 
+            ui['scheduler_type'], 
+            ui['cfg_type'], 
+            ui['omega_scale'],
+            ui['manual_seeds'], 
+            ui['guidance_interval'], 
+            ui['guidance_interval_decay'],
+            ui['min_guidance_scale'], 
+            ui['use_erg_tag'], 
+            ui['use_erg_lyric'], 
+            ui['use_erg_diffusion'],
+            ui['oss_steps'], 
+            ui['guidance_scale_text'],
+            ui['guidance_scale_lyric'], 
+            ui['audio2audio_enable'], 
+            ui['ref_audio_strength'],
+            ui['ref_audio_input']
+        ]
+    )
+
+    # 7) 메인 생성 버튼
     ui['text2music_bnt'].click(
         fn=enhanced_process_func,
-        inputs=[ui['audio_duration'], ui['prompt'], ui['lyrics'], ui['infer_step'], 
-                ui['guidance_scale'], ui['scheduler_type'], ui['cfg_type'], ui['omega_scale'],
-                ui['manual_seeds'], ui['guidance_interval'], ui['guidance_interval_decay'],
-                ui['min_guidance_scale'], ui['use_erg_tag'], ui['use_erg_lyric'], 
-                ui['use_erg_diffusion'], ui['oss_steps'], ui['guidance_scale_text'],
-                ui['guidance_scale_lyric'], ui['audio2audio_enable'], ui['ref_audio_strength'],
-                ui['ref_audio_input'], ui['lora_name_or_path'], ui['multi_seed_mode'],
-                ui['enable_smart_enhancement'], ui['genre_preset'], ui['song_style']],
+        inputs=[
+            ui['audio_duration'], ui['prompt'], ui['lyrics'], ui['infer_step'], 
+            ui['guidance_scale'], ui['scheduler_type'], ui['cfg_type'], ui['omega_scale'],
+            ui['manual_seeds'], ui['guidance_interval'], ui['guidance_interval_decay'],
+            ui['min_guidance_scale'], ui['use_erg_tag'], ui['use_erg_lyric'], 
+            ui['use_erg_diffusion'], ui['oss_steps'], ui['guidance_scale_text'],
+            ui['guidance_scale_lyric'], ui['audio2audio_enable'], ui['ref_audio_strength'],
+            ui['ref_audio_input'], ui['lora_name_or_path'], ui['multi_seed_mode'],
+            ui['enable_smart_enhancement'], ui['genre_preset'], ui['song_style']
+        ],
         outputs=outputs + [input_params_json]
     )
     
     print("✅ 이벤트 핸들러 연결 완료!")
 
-
 def create_main_demo_ui(
     text2music_process_func=dump_func,
     sample_data_func=dump_func,
@@ -1006,4 +1070,4 @@ if __name__ == "__main__":
         server_name="0.0.0.0",
         server_port=7860,
         share=True  # 공유 링크 생성
-    )
+    )