Update api/utils.py

api/utils.py

@@ -10,21 +10,20 @@ import httpx
 from fastapi import HTTPException
 from api.config import (
     MODEL_MAPPING,
-    common_headers,
+    get_headers_api_chat,
+    get_headers_chat,
     BASE_URL,
     AGENT_MODE,
     TRENDING_AGENT_MODE,
+    MODEL_PREFIXES,
+    API_ENDPOINT,
+    generate_id
 )
 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:
-    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
@@ -44,10 +43,13 @@ def create_chat_completion_data(
         "usage": None,
     }
 
-# Function to convert message to dictionary format
-def message_to_dict(message):
+# 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"]
+    if model_prefix:
+        content = f"{model_prefix} {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 {
             "role": message.role,
             "content": content,
@@ -59,11 +61,32 @@ def message_to_dict(message):
         }
     return {"role": message.role, "content": content}
 
+# 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):
+        logger.debug(f"Stripping prefix '{model_prefix}' from content.")
+        return content[len(model_prefix):].strip()
+    return content
+
+# 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
+
 # Process streaming response with headers from config.py
 async def process_streaming_response(request: ChatRequest):
-    chat_id = generate_chat_id()
+    chat_id = generate_id()
+    referer_url = get_referer_url(chat_id, request.model)
+    logger.info(f"Generated Chat ID: {chat_id} - Model: {request.model} - URL: {referer_url}")
+
     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(referer_url)
 
     if request.model == 'o1-preview':
         delay_seconds = random.randint(1, 60)
@@ -81,7 +104,7 @@ async def process_streaming_response(request: ChatRequest):
         "isChromeExt": False,
         "isMicMode": False,
         "maxTokens": request.max_tokens,
-        "messages": [message_to_dict(msg) for msg in request.messages],
+        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
         "mobileClient": False,
         "playgroundTemperature": request.temperature,
         "playgroundTopP": request.top_p,
@@ -98,8 +121,8 @@ async def process_streaming_response(request: ChatRequest):
         try:
             async with client.stream(
                 "POST",
-                f"{BASE_URL}/api/chat",
-                headers=common_headers,
+                API_ENDPOINT,
+                headers=headers_api_chat,
                 json=json_data,
                 timeout=100,
             ) as response:
@@ -108,7 +131,11 @@ async def process_streaming_response(request: ChatRequest):
                     timestamp = int(datetime.now().timestamp())
                     if line:
                         content = line
-                        yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
+                        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, 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:
@@ -120,9 +147,15 @@ async def process_streaming_response(request: ChatRequest):
 
 # Process non-streaming response with headers from config.py
 async def process_non_streaming_response(request: ChatRequest):
-    chat_id = generate_chat_id()
+    chat_id = generate_id()
+    referer_url = get_referer_url(chat_id, request.model)
+    logger.info(f"Generated Chat ID: {chat_id} - Model: {request.model} - URL: {referer_url}")
+
     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(referer_url)
 
     if request.model == 'o1-preview':
         delay_seconds = random.randint(20, 60)
@@ -140,7 +173,7 @@ async def process_non_streaming_response(request: ChatRequest):
         "isChromeExt": False,
         "isMicMode": False,
         "maxTokens": request.max_tokens,
-        "messages": [message_to_dict(msg) for msg in request.messages],
+        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
         "mobileClient": False,
         "playgroundTemperature": request.temperature,
         "playgroundTopP": request.top_p,
@@ -157,7 +190,10 @@ async def process_non_streaming_response(request: ChatRequest):
     async with httpx.AsyncClient() as client:
         try:
             async with client.stream(
-                method="POST", url=f"{BASE_URL}/api/chat", headers=common_headers, json=json_data
+                method="POST",
+                url=API_ENDPOINT,
+                headers=headers_api_chat,
+                json=json_data
             ) as response:
                 response.raise_for_status()
                 async for chunk in response.aiter_text():
@@ -168,6 +204,11 @@ 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:]
+
+    cleaned_full_response = strip_model_prefix(full_response, model_prefix)
 
     return {
         "id": f"chatcmpl-{uuid.uuid4()}",
@@ -177,7 +218,7 @@ async def process_non_streaming_response(request: ChatRequest):
         "choices": [
             {
                 "index": 0,
-                "message": {"role": "assistant", "content": full_response},
+                "message": {"role": "assistant", "content": cleaned_full_response},
                 "finish_reason": "stop",
             }
         ],