Update app.py

app.py

@@ -103,7 +103,7 @@ body, .gradio-container { background-color: #0F0F1A !important; color: #D0D0E0 !
 def create_placeholder_image(text="Processing...", size=(512, 512), color="#23233A", text_color="#E0E0FF"):
     img = Image.new('RGB', size, color=color); draw = ImageDraw.Draw(img)
     try: font_path = "arial.ttf" if os.path.exists("arial.ttf") else None 
-    except: font_path = None # Handle potential OS errors accessing font list
+    except: font_path = None 
     try: font = ImageFont.truetype(font_path, 40) if font_path else ImageFont.load_default()
     except IOError: font = ImageFont.load_default()
     if hasattr(draw, 'textbbox'): bbox = draw.textbbox((0,0), text, font=font); tw, th = bbox[2]-bbox[0], bbox[3]-bbox[1]
@@ -117,64 +117,57 @@ def add_scene_to_story_orchestrator(
     narrative_length: str, image_quality: str,
     progress=gr.Progress(track_tqdm=True)
 ):
+    # Initialize start_time here
+    start_time = time.time() 
+    
     if not current_story_obj: current_story_obj = Story() 
     
     log_accumulator = [f"**🚀 Scene {current_story_obj.current_scene_number + 1} - {time.strftime('%H:%M:%S')}**"]
     
+    # Define placeholders for the final return tuple values
+    # This ensures they exist even if errors occur early.
+    # Order must match engage_button.click outputs list
+    ret_story_state = current_story_obj
+    ret_gallery = current_story_obj.get_all_scenes_for_gallery_display()
+    ret_latest_image = None
+    ret_latest_narrative = gr.Markdown(value="## Error\nProcessing did not complete.")
+    ret_status_bar = gr.HTML(value="<p class='error_text status_text'>An error occurred during processing.</p>")
+    ret_log = gr.Markdown(value="\n".join(log_accumulator))
+
+
     # Initial UI update using direct component updates in yield by component variable name
     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),
+        engage_button: gr.Button(interactive=False), # Disable button
         surprise_button: gr.Button(interactive=False),
         output_interaction_log_markdown: gr.Markdown(value="\n".join(log_accumulator))
     }
 
-    # Prepare a dictionary to hold final return values for the .click() outputs list
-    # Initialize with current state or placeholders
-    final_return_dict = {
-        "story_state": current_story_obj,
-        "gallery": current_story_obj.get_all_scenes_for_gallery_display(), # Initial gallery
-        "latest_image": create_placeholder_image("Pending..."),
-        "latest_narrative": "## Pending...\nNarrative generation in progress.",
-        "status_bar": "<p class='processing_text status_text'>Processing...</p>",
-        "log": "\n".join(log_accumulator)
-    }
-
     try:
-        start_time = time.time() 
-
         if not scene_prompt_text.strip():
             raise ValueError("Scene prompt cannot be empty!")
 
         # --- 1. Generate Narrative Text ---
         progress(0.1, desc="✍️ Crafting narrative...")
-        narrative_text_generated = f"Narrative Error: Generation failed for '{scene_prompt_text[:30]}...'."
+        narrative_text_generated = f"Narrative Error: Init failed."
         text_model_info = TEXT_MODELS.get(text_model_key)
         if text_model_info and text_model_info["type"] != "none":
-            system_p = get_narrative_system_prompt("default")
-            prev_narrative = current_story_obj.get_last_scene_narrative()
+            system_p = get_narrative_system_prompt("default") 
+            prev_narrative = current_story_obj.get_last_scene_narrative() 
             user_p = format_narrative_user_prompt(scene_prompt_text, prev_narrative)
-            log_accumulator.append(f"  Narrative: Using {text_model_key} ({text_model_info['id']}). Length aim: {narrative_length}")
+            log_accumulator.append(f"  Narrative: Using {text_model_key} ({text_model_info['id']}). Length: {narrative_length}")
             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. (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.")
+            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.")
         
-        final_return_dict["latest_narrative"] = f"## Scene Idea: {scene_prompt_text}\n\n{narrative_text_generated}"
-        yield { output_latest_scene_narrative: gr.Markdown(value=final_return_dict["latest_narrative"]),
+        ret_latest_narrative = gr.Markdown(value=f"## Scene Idea: {scene_prompt_text}\n\n{narrative_text_generated}")
+        yield { output_latest_scene_narrative: ret_latest_narrative,
                 output_interaction_log_markdown: gr.Markdown(value="\n".join(log_accumulator)) }
 
         # --- 2. Generate Image ---
@@ -191,22 +184,13 @@ 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 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}' not available.")
+            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.")
 
-        final_return_dict["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=final_return_dict["latest_image"]),
+        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),
                 output_interaction_log_markdown: gr.Markdown(value="\n".join(log_accumulator)) }
 
         # --- 3. Add Scene to Story Object ---
@@ -223,40 +207,42 @@ def add_scene_to_story_orchestrator(
             image_provider=image_provider_key if selected_image_provider_type != "none" else "N/A",
             error_message=final_scene_error
         )
-        final_return_dict["story_state"] = current_story_obj # Update story state in final dict
-        log_accumulator.append(f"  Scene {current_story_obj.current_scene_number} processed and added to story object.")
+        ret_story_state = current_story_obj 
+        log_accumulator.append(f"  Scene {current_story_obj.current_scene_number} processed and added.")
         
-        # --- 4. Prepare Final Outputs for Gradio ---
-        final_return_dict["gallery"] = current_story_obj.get_all_scenes_for_gallery_display()
-        _ , final_return_dict["latest_narrative"] = current_story_obj.get_latest_scene_details_for_display() # Update narrative for final return
+        # --- 4. Prepare Final Values for Return Tuple ---
+        ret_gallery = current_story_obj.get_all_scenes_for_gallery_display()
+        _ , latest_narr_for_display_final_str = current_story_obj.get_latest_scene_details_for_display()
+        ret_latest_narrative = gr.Markdown(value=latest_narr_for_display_final_str)
         
-        final_return_dict["status_bar"] = 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 = 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 = gr.HTML(value=status_html_str)
         
         progress(1.0, desc="Scene Complete!")
 
     except ValueError as ve:
         log_accumulator.append(f"\n**INPUT/CONFIG ERROR:** {ve}")
-        final_return_dict["status_bar"] = f"<p class='error_text status_text'>❌ CONFIGURATION ERROR: {ve}</p>"
-        final_return_dict["latest_narrative"] = f"## Error\n{ve}"
+        ret_status_bar = gr.HTML(value=f"<p class='error_text status_text'>❌ CONFIGURATION ERROR: {ve}</p>")
+        ret_latest_narrative = gr.Markdown(value=f"## Error\n{ve}")
     except Exception as e:
         log_accumulator.append(f"\n**UNEXPECTED RUNTIME ERROR:** {type(e).__name__} - {e}\n{traceback.format_exc()}")
-        final_return_dict["status_bar"] = f"<p class='error_text status_text'>❌ UNEXPECTED ERROR: {e}. Check logs.</p>"
-        final_return_dict["latest_narrative"] = f"## Unexpected Error\n{e}\nSee log for details."
+        ret_status_bar = gr.HTML(value=f"<p class='error_text status_text'>❌ UNEXPECTED ERROR: {type(e).__name__}. Check logs.</p>")
+        ret_latest_narrative = gr.Markdown(value=f"## Unexpected Error\n{type(e).__name__}: {e}\nSee log for details.")
     finally:
-        log_accumulator.append(f"  Cycle ended at {time.strftime('%H:%M:%S')}. Total time: {time.time() - (start_time if 'start_time' in locals() else time.time()):.2f}s")
-        final_return_dict["log"] = "\n".join(log_accumulator)
-        # Final yield to re-enable buttons, this will be overridden by the return for other components
-        yield { engage_button: gr.Button(interactive=True), surprise_button: gr.Button(interactive=True) }
+        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 = gr.Markdown(value="\n".join(log_accumulator))
+        
+        # This yield is only for button states, does not affect the main 'return'
+        yield { 
+            engage_button: gr.Button(interactive=True), 
+            surprise_button: gr.Button(interactive=True),
+            output_interaction_log_markdown: ret_log # Update log one last time via yield
+        }
+    
+    # Final return for the .click() handler's `outputs` list
+    return ret_story_state, ret_gallery, ret_latest_image, ret_latest_narrative, ret_status_bar, ret_log
 
-    # Final return statement for the .click() handler
-    return (
-        final_return_dict["story_state"],
-        final_return_dict["gallery"],
-        final_return_dict["latest_image"],
-        gr.Markdown(value=final_return_dict["latest_narrative"]),
-        gr.HTML(value=final_return_dict["status_bar"]),
-        gr.Markdown(value=final_return_dict["log"])
-    )
 
 def clear_story_state_ui_wrapper():
     new_story = Story()
@@ -317,7 +303,6 @@ with gr.Blocks(theme=omega_theme, css=omega_css, title="✨ StoryVerse Omega ✨
                         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):
-                # Assign these buttons to Python variables to be updated by yield
                 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="♻️")
@@ -346,7 +331,7 @@ 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 of the orchestrator
+        outputs=[ # These components are updated by the FINAL return tuple of the orchestrator
             story_state_output, 
             output_gallery, 
             output_latest_scene_image, 
@@ -375,6 +360,8 @@ with gr.Blocks(theme=omega_theme, css=omega_css, title="✨ StoryVerse Omega ✨
         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"],
             ["Deep within an ancient, bioluminescent forest, a hidden civilization of sentient fungi perform a mystical ritual around a pulsating crystal.", "Psychedelic Fantasy", "Alex Grey", "technology, buildings, roads"],
+             ["A child sits on a crescent moon, fishing for stars in a swirling nebula. A friendly space whale swims nearby.", "Whimsical Cosmic", "James Jean", "realistic, dark, scary"],
+            ["A grand, baroque library where the books fly freely and whisper forgotten lore to those who listen closely.", "Magical Realism", "Remedios Varo", "minimalist, simple, technology"]
         ],
         inputs=[scene_prompt_input, image_style_input, artist_style_input, negative_prompt_input], 
         label="🌌 Example Universes to Weave 🌌",