Update streamlit_app.py

streamlit_app.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """
-Video‑analysis Streamlit app (refactored & fixed).
+Video‑analysis Streamlit app (refactored, sidebar‑based controls, no experimental_rerun).
 """
 
 # ----------------------------------------------------------------------
@@ -210,10 +210,11 @@ def _strip_prompt_echo(prompt: str, text: str, threshold: float = 0.68) -> str:
 # UI helpers
 # ----------------------------------------------------------------------
 def _expand_sidebar(width: int = 380) -> None:
+    """Make the Streamlit sidebar a bit wider."""
     st.markdown(
         f"""
         <style>
-        .css-1d391kg {{  /* may vary with Streamlit versions */
+        .css-1d391kg {{  /* class name may change with Streamlit updates */
             width: {width}px !important;
             min-width: {width}px !important;
         }}
@@ -234,6 +235,19 @@ def main() -> None:
     st.sidebar.header("Video Input")
     st.sidebar.text_input("Video URL", key="url", placeholder="https://")
 
+    # Clear cached videos
+    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.toast("All cached videos cleared")
+
+    # Load video button
     if st.sidebar.button("Load Video"):
         try:
             with st.spinner("Downloading video…"):
@@ -241,12 +255,11 @@ def main() -> None:
                     st.session_state["url"], DATA_DIR, st.session_state["video_password"]
                 )
                 mp4_path = _convert_to_mp4(Path(raw_path))
-                # Optional compression (if size exceeds user‑defined limit)
+                # 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")
-            st.experimental_rerun()
         except Exception as e:
             st.session_state["last_error"] = f"Download failed: {e}"
             st.sidebar.error(st.session_state["last_error"])
@@ -260,11 +273,16 @@ def main() -> None:
             model = st.text_input("Custom model ID", value=DEFAULT_MODEL, key="custom_model")
         st.session_state["model_input"] = model
 
-        # API key handling
+        # 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
-        st.text_input("Google API Key", key="api_key", type="password")
+        st.text_input(
+            "Google API Key",
+            key="api_key",
+            type="password",
+            help="Enter your Gemini API key (or set GOOGLE_API_KEY env var).",
+        )
 
         st.text_area(
             "Analysis prompt",
@@ -286,17 +304,29 @@ def main() -> None:
             key="compress_mb",
         )
 
-        if st.sidebar.button("Clear Video"):
-            for f in DATA_DIR.iterdir():
+        # Run Analysis button – now in the sidebar, under Clear Video
+        if st.sidebar.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:
-                    f.unlink()
-                except Exception:
-                    pass
-            st.session_state["video_path"] = ""
-            st.session_state["analysis_out"] = ""
-            st.session_state["raw_output"] = ""
-            st.toast("All cached videos cleared")
-            st.experimental_rerun()
+                    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
 
     # ---------- Main panel ----------
     if st.session_state["last_error"]:
@@ -305,39 +335,16 @@ def main() -> None:
     if st.session_state.get("video_path"):
         st.video(st.session_state["video_path"])
 
-        if st.button("Run Analysis"):
-            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
-                st.experimental_rerun()
-
-        # Show results
-        if st.session_state.get("analysis_out"):
-            st.subheader("📝 Analysis")
-            st.write(st.session_state["analysis_out"])
-
-            with st.expander("Show raw model output"):
-                st.code(st.session_state["raw_output"], language="text")
-
-        # Optional error details
-        if st.session_state.get("last_error_detail"):
-            with st.expander("Show error details"):
-                st.code(st.session_state["last_error_detail"], language="text")
+    if st.session_state.get("analysis_out"):
+        st.subheader("📝 Analysis")
+        st.write(st.session_state["analysis_out"])
+
+        with st.expander("Show raw model output"):
+            st.code(st.session_state["raw_output"], language="text")
+
+    if st.session_state.get("last_error_detail"):
+        with st.expander("Show error details"):
+            st.code(st.session_state["last_error_detail"], language="text")
 
 
 # ----------------------------------------------------------------------
@@ -367,6 +374,9 @@ def _init_state() -> None:
 # ----------------------------------------------------------------------
 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"])
+
     main()