Update api/utils.py

api/utils.py

@@ -18,7 +18,7 @@ from api.config import (
     MODEL_PREFIXES,
     MODEL_REFERERS
 )
-from api.models import ChatRequest  # Ensure ChatRequest is correctly imported
+from api.models import ChatRequest
 from api.logger import (
     log_generated_chat_id,
     log_model_delay,
@@ -27,7 +27,7 @@ from api.logger import (
     log_strip_prefix
 )
 
-# Helper function to create a random alphanumeric chat ID
+# Helper function to 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))
@@ -78,33 +78,30 @@ def message_to_dict(message, model_prefix: Optional[str] = None):
 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)
+        log_strip_prefix(model_prefix, content)
         return content[len(model_prefix):].strip()
     return content
 
 # Process streaming response with headers from config.py
 async def process_streaming_response(request: ChatRequest):
-    # Determine if a Chat ID and referer URL should be generated
-    if request.model in MODEL_REFERERS:
-        chat_id = generate_chat_id()
-        chat_url = f"/chat/{chat_id}?model={request.model}"
-        log_generated_chat_id(chat_id, chat_url)
-        
-        referer_path = MODEL_REFERERS[request.model]
-        referer_url = f"{BASE_URL}{referer_path}"
-    else:
-        chat_id = None
-        referer_url = BASE_URL  # Use base URL for models not in MODEL_REFERERS
+    chat_id = generate_chat_id()
+    log_generated_chat_id(chat_id, request.model)
 
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
     model_prefix = MODEL_PREFIXES.get(request.model, "")
+    
+    # Check if the model is in MODEL_REFERERS, else no referer path
+    referer_path = MODEL_REFERERS.get(request.model, "")
+    referer_url = f"{BASE_URL}{referer_path}" if referer_path else BASE_URL
 
+    # Generate headers for API chat request with dynamic Referer
     headers_api_chat = get_headers_api_chat(referer_url)
 
+    # Introduce delay for 'o1-preview' model
     if request.model == 'o1-preview':
         delay_seconds = random.randint(20, 60)
-        log_model_delay(delay_seconds, chat_id, request.model if chat_id else "unknown")
+        log_model_delay(delay_seconds, request.model, chat_id)
         await asyncio.sleep(delay_seconds)
 
     json_data = {
@@ -114,7 +111,7 @@ async def process_streaming_response(request: ChatRequest):
         "clickedForceWebSearch": False,
         "codeModelMode": True,
         "githubToken": None,
-        "id": chat_id if chat_id else "unknown",
+        "id": chat_id,
         "isChromeExt": False,
         "isMicMode": False,
         "maxTokens": request.max_tokens,
@@ -147,41 +144,41 @@ 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"
 
                 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:
-            log_http_error(chat_id if chat_id else "unknown", e)
+            log_http_error(e, chat_id)
             raise HTTPException(status_code=e.response.status_code, detail=str(e))
         except httpx.RequestError as e:
-            log_request_error(chat_id if chat_id else "unknown", e)
+            log_request_error(e, chat_id)
             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):
-    if request.model in MODEL_REFERERS:
-        chat_id = generate_chat_id()
-        chat_url = f"/chat/{chat_id}?model={request.model}"
-        log_generated_chat_id(chat_id, chat_url)
-        
-        referer_path = MODEL_REFERERS[request.model]
-        referer_url = f"{BASE_URL}{referer_path}"
-    else:
-        chat_id = None
-        referer_url = BASE_URL
+    chat_id = generate_chat_id()
+    log_generated_chat_id(chat_id, request.model)
 
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
     model_prefix = MODEL_PREFIXES.get(request.model, "")
 
+    # Check if the model is in MODEL_REFERERS, else no referer path
+    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}"
+
+    # Generate headers for API chat request and chat request with dynamic Referer
     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([""])) if chat_id else None
+    headers_chat = get_headers_chat(chat_url, next_action=str(uuid.uuid4()), next_router_state_tree=json.dumps([""]))
 
+    # Introduce delay for 'o1-preview' model
     if request.model == 'o1-preview':
         delay_seconds = random.randint(20, 60)
-        log_model_delay(delay_seconds, chat_id if chat_id else "unknown", request.model)
+        log_model_delay(delay_seconds, request.model, chat_id)
         await asyncio.sleep(delay_seconds)
 
     json_data = {
@@ -191,7 +188,7 @@ async def process_non_streaming_response(request: ChatRequest):
         "clickedForceWebSearch": False,
         "codeModelMode": True,
         "githubToken": None,
-        "id": chat_id if chat_id else "unknown",
+        "id": chat_id,
         "isChromeExt": False,
         "isMicMode": False,
         "maxTokens": request.max_tokens,
@@ -218,14 +215,15 @@ async def process_non_streaming_response(request: ChatRequest):
                 async for chunk in response.aiter_text():
                     full_response += chunk
         except httpx.HTTPStatusError as e:
-            log_http_error(chat_id if chat_id else "unknown", e)
+            log_http_error(e, chat_id)
             raise HTTPException(status_code=e.response.status_code, detail=str(e))
         except httpx.RequestError as e:
-            log_request_error(chat_id if chat_id else "unknown", 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
     cleaned_full_response = strip_model_prefix(full_response, model_prefix)
 
     return {