Update app.py

app.py

@@ -265,7 +265,10 @@ def upload_file_to_mistral(client, path: str, filename: str | None = None, purpo
                     fid = None
             if fid:
                 if progress is not None:
-                    progress(0.6, desc="Upload complete (SDK)")
+                    try:
+                        progress(0.6)
+                    except TypeError:
+                        progress(0.6, desc="Upload complete (SDK)")
                 return fid
     except Exception as e:
         last_sdk_error = e
@@ -276,21 +279,88 @@ def upload_file_to_mistral(client, path: str, filename: str | None = None, purpo
         raise RuntimeError("MISTRAL_API_KEY missing or empty")
     url = "https://api.mistral.ai/v1/files"
     headers = {"Authorization": f"Bearer {api_key}"}
-    try:
+
+    def do_rest_upload(purpose_value: str):
         with open(path, "rb") as fh:
             files = {"file": (fname, fh)}
-            data = {"purpose": purpose}
+            data = {"purpose": purpose_value}
             r = requests.post(url, headers=headers, files=files, data=data, timeout=timeout)
             r.raise_for_status()
-            jr = r.json()
+            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:
+            jr = do_rest_upload(p)
             if progress is not None:
-                progress(0.65, desc="Upload complete (REST)")
-            return jr.get("id") or jr.get("data", [{}])[0].get("id")
-    except requests.exceptions.RequestException as 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)
+                try:
+                    progress(0.65)
+                except TypeError:
+                    progress(0.65, desc=f"Upload complete (REST, purpose={p})")
+            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):
+                def find_id(obj):
+                    if isinstance(obj, dict):
+                        if "id" in obj and isinstance(obj["id"], str):
+                            return obj["id"]
+                        for v in obj.values():
+                            found = find_id(v)
+                            if found:
+                                return found
+                    elif isinstance(obj, list):
+                        for item in obj:
+                            found = find_id(item)
+                            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}")
+        except requests.exceptions.HTTPError as he:
+            status = getattr(he.response, "status_code", None) or getattr(he.response, "status", None)
+            last_rest_exception = 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)
+        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
+
+    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}"
+    raise RuntimeError(err_msg)
 
 def determine_media_type(src: str, progress=None) -> Tuple[bool, bool]:
     is_image = False