Update streamlit_app.py

streamlit_app.py

@@ -17,7 +17,6 @@ st.set_page_config(page_title="Generate the story of videos", layout="wide")
 DATA_DIR = Path("./data")
 DATA_DIR.mkdir(exist_ok=True)
 
-# session defaults
 for k, v in {
     "videos": "",
     "loop_video": False,
@@ -147,7 +146,6 @@ def file_name_or_id(file_obj):
         return s[idx:] if s[idx:].startswith("files/") else f"files/{s[idx+6:]}"
     return None
 
-# optional Google SDK
 HAS_GENAI = False
 genai = None
 upload_file = None
@@ -157,8 +155,8 @@ if os.getenv("GOOGLE_API_KEY"):
     try:
         import google.generativeai as genai_mod
         genai = genai_mod
-        upload_file = genai_mod.upload_file
-        get_file = genai_mod.get_file
+        upload_file = getattr(genai_mod, "upload_file", None)
+        get_file = getattr(genai_mod, "get_file", None)
         delete_file = getattr(genai_mod, "delete_file", None)
         HAS_GENAI = True
     except Exception:
@@ -168,8 +166,8 @@ def upload_video_sdk(filepath: str):
     key = get_runtime_api_key()
     if not key:
         raise RuntimeError("No API key")
-    if not HAS_GENAI:
-        raise RuntimeError("google.generativeai SDK not available")
+    if not HAS_GENAI or upload_file is None:
+        raise RuntimeError("google.generativeai SDK upload not available")
     genai.configure(api_key=key)
     return upload_file(filepath)
 
@@ -213,7 +211,6 @@ def remove_prompt_echo(prompt: str, text: str):
             return t[len(ph):].lstrip(" \n:-")
     return text
 
-# UI: sidebar
 st.sidebar.header("Video Input")
 st.sidebar.text_input("Video URL", key="url", placeholder="https://")
 settings = st.sidebar.expander("Settings", expanded=False)
@@ -241,7 +238,6 @@ settings.number_input("Max output tokens", key="max_output_tokens", value=1024,
 if not API_KEY_INPUT and not env_key:
     settings.info("No Google API key provided; upload/generation disabled. Use local-only demos or provide key for real analysis.", icon="ℹ️")
 
-# load video
 if st.sidebar.button("Load Video", use_container_width=True):
     try:
         vpw = st.session_state.get("video-password", "")
@@ -302,7 +298,35 @@ def get_runtime_api_key():
         return key
     return os.getenv("GOOGLE_API_KEY", "").strip() or None
 
-# generation flow
+# Responses caller supporting SDK variants and HTTP fallback
+def responses_generate(model, messages, files, max_output_tokens, api_key):
+    genai.configure(api_key=api_key)
+    # preferred SDK style
+    if hasattr(genai, "responses") and getattr(genai, "responses") is not None:
+        try:
+            return genai.responses.generate(model=model, messages=messages, files=files, max_output_tokens=max_output_tokens)
+        except Exception:
+            # let higher level handle retries/errors
+            raise
+    # older/newer SDKs might expose different helpers; attempt generic client POST
+    # fallback: directly call the REST endpoint via genai.client/_client if available
+    client_attr = getattr(genai, "client", None) or getattr(genai, "_client", None) or getattr(genai, "transport", None)
+    if client_attr:
+        try:
+            # construct payload similar to Responses API
+            payload = {"model": model, "messages": messages, "max_output_tokens": max_output_tokens}
+            headers = {"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"}
+            # try to find a requests-like post method
+            post = getattr(client_attr, "post", None) or getattr(client_attr, "request", None)
+            if post:
+                # endpoint path used by Google Generative API
+                url = "/v1/responses"
+                resp = post(url, json=payload, headers=headers)
+                return resp
+        except Exception:
+            pass
+    raise RuntimeError("genai.responses not available and HTTP fallback failed")
+
 if (st.session_state.get("busy") is False) and ('generate_now' in locals() and generate_now):
     if not st.session_state.get("videos"):
         st.error("No video loaded. Use 'Load Video' in the sidebar.")
@@ -328,7 +352,6 @@ if (st.session_state.get("busy") is False) and ('generate_now' in locals() and g
 
                 upload_path = current_path
                 uploaded = st.session_state.get("uploaded_file")
-                # If we need to (re)upload
                 if reupload_needed:
                     local_path = current_path
                     fast_mode = st.session_state.get("fast_mode", False)
@@ -354,8 +377,6 @@ if (st.session_state.get("busy") is False) and ('generate_now' in locals() and g
                         st.session_state["processed_file"] = processed
                         st.session_state["last_loaded_path"] = current_path
                         st.session_state["file_hash"] = current_hash
-
-                    # Do not delete original local file until entire generation succeeds.
                 else:
                     uploaded = st.session_state.get("uploaded_file")
                     processed = st.session_state.get("processed_file")
@@ -372,24 +393,11 @@ if (st.session_state.get("busy") is False) and ('generate_now' in locals() and g
                 user_msg = {"role": "user", "content": prompt_text}
 
                 def call_responses_once(model_used, system_msg, user_msg, fname, max_tokens):
-                    genai.configure(api_key=runtime_key)
                     for attempt in range(2):
                         try:
-                            try:
-                                response = genai.responses.generate(
-                                    model=model_used,
-                                    messages=[system_msg, user_msg],
-                                    files=[{"name": fname}],
-                                    max_output_tokens=max_tokens,
-                                )
-                            except TypeError:
-                                response = genai.responses.generate(
-                                    model=model_used,
-                                    input=[{"text": user_msg["content"], "files": [{"name": fname}]}],
-                                    max_output_tokens=max_tokens,
-                                )
-                            return response
-                        except Exception as e:
+                            resp = responses_generate(model_used, [system_msg, user_msg], [{"name": fname}], max_tokens, api_key=runtime_key)
+                            return resp
+                        except Exception:
                             if attempt == 0:
                                 time.sleep(1.0)
                                 continue
@@ -470,12 +478,10 @@ if (st.session_state.get("busy") is False) and ('generate_now' in locals() and g
                 st.subheader("Analysis Result")
                 st.markdown(out or "_(no text returned)_")
 
-                # delete local copies now that generation succeeded (if upload created temporary compressed file)
                 try:
                     if reupload_needed:
                         if upload_path and Path(upload_path).exists() and Path(upload_path) != Path(current_path):
                             Path(upload_path).unlink(missing_ok=True)
-                        # optionally remove original local file to avoid persistence
                         Path(current_path).unlink(missing_ok=True)
                         st.session_state["videos"] = ""
                 except Exception:
@@ -490,7 +496,6 @@ if (st.session_state.get("busy") is False) and ('generate_now' in locals() and g
                             "processed_state": getattr(st.session_state.get("processed_file"), "state", None) if st.session_state.get("processed_file") else None,
                         }
                         st.write(info)
-                        # truncated response keys for debugging
                         try:
                             if isinstance(response, dict):
                                 keys = list(response.keys())[:20]
@@ -508,7 +513,6 @@ if (st.session_state.get("busy") is False) and ('generate_now' in locals() and g
             finally:
                 st.session_state["busy"] = False
 
-# persistent UI: show cached analysis without paths/ids
 if st.session_state.get("analysis_out"):
     st.subheader("Analysis Result")
     st.markdown(st.session_state.get("analysis_out"))
@@ -517,7 +521,6 @@ if st.session_state.get("last_error"):
     with st.expander("Last Error", expanded=False):
         st.write(st.session_state.get("last_error"))
 
-# delete uploaded files (local + cloud if possible)
 with st.sidebar.expander("Manage uploads", expanded=False):
     if st.button("Delete uploaded files (local + cloud)"):
         for f in glob(str(DATA_DIR / "*")):