Update api/utils.py

api/utils.py

@@ -1,31 +1,35 @@
+# api/utils.py
+
 from datetime import datetime
 import json
 import uuid
 import asyncio
 import random
 import string
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, List, Union
 
 import httpx
 from fastapi import HTTPException
 from api.config import (
-    MODEL_ALIASES,
+    MODEL_MAPPING,
     get_headers_api_chat,
     get_headers_chat,
     BASE_URL,
     AGENT_MODE,
     TRENDING_AGENT_MODE,
     MODEL_PREFIXES,
-    API_ENDPOINT,
-    generate_id,
-    MODELS
+    MODEL_REFERERS
 )
-from api.models import ChatRequest
+from api.models import ChatRequest, Message
 from api.logger import setup_logger
-from api.image import ImageResponse, to_data_uri  # Assuming image utilities are here
 
 logger = setup_logger(__name__)
 
+# Helper function to create a random alphanumeric chat ID
+def generate_chat_id(length: int = 7) -> str:
+    characters = string.ascii_letters + string.digits
+    return ''.join(random.choices(characters, k=length))
+
 # Helper function to create chat completion data
 def create_chat_completion_data(
     content: str, model: str, timestamp: int, finish_reason: Optional[str] = None
@@ -46,10 +50,18 @@ def create_chat_completion_data(
     }
 
 # Function to convert message to dictionary format, ensuring base64 data and optional model prefix
-def message_to_dict(message, model_prefix: Optional[str] = None):
-    content = message.content if isinstance(message.content, str) else message.content[0]["text"]
+def message_to_dict(message: Message, model_prefix: Optional[str] = None) -> Dict[str, Any]:
+    if isinstance(message.content, str):
+        content = message.content
+    elif isinstance(message.content, list) and len(message.content) > 0:
+        content = message.content[0].get("text", "")
+    else:
+        content = ""
+    
     if model_prefix:
         content = f"{model_prefix} {content}"
+    
+    # Handle image content
     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 {
@@ -73,25 +85,24 @@ def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
 
 # Function to get the correct referer URL for logging
 def get_referer_url(chat_id: str, model: str) -> str:
-    """Generate the referer URL based on specific models listed in MODELS."""
-    return f"{BASE_URL}/chat/{chat_id}?model={model}"
+    """Generate the referer URL based on specific models listed in MODEL_REFERERS."""
+    if model in MODEL_REFERERS:
+        return f"{BASE_URL}/chat/{chat_id}?model={model}"
+    return BASE_URL
 
 # Process streaming response with headers from config.py
-async def process_streaming_response(request: ChatRequest, web_search: bool = False):
-    chat_id = generate_id()
+async def process_streaming_response(request: ChatRequest):
+    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}")
 
-    # Resolve model aliases
-    resolved_model = MODEL_ALIASES.get(request.model, request.model)
+    agent_mode = AGENT_MODE.get(request.model, {})
+    trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
+    model_prefix = MODEL_PREFIXES.get(request.model, "")
 
-    agent_mode = AGENT_MODE.get(resolved_model, {})
-    trending_agent_mode = TRENDING_AGENT_MODE.get(resolved_model, {})
-    model_prefix = MODEL_PREFIXES.get(resolved_model, "")
+    headers_api_chat = get_headers_api_chat(referer_url)
 
-    headers_api_chat = get_headers_api_chat()
-
-    if resolved_model == 'o1-preview':
+    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})")
         await asyncio.sleep(delay_seconds)
@@ -114,18 +125,17 @@ async def process_streaming_response(request: ChatRequest, web_search: bool = Fa
         "previewToken": None,
         "trendingAgentMode": trending_agent_mode,
         "userId": None,
-        "userSelectedModel": resolved_model if resolved_model in MODELS else None,
+        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
         "userSystemPrompt": None,
         "validated": "69783381-2ce4-4dbd-ac78-35e9063feabc",
         "visitFromDelta": False,
-        "webSearchMode": web_search,  # Include web search mode
     }
 
     async with httpx.AsyncClient() as client:
         try:
             async with client.stream(
                 "POST",
-                API_ENDPOINT,
+                f"{BASE_URL}/api/chat",
                 headers=headers_api_chat,
                 json=json_data,
                 timeout=100,
@@ -138,9 +148,9 @@ async def process_streaming_response(request: ChatRequest, web_search: bool = Fa
                         if content.startswith("$@$v=undefined-rv1$@$"):
                             content = content[21:]
                         cleaned_content = strip_model_prefix(content, model_prefix)
-                        yield f"data: {json.dumps(create_chat_completion_data(cleaned_content, resolved_model, timestamp))}\n\n"
+                        yield f"data: {json.dumps(create_chat_completion_data(cleaned_content, request.model, timestamp))}\n\n"
 
-                yield f"data: {json.dumps(create_chat_completion_data('', resolved_model, timestamp, 'stop'))}\n\n"
+                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}")
@@ -150,21 +160,19 @@ async def process_streaming_response(request: ChatRequest, web_search: bool = Fa
             raise HTTPException(status_code=500, detail=str(e))
 
 # Process non-streaming response with headers from config.py
-async def process_non_streaming_response(request: ChatRequest, web_search: bool = False):
-    chat_id = generate_id()
+async def process_non_streaming_response(request: ChatRequest):
+    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}")
 
-    # Resolve model aliases
-    resolved_model = MODEL_ALIASES.get(request.model, request.model)
-
-    agent_mode = AGENT_MODE.get(resolved_model, {})
-    trending_agent_mode = TRENDING_AGENT_MODE.get(resolved_model, {})
-    model_prefix = MODEL_PREFIXES.get(resolved_model, "")
+    agent_mode = AGENT_MODE.get(request.model, {})
+    trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
+    model_prefix = MODEL_PREFIXES.get(request.model, "")
 
-    headers_api_chat = get_headers_api_chat()
+    headers_api_chat = get_headers_api_chat(referer_url)
+    headers_chat = get_headers_chat(referer_url, next_action=str(uuid.uuid4()), next_router_state_tree=json.dumps([""]))
 
-    if resolved_model == 'o1-preview':
+    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})")
         await asyncio.sleep(delay_seconds)
@@ -187,11 +195,10 @@ async def process_non_streaming_response(request: ChatRequest, web_search: bool
         "previewToken": None,
         "trendingAgentMode": trending_agent_mode,
         "userId": None,
-        "userSelectedModel": resolved_model if resolved_model in MODELS else None,
+        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
         "userSystemPrompt": None,
         "validated": "69783381-2ce4-4dbd-ac78-35e9063feabc",
         "visitFromDelta": False,
-        "webSearchMode": web_search,  # Include web search mode
     }
 
     full_response = ""
@@ -199,10 +206,9 @@ async def process_non_streaming_response(request: ChatRequest, web_search: bool
         try:
             async with client.stream(
                 method="POST",
-                url=API_ENDPOINT,
+                url=f"{BASE_URL}/api/chat",
                 headers=headers_api_chat,
-                json=json_data,
-                timeout=100,
+                json=json_data
             ) as response:
                 response.raise_for_status()
                 async for chunk in response.aiter_text():
@@ -213,7 +219,7 @@ async def process_non_streaming_response(request: ChatRequest, web_search: bool
         except httpx.RequestError as e:
             logger.error(f"Error occurred during request for Chat ID {chat_id}: {e}")
             raise HTTPException(status_code=500, detail=str(e))
-
+    
     if full_response.startswith("$@$v=undefined-rv1$@$"):
         full_response = full_response[21:]
 
@@ -223,7 +229,7 @@ async def process_non_streaming_response(request: ChatRequest, web_search: bool
         "id": f"chatcmpl-{uuid.uuid4()}",
         "object": "chat.completion",
         "created": int(datetime.now().timestamp()),
-        "model": resolved_model,
+        "model": request.model,
         "choices": [
             {
                 "index": 0,