Update api/utils.py

api/utils.py

@@ -9,7 +9,7 @@ from typing import Any, Dict, Optional
 import httpx
 from fastapi import HTTPException
 from api.config import (
-    MODEL_MAPPING,
+    MODEL_ALIASES,
     get_headers_api_chat,
     get_headers_chat,
     BASE_URL,
@@ -17,7 +17,8 @@ from api.config import (
     TRENDING_AGENT_MODE,
     MODEL_PREFIXES,
     API_ENDPOINT,
-    generate_id
+    generate_id,
+    MODELS
 )
 from api.models import ChatRequest
 from api.logger import setup_logger
@@ -71,10 +72,8 @@ 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 MODEL_MAPPING."""
-    if model in MODEL_MAPPING:
-        return f"{BASE_URL}/chat/{chat_id}?model={model}"
-    return BASE_URL
+    """Generate the referer URL based on specific models listed in MODELS."""
+    return f"{BASE_URL}/chat/{chat_id}?model={model}"
 
 # Process streaming response with headers from config.py
 async def process_streaming_response(request: ChatRequest):
@@ -86,7 +85,7 @@ async def process_streaming_response(request: ChatRequest):
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
     model_prefix = MODEL_PREFIXES.get(request.model, "")
 
-    headers_api_chat = get_headers_api_chat(referer_url)
+    headers_api_chat = get_headers_api_chat()
 
     if request.model == 'o1-preview':
         delay_seconds = random.randint(1, 60)
@@ -111,7 +110,7 @@ async def process_streaming_response(request: ChatRequest):
         "previewToken": None,
         "trendingAgentMode": trending_agent_mode,
         "userId": None,
-        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
+        "userSelectedModel": request.model if request.model in MODELS else None,
         "userSystemPrompt": None,
         "validated": "69783381-2ce4-4dbd-ac78-35e9063feabc",
         "visitFromDelta": False,
@@ -155,7 +154,7 @@ async def process_non_streaming_response(request: ChatRequest):
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
     model_prefix = MODEL_PREFIXES.get(request.model, "")
 
-    headers_api_chat = get_headers_api_chat(referer_url)
+    headers_api_chat = get_headers_api_chat()
 
     if request.model == 'o1-preview':
         delay_seconds = random.randint(20, 60)
@@ -180,7 +179,7 @@ async def process_non_streaming_response(request: ChatRequest):
         "previewToken": None,
         "trendingAgentMode": trending_agent_mode,
         "userId": None,
-        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
+        "userSelectedModel": request.model if request.model in MODELS else None,
         "userSystemPrompt": None,
         "validated": "69783381-2ce4-4dbd-ac78-35e9063feabc",
         "visitFromDelta": False,
@@ -193,7 +192,8 @@ async def process_non_streaming_response(request: ChatRequest):
                 method="POST",
                 url=API_ENDPOINT,
                 headers=headers_api_chat,
-                json=json_data
+                json=json_data,
+                timeout=100,
             ) as response:
                 response.raise_for_status()
                 async for chunk in response.aiter_text():
@@ -204,7 +204,7 @@ 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:]