Update api/utils.py

api/utils.py

@@ -2,10 +2,6 @@
 
 from datetime import datetime
 import json
-import uuid
-import asyncio
-import random
-import string
 from typing import Any, Dict, Optional
 
 import httpx
@@ -31,12 +27,6 @@ logger = setup_logger(__name__)
 bearer_scheme = HTTPBearer()
 
 
-def generate_chat_id(length: int = 7) -> str:
-    """Generate a random alphanumeric chat ID."""
-    characters = string.ascii_letters + string.digits
-    return ''.join(random.choices(characters, k=length))
-
-
 def create_chat_completion_data(
     content: str, model: str, timestamp: int, finish_reason: Optional[str] = None
 ) -> Dict[str, Any]:
@@ -66,33 +56,39 @@ def verify_app_secret(credentials: HTTPAuthorizationCredentials = Depends(bearer
     return credentials.credentials
 
 
-def message_to_dict(message, model_prefix: Optional[str] = None):
+def message_to_dict(message):
     """
     Convert a message object to a dictionary suitable for the API request.
-    Ensures base64 data and optional model prefix are handled.
+    Handles different content types gracefully.
     """
+    message_dict = {"role": message.role}
+
     if isinstance(message.content, str):
-        content = message.content
+        message_dict["content"] = message.content
     elif isinstance(message.content, list):
-        content = message.content[0].get("text", "")
+        # Handle list content more robustly
+        try:
+            if len(message.content) >= 2:
+                # Assuming the first element has 'text' and the second has 'image_url'
+                text_content = message.content[0].get("text", "")
+                image_url = message.content[1].get("image_url", {}).get("url", "")
+                message_dict["content"] = text_content
+                message_dict["data"] = {
+                    "imageBase64": image_url,
+                    "fileText": "",
+                    "title": "snapshot",
+                }
+            else:
+                # Fallback if the list doesn't have expected structure
+                message_dict["content"] = json.dumps(message.content)
+        except (AttributeError, KeyError, TypeError) as e:
+            logger.error(f"Error parsing message content: {e}")
+            message_dict["content"] = "Invalid message format."
     else:
-        content = str(message.content)
-
-    if model_prefix:
-        content = f"{model_prefix} {content}"
+        # Fallback for unexpected content types
+        message_dict["content"] = str(message.content)
 
-    if isinstance(message.content, list) and len(message.content) == 2 and "image_url" in message.content[1]:
-        return {
-            "role": message.role,
-            "content": content,
-            "data": {
-                "imageBase64": message.content[1]["image_url"]["url"],
-                "fileText": "",
-                "title": "snapshot",
-            },
-        }
-
-    return {"role": message.role, "content": content}
+    return message_dict
 
 
 def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
@@ -103,8 +99,6 @@ def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
     return content
 
 
-
-
 def get_agent_mode_config(model: str) -> Dict[str, Any]:
     """
     Retrieve the agent mode configuration.
@@ -129,19 +123,22 @@ def get_trending_agent_mode_config(model: str) -> Dict[str, Any]:
 
 async def process_streaming_response(request: ChatRequest):
     """Process a streaming response for a chat completion request."""
-    chat_id = generate_chat_id()
-    referer_url = get_referer_url(chat_id, request.model)
-    logger.info(f"Generated Chat ID: {chat_id} - Model: {request.model} - URL: {referer_url}")
+    # No chat_id generation
+    # referer_url is not used without MODEL_REFERERS
+
+    logger.info(f"Processing streaming request for model: '{request.model}'")
 
     agent_mode = get_agent_mode_config(request.model)
     trending_agent_mode = get_trending_agent_mode_config(request.model)
     model_prefix = MODEL_PREFIXES.get(request.model, "")
 
-    headers_api_chat = headers  # Assuming 'headers' from config.py is suitable
+    # Use headers from config.py
+    headers_api_chat = headers
 
+    # Introduce delay for specific models if needed
     if request.model == 'o1-preview':
         delay_seconds = random.randint(1, 60)
-        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' (Chat ID: {chat_id})")
+        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview'")
         await asyncio.sleep(delay_seconds)
 
     json_data = {
@@ -151,11 +148,10 @@ async def process_streaming_response(request: ChatRequest):
         "clickedForceWebSearch": False,
         "codeModelMode": True,
         "githubToken": None,
-        "id": 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": [message_to_dict(msg) for msg in request.messages],
         "mobileClient": False,
         "playgroundTemperature": request.temperature,
         "playgroundTopP": request.top_p,
@@ -196,31 +192,31 @@ async def process_streaming_response(request: ChatRequest):
                 yield f"data: {json.dumps(create_chat_completion_data('', request.model, timestamp, 'stop'))}\n\n"
                 yield "data: [DONE]\n\n"
         except httpx.HTTPStatusError as e:
-            logger.error(f"HTTP error occurred for Chat ID {chat_id}: {e}")
-            raise HTTPException(status_code=e.response.status_code, detail=str(e))
+            logger.error(f"HTTP error occurred: {e.response.status_code} - {e.response.text}")
+            raise HTTPException(status_code=e.response.status_code, detail="Error from upstream service.")
         except httpx.RequestError as e:
-            logger.error(f"Request error occurred for Chat ID {chat_id}: {e}")
-            raise HTTPException(status_code=500, detail=str(e))
+            logger.error(f"Request error occurred: {e}")
+            raise HTTPException(status_code=500, detail="Internal server error.")
         except Exception as e:
-            logger.error(f"Unexpected error for Chat ID {chat_id}: {e}")
-            raise HTTPException(status_code=500, detail=str(e))
+            logger.error(f"Unexpected error: {e}")
+            raise HTTPException(status_code=500, detail="Internal server error.")
 
 
 async def process_non_streaming_response(request: ChatRequest):
     """Process a non-streaming response for a chat completion request."""
-    chat_id = generate_chat_id()
-    referer_url = get_referer_url(chat_id, request.model)
-    logger.info(f"Generated Chat ID: {chat_id} - Model: {request.model} - URL: {referer_url}")
+    logger.info(f"Processing non-streaming request for model: '{request.model}'")
 
     agent_mode = get_agent_mode_config(request.model)
     trending_agent_mode = get_trending_agent_mode_config(request.model)
     model_prefix = MODEL_PREFIXES.get(request.model, "")
 
-    headers_api_chat = headers  # Assuming 'headers' from config.py is suitable
+    # Use headers from config.py
+    headers_api_chat = headers
 
+    # Introduce delay for specific models if needed
     if request.model == 'o1-preview':
         delay_seconds = random.randint(20, 60)
-        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' (Chat ID: {chat_id})")
+        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview'")
         await asyncio.sleep(delay_seconds)
 
     json_data = {
@@ -230,11 +226,10 @@ async def process_non_streaming_response(request: ChatRequest):
         "clickedForceWebSearch": False,
         "codeModelMode": True,
         "githubToken": None,
-        "id": 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": [message_to_dict(msg) for msg in request.messages],
         "mobileClient": False,
         "playgroundTemperature": request.temperature,
         "playgroundTopP": request.top_p,
@@ -257,11 +252,14 @@ async def process_non_streaming_response(request: ChatRequest):
                 async for chunk in response.aiter_text():
                     full_response += chunk
         except httpx.HTTPStatusError as e:
-            logger.error(f"HTTP error occurred for Chat ID {chat_id}: {e}")
-            raise HTTPException(status_code=e.response.status_code, detail=str(e))
+            logger.error(f"HTTP error occurred: {e.response.status_code} - {e.response.text}")
+            raise HTTPException(status_code=e.response.status_code, detail="Error from upstream service.")
         except httpx.RequestError as e:
-            logger.error(f"Request error occurred for Chat ID {chat_id}: {e}")
-            raise HTTPException(status_code=500, detail=str(e))
+            logger.error(f"Request error occurred: {e}")
+            raise HTTPException(status_code=500, detail="Internal server error.")
+        except Exception as e:
+            logger.error(f"Unexpected error: {e}")
+            raise HTTPException(status_code=500, detail="Internal server error.")
 
     if full_response.startswith("$@$v=undefined-rv1$@$"):
         full_response = full_response[21:]