Update streamlit_app.py

streamlit_app.py

@@ -255,51 +255,54 @@ def _strip_prompt_echo(prompt: str, text: str, threshold: float = 0.68) -> str:
 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 ----------
-    st.sidebar.header("Video Input")
-    st.sidebar.text_input("Video URL", key="url", placeholder="https://")
+        with col_sidebar:
+        st.header("Video Input")
+        st.text_input("Video URL", key="url", placeholder="https://")
 
-    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",
-        )
+        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["compress_mb"],
+                step=10,
+                key="compress_mb",
+            )
 
     # ---------- Load video ----------
-    if st.sidebar.button("Load Video"):
-        try:
-            with st.spinner("Downloading video…"):
-                path = download_video(
-                    st.session_state["url"], DATA_DIR, st.session_state["video_password"]
-                )
-            st.session_state["video_path"] = str(path)
-            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"])
+    if st.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["video_path"]:
@@ -309,14 +312,14 @@ def main() -> None:
         except Exception:
             st.sidebar.write("Preview unavailable")
 
-        if st.sidebar.button("Clear Video"):
-            # delete files
+        if st.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 state, including URL field
+            # reset session state, including the URL field
             st.session_state.update(
                 {
                     "url": "",
@@ -324,19 +327,22 @@ def main() -> None:
                     "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["busy"]
-    )
-with col2:
-    if not st.session_state["video_path"]:
-        st.info("Load a video first.", icon="ℹ️")
+    with col_main:
+        # ---------- 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")
@@ -389,25 +395,20 @@ if generate_now and not st.session_state["busy"]:
         finally:
             st.session_state["busy"] = False
 
-# ---------- Results ----------
-if st.session_state["analysis_out"]:
-    st.subheader("📝 Analysis")
-    st.markdown(st.session_state["analysis_out"])
-
-# Show raw Gemini output **above** the error expander when:
-#   • we have a normal analysis (so user can compare)  OR
-#   • an error occurred (flag set)
-if st.session_state["raw_output"] and (
-    st.session_state["analysis_out"] or st.session_state["show_raw_on_error"]
-):
-    with st.expander("🔎 Full Gemini output (debug)"):
-        st.code(st.session_state["raw_output"], language="text")
-
-# ---------- Errors ----------
-if st.session_state["last_error"]:
-    with st.expander("❗️ Error details"):
-        # only the traceback – raw output already shown above
-        st.code(st.session_state["last_error_detail"], language="text")
+        # ---------- Results ----------
+        if st.session_state["analysis_out"]:
+            st.subheader("📝 Analysis")
+            st.markdown(st.session_state["analysis_out"])
+
+        # Show raw Gemini output only when it exists (no extra expander)
+        if st.session_state["raw_output"]:
+            st.subheader("🔎 Full Gemini output")
+            st.code(st.session_state["raw_output"], language="text")
+
+        # ---------- Errors ----------
+        if st.session_state["last_error"]:
+            with st.expander("❗️ Error details"):
+                st.code(st.session_state["last_error_detail"], language="text")
 
 if __name__ == "__main__":
     main()