Update app.py

app.py

@@ -122,22 +122,28 @@ def add_scene_to_story_orchestrator(
     
     log_accumulator = [f"**🚀 Scene {current_story_obj.current_scene_number + 1} - {time.strftime('%H:%M:%S')}**"]
     
-    # Initialize placeholders for the final return tuple values
+    # Initialize values for the final return tuple
+    # These will be updated throughout the try block.
+    # Order must match engage_button.click outputs list:
+    # story_state_output, output_gallery, output_latest_scene_image, 
+    # output_latest_scene_narrative, output_status_bar, output_interaction_log_markdown
+    
+    # Set initial/default values for the elements that will be returned
     ret_story_state = current_story_obj
     ret_gallery = current_story_obj.get_all_scenes_for_gallery_display()
-    ret_latest_image = None
-    ret_latest_narrative_str = "## Processing...\nNarrative generation in progress."
-    ret_status_bar_html = "<p class='processing_text status_text'>Processing...</p>"
-    ret_log_str = "\n".join(log_accumulator)
+    ret_latest_image = None # Will be PIL.Image or None
+    ret_latest_narrative_md = gr.Markdown(value="## Processing...\nNarrative being woven...")
+    ret_status_bar_html = gr.HTML(value="<p class='processing_text status_text'>Processing...</p>")
+    ret_log_md = gr.Markdown(value="\n".join(log_accumulator))
 
-    # Initial UI update by yielding a dictionary mapping component variables to their new configurations
+    # Initial UI updates (disabling buttons, setting placeholders) are done via yield
     yield {
-        output_status_bar: gr.HTML(value=f"<p class='processing_text status_text'>🌌 Weaving Scene {current_story_obj.current_scene_number + 1}...</p>"),
-        output_latest_scene_image: gr.Image(value=create_placeholder_image("🎨 Conjuring visuals..."), visible=True),
-        output_latest_scene_narrative: gr.Markdown(value=" Musing narrative...", visible=True),
         engage_button: gr.Button(interactive=False),
         surprise_button: gr.Button(interactive=False),
-        output_interaction_log_markdown: gr.Markdown(value="\n".join(log_accumulator))
+        output_status_bar: gr.HTML(value=f"<p class='processing_text status_text'>🌌 Weaving Scene {current_story_obj.current_scene_number + 1}...</p>"),
+        output_latest_scene_image: gr.Image(value=create_placeholder_image("🎨 Conjuring visuals...")),
+        output_latest_scene_narrative: gr.Markdown(value=" Musing narrative..."),
+        output_interaction_log_markdown: ret_log_md # Initial log
     }
 
     try:
@@ -156,13 +162,21 @@ def add_scene_to_story_orchestrator(
             text_response = None
             if text_model_info["type"] == "gemini": text_response = generate_text_gemini(user_p, model_id=text_model_info["id"], system_prompt=system_p, max_tokens=768 if narrative_length.startswith("Detailed") else 400)
             elif text_model_info["type"] == "hf_text": text_response = generate_text_hf(user_p, model_id=text_model_info["id"], system_prompt=system_p, max_tokens=768 if narrative_length.startswith("Detailed") else 400)
-            if text_response and text_response.success: narrative_text_generated = basic_text_cleanup(text_response.text); log_accumulator.append(f"  Narrative: Success.")
-            elif text_response: narrative_text_generated = f"**Narrative Error ({text_model_key}):** {text_response.error}"; log_accumulator.append(f"  Narrative: FAILED - {text_response.error}")
-            else: log_accumulator.append(f"  Narrative: FAILED - No response from {text_model_key}.")
-        else: narrative_text_generated = "**Narrative Error:** Text model unavailable."; log_accumulator.append(f"  Narrative: FAILED - Model '{text_model_key}' unavailable.")
+            
+            if text_response and text_response.success:
+                narrative_text_generated = basic_text_cleanup(text_response.text)
+                log_accumulator.append(f"  Narrative: Success. (Snippet: {narrative_text_generated[:50]}...)")
+            elif text_response:
+                narrative_text_generated = f"**Narrative Error ({text_model_key}):** {text_response.error}"
+                log_accumulator.append(f"  Narrative: FAILED - {text_response.error}")
+            else:
+                 log_accumulator.append(f"  Narrative: FAILED - No response object from {text_model_key}.")
+        else:
+            narrative_text_generated = "**Narrative Error:** Selected text model not available or misconfigured."
+            log_accumulator.append(f"  Narrative: FAILED - Model '{text_model_key}' not available.")
         
-        ret_latest_narrative_str = f"## Scene Idea: {scene_prompt_text}\n\n{narrative_text_generated}"
-        yield { output_latest_scene_narrative: gr.Markdown(value=ret_latest_narrative_str),
+        ret_latest_narrative_str_content = f"## Scene Idea: {scene_prompt_text}\n\n{narrative_text_generated}"
+        yield { output_latest_scene_narrative: gr.Markdown(value=ret_latest_narrative_str_content),
                 output_interaction_log_markdown: gr.Markdown(value="\n".join(log_accumulator)) }
 
         # --- 2. Generate Image ---
@@ -179,13 +193,22 @@ def add_scene_to_story_orchestrator(
             image_response = None
             if selected_image_provider_type == "stability_ai": image_response = generate_image_stabilityai(full_image_prompt, negative_prompt=negative_prompt_text or COMMON_NEGATIVE_PROMPTS, steps=40 if image_quality=="High Detail" else 25)
             elif selected_image_provider_type == "dalle": image_response = generate_image_dalle(full_image_prompt, quality="hd" if image_quality=="High Detail" else "standard")
-            if image_response and image_response.success: image_generated_pil = image_response.image; log_accumulator.append(f"  Image: Success.")
-            elif image_response: image_generation_error_message = f"**Image Error ({image_response.provider}):** {image_response.error}"; log_accumulator.append(f"  Image: FAILED - {image_response.error}")
-            else: image_generation_error_message = f"**Image Error:** No response from {image_provider_key}."; log_accumulator.append(f"  Image: FAILED - No response.")
-        else: image_generation_error_message = "**Image Error:** Image provider unavailable."; log_accumulator.append(f"  Image: FAILED - Provider '{image_provider_key}' unavailable.")
+            
+            if image_response and image_response.success:
+                image_generated_pil = image_response.image
+                log_accumulator.append(f"  Image: Success from {image_response.provider}.")
+            elif image_response:
+                image_generation_error_message = f"**Image Error ({image_response.provider}):** {image_response.error}"
+                log_accumulator.append(f"  Image: FAILED - {image_response.error}")
+            else:
+                image_generation_error_message = f"**Image Error:** No response object from {image_provider_key} service."
+                log_accumulator.append(f"  Image: FAILED - No response object from {image_provider_key}.")
+        else:
+            image_generation_error_message = "**Image Error:** Selected image provider not available or misconfigured."
+            log_accumulator.append(f"  Image: FAILED - Provider '{image_provider_key}' unavailable.")
 
         ret_latest_image = image_generated_pil if image_generated_pil else create_placeholder_image("Image Gen Failed", color="#401010")
-        yield { output_latest_scene_image: gr.Image(value=ret_latest_image),
+        yield { output_latest_scene_image: gr.Image(value=ret_latest_image), # Use gr.Image() for update
                 output_interaction_log_markdown: gr.Markdown(value="\n".join(log_accumulator)) }
 
         # --- 3. Add Scene to Story Object ---
@@ -208,45 +231,44 @@ def add_scene_to_story_orchestrator(
         # --- 4. Prepare Final Values for Return Tuple ---
         ret_gallery = current_story_obj.get_all_scenes_for_gallery_display()
         _ , latest_narr_for_display_final_str_temp = current_story_obj.get_latest_scene_details_for_display()
-        ret_latest_narrative_str = latest_narr_for_display_final_str_temp
+        ret_latest_narrative_str = latest_narr_for_display_final_str_temp # This is a string
         
-        ret_status_bar_html = f"<p class='error_text status_text'>Scene {current_story_obj.current_scene_number} added with errors.</p>" if final_scene_error else f"<p class='success_text status_text'>🌌 Scene {current_story_obj.current_scene_number} woven!</p>"
+        status_html_str_temp = f"<p class='error_text status_text'>Scene {current_story_obj.current_scene_number} added with errors.</p>" if final_scene_error else f"<p class='success_text status_text'>🌌 Scene {current_story_obj.current_scene_number} woven!</p>"
+        ret_status_bar_html = gr.HTML(value=status_html_str_temp) # Convert to HTML update
         
         progress(1.0, desc="Scene Complete!")
 
     except ValueError as ve:
         log_accumulator.append(f"\n**INPUT/CONFIG ERROR:** {ve}")
-        ret_status_bar_html = f"<p class='error_text status_text'>❌ CONFIGURATION ERROR: {ve}</p>"
+        ret_status_bar_html = gr.HTML(value=f"<p class='error_text status_text'>❌ CONFIGURATION ERROR: {ve}</p>")
         ret_latest_narrative_str = f"## Error\n{ve}"
     except Exception as e:
         log_accumulator.append(f"\n**UNEXPECTED RUNTIME ERROR:** {type(e).__name__} - {e}\n{traceback.format_exc()}")
-        ret_status_bar_html = f"<p class='error_text status_text'>❌ UNEXPECTED ERROR: {type(e).__name__}. Check logs.</p>"
+        ret_status_bar_html = gr.HTML(value=f"<p class='error_text status_text'>❌ UNEXPECTED ERROR: {type(e).__name__}. Check logs.</p>")
         ret_latest_narrative_str = f"## Unexpected Error\n{type(e).__name__}: {e}\nSee log for details."
     finally:
         current_total_time = time.time() - start_time
         log_accumulator.append(f"  Cycle ended at {time.strftime('%H:%M:%S')}. Total time: {current_total_time:.2f}s")
-        ret_log_str = "\n".join(log_accumulator)
+        ret_log_str = "\n".join(log_accumulator) # Prepare final log string
         
-        # This final yield updates button states and the log just before the function returns.
-        # It does NOT provide values for the main `outputs` list of the click handler.
+        # This final yield updates button states and the log markdown component.
+        # It does NOT update components that are part of the main `return` statement's responsibility.
         yield { 
             engage_button: gr.Button(interactive=True), 
             surprise_button: gr.Button(interactive=True),
-            output_interaction_log_markdown: gr.Markdown(value=ret_log_str) # Final log update via yield
+            output_interaction_log_markdown: gr.Markdown(value=ret_log_str) # Update log via yield
         }
     
-    # This `return` statement's tuple structure and order must match the `outputs` list
-    # of the `engage_button.click()` method.
+    # The final `return` provides values for the components listed in `engage_button.click(outputs=...)`
     return (
         ret_story_state,
         ret_gallery,
         ret_latest_image, 
-        gr.Markdown(value=ret_latest_narrative_str), 
-        gr.HTML(value=ret_status_bar_html),          
-        gr.Markdown(value=ret_log_str) # Log is also part of final return
+        gr.Markdown(value=ret_latest_narrative_str), # Ensure it's a Gradio update object
+        ret_status_bar_html, # Already a Gradio update object
+        gr.Markdown(value=ret_log_str)  # Ensure it's a Gradio update object for the log too
     )
 
-
 def clear_story_state_ui_wrapper():
     new_story = Story()
     placeholder_img = create_placeholder_image("Your StoryVerse is a blank canvas...", color="#1A1A2E", text_color="#A0A0C0")
@@ -267,25 +289,23 @@ def surprise_me_func():
 # --- Gradio UI Definition ---
 with gr.Blocks(theme=omega_theme, css=omega_css, title="✨ StoryVerse Omega ✨ - AI Story & World Weaver") as story_weaver_demo:
     # --- Define Python variables for UI components that need to be updated by `yield` or `return` ---
-    # State
     story_state_output = gr.State(Story()) 
-
-    # Input Column (some inputs are also outputs for clear/surprise)
     scene_prompt_input = gr.Textbox()      
     image_style_input = gr.Dropdown()      
     artist_style_input = gr.Textbox()      
-    
-    # Output Column (and status bar from input column)
+    # negative_prompt_input will be defined in layout
+    # text_model_dropdown will be defined in layout
+    # image_provider_dropdown will be defined in layout
+    # narrative_length_dropdown will be defined in layout
+    # image_quality_dropdown will be defined in layout
+    output_gallery = gr.Gallery()
     output_latest_scene_image = gr.Image()
     output_latest_scene_narrative = gr.Markdown()
-    output_gallery = gr.Gallery()
     output_status_bar = gr.HTML()
     output_interaction_log_markdown = gr.Markdown()
-    
-    # Buttons (interactivity updated by yield)
     engage_button = gr.Button()
     surprise_button = gr.Button()
-    # clear_story_button is not directly updated by the main orchestrator's yield typically
+    clear_story_button = gr.Button()
 
     # --- Layout the UI ---
     gr.Markdown("<div align='center'><h1>✨ StoryVerse Omega ✨</h1>\n<h3>Craft Immersive Multimodal Worlds with AI</h3></div>")
@@ -306,16 +326,13 @@ with gr.Blocks(theme=omega_theme, css=omega_css, title="✨ StoryVerse Omega ✨
         with gr.Column(scale=7, min_width=450): 
             gr.Markdown("### 💡 **Craft Your Scene**", elem_classes="input-section-header")
             with gr.Group():
-                scene_prompt_input = gr.Textbox(lines=7, label="Scene Vision (Description, Dialogue, Action):", placeholder="e.g., Amidst swirling cosmic dust, Captain Eva pilots her damaged starfighter towards a colossal, ringed gas giant. Alarms blare. 'Just a little further,' she mutters, gripping the controls.")
-            
+                scene_prompt_input = gr.Textbox(lines=7, label="Scene Vision (Description, Dialogue, Action):", placeholder="e.g., Amidst swirling cosmic dust...")
             with gr.Row(elem_classes=["compact-row"]):
                 with gr.Column(scale=2):
                     image_style_input = gr.Dropdown(choices=["Default (Cinematic Realism)"] + sorted(list(STYLE_PRESETS.keys())), value="Default (Cinematic Realism)", label="Visual Style Preset")
                 with gr.Column(scale=2):
-                    artist_style_input = gr.Textbox(label="Artistic Inspiration (Optional):", placeholder="e.g., Moebius, Zdzisław Beksiński")
-            
-            negative_prompt_input = gr.Textbox(lines=2, label="Exclude from Image (Negative Prompt):", placeholder="Default exclusions applied. Add more if needed.", value=COMMON_NEGATIVE_PROMPTS)
-
+                    artist_style_input = gr.Textbox(label="Artistic Inspiration (Optional):", placeholder="e.g., Moebius...")
+            negative_prompt_input = gr.Textbox(lines=2, label="Exclude from Image (Negative Prompt):", value=COMMON_NEGATIVE_PROMPTS)
             with gr.Accordion("⚙️ Advanced AI Configuration", open=False):
                  with gr.Group():
                     text_model_dropdown = gr.Dropdown(choices=list(TEXT_MODELS.keys()), value=UI_DEFAULT_TEXT_MODEL_KEY, label="Narrative AI Engine")
@@ -323,12 +340,10 @@ with gr.Blocks(theme=omega_theme, css=omega_css, title="✨ StoryVerse Omega ✨
                     with gr.Row():
                         narrative_length_dropdown = gr.Dropdown(["Short (1 paragraph)", "Medium (2-3 paragraphs)", "Detailed (4+ paragraphs)"], value="Medium (2-3 paragraphs)", label="Narrative Detail")
                         image_quality_dropdown = gr.Dropdown(["Standard", "High Detail", "Sketch Concept"], value="Standard", label="Image Detail/Style")
-            
             with gr.Row(elem_classes=["compact-row"], equal_height=True):
                 engage_button = gr.Button("🌌 Weave This Scene!", variant="primary", scale=3, icon="✨")
                 surprise_button = gr.Button("🎲 Surprise Me!", variant="secondary", scale=1, icon="🎁")
                 clear_story_button = gr.Button("🗑️ New Story", variant="stop", scale=1, icon="♻️")
-            
             output_status_bar = gr.HTML(value="<p class='processing_text status_text'>Ready to weave your first masterpiece!</p>")
 
         with gr.Column(scale=10, min_width=700): 
@@ -337,10 +352,8 @@ with gr.Blocks(theme=omega_theme, css=omega_css, title="✨ StoryVerse Omega ✨
                 with gr.TabItem("🌠 Latest Scene", id="latest_scene_tab"):
                     output_latest_scene_image = gr.Image(label="Latest Scene Image", type="pil", interactive=False, show_download_button=True, height=512, show_label=False, elem_classes=["panel_image"])
                     output_latest_scene_narrative = gr.Markdown() 
-                
                 with gr.TabItem("📚 Story Scroll", id="story_scroll_tab"):
                     output_gallery = gr.Gallery(label="Story Scroll", show_label=False, columns=4, object_fit="cover", height=700, preview=True, allow_preview=True, elem_classes=["gallery_output"])
-                
                 with gr.TabItem("⚙️ Interaction Log", id="log_tab"):
                     with gr.Accordion(label="Developer Interaction Log", open=False): 
                         output_interaction_log_markdown = gr.Markdown("Log will appear here...")
@@ -353,22 +366,17 @@ with gr.Blocks(theme=omega_theme, css=omega_css, title="✨ StoryVerse Omega ✨
             text_model_dropdown, image_provider_dropdown,
             narrative_length_dropdown, image_quality_dropdown
         ],
-        outputs=[ # These components are updated by the FINAL return tuple of the orchestrator
-            story_state_output, 
-            output_gallery, 
-            output_latest_scene_image, 
-            output_latest_scene_narrative, 
-            output_status_bar, 
-            output_interaction_log_markdown
+        outputs=[ 
+            story_state_output, output_gallery, output_latest_scene_image, 
+            output_latest_scene_narrative, output_status_bar, output_interaction_log_markdown
         ]
     )
     clear_story_button.click(
         fn=clear_story_state_ui_wrapper,
         inputs=[],
         outputs=[ 
-            story_state_output, output_gallery, 
-            output_latest_scene_image, output_latest_scene_narrative, 
-            output_status_bar, output_interaction_log_markdown,
+            story_state_output, output_gallery, output_latest_scene_image, 
+            output_latest_scene_narrative, output_status_bar, output_interaction_log_markdown,
             scene_prompt_input 
         ]
     )
@@ -377,7 +385,6 @@ with gr.Blocks(theme=omega_theme, css=omega_css, title="✨ StoryVerse Omega ✨
         inputs=[],
         outputs=[scene_prompt_input, image_style_input, artist_style_input]
     )
-
     gr.Examples(
         examples=[
             ["A lone, weary traveler on a mechanical steed crosses a vast, crimson desert under twin suns. Dust devils dance in the distance.", "Sci-Fi Western", "Moebius", "greenery, water, modern city"],