Update streamlit_app.py

streamlit_app.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-Video‑analysis Streamlit app (refactored, sidebar‑based controls, no experimental_rerun).
+Video‑analysis Streamlit app
 """
 
 # ----------------------------------------------------------------------
@@ -119,8 +119,8 @@ def _download_with_yt_dlp(url: str, dst: Path, password: str = "") -> Path:
         "nocheckcertificate": True,
         "merge_output_format": "mp4",
         "fragment_retries": 0,
-        "force_ipv4": True,               # <‑‑ force IPv4
-        "retries": 3,                     # retry a few times on transient errors
+        "force_ipv4": True,
+        "retries": 3,
         "socket_timeout": 30,
     }
     if password:
@@ -220,7 +220,7 @@ def _expand_sidebar(width: int = 380) -> None:
     st.markdown(
         f"""
         <style>
-        .css-1d391kg {{  /* class name may change with Streamlit updates */
+        section[data-testid="stSidebar"] {{
             width: {width}px !important;
             min-width: {width}px !important;
         }}
@@ -230,30 +230,71 @@ def _expand_sidebar(width: int = 380) -> None:
     )
 
 
+# ----------------------------------------------------------------------
+# Session‑state defaults
+# ----------------------------------------------------------------------
+def _init_state() -> None:
+    defaults = {
+        "url": "",
+        "video_path": "",
+        "model_input": DEFAULT_MODEL,
+        "prompt": DEFAULT_PROMPT,
+        "api_key": os.getenv("GOOGLE_API_KEY", "AIzaSyBiAW2GQLid0HGe9Vs_ReKwkwsSVNegNzs"), 
+        "video_password": "",
+        "compress_mb": 200,
+        "busy": False,
+        "last_error": "",
+        "analysis_out": "",
+        "raw_output": "",
+        "last_error_detail": "",
+    }
+    for k, v in defaults.items():
+        st.session_state.setdefault(k, v)
+
+
 # ----------------------------------------------------------------------
 # Streamlit UI
 # ----------------------------------------------------------------------
 def main() -> None:
     st.set_page_config(page_title="Video Analysis", layout="wide")
+    _init_state()                     # initialise after config
     _expand_sidebar()
 
     # ---------- Sidebar ----------
     st.sidebar.header("Video Input")
-    st.sidebar.text_input("Video URL", key="url", placeholder="https://")
-
-    # Clear cached videos
+    st.sidebar.text_input(
+        "Video URL", key="url", placeholder="https://"
+    )
+    st.sidebar.text_input(
+        "Video password (if needed)",
+        key="video_password",
+        type="password",
+    )
+    st.sidebar.number_input(
+        "Compress if > (MB)",
+        min_value=10,
+        max_value=2000,
+        value=st.session_state.get("compress_mb", 200),
+        step=10,
+        key="compress_mb",
+    )
     if st.sidebar.button("Clear Video"):
         for f in DATA_DIR.iterdir():
             try:
                 f.unlink()
             except Exception:
                 pass
-        st.session_state["video_path"] = ""
-        st.session_state["analysis_out"] = ""
-        st.session_state["raw_output"] = ""
+        st.session_state.update(
+            {
+                "video_path": "",
+                "analysis_out": "",
+                "raw_output": "",
+                "last_error": "",
+                "last_error_detail": "",
+            }
+        )
         st.toast("All cached videos cleared")
 
-    # Load video button
     if st.sidebar.button("Load Video"):
         try:
             with st.spinner("Downloading video…"):
@@ -261,12 +302,15 @@ def main() -> None:
                     st.session_state["url"], DATA_DIR, st.session_state["video_password"]
                 )
                 mp4_path = _convert_to_mp4(Path(raw_path))
-                # Optional compression based on user‑defined limit
                 mp4_path, _ = _maybe_compress(mp4_path, st.session_state["compress_mb"])
             st.session_state["video_path"] = str(mp4_path)
             st.session_state["last_error"] = ""
             st.toast("Video ready")
-        except Exception as e:
+        except (
+            RuntimeError,
+            requests.exceptions.RequestException,
+            yt_dlp.utils.DownloadError,
+        ) as e:
             st.session_state["last_error"] = f"Download failed: {e}"
             st.sidebar.error(st.session_state["last_error"])
 
@@ -276,13 +320,12 @@ def main() -> None:
             "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")
+            model = st.text_input(
+                "Custom model ID", value=DEFAULT_MODEL, key="custom_model"
+            )
         st.session_state["model_input"] = model
 
