Update streamlit_app.py

streamlit_app.py

@@ -40,10 +40,10 @@ settings_exp = st.sidebar.expander("Settings", expanded=False)
 env_api_key = os.getenv("GOOGLE_API_KEY", "")
 API_KEY = settings_exp.text_input("Google API Key", value=env_api_key, placeholder="Set GOOGLE_API_KEY in .env or enter here")
 
-# Normalize model input: accept either "gemini-2.0-flash-lite" or "models/gemini-2.0-flash-lite"
+# Accept short model name like "gemini-2.0-flash-lite" and normalize to "models/..."
 raw_model = settings_exp.text_input("Gemini Model (model name)", "gemini-2.0-flash-lite")
-model_id = raw_model.strip()
-if model_id and not model_id.startswith("models/"):
+model_id = raw_model.strip() or "gemini-2.0-flash-lite"
+if not model_id.startswith("models/"):
     model_id = f"models/{model_id}"
 
 analysis_prompt = settings_exp.text_area("Enter analysis", "watch entire video and describe")
@@ -52,7 +52,6 @@ settings_exp.text_input("Video Password", key="video-password", placeholder="Ent
 if not API_KEY:
     settings_exp.warning("No Google API key provided. Uploading/processing will not work.", icon="⚠️")
 
-# Safety settings (optional)
 safety_settings = [
     {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "OFF"},
     {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "OFF"},
@@ -95,7 +94,6 @@ def download_video_ytdlp(url: str, save_dir: str, video_password: str = None) ->
         raise FileNotFoundError("Downloaded video not found")
     return convert_video_to_mp4(matches[0])
 
-# Load video
 if st.sidebar.button("Load Video", use_container_width=True):
     try:
         video_password = st.session_state.get("video-password", "")
@@ -104,7 +102,6 @@ if st.sidebar.button("Load Video", use_container_width=True):
     except Exception as e:
         st.sidebar.error(f"Failed to load video: {e}")
 
-# Sidebar preview & options
 if st.session_state["videos"]:
     try:
         st.sidebar.video(st.session_state["videos"], loop=st.session_state.get("loop_video", True))
@@ -137,13 +134,11 @@ if st.session_state["videos"]:
 
     st.sidebar.write("Title:", Path(st.session_state["videos"]).name)
 
-# Helper: upload via SDK if available, else use direct HTTP
 def upload_video(filepath: str):
     if not API_KEY:
         raise RuntimeError("No API key provided")
     if HAS_GENAI and callable(upload_file):
         return upload_file(filepath)
-    # Fallback: use REST upload (multipart/form-data)
     url = "https://generative.googleapis.com/v1beta2/files?uploadType=multipart"
     headers = {"Authorization": f"Bearer {API_KEY}"}
     metadata = {"mimeType": "video/mp4", "displayName": Path(filepath).name}
@@ -155,10 +150,8 @@ def upload_video(filepath: str):
     r.raise_for_status()
     return r.json()
 
-# Helper: poll file processing; SDK get_file returns object with state; fallback to REST GET
 def poll_file_processed(file_obj, timeout=180):
     start = time.time()
-    # If SDK returned an object with .name and .state, use SDK get_file
     if HAS_GENAI and hasattr(file_obj, "name"):
         name = file_obj.name
         while getattr(file_obj, "state", None) and getattr(file_obj.state, "name", None) == "PROCESSING":
@@ -167,11 +160,9 @@ def poll_file_processed(file_obj, timeout=180):
             time.sleep(2)
             file_obj = get_file(name)
         return file_obj
-    # If file_obj is a dict from REST upload, it should have "name" field or "id"
     fid = file_obj.get("name") or file_obj.get("id")
     if not fid:
         return file_obj
-    # Poll via REST GET
     url = f"https://generative.googleapis.com/v1beta2/{fid}"
     headers = {"Authorization": f"Bearer {API_KEY}"}
     while True:
@@ -185,22 +176,19 @@ def poll_file_processed(file_obj, timeout=180):
             raise TimeoutError("File processing timed out")
         time.sleep(2)
 
-# Updated helper to call Responses API correctly (use /v1 or /v1beta2 responses:generate depending on model string)
 def call_model_with_file(prompt_text: str, uploaded_file_obj):
     if not API_KEY:
         raise RuntimeError("No API key provided")
 
-    # Resolve file reference name from upload response
     file_ref_name = (
         uploaded_file_obj.name
         if hasattr(uploaded_file_obj, "name")
         else uploaded_file_obj.get("name") or uploaded_file_obj.get("id")
     )
 
-    # If SDK present, prefer it (some SDKs expose GENAI.responses.generate or http.post)
+    # Prefer SDK responses.generate if available
     if HAS_GENAI:
         try:
-            # If SDK exposes a responses.generate style, use it
             if hasattr(GENAI, "responses") and hasattr(GENAI.responses, "generate"):
                 request = {
                     "model": model_id,
@@ -209,20 +197,11 @@ def call_model_with_file(prompt_text: str, uploaded_file_obj):
                     "maxOutputTokens": 1000,
                 }
                 return GENAI.responses.generate(**request)
-            # Fallback to http.post if available
-            if hasattr(GENAI, "http") and hasattr(GENAI.http, "post"):
-                path = f"/v1beta2/{model_id}:generate"
-                body = {
-                    "prompt": prompt_text,
-                    "fileReferences": [{"fileName": file_ref_name}],
-                    "safetySettings": safety_settings,
-                    "maxOutputTokens": 1000,
-                }
-                return GENAI.http.post(path, json=body)
         except Exception:
             pass
 
-    # REST fallback — use Responses API's generate endpoint.
+    # Use the v1 Responses API host and normalized model_id (models/...)
+    endpoint = f"https://api.generativeai.googleapis.com/v1/{model_id}:generate"
     body = {
         "input": [
             {
@@ -235,33 +214,10 @@ def call_model_with_file(prompt_text: str, uploaded_file_obj):
     }
     headers = {"Authorization": f"Bearer {API_KEY}", "Content-Type": "application/json"}
 
-    # Normalize model path: model_id already has "models/" prefix from above normalization
-    endpoints_to_try = [
-        f"https://api.generativeai.googleapis.com/v1/{model_id}:generate",
-        f"https://api.generativeai.googleapis.com/v1/models/{model_id}:generate",
-        f"https://generative.googleapis.com/v1/{model_id}:generate",
-        f"https://generative.googleapis.com/v1/models/{model_id}:generate",
-        # fallback to v1beta2 legacy URLs
-        f"https://generative.googleapis.com/v1beta2/models/{model_id}:generate",
-        f"https://generative.googleapis.com/v1beta2/{model_id}:generate",
-    ]
-
-    last_exc = None
-    for endpoint in endpoints_to_try:
-        try:
-            r = requests.post(endpoint, headers=headers, json=body, timeout=180)
-            r.raise_for_status()
-            return r.json()
-        except requests.HTTPError as e:
-            last_exc = e
-            if e.response is not None and e.response.status_code not in (404,):
-                raise
-        except Exception as e:
-            last_exc = e
-
-    raise last_exc or RuntimeError("Failed to call model endpoint")
+    r = requests.post(endpoint, headers=headers, json=body, timeout=180)
+    r.raise_for_status()
+    return r.json()
 
-# Main action
 if st.button("Generate the story", type="primary"):
     if not st.session_state.get("videos"):
         st.error("No video loaded. Use 'Load Video' in the sidebar.")
@@ -278,7 +234,6 @@ if st.button("Generate the story", type="primary"):
             with st.spinner("Generating description..."):
                 result = call_model_with_file(prompt_text, processed)
 
-            # Result may be SDK object or dict from REST; try extracting text
             text_out = ""
             if isinstance(result, dict):
                 if "output" in result: