Update api/utils.py

api/utils.py

@@ -9,13 +9,16 @@ from typing import Any, Dict, Optional
 import httpx
 from fastapi import HTTPException
 from api.config import (
-    models,
-    model_aliases,
-    agentMode,
-    trendingAgentMode,
-    get_headers_api_chat,
+    MODEL_MAPPING,
+    common_headers,
     BASE_URL,
+    AGENT_MODE,
+    TRENDING_AGENT_MODE,
 )
+from api.models import ChatRequest
+from api.logger import setup_logger
+
+logger = setup_logger(__name__)
 
 # Helper function to create a random alphanumeric chat ID
 def generate_chat_id(length: int = 7) -> str:
@@ -45,7 +48,6 @@ def create_chat_completion_data(
 def message_to_dict(message):
     content = message.content if isinstance(message.content, str) else message.content[0]["text"]
     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,
@@ -58,20 +60,21 @@ def message_to_dict(message):
     return {"role": message.role, "content": content}
 
 # Process streaming response with headers from config.py
-async def process_streaming_response(request):
+async def process_streaming_response(request: ChatRequest):
     chat_id = generate_chat_id()
-    logger.info(f"Generated Chat ID: {chat_id} - Model: {request.model}")
-
-    agent_mode = agentMode.get(request.model, {})
-    trending_agent_mode = trendingAgentMode.get(request.model, {})
+    agent_mode = AGENT_MODE.get(request.model, {})
+    trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
 
-    headers_api_chat = get_headers_api_chat(f"{BASE_URL}/?model={request.model}")
+    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)
 
     json_data = {
         "agentMode": agent_mode,
         "clickedAnswer2": False,
         "clickedAnswer3": False,
-        "clickedForceWebSearch ": False,
+        "clickedForceWebSearch": False,
         "codeModelMode": True,
         "githubToken": None,
         "id": chat_id,
@@ -85,7 +88,7 @@ async def process_streaming_response(request):
         "previewToken": None,
         "trendingAgentMode": trending_agent_mode,
         "userId": None,
-        "userSelectedModel": request.model,
+        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
         "userSystemPrompt": None,
         "validated": "69783381-2ce4-4dbd-ac78-35e9063feabc",
         "visitFromDelta": False,
@@ -96,7 +99,7 @@ async def process_streaming_response(request):
             async with client.stream(
                 "POST",
                 f"{BASE_URL}/api/chat",
-                headers=headers_api_chat,
+                headers=common_headers,
                 json=json_data,
                 timeout=100,
             ) as response:
@@ -105,10 +108,7 @@ async def process_streaming_response(request):
                     timestamp = int(datetime.now().timestamp())
                     if line:
                         content = line
-                        if content.startswith("$@$v=undefined-rv1$@$"):
-                            content = content[21:]
                         yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\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:
@@ -119,14 +119,15 @@ async def process_streaming_response(request):
             raise HTTPException(status_code=500, detail=str(e))
 
 # Process non-streaming response with headers from config.py
-async def process_non_streaming_response(request):
+async def process_non_streaming_response(request: ChatRequest):
     chat_id = generate_chat_id()
-    logger.info(f"Generated Chat ID: {chat_id} - Model: {request.model}")
-
-    agent_mode = agentMode.get(request.model, {})
-    trending_agent_mode = trendingAgentMode.get(request.model, {})
+    agent_mode = AGENT_MODE.get(request.model, {})
+    trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
 
-    headers_api_chat = get_headers_api_chat(f"{BASE_URL}/?model={request.model}")
+    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)
 
     json_data = {
         "agentMode": agent_mode,
@@ -146,7 +147,7 @@ async def process_non_streaming_response(request):
         "previewToken": None,
         "trendingAgentMode": trending_agent_mode,
         "userId": None,
-        "userSelectedModel": request.model,
+        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
         "userSystemPrompt": None,
         "validated": "69783381-2ce4-4dbd-ac78-35e9063feabc",
         "visitFromDelta": False,
@@ -156,7 +157,7 @@ async def process_non_streaming_response(request):
     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
+                method="POST", url=f"{BASE_URL}/api/chat", headers=common_headers, json=json_data
             ) as response:
                 response.raise_for_status()
                 async for chunk in response.aiter_text():
@@ -167,8 +168,6 @@ async def process_non_streaming_response(request):
         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:]
 
     return {
         "id": f"chatcmpl-{uuid.uuid4()}",
@@ -183,4 +182,4 @@ async def process_non_streaming_response(request):
             }
         ],
         "usage": None,
-    }
+    }