Update api/utils.py

api/utils.py

@@ -16,7 +16,7 @@ from api.config import (
     AGENT_MODE,
     TRENDING_AGENT_MODE,
     MODEL_PREFIXES,
-    MODEL_REFERERS
+    MODEL_REFERERS,
 )
 from api.models import ChatRequest
 from api.logger import (
@@ -24,15 +24,15 @@ from api.logger import (
     log_model_delay,
     log_http_error,
     log_request_error,
-    log_strip_prefix
+    log_strip_prefix,
 )
 
-# Helper function to generate a random alphanumeric chat ID
+# Generate 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
+# 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]:
@@ -51,56 +51,39 @@ def create_chat_completion_data(
         "usage": None,
     }
 
-# Function to convert message to dictionary format with optional model prefix
+# 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
-        if model_prefix:
-            content = f"{model_prefix} {content}"
-        return {"role": message.role, "content": content}
-    elif isinstance(message.content, list) and len(message.content) == 2:
-        content = message.content[0]["text"]
-        if model_prefix:
-            content = f"{model_prefix} {content}"
-        return {
-            "role": message.role,
-            "content": content,
-            "data": {
-                "imageBase64": message.content[1]["image_url"]["url"],
-                "fileText": "",
-                "title": "snapshot",
-            },
-        }
-    else:
-        return {"role": message.role, "content": message.content}
-
-# Function to strip model prefix from content if present
+    content = message.content
+    if model_prefix:
+        content = f"{model_prefix} {content}"
+    return {"role": message.role, "content": content}
+
+# Remove 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):
         log_strip_prefix(model_prefix, content)
         return content[len(model_prefix):].strip()
     return content
 
-# Process streaming response with headers from config.py
+# Streaming response with headers from config.py
 async def process_streaming_response(request: ChatRequest):
-    chat_id = generate_chat_id()
-    
-    # Get referer URL only if model is in MODEL_REFERERS
+    # Generate chat_id only if model is in MODEL_REFERERS
+    chat_id = generate_chat_id() if request.model in MODEL_REFERERS else None
     referer_path = MODEL_REFERERS.get(request.model, "")
-    referer_url = f"{BASE_URL}{referer_path}" if referer_path else BASE_URL
+    referer_url = f"{BASE_URL}/chat/{chat_id}?model={request.model}" if chat_id else BASE_URL
 
-    # Log with chat ID, model, and referer URL (if present)
+    # Log chat ID, model, and referer URL if applicable
     log_generated_chat_id_with_referer(chat_id, request.model, referer_url)
 
+    # Fetch model configurations
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
     model_prefix = MODEL_PREFIXES.get(request.model, "")
 
-    # Generate headers for API chat request with dynamic Referer
+    # Dynamic headers based on referer
     headers_api_chat = get_headers_api_chat(referer_url)
 
-    # Introduce delay for 'o1-preview' model
+    # Delay for 'o1-preview' model
     if request.model == 'o1-preview':
         delay_seconds = random.randint(20, 60)
         log_model_delay(delay_seconds, request.model, chat_id)
@@ -143,10 +126,7 @@ async def process_streaming_response(request: ChatRequest):
                 async for line in response.aiter_lines():
                     timestamp = int(datetime.now().timestamp())
                     if line:
-                        content = line
-                        if content.startswith("$@$v=undefined-rv1$@$"):
-                            content = content[21:]
-                        # Strip the model prefix from the response content
+                        content = line.lstrip("$@$v=undefined-rv1$@$")
                         cleaned_content = strip_model_prefix(content, model_prefix)
                         yield f"data: {json.dumps(create_chat_completion_data(cleaned_content, request.model, timestamp))}\n\n"
 
@@ -159,27 +139,25 @@ async def process_streaming_response(request: ChatRequest):
             log_request_error(e, chat_id)
             raise HTTPException(status_code=500, detail=str(e))
 
-# Process non-streaming response with headers from config.py
+# Non-streaming response with headers from config.py
 async def process_non_streaming_response(request: ChatRequest):
-    chat_id = generate_chat_id()
-
-    # Get referer URL only if model is in MODEL_REFERERS
+    chat_id = generate_chat_id() if request.model in MODEL_REFERERS else None
     referer_path = MODEL_REFERERS.get(request.model, "")
-    referer_url = f"{BASE_URL}{referer_path}" if referer_path else BASE_URL
-    chat_url = f"{referer_url}/chat/{chat_id}?model={request.model}"
+    referer_url = f"{BASE_URL}/chat/{chat_id}?model={request.model}" if chat_id else BASE_URL
 
-    # Log with chat ID, model, and referer URL (if present)
-    log_generated_chat_id_with_referer(chat_id, request.model, chat_url)
+    # Log with chat ID, model, and referer URL if applicable
+    log_generated_chat_id_with_referer(chat_id, request.model, referer_url)
 
+    # Model configurations
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
     model_prefix = MODEL_PREFIXES.get(request.model, "")
 
-    # Generate headers for API chat request and chat request with dynamic Referer
+    # Headers for API chat and secondary 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([""]))
+    headers_chat = get_headers_chat(referer_url, next_action=str(uuid.uuid4()), next_router_state_tree=json.dumps([""]))
 
-    # Introduce delay for 'o1-preview' model
+    # Delay for 'o1-preview' model
     if request.model == 'o1-preview':
         delay_seconds = random.randint(20, 60)
         log_model_delay(delay_seconds, request.model, chat_id)
@@ -224,10 +202,11 @@ async def process_non_streaming_response(request: ChatRequest):
         except httpx.RequestError as e:
             log_request_error(e, chat_id)
             raise HTTPException(status_code=500, detail=str(e))
+    
     if full_response.startswith("$@$v=undefined-rv1$@$"):
         full_response = full_response[21:]
 
-    # Strip the model prefix from the full response
+    # Strip the model prefix
     cleaned_full_response = strip_model_prefix(full_response, model_prefix)
 
     return {