debug...

event_handlers.py

@@ -11,10 +11,8 @@ from utils.script_parser import parse_dialogue_script, calculate_cost
 from utils.openai_tts import synthesize_speech_line
 from utils.merge_audio import merge_mp3_files
 
-# Import constants from ui_layout to avoid circular dependencies if they were in app.py
 from ui_layout import APP_AVAILABLE_VOICES, DEFAULT_VIBE, VIBE_CHOICES, PREDEFINED_VIBES
 
-# Ensure a default voice if APP_AVAILABLE_VOICES is empty (shouldn't happen with new ui_layout)
 DEFAULT_FALLBACK_VOICE = APP_AVAILABLE_VOICES[0] if APP_AVAILABLE_VOICES else "alloy"
 
 
@@ -35,7 +33,6 @@ def get_speakers_from_script(script_text: str):
 
 
 def handle_dynamic_input_change(new_value, current_configs_state_dict: dict, speaker_name: str, config_key: str, tts_model: str):
-    """Handles changes from dynamically generated UI elements for per-speaker settings."""
     if current_configs_state_dict is None: 
         current_configs_state_dict = {}
     if speaker_name not in current_configs_state_dict:
@@ -46,101 +43,20 @@ def handle_dynamic_input_change(new_value, current_configs_state_dict: dict, spe
 
 
 def load_refresh_per_speaker_ui(script_text: str, current_configs_state_dict: dict, tts_model: str, speaker_configs_state_component: gr.State):
-    """
-    Generates or refreshes the dynamic UI components (accordions) for each speaker.
-    Returns a list of Gradio components to populate the dynamic UI area and the updated state.
-    """
-    # --- START OF PHASE 1 DEBUGGING ---
-    print("DEBUG: load_refresh_per_speaker_ui CALLED - Phase 1: HARDCODED RETURN")
-    debug_markdown = gr.Markdown("## !! Dynamic Area Test Content Loaded via Load/Refresh Button !!")
-    # Return this simple component and an empty dict for state for now
-    return [debug_markdown], {} 
+    # --- START OF PHASE 1 DEBUGGING (MODIFIED) ---
+    print("DEBUG: load_refresh_per_speaker_ui CALLED - Phase 1: HARDCODED RETURN with gr.update()")
+    debug_markdown = gr.Markdown("## !! Dynamic Area Test Content Loaded (gr.update) !!")
+    # Return an explicit gr.update for the column's children, and the state update
+    return gr.update(children=[debug_markdown]), {} 
     # --- END OF PHASE 1 DEBUGGING ---
 
     # --- ORIGINAL LOGIC (Commented out for Phase 1) ---
     # print(f"Load/Refresh UI called. TTS Model: {tts_model}") 
     # unique_speakers = get_speakers_from_script(script_text)
     # new_ui_components = []
-    
-    # if current_configs_state_dict is None:
-    #     current_configs_state_dict = {}
-
-    # safe_default_voice = APP_AVAILABLE_VOICES[0] if APP_AVAILABLE_VOICES else "alloy"
-
-    # for speaker_name in unique_speakers:
-    #     if speaker_name not in current_configs_state_dict:
-    #         current_configs_state_dict[speaker_name] = {
-    #             "voice": safe_default_voice, "speed": 1.0,
-    #             "vibe": DEFAULT_VIBE, "custom_instructions": ""
-    #         }
-    #     current_configs_state_dict[speaker_name].setdefault("voice", safe_default_voice)
-    #     current_configs_state_dict[speaker_name].setdefault("speed", 1.0)
-    #     current_configs_state_dict[speaker_name].setdefault("vibe", DEFAULT_VIBE)
-    #     current_configs_state_dict[speaker_name].setdefault("custom_instructions", "")
-
-    # if not unique_speakers:
-    #     print("No unique speakers found, returning markdown.") 
-    #     new_ui_components.append(gr.Markdown("No speakers detected in the script, or script is empty. Type a script and click 'Load/Refresh' again, or change the script content."))
-    #     return new_ui_components, current_configs_state_dict
-
-    # print(f"Found speakers: {unique_speakers}. Building UI...") 
-    # for speaker_name in unique_speakers:
-    #     speaker_cfg = current_configs_state_dict[speaker_name]
-
-    #     speed_interactive = tts_model in ["tts-1", "tts-1-hd"]
-    #     instructions_relevant = tts_model == "gpt-4o-mini-tts"
-
-    #     accordion_elem_id = f"accordion_speaker_{speaker_name.replace(' ', '_')}"
-
-    #     with gr.Accordion(label=f"Settings for: {speaker_name}", open=False, elem_id=accordion_elem_id) as speaker_accordion:
-    #         voice_dd = gr.Dropdown(
-    #             label="Voice", choices=APP_AVAILABLE_VOICES, value=speaker_cfg.get("voice", safe_default_voice), interactive=True
-    #         )
-    #         voice_dd.change(
-    #             fn=partial(handle_dynamic_input_change, speaker_name=speaker_name, config_key="voice", tts_model=tts_model),
-    #             inputs=[voice_dd, speaker_configs_state_component],
-    #             outputs=[speaker_configs_state_component]
-    #         )
-
-    #         speed_slider_label = "Speech Speed" + (" (Active for tts-1/hd)" if speed_interactive else " (N/A for this model)")
-    #         speed_slider = gr.Slider(
-    #             label=speed_slider_label, minimum=0.25, maximum=4.0, value=float(speaker_cfg.get("speed", 1.0)),
-    #             step=0.05, interactive=speed_interactive
-    #         )
-    #         if speed_interactive:
-    #             speed_slider.release(
-    #                 fn=partial(handle_dynamic_input_change, speaker_name=speaker_name, config_key="speed", tts_model=tts_model),
-    #                 inputs=[speed_slider, speaker_configs_state_component],
-    #                 outputs=[speaker_configs_state_component]
-    #             )
-            
-    #         vibe_label = "Vibe/Emotion Preset" + (" (For gpt-4o-mini-tts)" if instructions_relevant else " (Less impact on other models)")
-    #         vibe_dd = gr.Dropdown(
-    #             label=vibe_label, choices=VIBE_CHOICES, value=speaker_cfg.get("vibe", DEFAULT_VIBE), interactive=True
-    #         )
-    #         vibe_dd.change(
-    #             fn=partial(handle_dynamic_input_change, speaker_name=speaker_name, config_key="vibe", tts_model=tts_model),
-    #             inputs=[vibe_dd, speaker_configs_state_component],
-    #             outputs=[speaker_configs_state_component]
-    #         )
-
-    #         custom_instr_label = "Custom Instructions"
-    #         custom_instr_placeholder = "Used if Vibe is 'Custom...'. Overrides Vibe preset."
-    #         custom_instr_tb = gr.Textbox(
-    #             label=custom_instr_label,
-    #             value=speaker_cfg.get("custom_instructions", ""),
-    #             placeholder=custom_instr_placeholder,
-    #             lines=2, interactive=True
-    #         )
-    #         custom_instr_tb.input(
-    #             fn=partial(handle_dynamic_input_change, speaker_name=speaker_name, config_key="custom_instructions", tts_model=tts_model),
-    #             inputs=[custom_instr_tb, speaker_configs_state_component],
-    #             outputs=[speaker_configs_state_component]
-    #         )
-    #     new_ui_components.append(speaker_accordion)
-    
-    # print(f"Returning {len(new_ui_components)} UI components for dynamic area.") 
-    # return new_ui_components, current_configs_state_dict
+    # # ... (rest of original logic) ...
+    # # At the end of original logic, if returning components for the column:
+    # # return gr.update(children=new_ui_components), current_configs_state_dict
     # --- END OF ORIGINAL LOGIC ---
 
 
@@ -153,6 +69,7 @@ async def handle_script_processing(
     global_instructions: str,
     progress=gr.Progress(track_tqdm=True)
 ):
+    # ... (content of this function remains unchanged from the previous correct version) ...
     if not openai_api_key or not async_openai_client:
         return None, None, "Error: OpenAI API Key or client is not configured."
     if not dialogue_script.strip():
@@ -275,8 +192,8 @@ async def handle_script_processing(
            merged_path if merged_path and os.path.exists(merged_path) else None,
            status)
 
-
 def handle_calculate_cost(dialogue_script: str, tts_model: str):
+    # ... (content of this function remains unchanged) ...
     if not dialogue_script.strip(): return "Cost: $0.00 (Script is empty)"
     try:
         parsed, chars = parse_dialogue_script(dialogue_script)
@@ -292,35 +209,32 @@ def update_model_controls_visibility(selected_model: str, script_text_for_refres
     """Updates visibility of global controls and refreshes per-speaker UI when TTS model changes."""
     print(f"Model changed to: {selected_model}. Refreshing dynamic UI and controls.") 
     try:
-        dynamic_ui_output, updated_state = load_refresh_per_speaker_ui(
+        # load_refresh_per_speaker_ui now returns (gr.update(children=...), updated_state_dict)
+        dynamic_ui_update_object, updated_state_dict = load_refresh_per_speaker_ui(
             script_text_for_refresh, current_speaker_configs_for_refresh, selected_model, speaker_configs_state_comp
         )
     except Exception as e:
         print(f"Error in load_refresh_per_speaker_ui called from model_controls_visibility: {e}")
-        dynamic_ui_output = [gr.Markdown(f"Error refreshing per-speaker UI: {e}")]
-        updated_state = current_speaker_configs_for_refresh 
+        error_markdown = gr.Markdown(f"Error refreshing per-speaker UI: {e}")
+        dynamic_ui_update_object = gr.update(children=[error_markdown]) # Wrap error in update
+        updated_state_dict = current_speaker_configs_for_refresh 
 
     is_tts1_family = selected_model in ["tts-1", "tts-1-hd"]
     is_gpt_mini_tts = selected_model == "gpt-4o-mini-tts"
     
-    # Return a TUPLE of updates, matching the order of components in 'outputs' list of the .change() event
     return (
-        gr.update(visible=is_tts1_family, interactive=is_tts1_family), # For global_speed_input
-        gr.update(visible=is_gpt_mini_tts, interactive=is_gpt_mini_tts), # For global_instructions_input
-        dynamic_ui_output, # For dynamic_speaker_ui_area
-        updated_state      # For speaker_configs_state
+        gr.update(visible=is_tts1_family, interactive=is_tts1_family), 
+        gr.update(visible=is_gpt_mini_tts, interactive=is_gpt_mini_tts), 
+        dynamic_ui_update_object, # This is now directly the gr.update object for the column
+        updated_state_dict      
     )
 
 
 def update_speaker_config_method_visibility(method: str):
-    """Updates visibility of UI groups based on selected speaker configuration method."""
     is_single = (method == "Single Voice (Global)")
     is_detailed_per_speaker = (method == "Detailed Configuration (Per Speaker UI)")
     
-    # Return a TUPLE of gr.update objects, in the order expected by the outputs list
-    # of the speaker_config_method_dropdown.change() event in app.py
-    # The order in app.py is: outputs=[single_voice_group, detailed_per_speaker_ui_group]
     return (
-        gr.update(visible=is_single),                   # For single_voice_group
-        gr.update(visible=is_detailed_per_speaker)      # For detailed_per_speaker_ui_group
+        gr.update(visible=is_single),                   
+        gr.update(visible=is_detailed_per_speaker)      
     )