Update streamlit_app.py

streamlit_app.py

@@ -265,68 +265,75 @@ safety_settings = [
 ]
 
 # ---- Upload & processing helpers ----
-def _normalize_uploaded_obj(obj):
+def _upload_with_kwargs(fn, filepath):
     """
-    Normalize possible upload_file return shapes:
-    - SDK object with .name or .id
-    - dict with 'name' or 'id'
-    - legacy or ragstore shapes: {'file': {...}} etc.
-    Return a dict-like wrapper with at least 'name' key or original obj.
+    Call an upload function `fn` with the required ragStoreName argument.
+    Most recent google.generativeai SDK versions expect:
+        upload_file(path, ragStoreName="default")
+    Older versions accept just the path, so we try both signatures.
     """
-    if obj is None:
-        return None
-    if isinstance(obj, dict):
-        # common keys
-        name = obj.get("name") or obj.get("id") or obj.get("fileId") or (obj.get("file") and obj["file"].get("name"))
-        if name:
-            return {"name": name, "_raw": obj}
-        return obj
-    # SDK object: try attributes and to_dict
-    for attr in ("name", "id", "fileId", "file_id"):
-        v = getattr(obj, attr, None)
-        if v:
-            return {"name": v, "_raw": obj}
     try:
-        if hasattr(obj, "to_dict"):
-            d = obj.to_dict()
-            if isinstance(d, dict):
-                name = d.get("name") or d.get("id") or d.get("fileId") or (d.get("file") and d["file"].get("name"))
-                if name:
-                    return {"name": name, "_raw": obj}
-    except Exception:
-        pass
-    return {"name": None, "_raw": obj}
+        # Preferred modern signature
+        return fn(filepath, ragStoreName="default")
+    except TypeError:
+        # Fallback to older signature (no ragStoreName)
+        return fn(filepath)
+    except Exception as e:
+        # Propagate any other error for higher‑level handling
+        raise e
+
 
 def upload_video_sdk(filepath: str):
+    """Upload a video file using whichever upload function the SDK provides."""
     key = get_effective_api_key()
     if not key:
         raise RuntimeError("No API key provided")
     if not HAS_GENAI or genai is None:
         raise RuntimeError("google.generativeai SDK not available; cannot upload")
-    # prefer upload_file if present, otherwise try genai.ragstore or genai.files.upload style
+
     genai.configure(api_key=key)
-    last_exc = None
-    # try a few known entrypoints
+
+    # Build a list of possible upload callables (newest first)
     candidate_calls = []
+
+    # Newer SDK exposes upload_file directly
     if upload_file:
         candidate_calls.append(("upload_file", upload_file))
-    # sometimes SDK exposed as genai.ragstore.upload_file or genai.files.upload
-    candidate_calls.append(("genai.ragstore.upload_file", getattr(genai, "ragstore", None) and getattr(genai.ragstore, "upload_file", None)))
-    candidate_calls.append(("genai.files.upload", getattr(genai, "files", None) and getattr(genai.files, "upload", None)))
-    candidate_calls.append(("genai.upload", getattr(genai, "upload", None)))
-    # filter none
-    candidate_calls = [(n, fn) for n, fn in candidate_calls if fn]
+
+    # Some installations expose it under ragstore or files namespaces
+    candidate_calls.append(
+        ("genai.ragstore.upload_file",
+         getattr(genai, "ragstore", None) and getattr(genai.ragstore, "upload_file", None))
+    )
+    candidate_calls.append(
+        ("genai.files.upload",
+         getattr(genai, "files", None) and getattr(genai.files, "upload", None))
+    )
+    candidate_calls.append(
+        ("genai.upload",
+         getattr(genai, "upload", None))
+    )
+
+    # Filter out any None entries
+    candidate_calls = [(name, fn) for name, fn in candidate_calls if fn]
+
     if not candidate_calls:
         raise RuntimeError("No upload function available in google.generativeai SDK")
+
+    last_exc = None
     for name, fn in candidate_calls:
         try:
-            res = fn(filepath)
-            norm = _normalize_uploaded_obj(res)
-            # ensure we return something that file_name_or_id understands
-            return norm if isinstance(norm, dict) else res
+            # Use the wrapper that injects ragStoreName when needed
+            res = _upload_with_kwargs(fn, filepath)
+            # Normalise the return value so the rest of the code works
+            return _normalize_uploaded_obj(res)
         except Exception as e:
             last_exc = e
+            # Log the attempted method for debugging (optional)
+            st.session_state["last_error"] = f"Upload attempt '{name}' failed: {e}"
             continue
+
+    # If we get here every method failed
     raise RuntimeError(f"All upload methods failed. Last error: {last_exc}")
 
 def wait_for_processed(file_obj, timeout: int = None):