Update streamlit_app.py

streamlit_app.py

@@ -3,7 +3,6 @@
 
 """
 Video‑analysis Streamlit app.
-
 Features
 --------
 * Download videos from direct links, Twitter, or any site supported by yt‑dlp.
@@ -183,7 +182,6 @@ def _download_with_yt_dlp(url: str, dst: Path, password: str = "") -> Path:
 def download_video(url: str, dst: Path, password: str = "") -> Path:
     """
     Download a video from *url* and return an MP4 path.
-
     Strategy
     ---------
     1. Direct video URL → HTTP GET.
@@ -248,64 +246,53 @@ def _strip_prompt_echo(prompt: str, text: str, threshold: float = 0.68) -> str:
         return text[cut:].lstrip(" \n:-")
     return text
 
+
 # ----------------------------------------------------------------------
 # Streamlit UI
 # ----------------------------------------------------------------------
 def main() -> None:
     st.set_page_config(page_title="Video Analysis", layout="wide")
 
-    # Two‑column layout: left = “pseudo‑sidebar”, right = main content
-    col_sidebar, col_main = st.columns([1, 3])
-
     # ---------- Sidebar ----------
-    with col_sidebar:
-        st.header("Video Input")
-        st.text_input("Video URL", key="url", placeholder="https://")
+    st.sidebar.header("Video Input")
+    st.sidebar.text_input("Video URL", key="url", placeholder="https://")
 
-        with st.expander("Settings", expanded=False):
-            model = st.selectbox(
-                "Model", MODEL_OPTIONS, index=MODEL_OPTIONS.index(DEFAULT_MODEL)
-            )
-            if model == "custom":
-                model = st.text_input(
-                    "Custom model ID", value=DEFAULT_MODEL, key="custom_model"
-                )
-            st.session_state["model_input"] = model
-
-            # API key handling
-            secret_key = os.getenv("GOOGLE_API_KEY", "")
-            if secret_key:
-                st.session_state["api_key"] = secret_key
-            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(
-                "Compress if > (MB)",
-                min_value=10,
-                max_value=2000,
-                value=st.session_state.get("compress_mb", 100),
-                step=10,
-                key="compress_mb",
-            )
+    with st.sidebar.expander("Settings", expanded=False):
+        model = st.selectbox(
+            "Model", MODEL_OPTIONS, index=MODEL_OPTIONS.index(DEFAULT_MODEL)
+        )
+        if model == "custom":
+            model = st.text_input("Custom model ID", value=DEFAULT_MODEL, key="custom_model")
+        st.session_state["model_input"] = model
+
+        # API key handling
+        secret_key = os.getenv("GOOGLE_API_KEY", "")
+        if secret_key:
+            st.session_state["api_key"] = secret_key
+        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(
+            "Compress if > (MB)",
+            min_value=10,
+            max_value=2000,
+            value=st.session_state["compress_mb"],
+            step=10,
+            key="compress_mb",
+        )
 
     # ---------- Load video ----------
-    if st.button("Load Video"):
+    if st.sidebar.button("Load Video"):
         try:
             with st.spinner("Downloading video…"):
-                raw_path = download_video(
+                path = download_video(
                     st.session_state["url"], DATA_DIR, st.session_state["video_password"]
                 )
-                # ALWAYS convert to MP4 before storing
-                mp4_path = _convert_to_mp4(Path(raw_path))
-            st.session_state["video_path"] = str(mp4_path)   # guaranteed MP4
+            st.session_state["video_path"] = str(path)
             st.session_state["last_error"] = ""
             st.success("Video loaded successfully.")
         except Exception as e:
@@ -313,21 +300,21 @@ def main() -> None:
             st.sidebar.error(st.session_state["last_error"])
 
     # ---------- Preview & clear ----------
-    if st.session_state.get("video_path"):
+    if st.session_state["video_path"]:
         try:
             mp4 = _convert_to_mp4(Path(st.session_state["video_path"]))
             st.sidebar.video(str(mp4))
         except Exception:
             st.sidebar.write("Preview unavailable")
 
-        if st.button("Clear Video"):
-            # delete every file in DATA_DIR (both raw and converted)
+        if st.sidebar.button("Clear Video"):
+            # delete files
             for f in DATA_DIR.iterdir():
                 try:
                     f.unlink()
                 except Exception:
                     pass
-            # reset session state, including the URL field
+            # reset state, including URL field
             st.session_state.update(
                 {
                     "url": "",
@@ -335,73 +322,70 @@ def main() -> None:
                     "analysis_out": "",
                     "last_error": "",
                     "busy": False,
-                    "show_raw_on_error": False,
                 }
             )
             st.success("Session cleared.")
 
-    # ---------- Generation ----------
-    with col_main:
-        col1, col2 = st.columns([1, 3])
-        with col1:
-            generate_now = st.button(
-                "Generate analysis", type="primary", disabled=st.session_state.get("busy", False)
-            )
-        with col2:
-            if not st.session_state.get("video_path"):
-                st.info("Load a video first.", icon="ℹ️")
-
-        if generate_now and not st.session_state.get("busy", False):
-            api_key = st.session_state.get("api_key") or os.getenv("GOOGLE_API_KEY")
-            if not st.session_state.get("video_path"):
-                st.error("No video loaded.")
-            elif not api_key:
-                st.error("Google API key missing.")
-            else:
+# ---------- Generation ----------
+col1, col2 = st.columns([1, 3])
+with col1:
+    generate_now = st.button(
+        "Generate analysis", type="primary", disabled=st.session_state["busy"]
+    )
+with col2:
+    if not st.session_state["video_path"]:
+        st.info("Load a video first.", icon="ℹ️")
+
+if generate_now and not st.session_state["busy"]:
+    api_key = st.session_state["api_key"] or os.getenv("GOOGLE_API_KEY")
+    if not st.session_state["video_path"]:
+        st.error("No video loaded.")
+    elif not api_key:
+        st.error("Google API key missing.")
+    else:
+        try:
+            st.session_state["busy"] = True
+            genai.configure(api_key=api_key)
+
+            # ---- optional compression ----
+            with st.spinner("Checking video size…"):
+                video_path, was_compressed = _maybe_compress(
+                    Path(st.session_state["video_path"]),
+                    st.session_state["compress_mb"],
+                )
+
+            # ---- generation ----
+            with st.spinner("Generating analysis…"):
+                raw_out = generate_report(
+                    video_path,
+                    st.session_state["prompt"],
+                    st.session_state["model_input"],
+                    st.session_state.get("generation_timeout", 300),
+                )
+                # store the untouched response for debugging
+                st.session_state["raw_output"] = raw_out
+
+            # clean up temporary compressed file
+            if was_compressed:
                 try:
-                    st.session_state["busy"] = True
-                    genai.configure(api_key=api_key)
-
-                    # ---- optional compression ----
-                    with st.spinner("Checking video size…"):
-                        video_path, was_compressed = _maybe_compress(
-                            Path(st.session_state["video_path"]),
-                            st.session_state["compress_mb"],
-                        )
-
-                    # ---- generation ----
-                    with st.spinner("Generating analysis…"):
-                        raw_out = generate_report(
-                            video_path,
-                            st.session_state["prompt"],
-                            st.session_state["model_input"],
-                            st.session_state.get("generation_timeout", 300),
-                        )
-                        st.session_state["raw_output"] = raw_out
-
-                    # clean up temporary compressed file
-                    if was_compressed:
-                        try:
-                            video_path.unlink()
-                        except OSError:
-                            pass
-
-                    out = _strip_prompt_echo(st.session_state["prompt"], raw_out)
-                    st.session_state["analysis_out"] = out
-                    st.success("Analysis generated.")
-                    st.markdown(out or "*(no output)*")
-
-                except Exception as exc:
-                    tb = traceback.format_exc()
-                    st.session_state["last_error_detail"] = (
-                        f"{tb}\n\nRaw Gemini output:\n"
-                        f"{st.session_state.get('raw_output', '')}"
-                    )
-                    st.session_state["last_error"] = f"Generation error: {exc}"
-                    st.session_state["show_raw_on_error"] = True
-                    st.error("An error occurred during generation.")
-                finally:
-                    st.session_state["busy"] = False
+                    video_path.unlink()
+                except OSError:
+                    pass
+
+            out = _strip_prompt_echo(st.session_state["prompt"], raw_out)
+            st.session_state["analysis_out"] = out
+            st.success("Analysis generated.")
+            st.markdown(out or "*(no output)*")
+        except Exception as exc:
+            tb = traceback.format_exc()
+            # keep both traceback and whatever raw output we might have
+            st.session_state["last_error_detail"] = f"{tb}\n\nRaw Gemini output:\n{st.session_state.get('raw_output','')}"
+            st.session_state["last_error"] = f"Generation error: {exc}"
+            # indicate that raw output should be shown in the main area
+            st.session_state["show_raw_on_error"] = True
+            st.error("An error occurred during generation.")
+        finally:
+            st.session_state["busy"] = False
 
                 # ---------- Results ----------
                 if st.session_state.get("analysis_out"):