Update streamlit_app.py

streamlit_app.py

@@ -257,12 +257,59 @@ def main() -> None:
     st.sidebar.header("Video Input")
     st.sidebar.text_input("Video URL", key="url", placeholder="https://")
 
+    # **Load Video button – now directly under the URL field**
+    if st.sidebar.button("Load Video"):
+        try:
+            with st.spinner("Downloading video…"):
+                raw_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["last_error"] = ""
+            st.success("Video loaded successfully.")
+        except Exception as e:
+            st.session_state["last_error"] = f"Download failed: {e}"
+            st.sidebar.error(st.session_state["last_error"])
+
+        # ---------- Preview & clear ----------
+        if st.session_state.get("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.sidebar.button("Clear Video"):
+                # delete every file in DATA_DIR (both raw and converted)
+                for f in DATA_DIR.iterdir():
+                    try:
+                        f.unlink()
+                    except Exception:
+                        pass
+                # reset session state, including the URL field
+                st.session_state.update(
+                    {
+                        "url": "",
+                        "video_path": "",
+                        "analysis_out": "",
+                        "last_error": "",
+                        "busy": False,
+                        "show_raw_on_error": False,
+                    }
+                )
+                st.success("Session cleared.")
+
+    # ---------- Settings ----------
     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")
+            model = st.text_input(
+                "Custom model ID", value=DEFAULT_MODEL, key="custom_model"
+            )
         st.session_state["model_input"] = model
 
         # API key handling
@@ -280,137 +327,88 @@ def main() -> None:
             "Compress if > (MB)",
             min_value=10,
             max_value=2000,
-            value=st.session_state["compress_mb"],
+            value=st.session_state.get("compress_mb", 100),
             step=10,
             key="compress_mb",
         )
 
-# ---------- Load video ----------
-if st.sidebar.button("Load Video"):
-    try:
-        with st.spinner("Downloading video…"):
-            raw_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["last_error"] = ""
-        st.success("Video loaded successfully.")
-    except Exception as e:
-        st.session_state["last_error"] = f"Download failed: {e}"
-        st.sidebar.error(st.session_state["last_error"])
+    # ---------- Generation ----------
+    col1, col2 = st.columns([1, 3])
 
-    # ---------- Preview & clear ----------
-    if st.session_state.get("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.sidebar.button("Clear Video"):
-            # delete every file in DATA_DIR (both raw and converted)
-            for f in DATA_DIR.iterdir():
-                try:
-                    f.unlink()
-                except Exception:
-                    pass
-            # reset session state, including the URL field
-            st.session_state.update(
-                {
-                    "url": "",
-                    "video_path": "",
-                    "analysis_out": "",
-                    "last_error": "",
-                    "busy": False,
-                    "show_raw_on_error": False,
-                }
-            )
-            st.success("Session cleared.")
-
-
-# ---------- Generation ----------
-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:
-        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"],
-                )
+    with col1:
+        generate_now = st.button(
+            "Generate analysis", type="primary", disabled=st.session_state.get("busy", False)
+        )
 
-            # ---- 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),
+    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:
+            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{st.session_state.get('raw_output', '')}"
                 )
-                # store the untouched response for debugging
-                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()
-            # 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"):
-            st.subheader("📝 Analysis")
-            st.markdown(st.session_state["analysis_out"])
-
-        # Show raw Gemini output only when it exists
-        if st.session_state.get("raw_output"):
-            st.subheader("🔎 Full Gemini output")
-            st.code(st.session_state["raw_output"], language="text")
-
-        # ---------- Errors ----------
-        if st.session_state.get("last_error"):
-            with st.expander("❗️ Error details"):
-                st.code(st.session_state["last_error_detail"], language="text")
+                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
+
+            # ---------- Results ----------
+            if st.session_state.get("analysis_out"):
+                st.subheader("📝 Analysis")
+                st.markdown(st.session_state["analysis_out"])
+
+            # Show raw Gemini output only when it exists
+            if st.session_state.get("raw_output"):
+                st.subheader("🔎 Full Gemini output")
+                st.code(st.session_state["raw_output"], language="text")
+
+            # ---------- Errors ----------
+            if st.session_state.get("last_error"):
+                with st.expander("❗️ Error details"):
+                    st.code(st.session_state["last_error_detail"], language="text")
 
 
 if __name__ == "__main__":