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 setup_logger
@@ -72,38 +72,18 @@ def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
         return content[len(model_prefix):].strip()
     return content
 
-# Process streaming response with headers from config.py
-async def process_streaming_response(request: ChatRequest):
-    # Generate a unique ID for this request
-    request_id = f"chatcmpl-{uuid.uuid4()}"
-    logger.info(f"Processing request with ID: {request_id} - Model: {request.model}")
-
+# Helper function to build JSON data for the request
+def build_json_data(request: ChatRequest, h_value: str, model_prefix: Optional[str]):
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
-    model_prefix = MODEL_PREFIXES.get(request.model, "")
-
-    # Adjust headers_api_chat since referer_url is removed
-    headers_api_chat = get_headers_api_chat(BASE_URL)
-
-    if request.model == 'o1-preview':
-        delay_seconds = random.randint(1, 60)
-        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview' (Request ID: {request_id})")
-        await asyncio.sleep(delay_seconds)
-
-    # Fetch the h-value for the 'validated' field
-    h_value = await getHid()
-    if not h_value:
-        logger.error("Failed to retrieve h-value for validation.")
-        raise HTTPException(status_code=500, detail="Validation failed due to missing h-value.")
-
-    json_data = {
+    return {
         "agentMode": agent_mode,
         "clickedAnswer2": False,
         "clickedAnswer3": False,
         "clickedForceWebSearch": False,
         "codeModelMode": True,
         "githubToken": None,
-        "id": None,  # Using request_id instead of chat_id
+        "id": None,
         "isChromeExt": False,
         "isMicMode": False,
         "maxTokens": request.max_tokens,
@@ -116,10 +96,32 @@ async def process_streaming_response(request: ChatRequest):
         "userId": None,
         "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
         "userSystemPrompt": None,
-        "validated": h_value,  # Dynamically set the validated field
+        "validated": h_value,
         "visitFromDelta": False,
     }
 
+# Process streaming response with headers from config.py
+async def process_streaming_response(request: ChatRequest):
+    logger.info(f"Processing request - Model: {request.model}")
+
+    model_prefix = MODEL_PREFIXES.get(request.model, "")
+
+    # Adjust headers_api_chat since referer_url is removed
+    headers_api_chat = get_headers_api_chat(BASE_URL)
+
+    if request.model == 'o1-preview':
+        delay_seconds = random.randint(1, 60)
+        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview'")
+        await asyncio.sleep(delay_seconds)
+
+    # Fetch the h-value for the 'validated' field
+    h_value = await getHid()
+    if not h_value:
+        logger.error("Failed to retrieve h-value for validation.")
+        raise HTTPException(status_code=500, detail="Validation failed due to missing h-value.")
+
+    json_data = build_json_data(request, h_value, model_prefix)
+
     async with httpx.AsyncClient() as client:
         try:
             async with client.stream(
@@ -138,7 +140,7 @@ async def process_streaming_response(request: ChatRequest):
                             content = content[21:]
                         # Remove the blocked message if present
                         if BLOCKED_MESSAGE in content:
-                            logger.info(f"Blocked message detected in response for Request ID {request_id}.")
+                            logger.info("Blocked message detected in response.")
                             content = content.replace(BLOCKED_MESSAGE, '').strip()
                             if not content:
                                 continue  # Skip if content is empty after removal
@@ -148,29 +150,29 @@ async def process_streaming_response(request: ChatRequest):
                 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:
-            logger.error(f"HTTP error occurred for Request ID {request_id}: {e}")
+            logger.error(f"HTTP error occurred: {e}")
             raise HTTPException(status_code=e.response.status_code, detail=str(e))
         except httpx.RequestError as e:
-            logger.error(f"Error occurred during request for Request ID {request_id}: {e}")
+            logger.error(f"Error occurred during request: {e}")
             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):
-    # Generate a unique ID for this request
-    request_id = f"chatcmpl-{uuid.uuid4()}"
-    logger.info(f"Processing request with ID: {request_id} - Model: {request.model}")
+    logger.info(f"Processing request - Model: {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, "")
 
     # Adjust headers_api_chat and headers_chat since referer_url is removed
     headers_api_chat = get_headers_api_chat(BASE_URL)
-    headers_chat = get_headers_chat(BASE_URL, next_action=str(uuid.uuid4()), next_router_state_tree=json.dumps([""]))
+    headers_chat = get_headers_chat(
+        BASE_URL,
+        next_action=str(uuid.uuid4()),
+        next_router_state_tree=json.dumps([""])
+    )
 
     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' (Request ID: {request_id})")
+        logger.info(f"Introducing a delay of {delay_seconds} seconds for model 'o1-preview'")
         await asyncio.sleep(delay_seconds)
 
     # Fetch the h-value for the 'validated' field
@@ -179,52 +181,33 @@ async def process_non_streaming_response(request: ChatRequest):
         logger.error("Failed to retrieve h-value for validation.")
         raise HTTPException(status_code=500, detail="Validation failed due to missing h-value.")
 
-    json_data = {
-        "agentMode": agent_mode,
-        "clickedAnswer2": False,
-        "clickedAnswer3": False,
-        "clickedForceWebSearch": False,
-        "codeModelMode": True,
-        "githubToken": None,
-        "id": None,  # Using request_id instead of chat_id
-        "isChromeExt": False,
-        "isMicMode": False,
-        "maxTokens": request.max_tokens,
-        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
-        "mobileClient": False,
-        "playgroundTemperature": request.temperature,
-        "playgroundTopP": request.top_p,
-        "previewToken": None,
-        "trendingAgentMode": trending_agent_mode,
-        "userId": None,
-        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
-        "userSystemPrompt": None,
-        "validated": h_value,  # Dynamically set the validated field
-        "visitFromDelta": False,
-    }
+    json_data = build_json_data(request, h_value, model_prefix)
 
     full_response = ""
     async with httpx.AsyncClient() as client:
         try:
             async with client.stream(
-                method="POST", url=f"{BASE_URL}/api/chat", headers=headers_api_chat, 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():
                     full_response += chunk
         except httpx.HTTPStatusError as e:
-            logger.error(f"HTTP error occurred for Request ID {request_id}: {e}")
+            logger.error(f"HTTP error occurred: {e}")
             raise HTTPException(status_code=e.response.status_code, detail=str(e))
         except httpx.RequestError as e:
-            logger.error(f"Error occurred during request for Request ID {request_id}: {e}")
+            logger.error(f"Error occurred during request: {e}")
             raise HTTPException(status_code=500, detail=str(e))
-    
+
     if full_response.startswith("$@$v=undefined-rv1$@$"):
         full_response = full_response[21:]
 
     # Remove the blocked message if present
     if BLOCKED_MESSAGE in full_response:
-        logger.info(f"Blocked message detected in response for Request ID {request_id}.")
+        logger.info("Blocked message detected in response.")
         full_response = full_response.replace(BLOCKED_MESSAGE, '').strip()
         if not full_response:
             raise HTTPException(status_code=500, detail="Blocked message detected in response.")
@@ -244,4 +227,4 @@ async def process_non_streaming_response(request: ChatRequest):
             }
         ],
         "usage": None,
-    }
+    }