Update api/utils.py

api/utils.py

@@ -1,31 +1,28 @@
 from datetime import datetime
 import json
 import uuid
-import random
 import asyncio
+import random
 from typing import Any, Dict, Optional
+
 import httpx
 from fastapi import HTTPException
 from api.config import (
     MODEL_MAPPING,
-    headers,
+    get_headers_api_chat,
+    get_headers_chat,
+    BASE_URL,
     AGENT_MODE,
     TRENDING_AGENT_MODE,
-    BASE_URL,
     MODEL_PREFIXES,
     MODEL_REFERERS
 )
 from api.models import ChatRequest
 from api.logger import setup_logger
 
-# Initialize logger
 logger = setup_logger(__name__)
 
-# Function to generate a unique chat ID
-def generate_chat_id() -> str:
-    return f"chat-{uuid.uuid4()}"
-
-# Create chat completion data function
+# Helper function to create chat completion data
 def create_chat_completion_data(
     content: str, model: str, timestamp: int, finish_reason: Optional[str] = None
 ) -> Dict[str, Any]:
@@ -44,7 +41,7 @@ def create_chat_completion_data(
         "usage": None,
     }
 
-# Message to dict converter function
+# Function to convert message to dictionary format with optional model prefix
 def message_to_dict(message, model_prefix: Optional[str] = None):
     if isinstance(message.content, str):
         content = message.content
@@ -67,7 +64,7 @@ def message_to_dict(message, model_prefix: Optional[str] = None):
     else:
         return {"role": message.role, "content": message.content}
 
-# Strip model prefix function
+# Function to strip model prefix from content if present
 def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
     """Remove the model prefix from the response content if present."""
     if model_prefix and content.startswith(model_prefix):
@@ -76,18 +73,16 @@ def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
     logger.debug("No prefix to strip from content.")
     return content
 
-# Process streaming response
+# Process streaming response with headers from config.py
 async def process_streaming_response(request: ChatRequest):
-    chat_id = generate_chat_id()  # Generate unique chat ID
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
     model_prefix = MODEL_PREFIXES.get(request.model, "")
     referer_path = MODEL_REFERERS.get(request.model, f"/?model={request.model}")
-    referer_url = f"{BASE_URL}/chat/{chat_id}?model={request.model}"  # Updated URL format with chat_id
+    referer_url = f"{BASE_URL}{referer_path}"
 
-    # Update headers with dynamic Referer
-    dynamic_headers = headers.copy()
-    dynamic_headers['Referer'] = referer_url
+    # Generate headers for API chat request
+    headers_api_chat = get_headers_api_chat(referer_url)
 
     # Introduce delay for 'o1-preview' model
     if request.model == 'o1-preview':
@@ -96,7 +91,6 @@ async def process_streaming_response(request: ChatRequest):
         await asyncio.sleep(delay_seconds)
 
     json_data = {
-        "id": chat_id,
         "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
         "previewToken": None,
         "userId": None,
@@ -124,7 +118,7 @@ async def process_streaming_response(request: ChatRequest):
             async with client.stream(
                 "POST",
                 f"{BASE_URL}/api/chat",
-                headers=dynamic_headers,
+                headers=headers_api_chat,
                 json=json_data,
                 timeout=100,
             ) as response:
@@ -135,6 +129,7 @@ async def process_streaming_response(request: ChatRequest):
                         content = line
                         if content.startswith("$@$v=undefined-rv1$@$"):
                             content = content[21:]
+                        # Strip the model prefix from the response content
                         cleaned_content = strip_model_prefix(content, model_prefix)
                         yield f"data: {json.dumps(create_chat_completion_data(cleaned_content, request.model, timestamp))}\n\n"
 
@@ -147,27 +142,20 @@ async def process_streaming_response(request: ChatRequest):
             logger.error(f"Error occurred during request: {e}")
             raise HTTPException(status_code=500, detail=str(e))
 
-# Process non-streaming response
+# Process non-streaming response with headers from config.py
 async def process_non_streaming_response(request: ChatRequest):
-    chat_id = generate_chat_id()  # Generate unique chat ID
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
     model_prefix = MODEL_PREFIXES.get(request.model, "")
     referer_path = MODEL_REFERERS.get(request.model, f"/?model={request.model}")
     referer_url = f"{BASE_URL}{referer_path}"
+    chat_url = f"{BASE_URL}/chat/{uuid.uuid4()}?model={request.model}"
 
-    # Update headers with dynamic Referer
-    dynamic_headers = headers.copy()
-    dynamic_headers['Referer'] = referer_url
-
-    # Introduce delay for 'o1-preview' 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'")
-        await asyncio.sleep(delay_seconds)
+    # Generate headers for API chat request and chat request
+    headers_api_chat = get_headers_api_chat(referer_url)
+    headers_chat = get_headers_chat(chat_url, next_action=str(uuid.uuid4()), next_router_state_tree=json.dumps([""]))
 
     json_data = {
-        "id": chat_id,
         "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
         "previewToken": None,
         "userId": None,
@@ -189,11 +177,12 @@ async def process_non_streaming_response(request: ChatRequest):
         "mobileClient": False,
         "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
     }
+
     full_response = ""
     async with httpx.AsyncClient() as client:
         try:
             async with client.stream(
-                method="POST", url=f"{BASE_URL}/api/chat", headers=dynamic_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():
@@ -207,6 +196,7 @@ async def process_non_streaming_response(request: ChatRequest):
     if full_response.startswith("$@$v=undefined-rv1$@$"):
         full_response = full_response[21:]
 
+    # Strip the model prefix from the full response
     cleaned_full_response = strip_model_prefix(full_response, model_prefix)
 
     return {