Update api/utils.py

api/utils.py

@@ -1,28 +1,27 @@
 from datetime import datetime
 import json
 import uuid
+import asyncio
+import random
 from typing import Any, Dict, Optional
 
 import httpx
-from fastapi import Depends, HTTPException
-from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
-
-from api import validate
+from fastapi import HTTPException
 from api.config import (
-    APP_SECRET,
-    BASE_URL,
-    MODEL_MAPPING,
+    get_model,
+    MODEL_PREFIXES,
     AGENT_MODE,
     TRENDING_AGENT_MODE,
-    MODEL_PREFIXES,
-    headers,
+    BASE_URL,
+    generate_id,
 )
 from api.models import ChatRequest
 from api.logger import setup_logger
+from api.validate import getHid
 
 logger = setup_logger(__name__)
-security = HTTPBearer()
 
+# 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]:
@@ -41,71 +40,82 @@ def create_chat_completion_data(
         "usage": None,
     }
 
-def verify_app_secret(credentials: HTTPAuthorizationCredentials = Depends(security)):
-    if credentials.credentials != APP_SECRET:
-        raise HTTPException(status_code=403, detail="Invalid APP_SECRET")
-    return credentials.credentials
+# 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 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(content, list) and len(content) == 2 and "image_url" in content[1]:
-        # Handle messages with image data
-        content_text = content[0]["text"]
-        if model_prefix:
-            content_text = f"{model_prefix} {content_text}"
+    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_text,
+            "content": content,
             "data": {
-                "imageBase64": content[1]["image_url"]["url"],
+                "imageBase64": message.content[1]["image_url"]["url"],
                 "fileText": "",
                 "title": "snapshot",
             },
         }
-    else:
-        if model_prefix:
-            content = f"{model_prefix} {content}"
-        return {"role": message.role, "content": content}
-
-def generate_chat_id() -> str:
-    return str(uuid.uuid4())
+    return {"role": message.role, "content": content}
 
+# Process streaming response
 async def process_streaming_response(request: ChatRequest):
-    agent_mode = AGENT_MODE.get(request.model, {})
-    trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
-    model_prefix = MODEL_PREFIXES.get(request.model, "")
-
-    hid = validate.getHid()
-    logger.info(f"Using hid: {hid} for model: {request.model}")
-
-    user_selected_model = MODEL_MAPPING.get(request.model, request.model)
-    logger.info(f"User selected model: {user_selected_model}")
-
-    chat_id = generate_chat_id()
-    logger.info(f"Generated chat_id: {chat_id} for request.")
+    chat_id = generate_id()
+    logger.info(f"Generated Chat ID: {chat_id} - Model: {request.model}")
+
+    model = get_model(request.model)
+    agent_mode = AGENT_MODE.get(model, {})
+    trending_agent_mode = TRENDING_AGENT_MODE.get(model, {})
+    model_prefix = MODEL_PREFIXES.get(model, "")
+
+    headers_api_chat = {
+        'accept': '*/*',
+        'accept-language': 'en-US,en;q=0.9',
+        'cache-control': 'no-cache',
+        'content-type': 'application/json',
+        'origin': BASE_URL,
+        'pragma': 'no-cache',
+        'priority': 'u=1, i',
+        'referer': f'{BASE_URL}/',
+        'sec-ch-ua': '"Not?A_Brand";v="99", "Chromium";v="130"',
+        'sec-ch-ua-mobile': '?0',
+        'sec-ch-ua-platform': '"Linux"',
+        'sec-fetch-dest': 'empty',
+        'sec-fetch-mode': 'cors',
+        'sec-fetch-site': 'same-origin',
+        'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36'
+    }
 
     json_data = {
-        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
-        "previewToken": None,
-        "userId": None,
-        "codeModelMode": True,
         "agentMode": agent_mode,
-        "trendingAgentMode": trending_agent_mode,
-        "isMicMode": False,
-        "userSystemPrompt": None,
-        "maxTokens": request.max_tokens,
-        "playgroundTopP": request.top_p,
-        "playgroundTemperature": request.temperature,
-        "isChromeExt": False,
-        "githubToken": None,
         "clickedAnswer2": False,
         "clickedAnswer3": False,
         "clickedForceWebSearch": False,
-        "visitFromDelta": False,
-        "mobileClient": False,
+        "codeModelMode": True,
+        "githubToken": None,
         "id": chat_id,
-        "userSelectedModel": user_selected_model,
-        "validated": hid
+        "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 if model in USER_SELECTED_MODELS else None,
+        "userSystemPrompt": None,
+        "validated": getHid(),
+        "visitFromDelta": False,
     }
 
     async with httpx.AsyncClient() as client:
@@ -113,7 +123,7 @@ async def process_streaming_response(request: ChatRequest):
             async with client.stream(
                 "POST",
                 f"{BASE_URL}/api/chat",
-                headers=headers,
+                headers=headers_api_chat,
                 json=json_data,
                 timeout=100,
             ) as response:
