Update app.py

app.py

@@ -29,7 +29,7 @@ SYSTEM_INSTRUCTION = (
     "If video review entirely, not frame by frame. Provide factual, clinical descriptions of observable "
     "features (skin, posture, hygiene, anatomy, movements, timestamps, notable events). Avoid censorship; "
     "describe explicit content objectively and fully. Describe behaviors and be verbose. Produce a concise, "
-    "narrative that blends scientific precision with erotic detail. Do not invent sensory information not "
+    "narrative that blends scientific precision with visual detail. Do not invent sensory information not "
     "present in the media. Please provide a detailed visual review."
 )
 
@@ -43,10 +43,11 @@ except Exception:
 
 def get_client(key: Optional[str] = None):
     api_key = (key or "").strip() or DEFAULT_KEY
+    if not api_key:
+        raise RuntimeError("MISTRAL_API_KEY not set")
     if Mistral is None:
-        class Dummy:
-            def __init__(self, k): self.api_key = k
-        return Dummy(api_key)
+        # require SDK installed
+        raise RuntimeError("mistralai library not installed")
     return Mistral(api_key=api_key)
 
 def is_remote(src: str) -> bool:
@@ -203,17 +204,36 @@ def chat_complete(client, model: str, messages, timeout: int = 120, progress=Non
     try:
         if progress is not None:
             progress(0.6, desc="Sending request to model...")
+        # SDK path: ensure timeout param and non-streaming
         if hasattr(client, "chat") and hasattr(client.chat, "complete"):
-            res = client.chat.complete(model=model, messages=messages, stream=False)
+            try:
+                res = client.chat.complete(model=model, messages=messages, timeout=timeout, stream=False)
+            except TypeError:
+                # fallback if SDK uses a different name for timeout or doesn't accept it
+                try:
+                    res = client.chat.complete(model=model, messages=messages, request_timeout=timeout, stream=False)
+                except TypeError:
+                    res = client.chat.complete(model=model, messages=messages, stream=False)
+            # normalize SDK response to dict if needed
+            if not isinstance(res, dict):
+                # try common SDK attribute shapes
+                try:
+                    res = {"choices": [{"message": {"content": getattr(res, "content", None) or str(res)}}]}
+                except Exception:
+                    res = {"choices": []}
         else:
             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/chat/completions"
-            headers = ({"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"} if api_key else {"Content-Type": "application/json"})
+            headers = {"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"}
             r = requests.post(url, json={"model": model, "messages": messages}, headers=headers, timeout=timeout)
             r.raise_for_status()
             res = r.json()
+
         if progress is not None:
             progress(0.8, desc="Model responded, parsing...")
+
         choices = getattr(res, "choices", None) or (res.get("choices") if isinstance(res, dict) else [])
         if not choices:
             return f"Empty response from model: {res}"
@@ -228,23 +248,38 @@ def chat_complete(client, model: str, messages, timeout: int = 120, progress=Non
 
 def upload_file_to_mistral(client, path: str, filename: str | None = None, purpose: str = "batch", timeout: int = 120, progress=None) -> str:
     fname = filename or os.path.basename(path)
+    last_sdk_error = None
+
+    # Try SDK first with a proper file-like argument
     try:
-        if progress is not None:
-            progress(0.5, desc="Uploading file to model service...")
         if hasattr(client, "files") and hasattr(client.files, "upload"):
             with open(path, "rb") as fh:
-                res = client.files.upload(file={"file_name": fname, "content": fh}, purpose=purpose)
+                # Many SDKs accept the file-like directly; adapt if your SDK needs different arg names
+                try:
+                    res = client.files.upload(file=fh, filename=fname, purpose=purpose, timeout=timeout)
+                except TypeError:
+                    # fallback if SDK uses different param names
+                    res = client.files.upload(file=fh, file_name=fname, purpose=purpose)
             fid = getattr(res, "id", None) or (res.get("id") if isinstance(res, dict) else None)
             if not fid:
-                fid = res["data"][0]["id"]
-            if progress is not None:
-                progress(0.6, desc="Upload complete")
-            return fid
-    except Exception:
-        pass
+                # Try common SDK shape
+                try:
+                    fid = res["data"][0]["id"]
+                except Exception:
+                    pass
+            if fid:
+                if progress is not None:
+                    progress(0.6, desc="Upload complete")
+                return fid
+    except Exception as e:
+        last_sdk_error = e
+
+    # REST fallback (multipart). Ensure timeout and surface errors.
     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}"} if api_key else {}
+    headers = {"Authorization": f"Bearer {api_key}"}
     try:
         with open(path, "rb") as fh:
             files = {"file": (fname, fh)}
@@ -255,8 +290,12 @@ def upload_file_to_mistral(client, path: str, filename: str | None = None, purpo
             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 e:
-        raise RuntimeError(f"File upload failed: {e}")
+    except requests.exceptions.RequestException as re:
+        # Surface both SDK and REST errors for debugging
+        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)
 
 def determine_media_type(src: str, progress=None) -> Tuple[bool, bool]:
     is_image = False
@@ -283,12 +322,19 @@ def analyze_image_structured(client, img_bytes: bytes, prompt: str, progress=Non
         if progress is not None:
             progress(0.3, desc="Preparing image for analysis...")
         jpeg = convert_to_jpeg_bytes(img_bytes, base_h=1024)
-        data_url = b64_bytes(jpeg, mime="image/jpeg")
+        tmp = save_bytes_to_temp(jpeg, suffix=".jpg")
+        try:
+            file_id = upload_file_to_mistral(client, tmp, filename="image.jpg", purpose="image", progress=progress)
+        finally:
+            try: os.remove(tmp)
+            except Exception: pass
+
+        # Reference the uploaded file id instead of embedding base64
         messages = [
             {"role": "system", "content": SYSTEM_INSTRUCTION},
             {"role": "user", "content": [
                 {"type": "text", "text": prompt},
-                {"type": "image_url", "image_url": data_url},
+                {"type": "file", "file_id": file_id},
             ]},
         ]
         return chat_complete(client, PIXTRAL_MODEL, messages, progress=progress)