Update app.py

app.py

@@ -10,7 +10,6 @@ import traceback
 # --- Core Logic Imports ---
 from core.llm_services import initialize_text_llms, is_gemini_text_ready, is_hf_text_ready, generate_text_gemini, generate_text_hf
 from core.image_services import initialize_image_llms, is_hf_image_api_ready, generate_image_hf_model, ImageGenResponse 
-# Removed STABILITY_API_CONFIGURED, OPENAI_DALLE_CONFIGURED, generate_image_stabilityai, generate_image_dalle
 from core.story_engine import Story, Scene
 from prompts.narrative_prompts import get_narrative_system_prompt, format_narrative_user_prompt
 from prompts.image_style_prompts import STYLE_PRESETS, COMMON_NEGATIVE_PROMPTS, format_image_generation_prompt
@@ -18,18 +17,19 @@ from core.utils import basic_text_cleanup
 
 # --- Initialize Services ---
 initialize_text_llms()
-initialize_image_llms() # This will initialize based on HF_TOKEN for images
+initialize_image_llms() # This now primarily initializes based on HF_TOKEN for images
 
 # --- Get API Readiness Status ---
 GEMINI_TEXT_IS_READY = is_gemini_text_ready()
 HF_TEXT_IS_READY = is_hf_text_ready()
-HF_IMAGE_IS_READY = is_hf_image_api_ready() # Primary image status
+HF_IMAGE_IS_READY = is_hf_image_api_ready() # Primary image status from image_services.py
 
 # --- Application Configuration (Models, Defaults) ---
 TEXT_MODELS = {}
 UI_DEFAULT_TEXT_MODEL_KEY = None
 if GEMINI_TEXT_IS_READY:
     TEXT_MODELS["✨ Gemini 1.5 Flash (Narrate)"] = {"id": "gemini-1.5-flash-latest", "type": "gemini"}
+    TEXT_MODELS["Legacy Gemini 1.0 Pro (Narrate)"] = {"id": "gemini-1.0-pro-latest", "type": "gemini"}
 if HF_TEXT_IS_READY:
     TEXT_MODELS["Mistral 7B (Narrate via HF)"] = {"id": "mistralai/Mistral-7B-Instruct-v0.2", "type": "hf_text"}
     TEXT_MODELS["Gemma 2B (Narrate via HF)"] = {"id": "google/gemma-2b-it", "type": "hf_text"}
@@ -47,7 +47,7 @@ UI_DEFAULT_IMAGE_PROVIDER_KEY = None
 if HF_IMAGE_IS_READY: 
     IMAGE_PROVIDERS["🎡 HF - Stable Diffusion XL Base"] = "hf_sdxl_base" 
     IMAGE_PROVIDERS["🎠 HF - OpenJourney (Midjourney-like)"] = "hf_openjourney"
-    IMAGE_PROVIDERS["🌌 HF - Stable Diffusion v1.5"] = "hf_sd_1_5" # Another option
+    IMAGE_PROVIDERS["🌌 HF - Stable Diffusion v1.5"] = "hf_sd_1_5" 
     UI_DEFAULT_IMAGE_PROVIDER_KEY = "🎡 HF - Stable Diffusion XL Base"
 else:
     IMAGE_PROVIDERS["No Image Providers Configured (HF Token needed)"] = "none"
