Update app.py

app.py

@@ -1,7 +1,7 @@
 # app.py
 import streamlit as st
 from core.gemini_handler import GeminiHandler
-from core.visual_engine import VisualEngine # Your updated VisualEngine with DALL-E prep
+from core.visual_engine import VisualEngine 
 from core.prompt_engineering import (
     create_story_breakdown_prompt,
     create_image_prompt_from_scene_data,
@@ -39,20 +39,23 @@ if 'visual_engine' not in st.session_state:
     # --- TRY TO SET OPENAI API KEY FOR VISUAL ENGINE ---
     openai_key_from_secrets = None
     try:
+        # Check Streamlit Cloud secrets first
         if "OPENAI_API_KEY" in st.secrets:
             openai_key_from_secrets = st.secrets["OPENAI_API_KEY"]
+    except AttributeError: # st.secrets might not exist in all local dev environments
+        print("st.secrets not available (likely local dev without secrets.toml). Checking environment variables.")
     except Exception as e:
-        print(f"Could not access st.secrets for OPENAI_API_KEY: {e}") # Log, don't stop app
+        print(f"Could not access st.secrets for OPENAI_API_KEY: {e}")
 
     if not openai_key_from_secrets and "OPENAI_API_KEY" in os.environ: # Fallback to env var
         openai_key_from_secrets = os.environ["OPENAI_API_KEY"]
     
     if openai_key_from_secrets:
         st.session_state.visual_engine.set_openai_api_key(openai_key_from_secrets)
-        # st.sidebar.info("OpenAI API Key loaded. DALL-E generation enabled.") # Optional UI feedback
+        # st.sidebar.caption("OpenAI API Key loaded. DALL-E ready.") # Optional UI feedback
     else:
         st.session_state.visual_engine.set_openai_api_key(None) 
-        st.sidebar.warning("OpenAI API Key for DALL-E not found. Visuals will be placeholders.")
+        st.sidebar.caption("OpenAI API Key for DALL-E not found. Visuals will be placeholders.")
     # --- END OF OPENAI API KEY SETUP ---
 
 # Story and generated content state
@@ -78,22 +81,21 @@ def initialize_new_story():
 
 def generate_visual_for_scene_wrapper(scene_index, scene_data, is_regeneration=False, version_count=1):
     scene_num_for_log = scene_data.get('scene_number', scene_index + 1)
-    # This st.info will appear briefly in the main app area below the "Generate" button.
-    # Consider moving detailed progress to sidebar or using st.status.
-    # st.info(f"Processing visual concept for Scene {scene_num_for_log} (v{version_count})...") 
     
     textual_image_prompt = ""
-    if is_regeneration and scene_index < len(st.session_state.scene_image_prompts):
+    if is_regeneration and scene_index < len(st.session_state.scene_image_prompts) and st.session_state.scene_image_prompts[scene_index]:
         textual_image_prompt = st.session_state.scene_image_prompts[scene_index]
+        # st.caption(f"Using refined prompt for Scene {scene_num_for_log}.") # Can be noisy
     else:
         textual_image_prompt = create_image_prompt_from_scene_data(
             scene_data,
             st.session_state.character_definitions,
             st.session_state.style_reference_description
         )
+        # st.caption(f"Generated initial prompt for Scene {scene_num_for_log}.") # Can be noisy
 
     if not textual_image_prompt:
-        st.error(f"Failed to create/retrieve textual image prompt for Scene {scene_num_for_log}.")
+        # st.error(f"Failed to create/retrieve textual image prompt for Scene {scene_num_for_log}.") # Handled by status
         return False
 
     if scene_index >= len(st.session_state.scene_image_prompts):
@@ -103,21 +105,18 @@ def generate_visual_for_scene_wrapper(scene_index, scene_data, is_regeneration=F
 
     image_filename = f"scene_{scene_num_for_log}_visual_v{version_count}.png"
     
-    # The actual generation (AI or placeholder) happens here
     generated_image_path = st.session_state.visual_engine.generate_image_visual(
-        textual_image_prompt,
-        image_filename
+        textual_image_prompt, image_filename
     )
 
     while len(st.session_state.generated_images_paths) <= scene_index:
         st.session_state.generated_images_paths.append(None)
 
     if generated_image_path and os.path.exists(generated_image_path):
-        # st.success(f"Visual for Scene {scene_num_for_log} (v{version_count}) ready.") # Can be noisy
         st.session_state.generated_images_paths[scene_index] = generated_image_path
         return True
     else:
-        st.warning(f"Visual generation failed or path invalid for Scene {scene_num_for_log} (v{version_count}).")
+        # st.warning(f"Visual for Scene {scene_num_for_log} (v{version_count}) failed or path invalid.") # Handled by status
         st.session_state.generated_images_paths[scene_index] = None
         return False
 
@@ -125,10 +124,10 @@ def generate_visual_for_scene_wrapper(scene_index, scene_data, is_regeneration=F
 with st.sidebar:
     st.title("🎬 CineGen AI Pro")
     st.markdown("### Creative Controls")
-    user_idea = st.text_area("Enter your core story idea:", "A detective in a cyberpunk city investigates a rogue AI that believes it's the next step in evolution.", height=100, key="user_idea_input")
-    genre = st.selectbox("Genre:", ["Sci-Fi", "Fantasy", "Noir", "Thriller", "Drama", "Horror"], index=2, key="genre_select")
-    mood = st.selectbox("Mood:", ["Suspenseful", "Mysterious", "Gritty", "Epic", "Dark", "Hopeful"], index=2, key="mood_select")
-    num_scenes_val = st.slider("Number of Scenes:", 1, 5, 3, key="num_scenes_slider")
+    user_idea = st.text_area("Enter your core story idea:", "A lone astronaut discovers a glowing alien artifact on Mars, a sense of wonder and slight dread.", height=100, key="user_idea_input")
+    genre = st.selectbox("Genre:", ["Sci-Fi", "Fantasy", "Noir", "Thriller", "Drama", "Horror", "Cyberpunk"], index=6, key="genre_select")
+    mood = st.selectbox("Mood:", ["Suspenseful", "Mysterious", "Gritty", "Epic", "Dark", "Hopeful", "Wonder"], index=6, key="mood_select")
+    num_scenes_val = st.slider("Number of Scenes:", 1, 5, 3, key="num_scenes_slider") # Max 5 for sensible generation times
 
     if st.button("✨ Generate Full Story Concept", type="primary", key="generate_full_story_btn", use_container_width=True):
         initialize_new_story()
@@ -140,51 +139,55 @@ with st.sidebar:
                 story_prompt_text = create_story_breakdown_prompt(user_idea, genre, mood, num_scenes_val)
                 try:
                     st.session_state.story_scenes = st.session_state.gemini_handler.generate_story_breakdown(story_prompt_text)
-                    status_main.update(label="Script breakdown complete! ✅", state="running")
+                    status_main.update(label="Script breakdown complete! ✅", state="running", expanded=True)
 
                     num_actual_scenes = len(st.session_state.story_scenes)
                     st.session_state.scene_image_prompts = [""] * num_actual_scenes
                     st.session_state.generated_images_paths = [None] * num_actual_scenes
 
                 except Exception as e:
-                    status_main.update(label=f"Failed to generate story breakdown: {e}", state="error")
-                    st.session_state.story_scenes = []
-                    st.stop() # Stop further execution if script fails
+                    status_main.update(label=f"Failed to generate story breakdown: {e}", state="error", expanded=True)
+                    st.session_state.story_scenes = [] # Ensure it's empty on failure
+                    st.stop() 
 
                 if st.session_state.story_scenes:
-                    st.write("Phase 2: Generating initial visual concepts... 🖼️")
+                    st.write("Phase 2: Generating initial visual concepts... 🖼️ (This may take a few minutes per scene with DALL-E)")
                     success_count = 0
                     for i_loop, scene_data_loop_var in enumerate(st.session_state.story_scenes):
-                        st.write(f"Generating visual for Scene {scene_data_loop_var.get('scene_number', i_loop + 1)}...")
+                        scene_num_log = scene_data_loop_var.get('scene_number', i_loop + 1)
+                        st.write(f"Generating visual for Scene {scene_num_log}...")
                         if generate_visual_for_scene_wrapper(i_loop, scene_data_loop_var, version_count=1):
                             success_count +=1
+                            st.write(f"Visual for Scene {scene_num_log} done.")
+                        else:
+                            st.write(f"Visual for Scene {scene_num_log} failed.")
                     
                     if success_count == len(st.session_state.story_scenes):
                         status_main.update(label="All concepts generated successfully! 🎉", state="complete", expanded=False)
                     elif success_count > 0:
-                         status_main.update(label=f"{success_count}/{len(st.session_state.story_scenes)} visuals generated. Some failed.", state="warning", expanded=False)
+                         status_main.update(label=f"{success_count}/{len(st.session_state.story_scenes)} visuals generated.", state="warning", expanded=False)
                     else:
                         status_main.update(label="Visual concept generation failed for all scenes.", state="error", expanded=False)
 
-
     st.markdown("---")
     st.markdown("### Advanced Options")
     with st.expander("Character Consistency", expanded=False):
         char_name_input = st.text_input("Character Name (e.g., Eva)", key="char_name_adv_input")
-        char_desc_input = st.text_area("Character Description (for visual consistency)", key="char_desc_adv_input", height=80)
+        char_desc_input = st.text_area("Character Description (e.g., 'female, short red hair, green eyes, wearing a blue jumpsuit')", key="char_desc_adv_input", height=100)
         if st.button("Add/Update Character", key="add_char_adv_btn"):
             if char_name_input and char_desc_input:
-                st.session_state.character_definitions[char_name_input.strip()] = char_desc_input.strip()
+                # Store character names in lowercase for easier matching, but keep original for display if needed
+                st.session_state.character_definitions[char_name_input.strip().lower()] = char_desc_input.strip()
                 st.success(f"Character '{char_name_input.strip()}' defined.")
             else:
                 st.warning("Please provide both name and description.")
         if st.session_state.character_definitions:
             st.caption("Defined Characters:")
-            for char, desc in st.session_state.character_definitions.items():
-                st.markdown(f"**{char}:** _{desc}_")
+            for char_key, desc_val in st.session_state.character_definitions.items():
+                st.markdown(f"**{char_key.title()}:** _{desc_val}_") # Display with title case
 
     with st.expander("Style Transfer", expanded=False):
-        style_ref_text = st.text_area("Describe Style (e.g., 'Van Gogh inspired, swirling brushstrokes')", key="style_text_adv_input", height=80)
+        style_ref_text = st.text_area("Describe Visual Style (e.g., 'impressionistic oil painting, vibrant colors')", key="style_text_adv_input", height=100)
         if st.button("Apply Textual Style", key="apply_style_adv_btn"):
             st.session_state.style_reference_description = style_ref_text.strip()
             st.success("Style reference applied. Re-generate visuals or full story to see changes.")
@@ -221,7 +224,7 @@ else:
         with col2: 
             current_image_path = st.session_state.generated_images_paths[i] if i < len(st.session_state.generated_images_paths) else None
             if current_image_path and os.path.exists(current_image_path):
-                st.image(current_image_path, caption=f"Visual Concept for Scene {scene_num_display}")
+                st.image(current_image_path, caption=f"Visual Concept for Scene {scene_num_display}", use_column_width=True)
             else:
                 if st.session_state.story_scenes: 
                     st.caption("Visual for this scene is pending or failed to generate.")
@@ -282,7 +285,8 @@ else:
                                         if '_v' in base: version = int(base.split('_v')[-1]) + 1
                                     except : pass
                                 
-                                if generate_visual_for_scene_wrapper(i, scene_data_display, is_regeneration=True, version_count=version): # Pass current scene_data, as only prompt changed
+                                # Pass current scene_data_display as scene content hasn't changed, only the prompt.
+                                if generate_visual_for_scene_wrapper(i, scene_data_display, is_regeneration=True, version_count=version):
                                     status_visual_regen.update(label="Visual for Scene updated! 🎉", state="complete", expanded=False)
                                 else:
                                      status_visual_regen.update(label="Prompt refined, but visual failed.", state="warning", expanded=False)
@@ -294,20 +298,30 @@ else:
         st.markdown("---")
     
     if st.session_state.story_scenes and any(p for p in st.session_state.generated_images_paths if p is not None):
-        if st.button("🎬 Assemble Animatic Video", key="assemble_video_btn", type="primary", use_container_width=True):
-            with st.status("Assembling video...", expanded=False) as status_video:
-                valid_image_paths_for_video = [p for p in st.session_state.generated_images_paths if p and os.path.exists(p)]
-                if valid_image_paths_for_video:
+        if st.button("🎬 Assemble Enhanced Animatic", key="assemble_enhanced_video_btn", type="primary", use_container_width=True):
+            with st.status("Assembling enhanced animatic video...", expanded=False) as status_video:
+                image_data_for_video = []
+                for idx, scene_info in enumerate(st.session_state.story_scenes):
+                    img_path = st.session_state.generated_images_paths[idx] if idx < len(st.session_state.generated_images_paths) else None
+                    if img_path and os.path.exists(img_path):
+                        image_data_for_video.append({
+                            'path': img_path,
+                            'scene_num': scene_info.get('scene_number', idx + 1),
+                            'key_action': scene_info.get('key_action', '') 
+                        })
+                
+                if image_data_for_video:
                     st.session_state.video_path = st.session_state.visual_engine.create_video_from_images(
-                        valid_image_paths_for_video,
-                        output_filename="cinegen_pro_animatic.mp4",
-                        duration_per_image=3 # Adjust as needed
+                        image_data_for_video, 
+                        output_filename="cinegen_pro_animatic_enhanced.mp4",
+                        duration_per_image=4, 
+                        fps=24 
                     )
                     if st.session_state.video_path and os.path.exists(st.session_state.video_path):
-                        status_video.update(label="Animatic video assembled! 🎉", state="complete")
+                        status_video.update(label="Enhanced animatic assembled! 🎉", state="complete")
                         st.balloons()
                     else:
-                        status_video.update(label="Video assembly failed. Check logs.", state="error")
+                        status_video.update(label="Enhanced video assembly failed. Check logs.", state="error")
                 else:
                     status_video.update(label="No valid images to assemble video.", state="error")
     elif st.session_state.story_scenes:
@@ -318,12 +332,12 @@ else:
         try:
             with open(st.session_state.video_path, 'rb') as video_file_obj:
                 video_bytes_content = video_file_obj.read()
-            st.video(video_bytes_content)
+            st.video(video_bytes_content, format="video/mp4") # Specify format for better compatibility
             with open(st.session_state.video_path, "rb") as fp_download_video:
                 st.download_button(
-                    label="Download Animatic Video", data=fp_download_video,
+                    label="Download Enhanced Animatic", data=fp_download_video,
                     file_name=os.path.basename(st.session_state.video_path), mime="video/mp4",
-                    use_container_width=True
+                    use_container_width=True, key="download_video_btn" # Added key
                 )
         except Exception as e:
             st.error(f"Error displaying or preparing video for download: {e}")