Update app.py

app.py

@@ -1,378 +1,444 @@
-# core/visual_engine.py
-from PIL import Image, ImageDraw, ImageFont, ImageOps
-# --- MONKEY PATCH FOR Image.ANTIALIAS ---
-try:
-    if hasattr(Image, 'Resampling') and hasattr(Image.Resampling, 'LANCZOS'): # Pillow 9+
-        if not hasattr(Image, 'ANTIALIAS'): Image.ANTIALIAS = Image.Resampling.LANCZOS
-    elif hasattr(Image, 'LANCZOS'): # Pillow 8
-         if not hasattr(Image, 'ANTIALIAS'): Image.ANTIALIAS = Image.LANCZOS
-    elif not hasattr(Image, 'ANTIALIAS'):
-             print("WARNING: Pillow version lacks common Resampling attributes or ANTIALIAS. Video effects might fail.")
-except Exception as e_mp: print(f"WARNING: ANTIALIAS monkey-patch error: {e_mp}")
-# --- END MONKEY PATCH ---
-
-from moviepy.editor import (ImageClip, VideoFileClip, concatenate_videoclips, TextClip,
-                            CompositeVideoClip, AudioFileClip)
-import moviepy.video.fx.all as vfx
-import numpy as np
+# app.py
+import streamlit as st
+from core.gemini_handler import GeminiHandler
+from core.visual_engine import VisualEngine
+from core.prompt_engineering import (
+    create_cinematic_treatment_prompt,
+    construct_dalle_prompt,
+    construct_text_to_video_prompt_for_gen4, # <<< USE THIS FOR RUNWAY
+    create_narration_script_prompt_enhanced,
+    create_scene_regeneration_prompt,
+    create_visual_regeneration_prompt # This is for DALL-E image prompt refinement
+)
 import os
-import openai
-import requests
-import io
-import time
-import random
 import logging
 
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
-
-# --- ElevenLabs Client Import ---
-ELEVENLABS_CLIENT_IMPORTED = False; ElevenLabsAPIClient = None; Voice = None; VoiceSettings = None
-try:
-    from elevenlabs.client import ElevenLabs as ImportedElevenLabsClient
-    from elevenlabs import Voice as ImportedVoice, VoiceSettings as ImportedVoiceSettings
-    ElevenLabsAPIClient = ImportedElevenLabsClient; Voice = ImportedVoice; VoiceSettings = ImportedVoiceSettings
-    ELEVENLABS_CLIENT_IMPORTED = True; logger.info("ElevenLabs client components imported.")
-except Exception as e_eleven: logger.warning(f"ElevenLabs client import failed: {e_eleven}. Audio disabled.")
-
-# --- RunwayML Client Import (Placeholder) ---
-RUNWAYML_SDK_IMPORTED = False; RunwayMLClient = None
-try:
-    logger.info("RunwayML SDK import is a placeholder.")
-except ImportError: logger.warning("RunwayML SDK (placeholder) not found. RunwayML disabled.")
-except Exception as e_runway_sdk: logger.warning(f"Error importing RunwayML SDK (placeholder): {e_runway_sdk}. RunwayML disabled.")
-
-
-class VisualEngine:
-    def __init__(self, output_dir="temp_cinegen_media", default_elevenlabs_voice_id="Rachel"):
-        self.output_dir = output_dir
-        os.makedirs(self.output_dir, exist_ok=True)
-        self.font_filename = "DejaVuSans-Bold.ttf"
-        font_paths_to_try = [
-            self.font_filename,
-            f"/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf",
-            f"/usr/share/fonts/truetype/liberation/LiberationSans-Bold.ttf",
-            f"/System/Library/Fonts/Supplemental/Arial.ttf", f"C:/Windows/Fonts/arial.ttf",
-            f"/usr/local/share/fonts/truetype/mycustomfonts/arial.ttf"
-        ]
-        self.font_path_pil = next((p for p in font_paths_to_try if os.path.exists(p)), None)
-        self.font_size_pil = 20
-        self.video_overlay_font_size = 30
-        self.video_overlay_font_color = 'white'
-        self.video_overlay_font = 'DejaVu-Sans-Bold'
+# --- Configuration & Initialization ---
+st.set_page_config(page_title="CineGen AI Ultra+", layout="wide", initial_sidebar_state="expanded")
+# Configure logging to be more verbose for debugging if needed
+logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+logger = logging.getLogger(__name__) # Get logger for this module
 
