Update app.py

app.py

@@ -246,76 +246,73 @@ def chat_complete(client, model: str, messages, timeout: int = 120, progress=Non
     except Exception as e:
         return f"Error during model call: {e}"
 
-def upload_file_to_mistral(client, path: str, filename: str | None = None, purpose: str = "batch", timeout: int = 120, progress=None) -> str:
+def upload_file_to_mistral(
+    client,
+    path: str,
+    filename: str | None = None,
+    purpose: str = "batch",
+    timeout: int = 120,
+    progress=None,
+) -> str:
+    """
+    Upload a file to Mistral using only the REST endpoint.
+    - Sends multipart/form‑data with field name **file**.
+    - Sends a form field **purpose** (string).
+    - If the request returns 422, retries with common allowed purposes
+      (image, batch, fine‑tune) and returns the first successful file id.
+    """
     fname = filename or os.path.basename(path)
-    last_sdk_error = None
 
-    # Try SDK upload: pass exactly one positional file-like argument
-    try:
-        if hasattr(client, "files") and hasattr(client.files, "upload"):
-            with open(path, "rb") as fh:
-                # many SDKs expect a single positional file arg
-                res = client.files.upload(fh)
-            # normalize response
-            fid = getattr(res, "id", None) or (res.get("id") if isinstance(res, dict) else None)
-            if not fid:
-                try:
-                    fid = res["data"][0]["id"]
-                except Exception:
-                    fid = None
-            if fid:
-                if progress is not None:
-                    try:
-                        progress(0.6)
-                    except TypeError:
-                        progress(0.6, desc="Upload complete (SDK)")
-                return fid
-    except Exception as e:
-        last_sdk_error = e
+    # ------------------------------------------------------------------ #
+    # Build the list of purposes to try (original + sensible fallbacks)
+    # ------------------------------------------------------------------ #
+    purposes_to_try = [purpose]
+
+    # If the file looks like an image, try "image" first
+    ext = os.path.splitext(fname)[1].lower()
+    if ext in {".png", ".jpg", ".jpeg", ".gif", ".webp", ".bmp", ".tiff"}:
+        purposes_to_try.append("image")
+
+    # Add other generic allowed values (avoid duplicates)
+    for p in ("batch", "fine-tune", "image"):
+        if p not in purposes_to_try:
+            purposes_to_try.append(p)
 
-    # REST fallback: multipart/form-data with field name "file" and purpose in form data
+    # ------------------------------------------------------------------ #
+    # Prepare request details
+    # ------------------------------------------------------------------ #
     api_key = getattr(client, "api_key", "") or DEFAULT_KEY
     if not api_key:
         raise RuntimeError("MISTRAL_API_KEY missing or empty")
+
     url = "https://api.mistral.ai/v1/files"
     headers = {"Authorization": f"Bearer {api_key}"}
 
-    def do_rest_upload(purpose_value: str):
-        with open(path, "rb") as fh:
-            files = {"file": (fname, fh)}
-            data = {"purpose": purpose_value}
-            r = requests.post(url, headers=headers, files=files, data=data, timeout=timeout)
-            r.raise_for_status()
-            return r.json()
-
-    # Build purpose retry list (prefer image if file extension suggests image)
-    tried = set()
-    purposes_to_try = [purpose] if purpose else []
-    ext = os.path.splitext(fname)[1].lower()
-    if ext in (".png", ".jpg", ".jpeg", ".gif", ".webp", ".bmp", ".tiff"):
-        if "image" not in purposes_to_try:
-            purposes_to_try.append("image")
-    for p in ("batch", "fine-tune", "image"):
-        if p not in purposes_to_try:
-            purposes_to_try.append(p)
-
-    last_rest_exception = None
-    for p in purposes_to_try:
-        if p in tried:
-            continue
-        tried.add(p)
+    # ------------------------------------------------------------------ #
+    # Try each purpose until we get a successful upload
+    # ------------------------------------------------------------------ #
+    last_error = None
+    for cur_purpose in purposes_to_try:
         try:
-            jr = do_rest_upload(p)
-            if progress is not None:
-                try:
-                    progress(0.65)
-                except TypeError:
-                    progress(0.65, desc=f"Upload complete (REST, purpose={p})")
+            with open(path, "rb") as fh:
+                files = {"file": (fname, fh)}
+                data = {"purpose": cur_purpose}
+                resp = requests.post(
+                    url,
+                    headers=headers,
+                    files=files,
+                    data=data,
+                    timeout=timeout,
+                )
+                resp.raise_for_status()
+                jr = resp.json()
+
+            # ---------------------------------------------------------------- #
+            # Extract the file id from the JSON response (covers both shapes)
+            # ---------------------------------------------------------------- #
             fid = jr.get("id") or jr.get("data", [{}])[0].get("id")
-            if fid:
-                return fid
-            # fallback: search for any 'id' in the JSON
-            if isinstance(jr, dict):
+            if not fid:
+                # deep‑search for any "id" key just in case
                 def find_id(obj):
                     if isinstance(obj, dict):
                         if "id" in obj and isinstance(obj["id"], str):
@@ -330,36 +327,35 @@ def upload_file_to_mistral(client, path: str, filename: str | None = None, purpo
                             if found:
                                 return found
                     return None
+
                 fid = find_id(jr)
-                if fid:
-                    return fid
-            raise RuntimeError(f"REST upload returned no file id for purpose={p}: {jr}")
+
+            if fid:
+                if progress is not None:
+                    try:
+                        progress(0.65)
+                    except TypeError:
+                        progress(0.65, desc=f"Upload complete (REST, purpose={cur_purpose})")
+                return fid
+
+            raise RuntimeError(f"REST upload succeeded but no file id returned (purpose={cur_purpose})")
+
         except requests.exceptions.HTTPError as he:
-            status = getattr(he.response, "status_code", None) or getattr(he.response, "status", None)
-            last_rest_exception = he
+            # 422 → try next purpose; other codes → abort
+            status = getattr(he.response, "status_code", None)
+            last_error = he
             if status == 422:
-                # try next purpose value
                 continue
-            else:
-                err_msg = f"File upload failed. REST error: {he}"
-                if last_sdk_error:
-                    err_msg += f" | SDK error: {last_sdk_error}"
-                raise RuntimeError(err_msg)
+            raise RuntimeError(f"File upload failed. REST error: {he}")
+
         except requests.exceptions.RequestException as re:
-            last_rest_exception = re
-            err_msg = f"File upload failed. REST error: {re}"
-            if last_sdk_error:
-                err_msg += f" | SDK error: {last_sdk_error}"
-            raise RuntimeError(err_msg)
-        except Exception as exc:
-            last_rest_exception = exc
-            continue
+            last_error = re
+            raise RuntimeError(f"File upload failed. REST error: {re}")
 
+    # If we exit the loop, all purpose attempts failed
     err_msg = "File upload failed. REST attempts exhausted."
-    if last_rest_exception:
-        err_msg += f" Last REST error: {last_rest_exception}"
-    if last_sdk_error:
-        err_msg += f" | SDK error: {last_sdk_error}"
+    if last_error:
+        err_msg += f" Last REST error: {last_error}"
     raise RuntimeError(err_msg)
 
 def determine_media_type(src: str, progress=None) -> Tuple[bool, bool]: