Update api/utils.py

api/utils.py

@@ -1,5 +1,3 @@
-# api/utils.py
-
 from datetime import datetime
 from http.client import HTTPException
 import json
@@ -7,15 +5,19 @@ from typing import Any, Dict, Optional
 import uuid
 
 import httpx
-from api.config import MODEL_MAPPING, headers, BASE_URL, validate, model_prefixes
-from fastapi import Depends
-from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
+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 api.models import ChatRequest
+
 from api.logger import setup_logger
 
 logger = setup_logger(__name__)
 
-from api.config import resolve_model
 
 def create_chat_completion_data(
     content: str, model: str, timestamp: int, finish_reason: Optional[str] = None
@@ -35,37 +37,38 @@ def create_chat_completion_data(
         "usage": None,
     }
 
-def verify_app_secret(credentials: HTTPAuthorizationCredentials = Depends(HTTPBearer())):
-    from api.config import APP_SECRET
+
+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": message.content[0].get("text", ""),
+            "content": message.content[0]["text"],
             "data": {
-                "imageBase64": message.content[1].get("image_url", {}).get("url", ""),
+                "imageBase64": message.content[1]["image_url"]["url"],
                 "fileText": "",
-                "title": "snapshot",
+                "title": "snapshoot",
             },
         }
     else:
         return {"role": message.role, "content": message.content}
 
-async def process_streaming_response(request: ChatRequest, resolved_model: str):
-    from api.config import validate
+
+async def process_streaming_response(request: ChatRequest):
     json_data = {
         "messages": [message_to_dict(msg) for msg in request.messages],
         "previewToken": None,
         "userId": None,
         "codeModelMode": True,
-        "agentMode": {},  # Adjust if agentMode is needed
-        "trendingAgentMode": {},  # Adjust if trendingAgentMode is needed
+        "agentMode": agentMode,
+        "trendingAgentMode": trendingAgentMode,
         "isMicMode": False,
         "userSystemPrompt": None,
         "maxTokens": request.max_tokens,
@@ -78,7 +81,7 @@ async def process_streaming_response(request: ChatRequest, resolved_model: str):
         "clickedForceWebSearch": False,
         "visitFromDelta": False,
         "mobileClient": False,
-        "userSelectedModel": resolved_model,
+        "userSelectedModel": MODEL_MAPPING.get(request.model),
         "validated": validate.getHid()
     }
 
@@ -99,14 +102,14 @@ async def process_streaming_response(request: ChatRequest, resolved_model: str):
                         if "https://www.blackbox.ai" in content:
                             validate.getHid(True)
                             content = "hid已刷新,重新对话即可\n"
-                            yield f"data: {json.dumps(create_chat_completion_data(content, resolved_model, timestamp))}\n\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:], resolved_model, timestamp))}\n\n"
+                            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, resolved_model, timestamp))}\n\n"
+                            yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
 
-                yield f"data: {json.dumps(create_chat_completion_data('', resolved_model, timestamp, 'stop'))}\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}")
@@ -115,15 +118,15 @@ async def process_streaming_response(request: ChatRequest, resolved_model: str):
             logger.error(f"Error occurred during request: {e}")
             raise HTTPException(status_code=500, detail=str(e))
 
-async def process_non_streaming_response(request: ChatRequest, resolved_model: str):
-    from api.config import validate
+
+async def process_non_streaming_response(request: ChatRequest):
     json_data = {
         "messages": [message_to_dict(msg) for msg in request.messages],
         "previewToken": None,
         "userId": None,
         "codeModelMode": True,
-        "agentMode": {},  # Adjust if agentMode is needed
-        "trendingAgentMode": {},  # Adjust if trendingAgentMode is needed
+        "agentMode": agentMode,
+        "trendingAgentMode": trendingAgentMode,
         "isMicMode": False,
         "userSystemPrompt": None,
         "maxTokens": request.max_tokens,
@@ -136,25 +139,16 @@ async def process_non_streaming_response(request: ChatRequest, resolved_model: s
         "clickedForceWebSearch": False,
         "visitFromDelta": False,
         "mobileClient": False,
-        "userSelectedModel": resolved_model,
+        "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, 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已刷新，重新对话即可"
@@ -164,7 +158,7 @@ async def process_non_streaming_response(request: ChatRequest, resolved_model: s
         "id": f"chatcmpl-{uuid.uuid4()}",
         "object": "chat.completion",
         "created": int(datetime.now().timestamp()),
-        "model": resolved_model,
+        "model": request.model,
         "choices": [
             {
                 "index": 0,