-        # API key handling – can be set via env var or entered here
-        secret_key = os.getenv("GOOGLE_API_KEY", "")
-        if secret_key:
-            st.session_state["api_key"] = secret_key
+        # API key – can also be set via env var
         st.text_input(
             "Google API Key",
             key="api_key",
@@ -296,45 +339,41 @@ def main() -> None:
             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", 200),
-            step=10,
-            key="compress_mb",
-        )
 
     # ---------- Main panel ----------
-        # Run Analysis button
-        if st.button("Run Analysis"):
-            if not st.session_state.get("video_path"):
-                st.sidebar.error("No video loaded – load a video first.")
-            else:
-                st.session_state["busy"] = True
-                st.session_state["analysis_out"] = ""
-                st.session_state["raw_output"] = ""
-                try:
-                    with st.spinner("Generating report…"):
-                        raw = generate_report(
-                            Path(st.session_state["video_path"]),
-                            st.session_state["prompt"],
-                            st.session_state["model_input"],
-                        )
-                        cleaned = _strip_prompt_echo(st.session_state["prompt"], raw)
-                        st.session_state["analysis_out"] = cleaned
-                        st.session_state["raw_output"] = raw
-                except Exception as e:
-                    st.session_state["last_error"] = f"Analysis failed: {e}"
-                    st.session_state["last_error_detail"] = traceback.format_exc()
-                finally:
-                    st.session_state["busy"] = False
-                    
+    # Run Analysis button (placed after settings for visual flow)
+    if st.button("Run Analysis"):
+        if not st.session_state.get("video_path"):
+            st.error("No video loaded – load a video first.")
+        elif not st.session_state.get("api_key"):
+            st.error("Google API key missing – enter it in the sidebar.")
+        else:
+            # configure Gemini now that we have a key
+            genai.configure(api_key=st.session_state["api_key"])
+
+            st.session_state["busy"] = True
+            st.session_state["analysis_out"] = ""
+            st.session_state["raw_output"] = ""
+            st.session_state["last_error"] = ""
+            st.session_state["last_error_detail"] = ""
+
+            try:
+                with st.spinner("Generating report (this may take a minute)…"):
+                    raw = generate_report(
+                        Path(st.session_state["video_path"]),
+                        st.session_state["prompt"],
+                        st.session_state["model_input"],
+                    )
+                    cleaned = _strip_prompt_echo(st.session_state["prompt"], raw)
+                    st.session_state["analysis_out"] = cleaned
+                    st.session_state["raw_output"] = raw
+            except Exception as e:
+                st.session_state["last_error"] = f"Analysis failed: {e}"
+                st.session_state["last_error_detail"] = traceback.format_exc()
+            finally:
+                st.session_state["busy"] = False
+
+    # ---- Layout: analysis first, then video, then errors ----
     if st.session_state.get("analysis_out"):
         st.subheader("📝 Analysis")
         st.write(st.session_state["analysis_out"])
@@ -344,44 +383,18 @@ def main() -> None:
 
     if st.session_state.get("video_path"):
         st.video(st.session_state["video_path"])
-        
-    if st.session_state["last_error"]:
+
+    if st.session_state.get("last_error"):
         st.error(st.session_state["last_error"])
-        
+
     if st.session_state.get("last_error_detail"):
         with st.expander("Show error details"):
             st.code(st.session_state["last_error_detail"], language="text")
 
-# ----------------------------------------------------------------------
-# Session‑state defaults
-# ----------------------------------------------------------------------
-def _init_state() -> None:
-    defaults = {
-        "url": "",
-        "video_path": "",
-        "model_input": DEFAULT_MODEL,
-        "prompt": DEFAULT_PROMPT,
-        "api_key": os.getenv("GOOGLE_API_KEY", "AIzaSyBiAW2GQLid0HGe9Vs_ReKwkwsSVNegNzs"),
-        "video_password": "",
-        "compress_mb": 200,
-        "busy": False,
-        "last_error": "",
-        "analysis_out": "",
-        "raw_output": "",
-        "last_error_detail": "",
-    }
-    for k, v in defaults.items():
-        st.session_state.setdefault(k, v)
-
 
 # ----------------------------------------------------------------------
 # Entry point
 # ----------------------------------------------------------------------
 if __name__ == "__main__":
-    _init_state()
-
-    # Configure Gemini if an API key is present (env var or sidebar entry)
-    if st.session_state["api_key"]:
-        genai.configure(api_key=st.session_state["api_key"])
-
+    # No need to call _init_state() here – it is invoked inside main()
     main()