Update app.py

app.py

@@ -11,7 +11,7 @@ from PIL import Image, ImageFile, UnidentifiedImageError
 import gradio as gr
 import time
 import atexit
-from requests.exceptions import RequestException
+from requests.exceptions import RequestException, HTTPError # Import HTTPError for requests fallback
 
 # --- Mistral Client Import & Placeholder for graceful degradation ---
 _MISTRAL_CLIENT_INSTALLED = False
@@ -22,8 +22,9 @@ try:
 except ImportError:
     print(
         "Warning: Mistral AI client library ('mistralai') not found. "
-        "Please install it with 'pip install mistralai' to enable AI analysis features. "
-        "The application will launch, but API calls will fail."
+        "Please install it with 'pip install mistralai' to enable full AI analysis features. " # Updated message
+        "The application will launch, but API calls will fall back to direct HTTP requests "
+        "if an API key is provided." # Updated message to reflect fallback
     )
     # Define placeholder classes to prevent NameErrors and provide clear messages
     class MistralAPIException(Exception):
@@ -38,6 +39,8 @@ except ImportError:
     class _DummyMistralChatClient:
         """Placeholder for Mistral client's chat interface."""
         def complete(self, *args, **kwargs):
+            # This method will typically not be called if _MISTRAL_CLIENT_INSTALLED is False,
+            # as the `chat_complete` function will use the requests fallback instead.
             raise MistralAPIException(
                 "Mistral AI chat client is unavailable. "
                 "Please install 'mistralai' with 'pip install mistralai'.",
@@ -46,6 +49,7 @@ except ImportError:
     class _DummyMistralFilesClient:
         """Placeholder for Mistral client's files interface."""
         def upload(self, *args, **kwargs):
+            # This method will typically not be called if _MISTRAL_CLIENT_INSTALLED is False.
             raise MistralAPIException(
                 "Mistral AI files client is unavailable. "
                 "Please install 'mistralai' with 'pip install mistralai'.",
@@ -53,8 +57,8 @@ except ImportError:
             )
     class Mistral:
         """A placeholder for the Mistral client if the library is not installed."""
-        def __init__(self, *args, **kwargs):
-            pass # Constructor doesn't need to raise here, methods will.
+        def __init__(self, api_key: str = "", *args, **kwargs): # Added api_key to store it for fallback
+            self.api_key = api_key # Store the API key
         @property
         def chat(self):
             return _DummyMistralChatClient()
@@ -105,15 +109,10 @@ atexit.register(_cleanup_all_temp_files)
 # --- Mistral Client and API Helpers ---
 def get_client(api_key: Optional[str] = None):
     """
-    Returns a Mistral client instance. If the API key is missing or the client library
-    is not installed, a MistralAPIException is raised.
+    Returns a Mistral client instance. If the API key is missing, a MistralAPIException is raised.
+    If the client library is not installed, a placeholder client is returned, and API calls
+    will fall back to direct HTTP requests.
     """
-    if not _MISTRAL_CLIENT_INSTALLED:
-        raise MistralAPIException(
-            "Mistral AI client library is not installed. Please install it with 'pip install mistralai'.",
-            status_code=500 # Internal Server Error, as it's a server-side dependency issue
-        )
-
     key_to_use = (api_key or "").strip() or DEFAULT_MISTRAL_KEY
     if not key_to_use:
         raise MistralAPIException(
@@ -121,8 +120,9 @@ def get_client(api_key: Optional[str] = None):
             status_code=401 # Unauthorized
         )
 
+    # Always return a Mistral client instance.
     # If _MISTRAL_CLIENT_INSTALLED is True, this will be the real Mistral client.
-    # Otherwise, it's the placeholder that will raise on method call.
+    # Otherwise, it's the placeholder that has the api_key stored.
     return Mistral(api_key=key_to_use)
 
 def is_remote(src: str) -> bool:
@@ -370,29 +370,48 @@ def chat_complete(client, model: str, messages, timeout: int = 120, progress=Non
             if progress is not None:
                 progress(0.6 + 0.01 * attempt, desc=f"Sending request to model (attempt {attempt+1}/{max_retries})...")
 
-            res = client.chat.complete(model=model, messages=messages, stream=False, timeout_ms=timeout * 1000)
-            choices = getattr(res, "choices", None)
+            res = None
+            if _MISTRAL_CLIENT_INSTALLED:
+                # Use the real Mistral client's chat.complete method
+                res = client.chat.complete(model=model, messages=messages, stream=False, timeout_ms=timeout * 1000)
+            else:
+                # Fallback to direct HTTP request if client library not installed
+                api_key = getattr(client, "api_key", "") # Get key from client, should always be present now
+                if not api_key: # Double check, though get_client already ensures this
+                    return "Error: Mistral API key is not set for fallback."
+
+                url = "https://api.mistral.ai/v1/chat/completions"
+                headers = {"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"}
+                payload = {"model": model, "messages": messages, "stream": False} # Removed timeout_ms for requests
+                r = requests.post(url, json=payload, headers=headers, timeout=timeout) # requests timeout in seconds
+                r.raise_for_status() # Raises HTTPError for bad responses (4xx or 5xx)
+                res = r.json()
 
             if progress is not None:
                 progress(0.8, desc="Model responded, parsing...")
 
+            # Handle both object-style (from mistralai client) and dict-style (from requests.json()) responses
+            choices = getattr(res, "choices", None) or (res.get("choices") if isinstance(res, dict) else [])
+
             if not choices:
                 return f"Empty response from model: {res}"
 
             first = choices[0]
-            # Handle both object-style and dict-style responses
             msg = getattr(first, "message", None) or (first.get("message") if isinstance(first, dict) else first)
             content = getattr(msg, "content", None) or (msg.get("content") if isinstance(msg, dict) else None)
             return content.strip() if isinstance(content, str) else str(content)
 
-        except MistralAPIException as e:
-            if e.status_code == 429 and attempt < max_retries - 1:
+        except (MistralAPIException, HTTPError) as e: # Catch both client lib and requests HTTP errors
+            status_code = getattr(e, "status_code", None) or (e.response.status_code if isinstance(e, HTTPError) else None)
+            message = getattr(e, "message", str(e))
+
+            if status_code == 429 and attempt < max_retries - 1:
                 delay = initial_delay * (2 ** attempt)
-                print(f"MistralAPIException: Rate limit exceeded (429). Retrying in {delay:.2f}s...")
+                print(f"Mistral API: Rate limit exceeded (429). Retrying in {delay:.2f}s...")
                 time.sleep(delay)
             else:
-                return f"Error: Mistral API error occurred ({e.status_code if e.status_code else 'unknown'}): {e.message}"
-        except RequestException as e:
+                return f"Error: Mistral API error occurred ({status_code if status_code else 'unknown'}): {message}"
+        except RequestException as e: # Catch other requests errors (e.g., connection issues, timeout)
             if attempt < max_retries - 1:
                 delay = initial_delay * (2 ** attempt)
                 print(f"Network/API request failed: {e}. Retrying in {delay:.2f}s...")
@@ -414,26 +433,45 @@ def upload_file_to_mistral(client, path: str, filename: str | None = None, purpo
             if progress is not None:
                 progress(0.5 + 0.01 * attempt, desc=f"Uploading file to model service (attempt {attempt+1}/{max_retries})...")
 
-            with open(path, "rb") as fh:
-                # The Mistral client's file upload typically expects a dict with 'file_name' and 'content'
-                # or a file-like object directly. Ensure compatibility here.
-                # Assuming the client expects 'file' parameter to be a dict as shown in placeholder
-                res = client.files.upload(file={"file_name": fname, "content": fh}, purpose=purpose)
+            fid = None
+            if _MISTRAL_CLIENT_INSTALLED:
+                with open(path, "rb") as fh:
+                    # Mistral client's file upload expects (filename, file_like_object) for 'file' param
+                    res = client.files.upload(file=(fname, fh), purpose=purpose) 
+                fid = getattr(res, "id", None) or (res.get("id") if isinstance(res, dict) else None)
+                if not fid:
+                    raise RuntimeError(f"Mistral API upload response missing file ID from client: {res}")
+            else:
+                # Fallback to direct HTTP request
+                api_key = getattr(client, "api_key", "")
+                if not api_key:
+                    raise RuntimeError("Mistral API key is not set for file upload fallback.")
+
+                url = "https://api.mistral.ai/v1/files"
+                headers = {"Authorization": f"Bearer {api_key}"}
+                with open(path, "rb") as fh:
+                    files = {"file": (fname, fh)}
+                    data = {"purpose": purpose}
+                    r = requests.post(url, headers=headers, files=files, data=data, timeout=timeout)
+                    r.raise_for_status()
+                    jr = r.json()
+                    fid = jr.get("id") or jr.get("data", [{}])[0].get("id") # Handle potential nested 'data' from older API
+                    if not fid:
+                        raise RuntimeError(f"Mistral API upload response missing file ID from direct request: {jr}")
 
-            fid = getattr(res, "id", None) or (res.get("id") if isinstance(res, dict) else None)
-            if not fid:
-                raise RuntimeError(f"Mistral API upload response missing file ID: {res}")
             if progress is not None:
                 progress(0.6, desc="Upload complete")
             return fid
 
-        except MistralAPIException as e:
-            if e.status_code == 429 and attempt < max_retries - 1:
+        except (MistralAPIException, HTTPError) as e:
+            status_code = getattr(e, "status_code", None) or (e.response.status_code if isinstance(e, HTTPError) else None)
+            message = getattr(e, "message", str(e))
+            if status_code == 429 and attempt < max_retries - 1:
                 delay = initial_delay * (2 ** attempt)
-                print(f"MistralAPIException: Upload rate limit exceeded (429). Retrying in {delay:.2f}s...")
+                print(f"Mistral API: Upload rate limit exceeded (429). Retrying in {delay:.2f}s...")
                 time.sleep(delay)
             else:
-                raise RuntimeError(f"Mistral API file upload failed with status {e.status_code}: {e.message}") from e
+                raise RuntimeError(f"Mistral API file upload failed with status {status_code}: {message}") from e
         except RequestException as e:
             if attempt < max_retries - 1:
                 delay = initial_delay * (2 ** attempt)
@@ -650,7 +688,7 @@ def create_demo():
 
     mistral_client_status_message = ""
     if not _MISTRAL_CLIENT_INSTALLED:
-        mistral_client_status_message = "🔴 Mistral AI client ('mistralai') not installed. AI analysis features will fail. Run `pip install mistralai`."
+        mistral_client_status_message = "🟡 Mistral AI client ('mistralai') not installed. AI analysis will fall back to direct HTTP requests. Run `pip install mistralai` for full features." # Updated message
     else:
         mistral_client_status_message = "🟢 Mistral AI client found."
 
@@ -883,7 +921,7 @@ def create_demo():
                     if ext_from_src(raw_media_path) in VIDEO_EXTENSIONS:
                         is_actually_video_for_analysis = True
 
-                client = get_client(key) # This will raise MistralAPIException if library not installed or key missing
+                client = get_client(key) # This will raise MistralAPIException if key missing, but NOT if lib not installed
 
                 if is_actually_video_for_analysis:
                     progress(0.25, desc="Running full-video analysis")