Update api/utils.py

api/utils.py

@@ -1,27 +1,21 @@
+# api/utils.py
+
 from datetime import datetime
+from http.client import HTTPException
 import json
-import uuid
 from typing import Any, Dict, Optional
+import uuid
 
 import httpx
-from fastapi import HTTPException, Depends
-from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
-
-from . import validate
-from .config import (
-    MODEL_MAPPING,
-    AGENT_MODE,
-    TRENDING_AGENT_MODE,
-    MODEL_PREFIXES,
-    BASE_URL,
-    APP_SECRET,
-)
-from .models import ChatRequest
-from .logger import setup_logger
+from api.config import MODEL_MAPPING, headers, BASE_URL, validate, model_prefixes
+from fastapi import Depends
+from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
+from api.models import ChatRequest
+from api.logger import setup_logger
 
 logger = setup_logger(__name__)
-security = HTTPBearer()
 
+from api.config import resolve_model
 
 def create_chat_completion_data(
     content: str, model: str, timestamp: int, finish_reason: Optional[str] = None
@@ -41,39 +35,37 @@ def create_chat_completion_data(
         "usage": None,
     }
 
-
-def verify_app_secret(credentials: HTTPAuthorizationCredentials = Depends(security)):
+def verify_app_secret(credentials: HTTPAuthorizationCredentials = Depends(HTTPBearer())):
+    from api.config import APP_SECRET
     if credentials.credentials != APP_SECRET:
         raise HTTPException(status_code=403, detail="Invalid APP_SECRET")
     return credentials.credentials
 
-
-def message_to_dict(message, model_prefix: Optional[str] = None):
-    content = message.content
-    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 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].get("text", ""),
             "data": {
-                "imageBase64": message.content[1]["image_url"]["url"],
+                "imageBase64": message.content[1].get("image_url", {}).get("url", ""),
                 "fileText": "",
                 "title": "snapshot",
             },
         }
-    return {"role": message.role, "content": content}
-
+    else:
+        return {"role": message.role, "content": message.content}
 
-async def process_streaming_response(request: ChatRequest):
-    model_prefix = MODEL_PREFIXES.get(request.model, "")
+async def process_streaming_response(request: ChatRequest, resolved_model: str):
+    from api.config import validate
     json_data = {
-        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
+        "messages": [message_to_dict(msg) for msg in request.messages],
         "previewToken": None,
         "userId": None,
         "codeModelMode": True,
-        "agentMode": AGENT_MODE.get(request.model, {}),
-        "trendingAgentMode": TRENDING_AGENT_MODE.get(request.model, {}),
+        "agentMode": {},  # Adjust if agentMode is needed
+        "trendingAgentMode": {},  # Adjust if trendingAgentMode is needed
         "isMicMode": False,
         "userSystemPrompt": None,
         "maxTokens": request.max_tokens,
@@ -86,17 +78,8 @@ async def process_streaming_response(request: ChatRequest):
         "clickedForceWebSearch": False,
         "visitFromDelta": False,
         "mobileClient": False,
-        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
-        "validated": validate.get_hid(),
-    }
-
-    headers = {
-        "Content-Type": "application/json",
-        "User-Agent": (
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
-            "AppleWebKit/537.36 (KHTML, like Gecko) "
-            "Chrome/91.0.4472.124 Safari/537.36"
-        ),
+        "userSelectedModel": resolved_model,
+        "validated": validate.getHid()
     }
 
     async with httpx.AsyncClient() as client:
@@ -112,17 +95,18 @@ async def process_streaming_response(request: ChatRequest):
                 async for line in response.aiter_lines():
                     timestamp = int(datetime.now().timestamp())
                     if line:
-                        content = line
+                        content = line + "\n"
                         if "https://www.blackbox.ai" in content:
-                            validate.get_hid(True)
-                            content = "HID refreshed, please start a new conversation.\n"
-                            yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
+                            validate.getHid(True)
+                            content = "hid已刷新,重新对话即可\n"
+                            yield f"data: {json.dumps(create_chat_completion_data(content, resolved_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"
+                            yield f"data: {json.dumps(create_chat_completion_data(content[21:], resolved_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('', request.model, timestamp, 'stop'))}\n\n"
+                yield f"data: {json.dumps(create_chat_completion_data('', resolved_model, timestamp, 'stop'))}\n\n"
                 yield "data: [DONE]\n\n"
         except httpx.HTTPStatusError as e:
             logger.error(f"HTTP error occurred: {e}")
@@ -131,16 +115,15 @@ async def process_streaming_response(request: ChatRequest):
             logger.error(f"Error occurred during request: {e}")
             raise HTTPException(status_code=500, detail=str(e))
 
-
-async def process_non_streaming_response(request: ChatRequest):
-    model_prefix = MODEL_PREFIXES.get(request.model, "")
+async def process_non_streaming_response(request: ChatRequest, resolved_model: str):
+    from api.config import validate
     json_data = {
-        "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
+        "messages": [message_to_dict(msg) for msg in request.messages],
         "previewToken": None,
         "userId": None,
         "codeModelMode": True,
-        "agentMode": AGENT_MODE.get(request.model, {}),
-        "trendingAgentMode": TRENDING_AGENT_MODE.get(request.model, {}),
+        "agentMode": {},  # Adjust if agentMode is needed
+        "trendingAgentMode": {},  # Adjust if trendingAgentMode is needed
         "isMicMode": False,
         "userSystemPrompt": None,
         "maxTokens": request.max_tokens,
@@ -153,43 +136,35 @@ async def process_non_streaming_response(request: ChatRequest):
         "clickedForceWebSearch": False,
         "visitFromDelta": False,
         "mobileClient": False,
-        "userSelectedModel": MODEL_MAPPING.get(request.model, request.model),
-        "validated": validate.get_hid(),
-    }
-
-    headers = {
-        "Content-Type": "application/json",
-        "User-Agent": (
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
-            "AppleWebKit/537.36 (KHTML, like Gecko) "
-            "Chrome/91.0.4472.124 Safari/537.36"
-        ),
+        "userSelectedModel": resolved_model,
+        "validated": validate.getHid()
     }
-
     full_response = ""
     async with httpx.AsyncClient() as client:
         try:
-            response = await client.post(f"{BASE_URL}/api/chat", headers=headers, json=json_data)
-            response.raise_for_status()
-            full_response = response.text
+            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))
-
+    
     if "https://www.blackbox.ai" in full_response:
-        validate.get_hid(True)
-        full_response = "HID refreshed, please start a new conversation."
+        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",
         "created": int(datetime.now().timestamp()),
-        "model": request.model,
+        "model": resolved_model,
         "choices": [
             {
                 "index": 0,