Update api/utils.py

api/utils.py

@@ -4,21 +4,18 @@ import uuid
 import asyncio
 import random
 import string
-from typing import Any, Dict, Optional, List
+from typing import Any, Dict, Optional
 
 import httpx
 from fastapi import HTTPException
 from api.config import (
-    MODEL_MAPPING,
-    AGENT_MODE,
-    TRENDING_AGENT_MODE,
-    get_headers,
+    models,
+    model_aliases,
+    agentMode,
+    trendingAgentMode,
+    get_headers_api_chat,
     BASE_URL,
 )
-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:
@@ -44,10 +41,11 @@ def create_chat_completion_data(
         "usage": None,
     }
 
-# Function to convert message to dictionary format for API
-def message_to_dict(message) -> Dict[str, Any]:
+# Function to convert message to dictionary format
+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,
@@ -59,37 +57,21 @@ def message_to_dict(message) -> Dict[str, Any]:
         }
     return {"role": message.role, "content": content}
 
-# Function to retrieve agent modes for a specific model
-def get_agent_modes(model: str) -> Dict[str, Any]:
-    """Returns specific agent mode configurations for agent models."""
-    agent_mode = AGENT_MODE.get(model, {})
-    trending_agent_mode = TRENDING_AGENT_MODE.get(model, {})
-
-    if agent_mode or trending_agent_mode:
-        logger.info(f"Applying agent configurations for model '{model}'")
-    else:
-        logger.info(f"Model '{model}' is not an agent model; defaulting to standard mode")
-
-    return {
-        "agentMode": agent_mode,
-        "trendingAgentMode": trending_agent_mode,
-    }
-
 # Process streaming response with headers from config.py
-async def process_streaming_response(request: ChatRequest):
+async def process_streaming_response(request):
     chat_id = generate_chat_id()
     logger.info(f"Generated Chat ID: {chat_id} - Model: {request.model}")
 
-    # Check if the model is an agent model and apply corresponding agent modes
-    agent_modes = get_agent_modes(request.model)
-    headers = get_headers()
+    agent_mode = agentMode.get(request.model, {})
+    trending_agent_mode = trendingAgentMode.get(request.model, {})
+
+    headers_api_chat = get_headers_api_chat(f"{BASE_URL}/?model={request.model}")
 
     json_data = {
-        "agentMode": agent_modes["agentMode"],
-        "trendingAgentMode": agent_modes["trendingAgentMode"],
+        "agentMode": agent_mode,
         "clickedAnswer2": False,
         "clickedAnswer3": False,
-        "clickedForceWebSearch": False,
+        "clickedForceWebSearch ": False,
         "codeModelMode": True,
         "githubToken": None,
         "id": chat_id,
@@ -101,20 +83,20 @@ async def process_streaming_response(request: ChatRequest):
         "playgroundTemperature": request.temperature,
         "playgroundTopP": request.top_p,
         "previewToken": None,
+        "trendingAgentMode": trending_agent_mode,
         "userId": None,
-        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
+        "userSelectedModel": request.model,
         "userSystemPrompt": None,
         "validated": "69783381-2ce4-4dbd-ac78-35e9063feabc",
         "visitFromDelta": False,
     }
 
-    logger.debug(f"Data Payload for {request.model}: {json_data}")  # Inspect payload for accuracy
     async with httpx.AsyncClient() as client:
         try:
             async with client.stream(
                 "POST",
                 f"{BASE_URL}/api/chat",
-                headers=headers,
+                headers=headers_api_chat,
                 json=json_data,
                 timeout=100,
             ) as response:
@@ -122,7 +104,11 @@ async def process_streaming_response(request: ChatRequest):
                 async for line in response.aiter_lines():
                     timestamp = int(datetime.now().timestamp())
                     if line:
-                        yield f"data: {json.dumps(create_chat_completion_data(line, request.model, timestamp))}\n\n"
+                        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:
@@ -133,17 +119,17 @@ async def process_streaming_response(request: ChatRequest):
             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):
+async def process_non_streaming_response(request):
     chat_id = generate_chat_id()
     logger.info(f"Generated Chat ID: {chat_id} - Model: {request.model}")
 
-    # Retrieve agent modes based on the model
-    agent_modes = get_agent_modes(request.model)
-    headers = get_headers()
+    agent_mode = agentMode.get(request.model, {})
+    trending_agent_mode = trendingAgentMode.get(request.model, {})
+
+    headers_api_chat = get_headers_api_chat(f"{BASE_URL}/?model={request.model}")
 
     json_data = {
-        "agentMode": agent_modes["agentMode"],
-        "trendingAgentMode": agent_modes["trendingAgentMode"],
+        "agentMode": agent_mode,
         "clickedAnswer2": False,
         "clickedAnswer3": False,
         "clickedForceWebSearch": False,
@@ -158,19 +144,19 @@ async def process_non_streaming_response(request: ChatRequest):
         "playgroundTemperature": request.temperature,
         "playgroundTopP": request.top_p,
         "previewToken": None,
+        "trendingAgentMode": trending_agent_mode,
         "userId": None,
-        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
+        "userSelectedModel": request.model,
         "userSystemPrompt": None,
         "validated": "69783381-2ce4-4dbd-ac78-35e9063feabc",
         "visitFromDelta": False,
     }
 
-    logger.debug(f"Data Payload for {request.model}: {json_data}")  # Inspect payload for accuracy
     full_response = ""
     async with httpx.AsyncClient() as client:
         try:
             async with client.stream(
-                method="POST", url=f"{BASE_URL}/api/chat", headers=headers, json=json_data
+                method="POST", url=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():
@@ -181,6 +167,8 @@ async def process_non_streaming_response(request: ChatRequest):
         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()}",
@@ -195,4 +183,4 @@ async def process_non_streaming_response(request: ChatRequest):
             }
         ],
         "usage": None,
-    }
+    }