Update api/utils.py

api/utils.py

@@ -1,24 +1,35 @@
 from datetime import datetime
-from http.client import HTTPException
 import json
-from typing import Any, Dict, Optional
 import uuid
+import asyncio
+import random
+import string
+from typing import Any, Dict, Optional
 
 import httpx
-from api import validate
-from api.config import MODEL_MAPPING, headers
-from fastapi import Depends, security
-from fastapi.security import HTTPAuthorizationCredentials
-
-from api.config import APP_SECRET, BASE_URL
-from api.config import MODEL_MAPPING, headers, agentMode, trendingAgentMode
+from fastapi import HTTPException
+from api import validate  # Import validate to use getHid
+from api.config import (
+    MODEL_MAPPING,
+    get_headers_api_chat,
+    get_headers_chat,
+    BASE_URL,
+    AGENT_MODE,
+    TRENDING_AGENT_MODE,
+    MODEL_PREFIXES,
+    MODEL_REFERERS
+)
 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
 ) -> Dict[str, Any]:
@@ -37,52 +48,79 @@ 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
-
-
-def message_to_dict(message):
-    if isinstance(message.content, str):
-        return {"role": message.role, "content": message.content}
-    elif isinstance(message.content, list) and len(message.content) == 2:
+# 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": message.content[0]["text"],
+            "content": content,
             "data": {
                 "imageBase64": message.content[1]["image_url"]["url"],
                 "fileText": "",
-                "title": "snapshoot",
+                "title": "snapshot",
             },
         }
-    else:
-        return {"role": message.role, "content": message.content}
+    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_REFERERS."""
+    if model in MODEL_REFERERS:
+        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()
+    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)
+    validated_token = validate.getHid()  # Get the validated token from validate.py
+
+    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' (Chat ID: {chat_id})")
+        await asyncio.sleep(delay_seconds)
 
-async def process_streaming_response(request: ChatRequest):
     json_data = {
-        "messages": [message_to_dict(msg) for msg in request.messages],
-        "previewToken": None,
-        "userId": None,
+        "agentMode": agent_mode,
+        "clickedAnswer2": False,
+        "clickedAnswer3": False,
+        "clickedForceWebSearch": False,
         "codeModelMode": True,
-        "agentMode": agentMode,
-        "trendingAgentMode": trendingAgentMode,
+        "githubToken": None,
+        "id": chat_id,
+        "isChromeExt": False,
         "isMicMode": False,
-        "userSystemPrompt": None,
         "maxTokens": request.max_tokens,
-        "playgroundTopP": request.top_p,
+        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
+        "mobileClient": False,
         "playgroundTemperature": request.temperature,
-        "isChromeExt": False,
-        "githubToken": None,
-        "clickedAnswer2": False,
-        "clickedAnswer3": False,
-        "clickedForceWebSearch": False,
+        "playgroundTopP": request.top_p,
+        "previewToken": None,
+        "trendingAgentMode": trending_agent_mode,
+        "userId": None,
+        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
+        "userSystemPrompt": None,
+        "validated": validated_token,
         "visitFromDelta": False,
-        "mobileClient": False,
-        "userSelectedModel": MODEL_MAPPING.get(request.model),
-        "validated": validate.getHid()
     }
 
     async with httpx.AsyncClient() as client:
@@ -90,7 +128,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:
@@ -98,62 +136,84 @@ async def process_streaming_response(request: ChatRequest):
                 async for line in response.aiter_lines():
                     timestamp = int(datetime.now().timestamp())
                     if line:
-                        content = line + "\n"
-                        if "https://www.blackbox.ai" in content:
-                            validate.getHid(True)
-                            content = "hid已刷新,重新对话即可\n"
-                            yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
-                            break
+                        content = line
                         if content.startswith("$@$v=undefined-rv1$@$"):
-                            yield f"data: {json.dumps(create_chat_completion_data(content[21:], request.model, timestamp))}\n\n"
-                        else:
-                            yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
+                            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:
-            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 with headers from config.py
 async def process_non_streaming_response(request: ChatRequest):
+    chat_id = generate_chat_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)
+    headers_chat = get_headers_chat(referer_url, next_action=str(uuid.uuid4()), next_router_state_tree=json.dumps([""]))
+    validated_token = validate.getHid()  # Get the validated token from validate.py
+
+    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' (Chat ID: {chat_id})")
+        await asyncio.sleep(delay_seconds)
+
     json_data = {
-        "messages": [message_to_dict(msg) for msg in request.messages],
-        "previewToken": None,
-        "userId": None,
+        "agentMode": agent_mode,
+        "clickedAnswer2": False,
+        "clickedAnswer3": False,
+        "clickedForceWebSearch": False,
         "codeModelMode": True,
-        "agentMode": agentMode,
-        "trendingAgentMode": trendingAgentMode,
+        "githubToken": None,
+        "id": chat_id,
+        "isChromeExt": False,
         "isMicMode": False,
-        "userSystemPrompt": None,
         "maxTokens": request.max_tokens,
-        "playgroundTopP": request.top_p,
+        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
+        "mobileClient": False,
         "playgroundTemperature": request.temperature,
-        "isChromeExt": False,
-        "githubToken": None,
-        "clickedAnswer2": False,
-        "clickedAnswer3": False,
-        "clickedForceWebSearch": False,
+        "playgroundTopP": request.top_p,
+        "previewToken": None,
+        "trendingAgentMode": trending_agent_mode,
+        "userId": None,
+        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
+        "userSystemPrompt": None,
+        "validated": validated_token,
         "visitFromDelta": False,
-        "mobileClient": False,
-        "userSelectedModel": MODEL_MAPPING.get(request.model),
-        "validated": validate.getHid()
     }
+
     full_response = ""
     async with httpx.AsyncClient() as client:
-        async with client.stream(
-            method="POST", url=f"{BASE_URL}/api/chat", headers=headers, json=json_data
-        ) as response:
-            async for chunk in response.aiter_text():
-                full_response += chunk
-    if "https://www.blackbox.ai" in full_response:
-        validate.getHid(True)
-        full_response = "hid已刷新，重新对话即可"
+        try:
+            async with client.stream(
+                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 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 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()}",
         "object": "chat.completion",
@@ -162,7 +222,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",
             }
         ],