@@ -126,9 +126,9 @@ def add_scene_to_story_orchestrator(
     ret_latest_image = None
     ret_latest_narrative_md_obj = gr.Markdown(value="## Processing...\nNarrative being woven...")
     ret_status_bar_html_obj = gr.HTML(value="<p class='processing_text status_text'>Processing...</p>")
-    # ret_log_md will be built up
+    # ret_log_md is built up
 
-    # Initial yield for UI updates (buttons disabled by .then() chain)
+    # Initial yield for UI updates (buttons handled by .then() chain)
     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...")),
@@ -154,11 +154,11 @@ def add_scene_to_story_orchestrator(
             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 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.")
+            else: log_accumulator.append(f"  Narrative: FAILED - No response 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}' unavailable.")
         
         ret_latest_narrative_str_content = f"## Scene Idea: {scene_prompt_text}\n\n{narrative_text_generated}"
-        ret_latest_narrative_md_obj = gr.Markdown(value=ret_latest_narrative_str_content) # Update the component object
+        ret_latest_narrative_md_obj = gr.Markdown(value=ret_latest_narrative_str_content)
         yield { output_latest_scene_narrative: ret_latest_narrative_md_obj,
                 output_interaction_log_markdown: gr.Markdown(value="\n".join(log_accumulator)) }
 
@@ -166,8 +166,8 @@ def add_scene_to_story_orchestrator(
         progress(0.5, desc="🎨 Conjuring visuals...")
         image_generated_pil = None
         image_generation_error_message = None
-        selected_image_provider_key_from_ui = image_provider_key # The key from the dropdown
-        selected_image_provider_type = IMAGE_PROVIDERS.get(selected_image_provider_key_from_ui) # The value (e.g., "hf_sdxl_base")
+        selected_image_provider_key_from_ui = image_provider_key
+        selected_image_provider_type = IMAGE_PROVIDERS.get(selected_image_provider_key_from_ui)
 
         image_content_prompt_for_gen = narrative_text_generated if narrative_text_generated and "Error" not in narrative_text_generated else scene_prompt_text
         quality_keyword = "ultra detailed, intricate, masterpiece, " if image_quality == "High Detail" else ("concept sketch, line art, " if image_quality == "Sketch Concept" else "")
@@ -175,39 +175,22 @@ def add_scene_to_story_orchestrator(
         log_accumulator.append(f"  Image: Using provider key '{selected_image_provider_key_from_ui}' (maps to type '{selected_image_provider_type}'). Style: {image_style_dropdown}.")
 
         if selected_image_provider_type and selected_image_provider_type != "none":
-            if not HF_IMAGE_IS_READY and selected_image_provider_type.startswith("hf_"): # Check if HF image specifically is ready
+            if not HF_IMAGE_IS_READY and selected_image_provider_type.startswith("hf_"):
                 image_generation_error_message = "**Image Error:** Hugging Face Image API not configured (check STORYVERSE_HF_TOKEN)."
                 log_accumulator.append(f"  Image: FAILED - {image_generation_error_message}")
             else:
-                image_response = None
-                hf_model_id_to_call = None
+                image_response = None; hf_model_id_to_call = None; img_width, img_height = 768, 768 # Defaults
                 if selected_image_provider_type == "hf_sdxl_base": hf_model_id_to_call = "stabilityai/stable-diffusion-xl-base-1.0"
                 elif selected_image_provider_type == "hf_openjourney": hf_model_id_to_call = "prompthero/openjourney"; img_width, img_height = 512, 512
                 elif selected_image_provider_type == "hf_sd_1_5": hf_model_id_to_call = "runwayml/stable-diffusion-v1-5"; img_width, img_height = 512, 512
-                # Add other specific HF model mappings here
                 
-                if hf_model_id_to_call: # If it's an HF model type
-                    image_response = generate_image_hf_model(
-                        full_image_prompt, model_id=hf_model_id_to_call,
-                        negative_prompt=negative_prompt_text or COMMON_NEGATIVE_PROMPTS,
-                        width=img_width if 'img_width' in locals() else 768, 
-                        height=img_height if 'img_height' in locals() else 768
-                    )
-                # Add elif for other providers like StabilityAI or DALL-E if you re-enable them
-                # elif selected_image_provider_type == "stability_ai": ...
-                else:
-                    image_generation_error_message = f"**Image Error:** Provider type '{selected_image_provider_type}' not handled."
-                    log_accumulator.append(f"  Image: FAILED - {image_generation_error_message}")
+                if hf_model_id_to_call:
+                    image_response = generate_image_hf_model(full_image_prompt, model_id=hf_model_id_to_call, negative_prompt=negative_prompt_text or COMMON_NEGATIVE_PROMPTS, width=img_width, height=img_height)
+                else: image_generation_error_message = f"**Image Error:** Provider type '{selected_image_provider_type}' not handled for image generation."
 
-                if image_response and image_response.success:
-                    image_generated_pil = image_response.image
-                    log_accumulator.append(f"  Image: Success from {image_response.provider} (Model: {image_response.model_id_used}).")
-                elif image_response:
-                    image_generation_error_message = f"**Image Error ({image_response.provider} - {image_response.model_id_used}):** {image_response.error}"
-                    log_accumulator.append(f"  Image: FAILED - {image_response.error}")
-                elif not image_generation_error_message: # If no response and no specific error yet
-                    image_generation_error_message = f"**Image Error:** No response from image service for {selected_image_provider_key_from_ui}."
-                    log_accumulator.append(f"  Image: FAILED - No response object.")
+                if image_response and image_response.success: image_generated_pil = image_response.image; log_accumulator.append(f"  Image: Success from HF model {image_response.model_id_used or hf_model_id_to_call}.")
+                elif image_response: image_generation_error_message = f"**Image Error (HF - {image_response.model_id_used or hf_model_id_to_call}):** {image_response.error}"; log_accumulator.append(f"  Image: FAILED - {image_response.error}")
+                elif not image_generation_error_message: image_generation_error_message = f"**Image Error:** No response from HF image service."; log_accumulator.append(f"  Image: FAILED - No response object.")
         else:
             image_generation_error_message = "**Image Error:** No image provider selected or configured."
             log_accumulator.append(f"  Image: FAILED - Provider key '{selected_image_provider_key_from_ui}' not found or type is 'none'.")
@@ -227,7 +210,7 @@ def add_scene_to_story_orchestrator(
             narrative_text=narrative_text_generated if "**Narrative Error**" not in narrative_text_generated else "(Narrative gen failed)",
             image=image_generated_pil,
             image_style_prompt=f"{image_style_dropdown}{f', by {artist_style_text}' if artist_style_text and artist_style_text.strip() else ''}",
-            image_provider=selected_image_provider_key_from_ui, # Use the UI key for display
+            image_provider=selected_image_provider_key_from_ui,
             error_message=final_scene_error
         )
         ret_story_state = current_story_obj 
@@ -252,31 +235,22 @@ def add_scene_to_story_orchestrator(
         ret_status_bar_html_obj = gr.HTML(value=f"<p class='error_text status_text'>❌ UNEXPECTED ERROR: {type(e).__name__}. Check logs.</p>")
         ret_latest_narrative_md_obj = gr.Markdown(value=f"## Unexpected Error\n{type(e).__name__}: {e}\nSee log for details.")
     
-    # Final log update happens as part of the main return now
     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_md = gr.Markdown(value="\n".join(log_accumulator))
     
     # This is the FINAL return. It must be a tuple matching the `outputs` list of engage_button.click()
     return (
-        ret_story_state,
-        ret_gallery,
-        ret_latest_image, 
-        ret_latest_narrative_md_obj, 
-        ret_status_bar_html_obj,     
-        ret_log_md                   
+        ret_story_state, ret_gallery, ret_latest_image, 
+        ret_latest_narrative_md_obj, ret_status_bar_html_obj, ret_log_md
     )
 
 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")
-    cleared_gallery = [(placeholder_img, "Your StoryVerse is new and untold...")]
-    initial_narrative = "## ✨ A New Story Begins ✨\nDescribe your first scene idea..."
-    status_msg = "<p class='processing_text status_text'>📜 Story Cleared.</p>"
-    return (new_story, cleared_gallery, None, gr.Markdown(initial_narrative), gr.HTML(status_msg), "Log Cleared.", "")
+    new_story = Story(); ph_img = create_placeholder_image("Blank canvas...", color="#1A1A2E", text_color="#A0A0C0")
+    return (new_story, [(ph_img,"New StoryVerse...")], None, gr.Markdown("## ✨ New Story ✨"), gr.HTML("<p class='processing_text status_text'>📜 Story Cleared.</p>"), "Log Cleared.", "")
 
 def surprise_me_func():
-    themes = ["Cosmic Horror", "Solarpunk Utopia", "Mythic Fantasy", "Noir Detective"]; actions = ["unearths an artifact", "negotiates"]; settings = ["on a rogue planet", "in a city in a tree"]; prompt = f"A protagonist {random.choice(actions)} {random.choice(settings)}. Theme: {random.choice(themes)}."; style = random.choice(list(STYLE_PRESETS.keys())); artist = random.choice(["H.R. Giger", "Moebius", ""]*2); return prompt, style, artist
+    themes = ["Cosmic Horror", "Solarpunk Utopia", "Mythic Fantasy"]; actions = ["unearths an artifact", "negotiates"]; settings = ["on a rogue planet", "in a city in a tree"]; prompt = f"A protagonist {random.choice(actions)} {random.choice(settings)}. Theme: {random.choice(themes)}."; style = random.choice(list(STYLE_PRESETS.keys())); artist = random.choice(["H.R. Giger", "Moebius", ""]*2); return prompt, style, artist
 
 def disable_buttons_for_processing():
     return gr.Button(interactive=False), gr.Button(interactive=False)
@@ -292,13 +266,13 @@ with gr.Blocks(theme=omega_theme, css=omega_css, title="✨ StoryVerse Omega ✨
     gr.HTML("<div class='important-note'><strong>Welcome, Worldsmith!</strong> Describe your vision, choose your style, and let Omega help you weave captivating scenes with narrative and imagery. Ensure API keys (<code>STORYVERSE_...</code>) are correctly set in Space Secrets!</div>")
 
     with gr.Accordion("🔧 AI Services Status & Info", open=False):
-        status_text_list = []; text_llm_ok, image_gen_ok = (GEMINI_TEXT_IS_READY or HF_TEXT_IS_READY), (STABILITY_API_IS_READY or OPENAI_DALLE_IS_READY or HF_IMAGE_IS_READY)
+        status_text_list = []; text_llm_ok, image_gen_ok = (GEMINI_TEXT_IS_READY or HF_TEXT_IS_READY), (HF_IMAGE_IS_READY) # Simplified image_gen_ok
         if not text_llm_ok and not image_gen_ok: status_text_list.append("<p style='color:#FCA5A5;font-weight:bold;'>⚠️ CRITICAL: NO AI SERVICES CONFIGURED.</p>")
         else:
             if text_llm_ok: status_text_list.append("<p style='color:#A7F3D0;'>✅ Text Generation Service(s) Ready.</p>")
             else: status_text_list.append("<p style='color:#FCD34D;'>⚠️ Text Generation Service(s) NOT Ready.</p>")
-            if image_gen_ok: status_text_list.append("<p style='color:#A7F3D0;'>✅ Image Generation Service(s) Ready.</p>")
-            else: status_text_list.append("<p style='color:#FCD34D;'>⚠️ Image Generation Service(s) NOT Ready.</p>")
+            if image_gen_ok: status_text_list.append("<p style='color:#A7F3D0;'>✅ Image Generation Service (HF) Ready.</p>") # Specify HF
+            else: status_text_list.append("<p style='color:#FCD34D;'>⚠️ Image Generation Service (HF) NOT Ready.</p>")
         gr.HTML("".join(status_text_list))
 
     with gr.Row(equal_height=False, variant="panel"):
@@ -315,7 +289,7 @@ with gr.Blocks(theme=omega_theme, css=omega_css, title="✨ StoryVerse Omega ✨
             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")
-                    image_provider_dropdown = gr.Dropdown(choices=list(IMAGE_PROVIDERS.keys()), value=UI_DEFAULT_IMAGE_PROVIDER_KEY, label="Visual AI Engine")
+                    image_provider_dropdown = gr.Dropdown(choices=list(IMAGE_PROVIDERS.keys()), value=UI_DEFAULT_IMAGE_PROVIDER_KEY, label="Visual AI Engine (HF Models)") # Updated label
                     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")
@@ -337,34 +311,24 @@ with gr.Blocks(theme=omega_theme, css=omega_css, title="✨ StoryVerse Omega ✨
                     with gr.Accordion(label="Developer Interaction Log", open=False): 
                         output_interaction_log_markdown = gr.Markdown("Log will appear here...")
 
-    # Chained event handling for engage_button
     engage_button.click(
-        fn=disable_buttons_for_processing,
-        inputs=None,
-        outputs=[engage_button, surprise_button],
-        queue=False 
+        fn=disable_buttons_for_processing, inputs=None, outputs=[engage_button, surprise_button], queue=False 
     ).then(
         fn=add_scene_to_story_orchestrator,
         inputs=[
-            story_state_output, scene_prompt_input, 
-            image_style_input, artist_style_input, negative_prompt_input,
-            text_model_dropdown, image_provider_dropdown,
-            narrative_length_dropdown, image_quality_dropdown
+            story_state_output, scene_prompt_input, image_style_input, artist_style_input, negative_prompt_input,
+            text_model_dropdown, image_provider_dropdown, narrative_length_dropdown, image_quality_dropdown
         ],
         outputs=[ 
             story_state_output, output_gallery, output_latest_scene_image, 
             output_latest_scene_narrative, output_status_bar, output_interaction_log_markdown
         ]
     ).then( 
-        fn=enable_buttons_after_processing,
-        inputs=None,
-        outputs=[engage_button, surprise_button],
-        queue=False 
+        fn=enable_buttons_after_processing, inputs=None, outputs=[engage_button, surprise_button], queue=False 
     )
     
     clear_story_button.click(
-        fn=clear_story_state_ui_wrapper,
-        inputs=[],
+        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,
@@ -372,12 +336,11 @@ with gr.Blocks(theme=omega_theme, css=omega_css, title="✨ StoryVerse Omega ✨
         ]
     )
     surprise_button.click(
-        fn=surprise_me_func,
-        inputs=[],
+        fn=surprise_me_func, inputs=[],
         outputs=[scene_prompt_input, image_style_input, artist_style_input]
     )
     gr.Examples(
-        examples=[ # Ensure these styles are in your STYLE_PRESETS in image_style_prompts.py
+        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"],
@@ -391,9 +354,11 @@ with gr.Blocks(theme=omega_theme, css=omega_css, title="✨ StoryVerse Omega ✨
 # --- Entry Point ---
 if __name__ == "__main__":
     print("="*80); print("✨ StoryVerse Omega™ Launching... ✨")
-    print(f"  Gemini Text Ready: {GEMINI_TEXT_IS_READY}"); print(f"  HF Text Ready: {HF_TEXT_IS_READY}")
-    print(f"  Stability AI Ready: {STABILITY_API_IS_READY}"); print(f"  DALL-E Ready: {OPENAI_DALLE_IS_READY}"); print(f"  HF Image Ready: {HF_IMAGE_IS_READY}")
-    if not (GEMINI_TEXT_IS_READY or HF_TEXT_IS_READY) or not (STABILITY_API_IS_READY or OPENAI_DALLE_IS_READY or HF_IMAGE_IS_READY): print("  🔴 WARNING: Not all services configured.")
+    print(f"  Text LLM Ready (Gemini): {GEMINI_TEXT_IS_READY}"); print(f"  Text LLM Ready (HF): {HF_TEXT_IS_READY}")
+    # Corrected to only show HF_IMAGE_IS_READY as per our simplification
+    print(f"  Image Provider Ready (HF): {HF_IMAGE_IS_READY}") 
+    if not (GEMINI_TEXT_IS_READY or HF_TEXT_IS_READY) or not HF_IMAGE_IS_READY: # Adjusted condition
+        print("  🔴 WARNING: Not all required AI services (Text and HF Image) are configured.")
     print(f"  Default Text Model: {UI_DEFAULT_TEXT_MODEL_KEY}"); print(f"  Default Image Provider: {UI_DEFAULT_IMAGE_PROVIDER_KEY}")
     print("="*80)
     story_weaver_demo.launch(debug=True, server_name="0.0.0.0", share=False)