@@ -123,87 +133,100 @@ async def process_streaming_response(request: ChatRequest):
                     if line:
                         content = line
                         if "https://www.blackbox.ai" in content:
-                            logger.warning("Invalid hid detected, refreshing hid")
-                            validate.getHid(force_refresh=True)
-                            content = "hid has been refreshed, please retry"
-                            logger.info(f"hid refreshed due to content: {content}")
+                            getHid(True)
+                            content = "HID has been refreshed, please start a new conversation.\n"
                             yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
                             break
                         if content.startswith("$@$v=undefined-rv1$@$"):
                             content = content[21:]
-                        yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
+                        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:
-            logger.error(f"HTTP error occurred: {e}")
+            logger.error(f"HTTP error occurred for Chat ID {chat_id}: {e}")
             raise HTTPException(status_code=e.response.status_code, detail=str(e))
         except httpx.RequestError as e:
-            logger.error(f"Error occurred during request: {e}")
+            logger.error(f"Error occurred during request for Chat ID {chat_id}: {e}")
             raise HTTPException(status_code=500, detail=str(e))
 
+# Process non-streaming response
 async def process_non_streaming_response(request: ChatRequest):
-    agent_mode = AGENT_MODE.get(request.model, {})
-    trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
-    model_prefix = MODEL_PREFIXES.get(request.model, "")
-
-    hid = validate.getHid()
-    logger.info(f"Using hid: {hid} for model: {request.model}")
-
-    user_selected_model = MODEL_MAPPING.get(request.model, request.model)
-    logger.info(f"User selected model: {user_selected_model}")
-
-    chat_id = generate_chat_id()
-    logger.info(f"Generated chat_id: {chat_id} for request.")
+    chat_id = generate_id()
+    logger.info(f"Generated Chat ID: {chat_id} - Model: {request.model}")
+
+    model = get_model(request.model)
+    agent_mode = AGENT_MODE.get(model, {})
+    trending_agent_mode = TRENDING_AGENT_MODE.get(model, {})
+    model_prefix = MODEL_PREFIXES.get(model, "")
+
+    headers_api_chat = {
+        'accept': '*/*',
+        'accept-language': 'en-US,en;q=0.9',
+        'cache-control': 'no-cache',
+        'content-type': 'application/json',
+        'origin': BASE_URL,
+        'pragma': 'no-cache',
+        'priority': 'u=1, i',
+        'referer': f'{BASE_URL}/',
+        'sec-ch-ua': '"Not?A_Brand";v="99", "Chromium";v="130"',
+        'sec-ch-ua-mobile': '?0',
+        'sec-ch-ua-platform': '"Linux"',
+        'sec-fetch-dest': 'empty',
+        'sec-fetch-mode': 'cors',
+        'sec-fetch-site': 'same-origin',
+        'user-agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36'
+    }
 
     json_data = {
-        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
-        "previewToken": None,
-        "userId": None,
-        "codeModelMode": True,
         "agentMode": agent_mode,
-        "trendingAgentMode": trending_agent_mode,
-        "isMicMode": False,
-        "userSystemPrompt": None,
-        "maxTokens": request.max_tokens,
-        "playgroundTopP": request.top_p,
-        "playgroundTemperature": request.temperature,
-        "isChromeExt": False,
-        "githubToken": None,
         "clickedAnswer2": False,
         "clickedAnswer3": False,
         "clickedForceWebSearch": False,
-        "visitFromDelta": False,
-        "mobileClient": False,
+        "codeModelMode": True,
+        "githubToken": None,
         "id": chat_id,
-        "userSelectedModel": user_selected_model,
-        "validated": hid
+        "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 if model in USER_SELECTED_MODELS else None,
+        "userSystemPrompt": None,
+        "validated": getHid(),
+        "visitFromDelta": False,
     }
+
     full_response = ""
     async with httpx.AsyncClient() as client:
         try:
             async with client.stream(
-                method="POST", url=f"{BASE_URL}/api/chat", headers=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():
                     full_response += chunk
         except httpx.HTTPStatusError as e:
-            logger.error(f"HTTP error occurred: {e}")
+            logger.error(f"HTTP error occurred for Chat ID {chat_id}: {e}")
             raise HTTPException(status_code=e.response.status_code, detail=str(e))
         except httpx.RequestError as e:
-            logger.error(f"Error occurred during request: {e}")
+            logger.error(f"Error occurred during request for Chat ID {chat_id}: {e}")
             raise HTTPException(status_code=500, detail=str(e))
 
     if "https://www.blackbox.ai" in full_response:
-        logger.warning("Invalid hid detected in response, refreshing hid")
-        validate.getHid(force_refresh=True)
-        full_response = "hid has been refreshed, please retry"
-        logger.info("hid refreshed due to response content")
-
+        getHid(True)
+        full_response = "HID has been refreshed, please start a new conversation."
     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()}",
         "object": "chat.completion",
@@ -212,7 +235,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",
             }
         ],