-        try:
-            self.font = ImageFont.truetype(self.font_path_pil, self.font_size_pil) if self.font_path_pil else ImageFont.load_default()
-            if self.font_path_pil: logger.info(f"Pillow font loaded: {self.font_path_pil}.")
-            else: logger.warning("Using default Pillow font."); self.font_size_pil = 10
-        except IOError as e_font: logger.error(f"Pillow font loading IOError: {e_font}. Using default."); self.font = ImageFont.load_default(); self.font_size_pil = 10
-
-        self.openai_api_key = None; self.USE_AI_IMAGE_GENERATION = False
-        self.dalle_model = "dall-e-3"; self.image_size_dalle3 = "1792x1024"
-        self.video_frame_size = (1280, 720)
-        self.elevenlabs_api_key = None; self.USE_ELEVENLABS = False; self.elevenlabs_client = None
-        self.elevenlabs_voice_id = default_elevenlabs_voice_id
-        if VoiceSettings and ELEVENLABS_CLIENT_IMPORTED: self.elevenlabs_voice_settings = VoiceSettings(stability=0.60, similarity_boost=0.80, style=0.15, use_speaker_boost=True)
-        else: self.elevenlabs_voice_settings = None
-        self.pexels_api_key = None; self.USE_PEXELS = False
-        self.runway_api_key = None; self.USE_RUNWAYML = False; self.runway_client = None
-        logger.info("VisualEngine initialized.")
-
-    def set_openai_api_key(self,k): self.openai_api_key=k; self.USE_AI_IMAGE_GENERATION=bool(k); logger.info(f"DALL-E ({self.dalle_model}) {'Ready.' if k else 'Disabled.'}")
-    def set_elevenlabs_api_key(self,api_key, voice_id_from_secret=None):
-        self.elevenlabs_api_key=api_key
-        if voice_id_from_secret: self.elevenlabs_voice_id = voice_id_from_secret
-        if api_key and ELEVENLABS_CLIENT_IMPORTED and ElevenLabsAPIClient:
-            try: self.elevenlabs_client = ElevenLabsAPIClient(api_key=api_key); self.USE_ELEVENLABS=bool(self.elevenlabs_client); logger.info(f"ElevenLabs Client {'Ready' if self.USE_ELEVENLABS else 'Failed Init'} (Voice ID: {self.elevenlabs_voice_id}).")
-            except Exception as e: logger.error(f"ElevenLabs client init error: {e}. Disabled.", exc_info=True); self.USE_ELEVENLABS=False
-        else: self.USE_ELEVENLABS=False; logger.info("ElevenLabs Disabled (no key or SDK).")
-    def set_pexels_api_key(self,k): self.pexels_api_key=k; self.USE_PEXELS=bool(k); logger.info(f"Pexels Search {'Ready.' if k else 'Disabled.'}")
-    def set_runway_api_key(self, k):
-        self.runway_api_key = k
-        if k and RUNWAYML_SDK_IMPORTED and RunwayMLClient:
-            try: self.USE_RUNWAYML = True; logger.info(f"RunwayML Client (Placeholder SDK) {'Ready.' if self.USE_RUNWAYML else 'Failed Init.'}")
-            except Exception as e: logger.error(f"RunwayML client (Placeholder SDK) init error: {e}. Disabled.", exc_info=True); self.USE_RUNWAYML = False
-        elif k: self.USE_RUNWAYML = True; logger.info("RunwayML API Key set (direct API or placeholder).")
-        else: self.USE_RUNWAYML = False; logger.info("RunwayML Disabled (no API key).")
-
-    def _get_text_dimensions(self, text_content, font_obj):
-        default_line_height = getattr(font_obj, 'size', self.font_size_pil)
-        if not text_content: return 0, default_line_height
-        try:
-            if hasattr(font_obj, 'getbbox'):
-                bbox = font_obj.getbbox(text_content); width = bbox[2] - bbox[0]; height = bbox[3] - bbox[1]
-                return width, height if height > 0 else default_line_height
-            elif hasattr(font_obj, 'getsize'):
-                width, height = font_obj.getsize(text_content)
-                return width, height if height > 0 else default_line_height
-            else: return int(len(text_content) * default_line_height * 0.6), int(default_line_height * 1.2)
-        except Exception as e: logger.warning(f"Error in _get_text_dimensions for '{text_content[:20]}...': {e}"); return int(len(text_content) * self.font_size_pil * 0.6),int(self.font_size_pil * 1.2)
-
-    def _create_placeholder_image_content(self, text_description, filename, size=None):
-        if size is None: size = self.video_frame_size
-        img = Image.new('RGB', size, color=(20, 20, 40)); draw = ImageDraw.Draw(img)
-        padding = 25; max_text_width = size[0] - (2 * padding); lines = []
-        if not text_description: text_description = "(Placeholder: No text description provided)"
-        words = text_description.split(); current_line = ""
-        for word in words:
-            test_line = current_line + word + " "; line_width_test, _ = self._get_text_dimensions(test_line.strip(), self.font)
-            if line_width_test <= max_text_width: current_line = test_line
-            else:
-                if current_line.strip(): lines.append(current_line.strip())
-                word_width, _ = self._get_text_dimensions(word, self.font)
-                if word_width > max_text_width:
-                    avg_char_w = self._get_text_dimensions("A", self.font)[0] or 10
-                    chars_that_fit = int(max_text_width / avg_char_w)
-                    lines.append(word[:chars_that_fit-3] + "..." if len(word) > chars_that_fit else word) # Corrected line
-                    current_line = ""
-                else: current_line = word + " "
-        if current_line.strip(): lines.append(current_line.strip())
-        if not lines and text_description:
-            avg_char_w = self._get_text_dimensions("A", self.font)[0] or 10; chars_that_fit = int(max_text_width / avg_char_w)
-            lines.append(text_description[:chars_that_fit-3] + "..." if len(text_description) > chars_that_fit else text_description)
-        elif not lines: lines.append("(Placeholder Text Error)")
-        _, single_line_height = self._get_text_dimensions("Ay", self.font); single_line_height = single_line_height if single_line_height > 0 else (self.font_size_pil + 2)
-        line_spacing = 2; max_lines_to_display = min(len(lines), (size[1]-(2*padding))//(single_line_height+line_spacing)) if single_line_height > 0 else 1
-        if max_lines_to_display <= 0: max_lines_to_display = 1
-        total_text_block_height = max_lines_to_display * single_line_height + (max_lines_to_display-1)*line_spacing
-        y_text_start = padding + (size[1]-(2*padding)-total_text_block_height)/2.0; current_y = y_text_start
-        for i in range(max_lines_to_display):
-            line_content = lines[i]; line_width_actual, _ = self._get_text_dimensions(line_content, self.font)
-            x_text = max(padding, (size[0]-line_width_actual)/2.0)
-            draw.text((x_text, current_y), line_content, font=self.font, fill=(200,200,180)); current_y += single_line_height + line_spacing
-            if i==6 and max_lines_to_display > 7 and len(lines) > max_lines_to_display:
-                ellipsis_width, _ = self._get_text_dimensions("...",self.font); x_ellipsis = max(padding, (size[0]-ellipsis_width)/2.0)
-                draw.text((x_ellipsis, current_y), "...", font=self.font, fill=(200,200,180)); break
-        filepath = os.path.join(self.output_dir, filename)
-        try: img.save(filepath); return filepath
-        except Exception as e: logger.error(f"Error saving placeholder image {filepath}: {e}", exc_info=True); return None
-
-    def _search_pexels_image(self, query, output_filename_base):
-        if not self.USE_PEXELS or not self.pexels_api_key: return None
-        headers = {"Authorization": self.pexels_api_key}
-        params = {"query": query, "per_page": 1, "orientation": "landscape", "size": "large2x"}
-        base_name, _ = os.path.splitext(output_filename_base)
-        pexels_filename = base_name + f"_pexels_{random.randint(1000,9999)}.jpg" # Use base_name
-        filepath = os.path.join(self.output_dir, pexels_filename)
-        try:
-            logger.info(f"Pexels search: '{query}'")
-            effective_query = " ".join(query.split()[:5])
-            params["query"] = effective_query
-            response = requests.get("https://api.pexels.com/v1/search", headers=headers, params=params, timeout=20)
-            response.raise_for_status()
-            data = response.json() # This line and subsequent ones are now correctly in the try block
-            if data.get("photos") and len(data["photos"]) > 0:
-                photo_details = data["photos"][0]
-                photo_url = photo_details["src"]["large2x"]
-                logger.info(f"Downloading Pexels image from: {photo_url}")
-                image_response = requests.get(photo_url, timeout=60)
-                image_response.raise_for_status()
-                img_data = Image.open(io.BytesIO(image_response.content))
-                if img_data.mode != 'RGB':
-                    logger.debug(f"Pexels image mode is {img_data.mode}, converting to RGB.")
-                    img_data = img_data.convert('RGB')
-                img_data.save(filepath)
-                logger.info(f"Pexels image saved successfully: {filepath}")
-                return filepath
-            else:
-                logger.info(f"No photos found on Pexels for query: '{effective_query}'")
-                return None
-        except requests.exceptions.RequestException as e_req: logger.error(f"Pexels request error for query '{query}': {e_req}", exc_info=True)
-        except json.JSONDecodeError as e_json: logger.error(f"Pexels JSON decode error for query '{query}': {e_json}", exc_info=True)
-        except Exception as e: logger.error(f"General Pexels error for query '{query}': {e}", exc_info=True)
-        return None
-
-    def _generate_video_clip_with_runwayml(self, pt, iip, sifnb, tds=5): # Renamed for clarity
-        if not self.USE_RUNWAYML or not self.runway_api_key: logger.warning("RunwayML disabled."); return None
-        if not iip or not os.path.exists(iip): logger.error(f"Runway Gen-4 needs input image. Path invalid: {iip}"); return None
-        runway_dur = 10 if tds > 7 else 5
-        ovfn = sifnb.replace(".png", f"_runway_gen4_d{runway_dur}s.mp4") # sifnb should be base name
-        ovfp = os.path.join(self.output_dir, ovfn)
-        logger.info(f"Runway Gen-4 (Placeholder) img: {os.path.basename(iip)}, motion: '{pt[:100]}...', dur: {runway_dur}s")
-        logger.warning("Using PLACEHOLDER video for Runway Gen-4.")
-        img_clip=None; txt_c=None; final_ph_clip=None
-        try:
-            img_clip = ImageClip(iip).set_duration(runway_dur)
-            txt = f"Runway Gen-4 Placeholder\nInput: {os.path.basename(iip)}\nMotion: {pt[:50]}..."
-            txt_c = TextClip(txt, fontsize=24,color='white',font=self.video_overlay_font,bg_color='rgba(0,0,0,0.5)',size=(self.video_frame_size[0]*0.8,None),method='caption').set_duration(runway_dur).set_position('center')
-            final_ph_clip = CompositeVideoClip([img_clip, txt_c], size=img_clip.size)
-            final_ph_clip.write_videofile(ovfp,fps=24,codec='libx264',preset='ultrafast',logger=None,threads=2)
-            logger.info(f"Runway Gen-4 placeholder video: {ovfp}"); return ovfp
-        except Exception as e: logger.error(f"Runway Gen-4 placeholder error: {e}",exc_info=True); return None
-        finally:
-            if img_clip and hasattr(img_clip,'close'): img_clip.close()
-            if txt_c and hasattr(txt_c,'close'): txt_c.close()
-            if final_ph_clip and hasattr(final_ph_clip,'close'): final_ph_clip.close()
-
-    def _create_placeholder_video_content(self, td, fn, dur=4, sz=None):
-        if sz is None: sz = self.video_frame_size; fp = os.path.join(self.output_dir, fn); tc = None
-        try: tc = TextClip(td, fontsize=50,color='white',font=self.video_overlay_font,bg_color='black',size=sz,method='caption').set_duration(dur)
-        tc.write_videofile(fp,fps=24,codec='libx264',preset='ultrafast',logger=None,threads=2); logger.info(f"Generic placeholder video: {fp}"); return fp
-        except Exception as e: logger.error(f"Generic placeholder error {fp}: {e}",exc_info=True); return None
-        finally:
-            if tc and hasattr(tc,'close'): tc.close()
-
-    def generate_scene_asset(self, image_generation_prompt_text, motion_prompt_text_for_video,
-                             scene_data, scene_identifier_filename_base, # This is base_name, no ext
-                             generate_as_video_clip=False, runway_target_duration=5):
-        base_name = scene_identifier_filename_base # Already a base name
-        asset_info = {'path': None, 'type': 'none', 'error': True, 'prompt_used': image_generation_prompt_text, 'error_message': 'Generation not attempted'}
-        input_image_for_runway_path = None
-        image_filename_for_base = base_name + "_base_image.png" # Specific name for base image file
-        temp_image_asset_info = {'error': True, 'prompt_used': image_generation_prompt_text, 'error_message': 'Base image generation not attempted'}
-
-        if self.USE_AI_IMAGE_GENERATION and self.openai_api_key:
-            max_r, att_n = 2, 0
-            for att_n in range(max_r):
+# --- Global Definitions ---
+SHOT_TYPES_OPTIONS = [ "Director's Choice", "Establishing Shot", "Long Shot", "Full Shot", "Medium Long Shot (Cowboy)", "Medium Shot", "Medium Close-up", "Close-up", "Extreme Close-up", "Point of View (POV)", "Over the Shoulder", "Tracking Shot", "Dolly Zoom", "Crane Shot", "Aerial Shot", "Static Shot", "Dutch Angle", "Whip Pan"]
+DEFAULT_SCENE_DURATION_SECS = 5
+DEFAULT_SHOT_TYPE = "Director's Choice"
+ASSET_TYPE_OPTIONS = ["Auto (Director's Choice)", "Image", "Video Clip"]
+
+
+# --- Global State Variables & API Key Setup ---
+def load_api_key(key_name_streamlit, key_name_env, service_name):
+    # (Keep this function as it was - robust)
+    key = None; secrets_available = hasattr(st, 'secrets')
+    try:
+        if secrets_available and key_name_streamlit in st.secrets:
+            key = st.secrets[key_name_streamlit]
+            if key: logger.info(f"{service_name} API Key found in Streamlit secrets.")
+    except Exception as e: logger.warning(f"Could not access st.secrets for {key_name_streamlit}: {e}")
+    if not key and key_name_env in os.environ:
+        key = os.environ[key_name_env]
+        if key: logger.info(f"{service_name} API Key found in environment variable.")
+    if not key: logger.warning(f"{service_name} API Key NOT FOUND. Related features may be disabled or use fallbacks.")
+    return key
+
+if 'services_initialized' not in st.session_state:
+    logger.info("Initializing services and API keys for the first time this session...")
+    st.session_state.GEMINI_API_KEY = load_api_key("GEMINI_API_KEY", "GEMINI_API_KEY", "Gemini")
+    st.session_state.OPENAI_API_KEY = load_api_key("OPENAI_API_KEY", "OPENAI_API_KEY", "OpenAI/DALL-E")
+    st.session_state.ELEVENLABS_API_KEY = load_api_key("ELEVENLABS_API_KEY", "ELEVENLABS_API_KEY", "ElevenLabs")
+    st.session_state.PEXELS_API_KEY = load_api_key("PEXELS_API_KEY", "PEXELS_API_KEY", "Pexels")
+    st.session_state.ELEVENLABS_VOICE_ID_CONFIG = load_api_key("ELEVENLABS_VOICE_ID", "ELEVENLABS_VOICE_ID", "ElevenLabs Voice ID")
+    st.session_state.RUNWAY_API_KEY = load_api_key("RUNWAY_API_KEY", "RUNWAY_API_KEY", "RunwayML")
+
+    if not st.session_state.GEMINI_API_KEY: st.error("CRITICAL: Gemini API Key missing!"); logger.critical("Gemini API Key missing."); st.stop()
+    
+    try: st.session_state.gemini_handler = GeminiHandler(api_key=st.session_state.GEMINI_API_KEY); logger.info("GeminiHandler initialized.")
+    except Exception as e: st.error(f"Failed to init GeminiHandler: {e}"); logger.critical(f"GeminiHandler init failed: {e}", exc_info=True); st.stop()
+    
+    try:
+        default_voice_id_el = "Rachel" # Fallback
+        configured_voice_id_el = st.session_state.ELEVENLABS_VOICE_ID_CONFIG or default_voice_id_el
+        st.session_state.visual_engine = VisualEngine(output_dir="temp_cinegen_media", default_elevenlabs_voice_id=configured_voice_id_el)
+        st.session_state.visual_engine.set_openai_api_key(st.session_state.OPENAI_API_KEY)
+        st.session_state.visual_engine.set_elevenlabs_api_key(st.session_state.ELEVENLABS_API_KEY, voice_id_from_secret=st.session_state.ELEVENLABS_VOICE_ID_CONFIG)
+        st.session_state.visual_engine.set_pexels_api_key(st.session_state.PEXELS_API_KEY)
+        st.session_state.visual_engine.set_runway_api_key(st.session_state.RUNWAY_API_KEY) # Pass Runway key
+        logger.info("VisualEngine initialized and API keys set.")
+    except Exception as e: st.error(f"Failed to init VisualEngine: {e}"); logger.critical(f"VisualEngine init/key setting failed: {e}", exc_info=True); st.warning("VisualEngine critical setup issue.")
+    st.session_state.services_initialized = True; logger.info("Service initialization complete.")
+
+# Initialize other session state variables
+for key_ss, default_val_ss in [ # Renamed loop vars
+    ('story_treatment_scenes', []), ('scene_generation_prompts', []), ('generated_scene_assets_info', []), # Stores full asset info dicts
+    ('video_path', None), ('character_definitions', {}), ('global_style_additions', ""),
+    ('overall_narration_audio_path', None), ('narration_script_display', "")
+]:
+    if key_ss not in st.session_state: st.session_state[key_ss] = default_val_ss
+
+def initialize_new_project_state(): # Renamed
+    st.session_state.story_treatment_scenes = []
+    st.session_state.scene_generation_prompts = [] # Stores the prompt used for DALL-E or Runway
+    st.session_state.generated_scene_assets_info = [] # Stores dicts {'path':..., 'type':..., 'error':..., 'prompt_used':...}
+    st.session_state.video_path, st.session_state.overall_narration_audio_path, st.session_state.narration_script_display = None, None, ""
+    logger.info("New project state initialized.")
+
+def generate_asset_for_scene_wrapper(scene_idx, scene_dict_data, version_num=1, user_selected_asset_type_override="Auto (Director's Choice)"): # Renamed
+    # Determine if video clip is desired based on user override or Gemini's suggestion
+    generate_as_video_clip_final = False
+    gemini_suggested_asset_type = scene_dict_data.get('suggested_asset_type_감독', 'image').lower()
+
+    if user_selected_asset_type_override == "Image":
+        generate_as_video_clip_final = False
+    elif user_selected_asset_type_override == "Video Clip":
+        generate_as_video_clip_final = True
+    elif user_selected_asset_type_override == "Auto (Director's Choice)": # Default
+        generate_as_video_clip_final = (gemini_suggested_asset_type == "video_clip")
+    
+    # Prompt for base image generation (DALL-E or Pexels fallback)
+    image_gen_prompt_text = construct_dalle_prompt(scene_dict_data, st.session_state.character_definitions, st.session_state.global_style_additions)
+    
+    # Prompt for video motion (Runway Gen-4) - only if generating video
+    motion_gen_prompt_text = ""
+    if generate_as_video_clip_final:
+        motion_gen_prompt_text = construct_text_to_video_prompt_for_gen4(scene_dict_data, st.session_state.global_style_additions)
+        if not motion_gen_prompt_text: # Fallback if specific motion prompt is empty
+            logger.warning(f"S{scene_dict_data.get('scene_number', scene_idx+1)}: Motion prompt empty, using generic for Runway.")
+            motion_gen_prompt_text = scene_dict_data.get('video_clip_motion_description_감독', "subtle ambient motion")
+
+
+    if not image_gen_prompt_text: # Base image prompt is always needed
+        logger.error(f"Base image prompt construction failed for S{scene_dict_data.get('scene_number', scene_idx+1)}"); return False
+
+    # Ensure session state lists are adequate
+    while len(st.session_state.scene_generation_prompts) <= scene_idx: st.session_state.scene_generation_prompts.append("")
+    while len(st.session_state.generated_scene_assets_info) <= scene_idx: st.session_state.generated_scene_assets_info.append(None)
+
+    # Store the relevant prompt (DALL-E for image, motion for video)
+    # The generate_scene_asset method will return the actual prompt it used if different internally.
+    st.session_state.scene_generation_prompts[scene_idx] = motion_gen_prompt_text if generate_as_video_clip_final else image_gen_prompt_text
+    
+    filename_base_for_asset = f"scene_{scene_dict_data.get('scene_number', scene_idx+1)}_asset_v{version_num}" # Renamed
+    runway_dur_for_scene = scene_dict_data.get('video_clip_duration_estimate_secs_감독', scene_dict_data.get('user_scene_duration_secs', DEFAULT_SCENE_DURATION_SECS))
+    if runway_dur_for_scene <= 0 : runway_dur_for_scene = DEFAULT_SCENE_DURATION_SECS
+
+    asset_result_dict = st.session_state.visual_engine.generate_scene_asset(
+        image_generation_prompt_text=image_gen_prompt_text, # For base DALL-E/Pexels image
+        motion_prompt_text_for_video=motion_gen_prompt_text, # For Runway motion
+        scene_data=scene_dict_data,
+        scene_identifier_filename_base=filename_base_for_asset,
+        generate_as_video_clip=generate_as_video_clip_final,
+        runway_target_duration=runway_dur_for_scene
+    )
+    
+    st.session_state.generated_scene_assets_info[scene_idx] = asset_result_dict
+    # Update the stored prompt with what was actually used by the engine, if available from result
+    if asset_result_dict and asset_result_dict.get('prompt_used'):
+        st.session_state.scene_generation_prompts[scene_idx] = asset_result_dict['prompt_used']
+
+
+    if asset_result_dict and not asset_result_dict['error'] and asset_result_dict.get('path') and os.path.exists(asset_result_dict['path']):
+        logger.info(f"Asset ({asset_result_dict.get('type')}) generated for S{scene_dict_data.get('scene_number', scene_idx+1)}: {os.path.basename(asset_result_dict['path'])}")
+        return True
+    else:
+        err_msg_asset = asset_result_dict.get('error_message', 'Unknown error') if asset_result_dict else 'Asset result is None'
+        logger.warning(f"Asset gen FAILED for S{scene_dict_data.get('scene_number', scene_idx+1)}. Type attempted: {'Video' if generate_as_video_clip_final else 'Image'}. Error: {err_msg_asset}")
+        # Store a more detailed failure state if not already
+        if not st.session_state.generated_scene_assets_info[scene_idx] or not st.session_state.generated_scene_assets_info[scene_idx]['error']:
+             st.session_state.generated_scene_assets_info[scene_idx] = {'path': None, 'type': 'none', 'error': True, 'error_message': err_msg_asset, 'prompt_used': st.session_state.scene_generation_prompts[scene_idx]}
+        return False
+
+# --- UI Sidebar ---
+with st.sidebar:
+    # ... (Sidebar UI code as before, no changes needed for this fix) ...
+    st.title("🎬 CineGen AI Ultra+")
+    st.markdown("### Creative Seed")
+    user_idea = st.text_area("Core Story Idea / Theme:", "A lone wanderer searches for a mythical oasis in a vast, post-apocalyptic desert, haunted by mirages and mechanical scavengers.", height=120, key="user_idea_main_v5")
+    genre = st.selectbox("Primary Genre:", ["Cyberpunk", "Sci-Fi", "Fantasy", "Noir", "Thriller", "Western", "Post-Apocalyptic", "Historical Drama", "Surreal"], index=6, key="genre_main_v5")
+    mood = st.selectbox("Overall Mood:", ["Hopeful yet Desperate", "Mysterious & Eerie", "Gritty & Tense", "Epic & Awe-Inspiring", "Melancholy & Reflective", "Whimsical & Lighthearted"], index=0, key="mood_main_v5")
+    num_scenes = st.slider("Number of Key Scenes:", 1, 10, 2, key="num_scenes_main_v5")
+    creative_guidance_options = {"Standard Director": "standard", "Artistic Visionary": "more_artistic", "Experimental Storyteller": "experimental_narrative"}
+    selected_creative_guidance_key = st.selectbox("AI Creative Director Style:", options=list(creative_guidance_options.keys()), key="creative_guidance_select_v5")
+    actual_creative_guidance = creative_guidance_options[selected_creative_guidance_key]
+
+    if st.button("🌌 Generate Cinematic Treatment", type="primary", key="generate_treatment_btn_v5", use_container_width=True):
+        initialize_new_project_state() # Use renamed function
+        if not user_idea.strip(): st.warning("Please provide a story idea.")
+        else:
+            with st.status("AI Director is envisioning your masterpiece...", expanded=True) as status_op: # Renamed
                 try:
-                    img_fp_dalle = os.path.join(self.output_dir, image_filename_for_base)
-                    logger.info(f"Attempt {att_n+1} DALL-E (base img): {image_generation_prompt_text[:100]}...")
-                    cl = openai.OpenAI(api_key=self.openai_api_key, timeout=90.0)
-                    r = cl.images.generate(model=self.dalle_model, prompt=image_generation_prompt_text, n=1, size=self.image_size_dalle3, quality="hd", response_format="url", style="vivid")
-                    iu = r.data[0].url; rp = getattr(r.data[0], 'revised_prompt', None)
-                    if rp: logger.info(f"DALL-E revised: {rp[:100]}...")
-                    ir = requests.get(iu, timeout=120); ir.raise_for_status()
-                    id_img = Image.open(io.BytesIO(ir.content));
-                    if id_img.mode != 'RGB': id_img = id_img.convert('RGB')
-                    id_img.save(img_fp_dalle); logger.info(f"DALL-E base image: {img_fp_dalle}");
-                    input_image_for_runway_path = img_fp_dalle
-                    temp_image_asset_info = {'path': img_fp_dalle, 'type': 'image', 'error': False, 'prompt_used': image_generation_prompt_text, 'revised_prompt': rp}
-                    break
-                except openai.RateLimitError as e: logger.warning(f"OpenAI Rate Limit {att_n+1}: {e}. Retry..."); time.sleep(5*(att_n+1)); temp_image_asset_info['error_message']=str(e)
-                except Exception as e: logger.error(f"DALL-E error: {e}", exc_info=True); temp_image_asset_info['error_message']=str(e); break
-            if temp_image_asset_info['error']: logger.warning(f"DALL-E failed after {att_n+1} attempts for base image.")
-        
-        if temp_image_asset_info['error'] and self.USE_PEXELS:
-            pqt = scene_data.get('pexels_search_query_감독', f"{scene_data.get('emotional_beat','')} {scene_data.get('setting_description','')}")
-            pp = self._search_pexels_image(pqt, image_filename_for_base) # Use base name for pexels
-            if pp: input_image_for_runway_path = pp; temp_image_asset_info = {'path': pp, 'type': 'image', 'error': False, 'prompt_used': f"Pexels: {pqt}"}
-            else: current_em = temp_image_asset_info.get('error_message',""); temp_image_asset_info['error_message']=(current_em + " Pexels failed.").strip()
-
-        if temp_image_asset_info['error']:
-            logger.warning("Base image (DALL-E/Pexels) failed. Placeholder base image.")
-            ppt = temp_image_asset_info.get('prompt_used', image_generation_prompt_text)
-            php = self._create_placeholder_image_content(f"[Base Img Placeholder] {ppt[:100]}...", image_filename_for_base)
-            if php: input_image_for_runway_path = php; temp_image_asset_info = {'path': php, 'type': 'image', 'error': False, 'prompt_used': ppt}
-            else: current_em=temp_image_asset_info.get('error_message',"");temp_image_asset_info['error_message']=(current_em + " Base placeholder failed.").strip()
-        
-        if generate_as_video_clip:
-            if self.USE_RUNWAYML and input_image_for_runway_path:
-                video_path = self._generate_video_clip_with_runwayml(motion_prompt_text_for_video, input_image_for_runway_path, base_name, runway_target_duration) # Pass base_name
-                if video_path and os.path.exists(video_path):
-                    return {'path': video_path, 'type': 'video', 'error': False, 'prompt_used': motion_prompt_text_for_video, 'base_image_path': input_image_for_runway_path}
-                else: asset_info = temp_image_asset_info; asset_info['error'] = True; asset_info['error_message'] = "RunwayML video gen failed; using base image."; asset_info['type'] = 'image'; return asset_info
-            elif not self.USE_RUNWAYML: asset_info = temp_image_asset_info; asset_info['error_message'] = "RunwayML disabled; using base image."; asset_info['type'] = 'image'; return asset_info
-            else: asset_info = temp_image_asset_info; asset_info['error_message'] = (asset_info.get('error_message',"") + " Base image failed, Runway video not attempted.").strip(); asset_info['type'] = 'image'; return asset_info
-        else: return temp_image_asset_info
-
-    def generate_narration_audio(self, ttn, ofn="narration_overall.mp3"):
-        if not self.USE_ELEVENLABS or not self.elevenlabs_client or not ttn: logger.info("11L skip."); return None; afp=os.path.join(self.output_dir,ofn)
-        try: logger.info(f"11L audio (Voice:{self.elevenlabs_voice_id}): {ttn[:70]}..."); asm=None
-        if hasattr(self.elevenlabs_client,'text_to_speech')and hasattr(self.elevenlabs_client.text_to_speech,'stream'):asm=self.elevenlabs_client.text_to_speech.stream;logger.info("Using 11L .text_to_speech.stream()")
-        elif hasattr(self.elevenlabs_client,'generate_stream'):asm=self.elevenlabs_client.generate_stream;logger.info("Using 11L .generate_stream()")
-        elif hasattr(self.elevenlabs_client,'generate'):logger.info("Using 11L .generate()");vp=Voice(voice_id=str(self.elevenlabs_voice_id),settings=self.elevenlabs_voice_settings)if Voice and self.elevenlabs_voice_settings else str(self.elevenlabs_voice_id);ab=self.elevenlabs_client.generate(text=ttn,voice=vp,model="eleven_multilingual_v2");
-        with open(afp,"wb")as f:f.write(ab);logger.info(f"11L audio (non-stream): {afp}");return afp
-        else:logger.error("No 11L audio method.");return None
-        if asm:vps={"voice_id":str(self.elevenlabs_voice_id)}
-        if self.elevenlabs_voice_settings:
-            if hasattr(self.elevenlabs_voice_settings,'model_dump'):vps["voice_settings"]=self.elevenlabs_voice_settings.model_dump()
-            elif hasattr(self.elevenlabs_voice_settings,'dict'):vps["voice_settings"]=self.elevenlabs_voice_settings.dict()
-            else:vps["voice_settings"]=self.elevenlabs_voice_settings
-        adi=asm(text=ttn,model_id="eleven_multilingual_v2",**vps)
-        with open(afp,"wb")as f:
-            for c in adi:
-                if c:f.write(c)
-        logger.info(f"11L audio (stream): {afp}");return afp
-        except Exception as e:logger.error(f"11L audio error: {e}",exc_info=True);return None
-
-    def assemble_animatic_from_assets(self, asset_data_list, overall_narration_path=None, output_filename="final_video.mp4", fps=24):
-        if not asset_data_list: logger.warning("No assets for animatic."); return None
-        processed_clips = []; narration_clip = None; final_clip = None
-        logger.info(f"Assembling from {len(asset_data_list)} assets. Frame: {self.video_frame_size}.")
-
-        for i, asset_info in enumerate(asset_data_list):
-            asset_path, asset_type, scene_dur = asset_info.get('path'), asset_info.get('type'), asset_info.get('duration', 4.5)
-            scene_num, key_action = asset_info.get('scene_num', i + 1), asset_info.get('key_action', '')
-            logger.info(f"S{scene_num}: Path='{asset_path}', Type='{asset_type}', Dur='{scene_dur}'s")
-
-            if not (asset_path and os.path.exists(asset_path)): logger.warning(f"S{scene_num}: Not found '{asset_path}'. Skip."); continue
-            if scene_dur <= 0: logger.warning(f"S{scene_num}: Invalid duration ({scene_dur}s). Skip."); continue
-
-            current_scene_mvpy_clip = None
-            try:
-                if asset_type == 'image':
-                    pil_img = Image.open(asset_path); logger.debug(f"S{scene_num}: Loaded img. Mode:{pil_img.mode}, Size:{pil_img.size}")
-                    img_rgba = pil_img.convert('RGBA') if pil_img.mode != 'RGBA' else pil_img.copy()
-                    thumb = img_rgba.copy(); rf = Image.Resampling.LANCZOS if hasattr(Image.Resampling,'LANCZOS') else Image.BILINEAR; thumb.thumbnail(self.video_frame_size,rf)
-                    cv_rgba = Image.new('RGBA',self.video_frame_size,(0,0,0,0)); xo,yo=(self.video_frame_size[0]-thumb.width)//2,(self.video_frame_size[1]-thumb.height)//2
-                    cv_rgba.paste(thumb,(xo,yo),thumb)
-                    final_rgb_pil = Image.new("RGB",self.video_frame_size,(0,0,0)); final_rgb_pil.paste(cv_rgba,mask=cv_rgba.split()[3])
-                    dbg_path = os.path.join(self.output_dir,f"debug_PRE_NUMPY_S{scene_num}.png"); final_rgb_pil.save(dbg_path); logger.info(f"DEBUG: Saved PRE_NUMPY_S{scene_num} to {dbg_path}")
-                    frame_np = np.array(final_rgb_pil,dtype=np.uint8);
-                    if not frame_np.flags['C_CONTIGUOUS']: frame_np=np.ascontiguousarray(frame_np,dtype=np.uint8)
-                    logger.debug(f"S{scene_num}: NumPy for MoviePy. Shape:{frame_np.shape}, DType:{frame_np.dtype}, C-Contig:{frame_np.flags['C_CONTIGUOUS']}")
-                    if frame_np.size==0 or frame_np.ndim!=3 or frame_np.shape[2]!=3: logger.error(f"S{scene_num}: Invalid NumPy. Skip."); continue
-                    clip_base = ImageClip(frame_np,transparent=False).set_duration(scene_dur)
-                    mvpy_dbg_path=os.path.join(self.output_dir,f"debug_MOVIEPY_FRAME_S{scene_num}.png"); clip_base.save_frame(mvpy_dbg_path,t=0.1); logger.info(f"DEBUG: Saved MOVIEPY_FRAME_S{scene_num} to {mvpy_dbg_path}")
-                    clip_fx = clip_base
-                    try: es=random.uniform(1.03,1.08); clip_fx=clip_base.fx(vfx.resize,lambda t:1+(es-1)*(t/scene_dur) if scene_dur>0 else 1).set_position('center')
-                    except Exception as e: logger.error(f"S{scene_num} Ken Burns error: {e}",exc_info=False)
-                    current_scene_mvpy_clip = clip_fx
-                elif asset_type == 'video':
-                    src_clip=None
-                    try:
-                        src_clip=VideoFileClip(asset_path,target_resolution=(self.video_frame_size[1],self.video_frame_size[0])if self.video_frame_size else None, audio=False)
-                        tmp_clip=src_clip
-                        if src_clip.duration!=scene_dur:
-                            if src_clip.duration>scene_dur:tmp_clip=src_clip.subclip(0,scene_dur)
-                            else:
-                                if scene_dur/src_clip.duration > 1.5 and src_clip.duration>0.1:tmp_clip=src_clip.loop(duration=scene_dur)
-                                else:tmp_clip=src_clip.set_duration(src_clip.duration);logger.info(f"S{scene_num} Video clip ({src_clip.duration:.2f}s) shorter than target ({scene_dur:.2f}s).")
-                        current_scene_mvpy_clip=tmp_clip.set_duration(scene_dur)
-                        if current_scene_mvpy_clip.size!=list(self.video_frame_size):current_scene_mvpy_clip=current_scene_mvpy_clip.resize(self.video_frame_size)
-                    except Exception as e:logger.error(f"S{scene_num} Video load error '{asset_path}':{e}",exc_info=True);continue
-                    finally:
-                        if src_clip and src_clip is not current_scene_mvpy_clip and hasattr(src_clip,'close'):src_clip.close()
-                else: logger.warning(f"S{scene_num} Unknown asset type '{asset_type}'. Skip."); continue
-                if current_scene_mvpy_clip and key_action:
+                    status_op.write("Phase 1: Gemini crafting cinematic treatment... 📜"); logger.info("Phase 1: Cinematic Treatment Gen.")
+                    treatment_gen_prompt = create_cinematic_treatment_prompt(user_idea, genre, mood, num_scenes, actual_creative_guidance) # Renamed
+                    raw_treatment_result = st.session_state.gemini_handler.generate_story_breakdown(treatment_gen_prompt) # Renamed
+                    if not isinstance(raw_treatment_result, list) or not raw_treatment_result: raise ValueError("Gemini returned invalid scene list format.")
+
+                    processed_scene_list = [] # Renamed
+                    for scene_from_gemini in raw_treatment_result: # Renamed
+                        scene_from_gemini['user_shot_type'] = scene_from_gemini.get('PROACTIVE_camera_work_감독', DEFAULT_SHOT_TYPE)
+                        # Use Gemini's video duration estimate if available for video clips, else default scene duration
+                        gemini_dur_est = scene_from_gemini.get('video_clip_duration_estimate_secs_감독', 0)
+                        scene_from_gemini['user_scene_duration_secs'] = gemini_dur_est if gemini_dur_est > 0 else DEFAULT_SCENE_DURATION_SECS
+                        scene_from_gemini['user_selected_asset_type'] = "Auto (Director's Choice)" # UI default
+                        processed_scene_list.append(scene_from_gemini)
+                    st.session_state.story_treatment_scenes = processed_scene_list
+
+                    num_generated_scenes = len(st.session_state.story_treatment_scenes) # Renamed
+                    st.session_state.scene_generation_prompts = [""]*num_generated_scenes
+                    st.session_state.generated_scene_assets_info = [None]*num_generated_scenes
+                    logger.info(f"Phase 1 complete. {num_generated_scenes} scenes."); status_op.update(label="Treatment complete! ✅ Generating visuals...", state="running")
+
+                    status_op.write("Phase 2: Creating visual assets (Image/Video)... 🖼️🎬"); logger.info("Phase 2: Visual Asset Gen.")
+                    successful_asset_count = 0 # Renamed
+                    for i_scene, scene_data_item in enumerate(st.session_state.story_treatment_scenes): # Renamed
+                        scene_num_display = scene_data_item.get('scene_number', i_scene+1) # Renamed
+                        status_op.write(f"  Asset for Scene {scene_num_display}..."); logger.info(f"  Processing asset for Scene {scene_num_display}.")
+                        if generate_asset_for_scene_wrapper(i_scene, scene_data_item, version_num=1): # Pass default 'Auto' for initial gen
+                            successful_asset_count += 1
+                        
+                    status_label_phase2 = "Visual assets ready! " # Renamed
+                    next_op_state = "running" # Renamed
+                    if successful_asset_count == 0 and num_generated_scenes > 0:
+                        logger.error("Asset gen failed for all scenes."); status_label_phase2 = "Asset gen FAILED for all scenes."; next_op_state="error";
+                        status_op.update(label=status_label_phase2, state=next_op_state, expanded=True); st.stop()
+                    elif successful_asset_count < num_generated_scenes:
+                        logger.warning(f"Assets partially generated ({successful_asset_count}/{num_generated_scenes})."); status_label_phase2 = f"Assets partially generated ({successful_asset_count}/{num_generated_scenes}). "
+                    status_op.update(label=f"{status_label_phase2}Generating narration script...", state=next_op_state)
+                    if next_op_state == "error": st.stop()
+
+                    status_op.write("Phase 3: Generating narration script..."); logger.info("Phase 3: Narration Script Gen.")
+                    voice_style_for_narration_prompt = st.session_state.get("selected_voice_style_for_generation", "cinematic_trailer") # Renamed
+                    narration_gen_prompt = create_narration_script_prompt_enhanced(st.session_state.story_treatment_scenes, mood, genre, voice_style_for_narration_prompt) # Renamed
+                    st.session_state.narration_script_display = st.session_state.gemini_handler.generate_image_prompt(narration_gen_prompt) # generate_image_prompt returns string
+                    logger.info("Narration script generated."); status_op.update(label="Narration script ready! Synthesizing voice...", state="running")
+                    
+                    status_op.write("Phase 4: Synthesizing voice (ElevenLabs)... 🔊"); logger.info("Phase 4: Voice Synthesis.")
+                    st.session_state.overall_narration_audio_path = st.session_state.visual_engine.generate_narration_audio(st.session_state.narration_script_display)
+                    
+                    final_status_label = "All components ready! Storyboard below. 🚀" # Renamed
+                    final_op_state = "complete"  # Renamed
+                    if not st.session_state.overall_narration_audio_path:
+                        final_status_label = f"{status_label_phase2}Storyboard ready (Voiceover skipped or failed)."
+                        logger.warning("Voiceover generation was skipped or failed.")
+                    else: logger.info("Voiceover generated successfully.")
+                    status_op.update(label=final_status_label, state=final_op_state, expanded=False)
+
+                except ValueError as ve_err: logger.error(f"ValueError in main generation: {ve_err}", exc_info=True); status_op.update(label=f"Input or Gemini response error: {ve_err}", state="error", expanded=True); # Renamed
+                except Exception as e_unhandled: logger.error(f"Unhandled Exception in main generation: {e_unhandled}", exc_info=True); status_op.update(label=f"An unexpected error: {e_unhandled}", state="error", expanded=True); # Renamed
+    
+    # --- Sidebar Fine-Tuning Options (Characters, Global Style, Voice) ---
+    # (Keep these sections as they were in the previous correct version)
+    with st.expander("Define Characters", expanded=False):
+        char_name_input = st.text_input("Character Name", key="char_name_adv_ultra_v5_sb"); char_desc_input = st.text_area("Visual Description", key="char_desc_adv_ultra_v5_sb", height=100, placeholder="e.g., Jax: rugged male astronaut...")
+        if st.button("Save Character", key="add_char_adv_ultra_v5_sb"):
+            if char_name_input and char_desc_input: st.session_state.character_definitions[char_name_input.strip().lower()] = char_desc_input.strip(); st.success(f"Char '{char_name_input.strip()}' saved.")
+            else: st.warning("Name and description needed.")
+        if st.session_state.character_definitions: st.caption("Current Characters:"); [st.markdown(f"**{k.title()}:** _{v}_") for k,v in st.session_state.character_definitions.items()]
+    
+    with st.expander("Global Style Overrides", expanded=False):
+        style_presets_dict = { "Default (Director's Choice)": "", "Hyper-Realistic Gritty Noir": "hyper-realistic gritty neo-noir...", "Surreal Dreamscape Fantasy": "surreal dreamscape, epic fantasy...", "Vintage Analog Sci-Fi": "70s/80s analog sci-fi..."} # Truncated for brevity
+        selected_style_preset_key = st.selectbox("Base Style Preset:", options=list(style_presets_dict.keys()), key="style_preset_adv_ultra_v5_sb")
+        custom_style_keywords_input = st.text_area("Additional Custom Style Keywords:", key="custom_style_adv_ultra_v5_sb", height=80, placeholder="e.g., 'Dutch angle'")
+        current_global_style = st.session_state.global_style_additions
+        if st.button("Apply Global Styles", key="apply_styles_adv_ultra_v5_sb"):
+            final_style_str = style_presets_dict[selected_style_preset_key]; 
+            if custom_style_keywords_input.strip(): final_style_str = f"{final_style_str}, {custom_style_keywords_input.strip()}" if final_style_str else custom_style_keywords_input.strip()
+            st.session_state.global_style_additions = final_style_str.strip(); current_global_style = final_style_str.strip() # Update local var for immediate display
+            if current_global_style: st.success("Global styles applied!")
+            else: st.info("Global style additions cleared.")
+        if current_global_style: st.caption(f"Active global styles: \"{current_global_style}\"")
+
+    with st.expander("Voice & Narration Style", expanded=False):
+        engine_default_voice = "Rachel"
+        if hasattr(st.session_state, 'visual_engine') and st.session_state.visual_engine: engine_default_voice = st.session_state.visual_engine.elevenlabs_voice_id
+        user_voice_id_input = st.text_input("ElevenLabs Voice ID (override):", value=engine_default_voice, key="el_voice_id_override_v5_sb", help=f"Defaulting to '{engine_default_voice}'.")
+        narration_prompt_styles_dict = {"Cinematic Trailer": "cinematic_trailer", "Neutral Documentary": "documentary_neutral", "Character Introspection": "introspective_character"}
+        selected_narration_style_key = st.selectbox("Narration Script Style:", list(narration_prompt_styles_dict.keys()), key="narr_style_sel_v5_sb", index=0)
+        if st.button("Set Narrator Voice & Style", key="set_voice_btn_ultra_v5_sb"):
+            final_voice_id_to_use_el = user_voice_id_input.strip() or st.session_state.get("ELEVENLABS_VOICE_ID_CONFIG", "Rachel") # Fallback
+            if hasattr(st.session_state, 'visual_engine'): st.session_state.visual_engine.elevenlabs_voice_id = final_voice_id_to_use_el
+            st.session_state.selected_voice_style_for_generation = narration_prompt_styles_dict[selected_narration_style_key]
+            st.success(f"Narrator Voice ID: {final_voice_id_to_use_el}. Script Style: {selected_narration_style_key}")
+            logger.info(f"User updated 11L Voice ID: {final_voice_id_to_use_el}, Script Style: {selected_narration_style_key}")
+
+
+# --- Main Content Area ---
+st.header("🎬 Cinematic Storyboard & Treatment")
+if st.session_state.narration_script_display:
+    with st.expander("📜 View Full Narration Script", expanded=False): st.markdown(f"> _{st.session_state.narration_script_display}_")
+
+if not st.session_state.story_treatment_scenes: st.info("Use the sidebar to generate your cinematic treatment.")
+else:
+    for i_main_loop, scene_content_item in enumerate(st.session_state.story_treatment_scenes): # Renamed
+        scene_num_val = scene_content_item.get('scene_number', i_main_loop + 1) # Renamed
+        scene_title_val = scene_content_item.get('scene_title', 'Untitled Scene') # Renamed
+        # Ensure unique keys for widgets within the loop
+        key_base_for_scene = f"s{scene_num_val}_{''.join(filter(str.isalnum, scene_title_val[:10]))}_main_{i_main_loop}" # Renamed
+
+        if "director_note" in scene_content_item and scene_content_item['director_note']: st.info(f"🎬 Director Note S{scene_num_val}: {scene_content_item['director_note']}")
+        st.subheader(f"SCENE {scene_num_val}: {scene_title_val.upper()}"); col_treatment, col_visual = st.columns([0.45, 0.55]) # Renamed
+
+        with col_treatment: # Treatment and Controls Column
+            with st.expander("📝 Scene Treatment & Controls", expanded=True):
+                # ... (Display textual scene details - beat, setting, chars, etc. - as before) ...
+                st.markdown(f"**Beat:** {scene_content_item.get('emotional_beat', 'N/A')}"); st.markdown(f"**Setting:** {scene_content_item.get('setting_description', 'N/A')}"); st.markdown(f"**Chars:** {', '.join(scene_content_item.get('characters_involved', ['N/A']))}"); st.markdown(f"**Focus Moment:** _{scene_content_item.get('character_focus_moment', 'N/A')}_"); st.markdown(f"**Plot Beat:** {scene_content_item.get('key_plot_beat', 'N/A')}"); st.markdown(f"**Dialogue Hook:** `\"{scene_content_item.get('suggested_dialogue_hook', '...')}\"`"); st.markdown("---"); st.markdown(f"**Dir. Visual Style:** _{scene_content_item.get('PROACTIVE_visual_style_감독', 'N/A')}_"); st.markdown(f"**Dir. Camera:** _{scene_content_item.get('PROACTIVE_camera_work_감독', 'N/A')}_"); st.markdown(f"**Dir. Sound:** _{scene_content_item.get('PROACTIVE_sound_design_감독', 'N/A')}_"); st.markdown("---")
+                
+                st.markdown("##### Shot, Pacing & Asset Controls")
+                # User Shot Type (Camera Angle)
+                current_ui_shot_type = st.session_state.story_treatment_scenes[i_main_loop].get('user_shot_type', DEFAULT_SHOT_TYPE) # Renamed
+                try: shot_type_idx_val = SHOT_TYPES_OPTIONS.index(current_ui_shot_type) # Renamed
+                except ValueError: shot_type_idx_val = SHOT_TYPES_OPTIONS.index(DEFAULT_SHOT_TYPE)
+                new_ui_shot_type = st.selectbox("Dominant Shot Type:", options=SHOT_TYPES_OPTIONS, index=shot_type_idx_val, key=f"shot_type_widget_{key_base_for_scene}") # Renamed
+                if new_ui_shot_type != current_ui_shot_type: st.session_state.story_treatment_scenes[i_main_loop]['user_shot_type'] = new_ui_shot_type
+
+                # User Scene Duration
+                current_ui_duration = st.session_state.story_treatment_scenes[i_main_loop].get('user_scene_duration_secs', DEFAULT_SCENE_DURATION_SECS) # Renamed
+                new_ui_duration = st.number_input("Scene Duration (seconds):", min_value=1, max_value=300, value=current_ui_duration, step=1, key=f"duration_widget_{key_base_for_scene}") # Renamed
+                if new_ui_duration != current_ui_duration: st.session_state.story_treatment_scenes[i_main_loop]['user_scene_duration_secs'] = new_ui_duration
+
+                # User Asset Type Selection
+                current_ui_asset_type = st.session_state.story_treatment_scenes[i_main_loop].get('user_selected_asset_type', "Auto (Director's Choice)") # Renamed
+                try: asset_type_idx_val = ASSET_TYPE_OPTIONS.index(current_ui_asset_type) # Renamed
+                except ValueError: asset_type_idx_val = 0
+                new_ui_asset_type = st.selectbox("Asset Type Override:", ASSET_TYPE_OPTIONS, index=asset_type_idx_val, key=f"asset_type_sel_{key_base_for_scene}", help="Choose 'Image' or 'Video Clip'. 'Auto' uses Gemini's suggestion.") # Renamed
+                if new_ui_asset_type != current_ui_asset_type: st.session_state.story_treatment_scenes[i_main_loop]['user_selected_asset_type'] = new_ui_asset_type
+                st.markdown("---")
+                
+                # Display generated prompt for the asset
+                prompt_for_current_asset = st.session_state.scene_generation_prompts[i_main_loop] if i_main_loop < len(st.session_state.scene_generation_prompts) else None # Renamed
+                if prompt_for_current_asset:
+                     with st.popover("👁️ View Asset Generation Prompt"):
+                        st.markdown(f"**Prompt used for current asset:**"); st.code(prompt_for_current_asset, language='text')
+                
+                pexels_query_val = scene_content_item.get('pexels_search_query_감독', None) # Renamed
+                if pexels_query_val: st.caption(f"Pexels Fallback Query: `{pexels_query_val}`")
+
+        with col_visual: # Visuals Column
+            asset_info_for_scene = st.session_state.generated_scene_assets_info[i_main_loop] if i_main_loop < len(st.session_state.generated_scene_assets_info) else None # Renamed
+            if asset_info_for_scene and not asset_info_for_scene.get('error') and asset_info_for_scene.get('path') and os.path.exists(asset_info_for_scene['path']):
+                path_to_asset_file = asset_info_for_scene['path'] # Renamed
+                type_of_asset_file = asset_info_for_scene.get('type', 'image') # Renamed
+                if type_of_asset_file == 'image': st.image(path_to_asset_file, caption=f"Scene {scene_num_val} ({type_of_asset_file}): {scene_title_val}")
+                elif type_of_asset_file == 'video':
                     try:
-                        to_dur=min(current_scene_mvpy_clip.duration-0.5,current_scene_mvpy_clip.duration*0.8)if current_scene_mvpy_clip.duration>0.5 else current_scene_mvpy_clip.duration
-                        to_start=0.25
-                        txt_c=TextClip(f"Scene {scene_num}\n{key_action}",fontsize=self.video_overlay_font_size,color=self.video_overlay_font_color,font=self.video_overlay_font,bg_color='rgba(10,10,20,0.7)',method='caption',align='West',size=(self.video_frame_size[0]*0.9,None),kerning=-1,stroke_color='black',stroke_width=1.5).set_duration(to_dur).set_start(to_start).set_position(('center',0.92),relative=True)
-                        current_scene_mvpy_clip=CompositeVideoClip([current_scene_mvpy_clip,txt_c],size=self.video_frame_size,use_bgclip=True)
-                    except Exception as e:logger.error(f"S{scene_num} TextClip error:{e}. No text.",exc_info=True)
-                if current_scene_mvpy_clip:processed_clips.append(current_scene_mvpy_clip);logger.info(f"S{scene_num} Processed. Dur:{current_scene_mvpy_clip.duration:.2f}s.")
-            except Exception as e:logger.error(f"MAJOR Error S{scene_num} ({asset_path}):{e}",exc_info=True)
-            finally:
-                if current_scene_mvpy_clip and hasattr(current_scene_mvpy_clip,'close'):
-                    try: current_scene_mvpy_clip.close()
-                    except: pass
-
-        if not processed_clips:logger.warning("No clips processed. Abort.");return None
-        td=0.75
+                        with open(path_to_asset_file, 'rb') as vf_read: video_bytes_data = vf_read.read() # Renamed
+                        st.video(video_bytes_data, format="video/mp4", start_time=0); st.caption(f"Scene {scene_num_val} ({type_of_asset_file}): {scene_title_val}")
+                    except Exception as e_vid_display: st.error(f"Error displaying video {path_to_asset_file}: {e_vid_display}"); logger.error(f"Error displaying video: {e_vid_display}", exc_info=True) # Renamed
+                else: st.warning(f"Unknown asset type '{type_of_asset_file}' for Scene {scene_num_val}.")
+            else:
+                if st.session_state.story_treatment_scenes:
+                    error_message_display = asset_info_for_scene.get('error_message', 'Visual pending or failed.') if asset_info_for_scene else 'Visual pending or failed.' # Renamed
+                    st.caption(error_message_display)
+            
+            # --- Popovers for Editing Scene Treatment & Visual Prompt ---
+            with st.popover(f"✏️ Edit S{scene_num_val} Treatment"):
+                feedback_for_treatment = st.text_area("Changes to treatment:", key=f"treat_fb_{key_base_for_scene}", height=150) # Renamed
+                if st.button(f"🔄 Update S{scene_num_val} Treatment", key=f"regen_treat_btn_{key_base_for_scene}"):
+                    if feedback_for_treatment:
+                        with st.status(f"Updating S{scene_num_val} Treatment & Asset...", expanded=True) as status_treatment_regen: # Renamed
+                            user_shot_type_pref = st.session_state.story_treatment_scenes[i_main_loop]['user_shot_type'] # Renamed
+                            user_duration_pref = st.session_state.story_treatment_scenes[i_main_loop]['user_scene_duration_secs'] # Renamed
+                            user_asset_type_pref = st.session_state.story_treatment_scenes[i_main_loop]['user_selected_asset_type'] # Renamed
+                            
+                            regen_prompt_for_gemini = create_scene_regeneration_prompt(scene_content_item, feedback_for_treatment, st.session_state.story_treatment_scenes) # Renamed
+                            try:
+                                updated_scene_data_gemini = st.session_state.gemini_handler.regenerate_scene_script_details(regen_prompt_for_gemini) # Renamed
+                                final_updated_scene_data = {**updated_scene_data_gemini} # Renamed
+                                final_updated_scene_data['user_shot_type'] = user_shot_type_pref
+                                final_updated_scene_data['user_scene_duration_secs'] = user_duration_pref
+                                final_updated_scene_data['user_selected_asset_type'] = user_asset_type_pref
+                                st.session_state.story_treatment_scenes[i_main_loop] = final_updated_scene_data
+                                status_treatment_regen.update(label="Treatment updated! Regenerating asset...", state="running")
+
+                                version_num_asset = 1 # Renamed
+                                if asset_info_for_scene and asset_info_for_scene.get('path') and os.path.exists(asset_info_for_scene['path']):
+                                    try: base_fn_asset,_=os.path.splitext(os.path.basename(asset_info_for_scene['path'])); version_num_asset = int(base_fn_asset.split('_v')[-1])+1 if '_v' in base_fn_asset else 2 # Renamed
+                                    except: version_num_asset = 2 
+                                
+                                if generate_asset_for_scene_wrapper(i_main_loop, final_updated_scene_data, version_num=version_num_asset, user_selected_asset_type_override=user_asset_type_pref):
+                                    status_treatment_regen.update(label="Treatment & Asset Updated! 🎉", state="complete", expanded=False)
+                                else: status_treatment_regen.update(label="Treatment updated, asset failed.", state="complete", expanded=False)
+                                st.rerun()
+                            except Exception as e_treat_regen_main: status_treatment_regen.update(label=f"Error: {e_treat_regen_main}", state="error"); logger.error(f"Scene treatment regen error: {e_treat_regen_main}", exc_info=True) # Renamed
+                    else: st.warning("Please provide feedback for treatment.")
+
+            with st.popover(f"🎨 Edit S{scene_num_val} Visual Prompt/Asset"):
+                current_gen_prompt_display = st.session_state.scene_generation_prompts[i_main_loop] if i_main_loop < len(st.session_state.scene_generation_prompts) else "No prompt generated yet." # Renamed
+                st.caption("Current Asset Generation Prompt:"); st.code(current_gen_prompt_display, language='text')
+                feedback_for_visual = st.text_area("Describe changes for the visual asset:", key=f"visual_fb_{key_base_for_scene}", height=150) # Renamed
+                if st.button(f"🔄 Update S{scene_num_val} Asset", key=f"regen_visual_btn_{key_base_for_scene}"):
+                    if feedback_for_visual:
+                        with st.status(f"Refining prompt & regenerating asset for S{scene_num_val}...", expanded=True) as status_visual_regen: # Renamed
+                            user_asset_type_choice_visual = st.session_state.story_treatment_scenes[i_main_loop]['user_selected_asset_type'] # Renamed
+                            is_video_asset_type = (user_asset_type_choice_visual == "Video Clip") or \
+                                              (user_asset_type_choice_visual == "Auto (Director's Choice)" and scene_content_item.get('suggested_asset_type_감독') == 'video_clip')
+
+                            newly_constructed_asset_prompt = "" # Renamed
+                            if not is_video_asset_type: # Refining an IMAGE prompt
+                                gemini_refinement_prompt = create_visual_regeneration_prompt(current_gen_prompt_display, feedback_for_visual, scene_content_item, st.session_state.character_definitions, st.session_state.global_style_additions) # Renamed
+                                try:
+                                    newly_constructed_asset_prompt = st.session_state.gemini_handler.refine_image_prompt_from_feedback(gemini_refinement_prompt)
+                                    st.session_state.scene_generation_prompts[i_main_loop] = newly_constructed_asset_prompt
+                                    status_visual_regen.update(label="Image prompt refined by Gemini! Regenerating asset...", state="running")
+                                except Exception as e_gemini_prompt_refine: status_visual_regen.update(label=f"Error refining prompt: {e_gemini_prompt_refine}", state="error"); logger.error(f"Visual prompt refinement error: {e_gemini_prompt_refine}", exc_info=True); continue # Skip asset gen
+                            else: # For VIDEO, reconstruct the motion prompt based on current scene data and feedback (feedback isn't directly used by construct_text_to_video_prompt_for_gen4 here, but scene_data might have changed)
+                                # For video, feedback should ideally modify scene_content_item's motion description first, then reconstruct.
+                                # Simple reconstruction for now:
+                                logger.info(f"Reconstructing video motion prompt for S{scene_num_val} based on feedback (indirectly via scene_data). Feedback was: {feedback_for_visual}")
+                                newly_constructed_asset_prompt = construct_text_to_video_prompt_for_gen4(scene_content_item, st.session_state.global_style_additions)
+                                st.session_state.scene_generation_prompts[i_main_loop] = newly_constructed_asset_prompt
+                                status_visual_regen.update(label="Video motion prompt reconstructed! Regenerating asset...", state="running")
+                            
+                            if not newly_constructed_asset_prompt: status_visual_regen.update(label="Prompt construction failed.", state="error"); continue
+
+                            version_num_visual_asset = 1 # Renamed
+                            if asset_info_for_scene and asset_info_for_scene.get('path') and os.path.exists(asset_info_for_scene['path']):
+                                try: base_fn_viz_asset,_=os.path.splitext(os.path.basename(asset_info_for_scene['path'])); version_num_visual_asset = int(base_fn_viz_asset.split('_v')[-1])+1 if '_v' in base_fn_viz_asset else 2 # Renamed
+                                except: version_num_visual_asset = 2
+                            
+                            if generate_asset_for_scene_wrapper(i_main_loop, st.session_state.story_treatment_scenes[i_main_loop], version_num=version_num_visual_asset, user_selected_asset_type_override=user_asset_type_choice_visual):
+                                status_visual_regen.update(label="Asset Updated! 🎉", state="complete", expanded=False)
+                            else: status_visual_regen.update(label="Prompt updated, asset regeneration failed.", state="complete", expanded=False)
+                            st.rerun()
+                    else: st.warning("Please provide feedback for visual asset.")
+        st.markdown("---")
+    
+    # Video Assembly Button
+    if st.session_state.story_treatment_scenes and any(asset_info_item_loop and not asset_info_item_loop.get('error') and asset_info_item_loop.get('path') for asset_info_item_loop in st.session_state.generated_scene_assets_info if asset_info_item_loop is not None):
+        if st.button("🎬 Assemble Narrated Cinematic Animatic", key="assemble_ultra_video_btn_v5_main", type="primary", use_container_width=True): # Unique key
+            with st.status("Assembling Ultra Animatic...", expanded=True) as status_video_assembly: # Renamed
+                assets_for_final_video = [] # Renamed
+                for i_vid_assembly, scene_data_for_vid in enumerate(st.session_state.story_treatment_scenes): # Renamed
+                    asset_info_current_scene = st.session_state.generated_scene_assets_info[i_vid_assembly] if i_vid_assembly < len(st.session_state.generated_scene_assets_info) else None # Renamed
+                    if asset_info_current_scene and not asset_info_current_scene.get('error') and asset_info_current_scene.get('path') and os.path.exists(asset_info_current_scene['path']):
+                        assets_for_final_video.append({
+                            'path': asset_info_current_scene['path'],
+                            'type': asset_info_current_scene.get('type', 'image'),
+                            'scene_num': scene_data_for_vid.get('scene_number', i_vid_assembly + 1),
+                            'key_action': scene_data_for_vid.get('key_plot_beat', ''),
+                            'duration': scene_data_for_vid.get('user_scene_duration_secs', DEFAULT_SCENE_DURATION_SECS)
+                        })
+                        status_video_assembly.write(f"Adding S{scene_data_for_vid.get('scene_number', i_vid_assembly + 1)} ({asset_info_current_scene.get('type')}).")
+                    else: logger.warning(f"Skipping S{scene_data_for_vid.get('scene_number', i_vid_assembly+1)} for video: No valid asset.")
+
+                if assets_for_final_video:
+                    status_video_assembly.write("Calling video engine...");
+                    st.session_state.video_path = st.session_state.visual_engine.assemble_animatic_from_assets(
+                        asset_data_list=assets_for_final_video,
+                        overall_narration_path=st.session_state.overall_narration_audio_path,
+                        output_filename="cinegen_ultra_animatic.mp4", fps=24
+                    )
+                    if st.session_state.video_path and os.path.exists(st.session_state.video_path):
+                        status_video_assembly.update(label="Ultra animatic assembled! 🎉", state="complete", expanded=False); st.balloons()
+                    else: status_video_assembly.update(label="Video assembly failed. Check logs.", state="error", expanded=False); logger.error("Video assembly returned None or file does not exist.")
+                else: status_video_assembly.update(label="No valid assets for video assembly.", state="error", expanded=False); logger.warning("No valid assets found for video assembly.")
+    elif st.session_state.story_treatment_scenes: st.info("Generate visual assets before assembling the animatic.")
+
+    if st.session_state.video_path and os.path.exists(st.session_state.video_path):
+        st.header("🎬 Generated Cinematic Animatic"); 
         try:
-            logger.info(f"Concatenating {len(processed_clips)} clips.");
-            if len(processed_clips)>1:final_clip=concatenate_videoclips(processed_clips,padding=-td if td>0 else 0,method="compose")
-            elif processed_clips:final_clip=processed_clips[0]
-            if not final_clip:logger.error("Concatenation failed.");return None
-            logger.info(f"Concatenated dur:{final_clip.duration:.2f}s")
-            if td>0 and final_clip.duration>0:
-                if final_clip.duration>td*2:final_clip=final_clip.fx(vfx.fadein,td).fx(vfx.fadeout,td)
-                else:final_clip=final_clip.fx(vfx.fadein,min(td,final_clip.duration/2.0))
-            if overall_narration_path and os.path.exists(overall_narration_path) and final_clip.duration>0:
-                try:narration_clip=AudioFileClip(overall_narration_path);final_clip=final_clip.set_audio(narration_clip);logger.info("Narration added.")
-                except Exception as e:logger.error(f"Narration add error:{e}",exc_info=True)
-            elif final_clip.duration<=0:logger.warning("Video no duration. No audio.")
-            if final_clip and final_clip.duration>0:
-                op=os.path.join(self.output_dir,output_filename);logger.info(f"Writing video:{op} (Dur:{final_clip.duration:.2f}s)")
-                final_clip.write_videofile(op,fps=fps,codec='libx264',preset='medium',audio_codec='aac',temp_audiofile=os.path.join(self.output_dir,f'temp-audio-{os.urandom(4).hex()}.m4a'),remove_temp=True,threads=os.cpu_count()or 2,logger='bar',bitrate="5000k",ffmpeg_params=["-pix_fmt", "yuv420p"])
-                logger.info(f"Video created:{op}");return op
-            else:logger.error("Final clip invalid. No write.");return None
-        except Exception as e:logger.error(f"Video write error:{e}",exc_info=True);return None
-        finally:
-            logger.debug("Closing all MoviePy clips in `assemble_animatic_from_assets` finally block.")
-            clips_to_close = processed_clips + ([narration_clip] if narration_clip else []) + ([final_clip] if final_clip else [])
-            for clip_obj in clips_to_close:
-                if clip_obj and hasattr(clip_obj, 'close'):
-                    try: clip_obj.close()
-                    except Exception as e_close: logger.warning(f"Ignoring error while closing a clip: {e_close}")
+            with open(st.session_state.video_path, 'rb') as vf_obj_read: video_bytes_content = vf_obj_read.read() # Renamed
+            st.video(video_bytes_content, format="video/mp4") 
+            st.download_button(label="Download Ultra Animatic", data=video_bytes_content, file_name=os.path.basename(st.session_state.video_path), mime="video/mp4", use_container_width=True, key="download_ultra_video_btn_v5_main_dl" ) # Unique key
+        except Exception as e_vid_final_display: st.error(f"Error displaying final video: {e_vid_final_display}"); logger.error(f"Error displaying final video: {e_vid_final_display}", exc_info=True) # Renamed
+
+# --- Footer ---
+st.sidebar.markdown("---"); st.sidebar.caption("CineGen AI Ultra+ | Visionary Cinematic Pre-Production")