Update api/utils.py

api/utils.py

@@ -1,27 +1,23 @@
 from datetime import datetime
-import uuid
-import asyncio
-import random
+from http.client import HTTPException
+import json
 from typing import Any, Dict, Optional
+import uuid
 
 import httpx
-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,
-)
+from api import validate
+from api.config import MODEL_MAPPING, headers, AGENT_MODE, TRENDING_AGENT_MODE
+from fastapi import Depends, security
+from fastapi.security import HTTPAuthorizationCredentials
+
+from api.config import APP_SECRET, BASE_URL
 from api.models import ChatRequest
+
 from api.logger import setup_logger
 
 logger = setup_logger(__name__)
 
-# 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]:
@@ -40,61 +36,55 @@ def create_chat_completion_data(
         "usage": None,
     }
 
-# 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]:
+
+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:
         return {
             "role": message.role,
-            "content": content,
+            "content": message.content[0]["text"],
             "data": {
                 "imageBase64": message.content[1]["image_url"]["url"],
                 "fileText": "",
                 "title": "snapshot",
             },
         }
-    return {"role": message.role, "content": content}
+    else:
+        return {"role": message.role, "content": message.content}
 
-# Process streaming response with headers from config.py
-async def process_streaming_response(request: ChatRequest):
-    logger.info(f"Processing streaming response for Model: {request.model}")
 
+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, "")
-
-    headers_api_chat = get_headers_api_chat(BASE_URL)
-    validated_token = validate.getHid()
-    logger.info(f"Retrieved validated token: {validated_token}")
-
-    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)
 
     json_data = {
-        "agentMode": agent_mode,
-        "clickedAnswer2": False,
-        "clickedAnswer3": False,
-        "clickedForceWebSearch": False,
+        "messages": [message_to_dict(msg) for msg in request.messages],
+        "previewToken": None,
+        "userId": None,
         "codeModelMode": True,
-        "githubToken": None,
-        "isChromeExt": False,
+        "agentMode": agent_mode,  # Populate agentMode
+        "trendingAgentMode": trending_agent_mode,  # Populate trendingAgentMode
         "isMicMode": False,
+        "userSystemPrompt": None,
         "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": validated_token,
+        "playgroundTemperature": request.temperature,
+        "isChromeExt": False,
+        "githubToken": None,
+        "clickedAnswer2": False,
+        "clickedAnswer3": False,
+        "clickedForceWebSearch": False,
         "visitFromDelta": False,
+        "mobileClient": False,
+        "userSelectedModel": MODEL_MAPPING.get(request.model),
+        "validated": validate.getHid()
     }
 
     async with httpx.AsyncClient() as client:
@@ -102,7 +92,7 @@ async def process_streaming_response(request: ChatRequest):
             async with client.stream(
                 "POST",
                 f"{BASE_URL}/api/chat",
-                headers=headers_api_chat,
+                headers=headers,
                 json=json_data,
                 timeout=100,
             ) as response:
@@ -110,9 +100,18 @@ async def process_streaming_response(request: ChatRequest):
                 async for line in response.aiter_lines():
                     timestamp = int(datetime.now().timestamp())
                     if line:
-                        # Stream line directly without additional processing or transformation
-                        yield f"data: {line}\n\n"
-
+                        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
+                        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"
+
+                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}")
@@ -121,62 +120,46 @@ async def process_streaming_response(request: ChatRequest):
             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):
-    logger.info(f"Processing non-streaming response for Model: {request.model}")
 
+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, "")
-
-    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([""]))
-    validated_token = validate.getHid()
-
-    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'")
-        await asyncio.sleep(delay_seconds)
 
     json_data = {
-        "agentMode": agent_mode,
-        "clickedAnswer2": False,
-        "clickedAnswer3": False,
-        "clickedForceWebSearch": False,
+        "messages": [message_to_dict(msg) for msg in request.messages],
+        "previewToken": None,
+        "userId": None,
         "codeModelMode": True,
-        "githubToken": None,
-        "isChromeExt": False,
+        "agentMode": agent_mode,  # Populate agentMode
+        "trendingAgentMode": trending_agent_mode,  # Populate trendingAgentMode
         "isMicMode": False,
+        "userSystemPrompt": None,
         "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": validated_token,
+        "playgroundTemperature": request.temperature,
+        "isChromeExt": False,
+        "githubToken": None,
+        "clickedAnswer2": False,
+        "clickedAnswer3": False,
+        "clickedForceWebSearch": False,
         "visitFromDelta": False,
+        "mobileClient": False,
+        "userSelectedModel": MODEL_MAPPING.get(request.model),
+        "validated": validate.getHid()
     }
 
     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
-            ) 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}")
-            raise HTTPException(status_code=e.response.status_code, detail=str(e))
-        except httpx.RequestError as e:
-            logger.error(f"Error occurred during request: {e}")
-            raise HTTPException(status_code=500, detail=str(e))
-
+        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已刷新，重新对话即可"
+    if full_response.startswith("$@$v=undefined-rv1$@$"):
+        full_response = full_response[21:]
     return {
         "id": f"chatcmpl-{uuid.uuid4()}",
         "object": "chat.completion",