Update api/utils.py

api/utils.py

@@ -5,6 +5,8 @@ import asyncio
 import random
 import string
 from typing import Any, Dict, Optional
+import base64
+import os
 
 import httpx
 from fastapi import HTTPException
@@ -51,26 +53,34 @@ def message_to_dict(message, model_prefix: Optional[str] = None):
     content = message.content if isinstance(message.content, str) else message.content[0]["text"]
     if model_prefix:
         content = f"{model_prefix} {content}"
+    
+    # Handle image data in the message
     if isinstance(message.content, list) and len(message.content) == 2 and "image_url" in message.content[1]:
         # Ensure base64 images are always included for all models
         return {
             "role": message.role,
             "content": content,
             "data": {
-                "imageBase64": message.content[1]["image_url"]["url"],
+                "imagesData": [
+                    {
+                        "filePath": message.content[1].get("filePath", ""),
+                        "contents": message.content[1].get("contents", "")
+                    }
+                ],
                 "fileText": "",
                 "title": "snapshot",
             },
         }
     return {"role": message.role, "content": content}
 
-# Function to strip model prefix from content if present
-def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
-    """Remove the model prefix from the response content if present."""
-    if model_prefix and content.startswith(model_prefix):
-        logger.debug(f"Stripping prefix '{model_prefix}' from content.")
-        return content[len(model_prefix):].strip()
-    return content
+# Function to convert image file to base64
+def image_to_base64(image_path: str) -> str:
+    try:
+        with open(image_path, "rb") as image_file:
+            return base64.b64encode(image_file.read()).decode('utf-8')
+    except Exception as e:
+        logger.error(f"Error reading image {image_path}: {e}")
+        return ""
 
 # Process streaming response with headers from config.py
 async def process_streaming_response(request: ChatRequest):
@@ -96,18 +106,24 @@ async def process_streaming_response(request: ChatRequest):
         logger.error("Failed to retrieve h-value for validation.")
         raise HTTPException(status_code=500, detail="Validation failed due to missing h-value.")
 
+    # Prepare the image payload (if any)
+    messages = []
+    for msg in request.messages:
+        message_dict = message_to_dict(msg, model_prefix=model_prefix)
+        messages.append(message_dict)
+
     json_data = {
         "agentMode": agent_mode,
         "clickedAnswer2": False,
         "clickedAnswer3": False,
         "clickedForceWebSearch": False,
-        "codeModelMode": True,
+        "codeModelMode": False,
         "githubToken": None,
         "id": None,  # Using request_id instead of chat_id
         "isChromeExt": False,
         "isMicMode": False,
         "maxTokens": request.max_tokens,
-        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
+        "messages": messages,
         "mobileClient": False,
         "playgroundTemperature": request.temperature,
         "playgroundTopP": request.top_p,
@@ -180,18 +196,24 @@ async def process_non_streaming_response(request: ChatRequest):
         logger.error("Failed to retrieve h-value for validation.")
         raise HTTPException(status_code=500, detail="Validation failed due to missing h-value.")
 
+    # Prepare the image payload (if any)
+    messages = []
+    for msg in request.messages:
+        message_dict = message_to_dict(msg, model_prefix=model_prefix)
+        messages.append(message_dict)
+
     json_data = {
         "agentMode": agent_mode,
         "clickedAnswer2": False,
         "clickedAnswer3": False,
         "clickedForceWebSearch": False,
-        "codeModelMode": True,
+        "codeModelMode": False,
         "githubToken": None,
         "id": None,  # Using request_id instead of chat_id
         "isChromeExt": False,
         "isMicMode": False,
         "maxTokens": request.max_tokens,
-        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
+        "messages": messages,
         "mobileClient": False,
         "playgroundTemperature": request.temperature,
         "playgroundTopP": request.top_p,
@@ -205,26 +227,25 @@ async def process_non_streaming_response(request: ChatRequest):
         "webSearchModePrompt": False,
     }
 
-    full_response = ""
     async with httpx.AsyncClient() as client:
         try:
-            async with client.stream(
-                method="POST", url=f"{BASE_URL}/api/chat", headers=headers_api_chat, json=json_data
+            async with client.post(
+                f"{BASE_URL}/api/chat", headers=headers_api_chat, json=json_data
             ) as response:
                 response.raise_for_status()
-                async for chunk in response.aiter_text():
-                    full_response += chunk
+                full_response = await response.text()
+
         except httpx.HTTPStatusError as e:
             logger.error(f"HTTP error occurred for Request ID {request_id}: {e}")
             raise HTTPException(status_code=e.response.status_code, detail=str(e))
         except httpx.RequestError as e:
             logger.error(f"Error occurred during request for Request ID {request_id}: {e}")
             raise HTTPException(status_code=500, detail=str(e))
-    
+
+    # Clean up the response and return it
     if full_response.startswith("$@$v=undefined-rv1$@$"):
         full_response = full_response[21:]
 
-    # Remove the blocked message if present
     if BLOCKED_MESSAGE in full_response:
         logger.info(f"Blocked message detected in response for Request ID {request_id}.")
         full_response = full_response.replace(BLOCKED_MESSAGE, '').strip()
@@ -246,4 +267,4 @@ async def process_non_streaming_response(request: ChatRequest):
             }
         ],
         "usage": None,
-    }
+    }