Update streamlit_app.py

streamlit_app.py

@@ -48,6 +48,8 @@ for key, val in {
     "last_error": "",
     "api_key": os.getenv("GOOGLE_API_KEY", ""),
     "model_input": DEFAULT_MODEL,
+    "prompt": DEFAULT_PROMPT,
+    "video_password": "",
     "processing_timeout": 900,
     "generation_timeout": 300,
     "compress_threshold_mb": 200,
@@ -98,15 +100,15 @@ def download_video(url: str, dst_dir: str, password: str = "") -> str:
     with yt_dlp.YoutubeDL(opts) as ydl:
         info = ydl.extract_info(url, download=True)
 
-    # yt‑dlp may return a dict or a playlist dict
-    vid_id = info.get("id") if isinstance(info, dict) else None
-    ext = info.get("ext", "mp4") if isinstance(info, dict) else "mp4"
-    candidate = str(Path(dst_dir) / f"{vid_id}.{ext}") if vid_id else None
+    # Try to locate the downloaded file
+    if isinstance(info, dict) and info.get("id"):
+        vid_id = info["id"]
+        ext = info.get("ext", "mp4")
+        candidate = str(Path(dst_dir) / f"{vid_id}.{ext}")
+        if os.path.exists(candidate):
+            return convert_to_mp4(candidate)
 
-    if candidate and os.path.exists(candidate):
-        return convert_to_mp4(candidate)
-
-    # Fallback: pick the newest file in the folder
+    # Fallback: newest file in the folder
     newest = max(glob(os.path.join(dst_dir, "*")), key=os.path.getmtime)
     return convert_to_mp4(newest)
 
@@ -132,9 +134,7 @@ def strip_prompt_echo(prompt: str, text: str) -> str:
     return text
 
 
-def generate_inline(
-    video_path: str, prompt: str, model_id: str, timeout: int
-) -> str:
+def generate_inline(video_path: str, prompt: str, model_id: str, timeout: int) -> str:
     with open(video_path, "rb") as f:
         b64 = base64.b64encode(f.read()).decode()
     video_part = {
@@ -153,21 +153,21 @@ def generate_inline(
 
 
 # ----------------------------------------------------------------------
-# UI – Sidebar (inputs)
+# Sidebar – inputs & settings
 # ----------------------------------------------------------------------
 st.sidebar.header("Video Input")
 st.sidebar.text_input("Video URL", key="url", placeholder="https://")
 
-with st.sidebar.expander("Settings", expanded=False) as exp:
-    model = exp.selectbox("Model", MODEL_OPTIONS, index=MODEL_OPTIONS.index(DEFAULT_MODEL))
+with st.sidebar.expander("Settings", expanded=False):
+    model = st.selectbox("Model", MODEL_OPTIONS, index=MODEL_OPTIONS.index(DEFAULT_MODEL))
     if model == "custom":
-        model = exp.text_input("Custom model ID", value=DEFAULT_MODEL, key="custom_model")
+        model = st.text_input("Custom model ID", value=DEFAULT_MODEL, key="custom_model")
     st.session_state["model_input"] = model
 
-    exp.text_input("Google API Key", key="api_key", type="password")
-    exp.text_area("Analysis prompt", value=DEFAULT_PROMPT, key="prompt", height=140)
-    exp.text_input("Video password (if needed)", key="video_password", type="password")
-    exp.number_input(
+    st.text_input("Google API Key", key="api_key", type="password")
+    st.text_area("Analysis prompt", value=DEFAULT_PROMPT, key="prompt", height=140)
+    st.text_input("Video password (if needed)", key="video_password", type="password")
+    st.number_input(
         "Processing timeout (s)",
         min_value=60,
         max_value=3600,
@@ -175,7 +175,7 @@ with st.sidebar.expander("Settings", expanded=False) as exp:
         step=30,
         key="processing_timeout",
     )
-    exp.number_input(
+    st.number_input(
         "Generation timeout (s)",
         min_value=30,
         max_value=1800,
@@ -183,10 +183,104 @@ with st.sidebar.expander("Settings", expanded=False) as exp:
         step=10,
         key="generation_timeout",
     )
-    exp.number_input(
+    st.number_input(
         "Compress if > (MB)",
         min_value=10,
         max_value=2000,
         value=st.session_state["compress_threshold_mb"],
         step=10,
-       
+        key="compress_threshold_mb",
+    )
+
+# ----------------------------------------------------------------------
+# Load / preview video
+# ----------------------------------------------------------------------
+if st.sidebar.button("Load Video"):
+    try:
+        path = download_video(
+            st.session_state["url"], str(DATA_DIR), st.session_state["video_password"]
+        )
+        st.session_state["videos"] = path
+        st.session_state["last_error"] = ""
+    except Exception as e:
+        st.session_state["last_error"] = f"Download failed: {e}"
+        st.sidebar.error(st.session_state["last_error"])
+
+if st.session_state["videos"]:
+    try:
+        mp4 = convert_to_mp4(st.session_state["videos"])
+        with open(mp4, "rb") as f:
+            video_bytes = f.read()
+        st.sidebar.video(video_bytes, format="video/mp4")
+    except Exception:
+        st.sidebar.write("Preview unavailable")
+
+    if st.sidebar.button("Clear Video"):
+        for f in glob(str(DATA_DIR / "*")):
+            try:
+                os.remove(f)
+            except Exception:
+                pass
+        st.session_state.update(
+            {
+                "videos": "",
+                "analysis_out": "",
+                "last_error": "",
+                "busy": False,
+            }
+        )
+
+# ----------------------------------------------------------------------
+# Generation
+# ----------------------------------------------------------------------
+col1, col2 = st.columns([1, 3])
+with col1:
+    generate_now = st.button("Generate analysis", type="primary")
+with col2:
+    if not st.session_state["videos"]:
+        st.info("Load a video first.", icon="ℹ️")
+
+if generate_now and not st.session_state["busy"]:
+    if not st.session_state["videos"]:
+        st.error("No video loaded.")
+    elif not (st.session_state["api_key"] or os.getenv("GOOGLE_API_KEY")):
+        st.error("Google API key missing.")
+    else:
+        st.session_state["busy"] = True
+        try:
+            genai.configure(api_key=st.session_state["api_key"] or os.getenv("GOOGLE_API_KEY"))
+            model_id = st.session_state["model_input"]
+            prompt = st.session_state["prompt"]
+
+            # Optional compression to stay under inline limits
+            video_path = maybe_compress(
+                st.session_state["videos"], st.session_state["compress_threshold_mb"]
+            )
+
+            with st.spinner("Generating…"):
+                raw_out = generate_inline(
+                    video_path, prompt, model_id, st.session_state["generation_timeout"]
+                )
+            out = strip_prompt_echo(prompt, raw_out)
+            st.session_state["analysis_out"] = out
+            st.subheader("Analysis Result")
+            st.markdown(out or "No output.")
+        except Exception as e:
+            # Capture full traceback for debugging while showing a short message to the user
+            tb = traceback.format_exc()
+            st.session_state["last_error"] = f"Generation error: {e}"
+            st.error("An error occurred during generation. Check the log below.")
+            st.code(tb, language="text")
+        finally:
+            st.session_state["busy"] = False
+
+# ----------------------------------------------------------------------
+# Show results / errors
+# ----------------------------------------------------------------------
+if st.session_state["analysis_out"]:
+    st.subheader("📝 Analysis")
+    st.markdown(st.session_state["analysis_out"])
+
+if st.session_state["last_error"]:
+    st.subheader("❗️ Error log")
+    st.code(st.session_state["last_error"], language="text")