Update api/utils.py

api/utils.py

@@ -11,6 +11,7 @@ from api import validate
 from api.config import (
     APP_SECRET,
     BASE_URL,
+    MODEL_MAPPING,
     AGENT_MODE,
     TRENDING_AGENT_MODE,
     MODEL_PREFIXES,
@@ -74,6 +75,10 @@ async def process_streaming_response(request: ChatRequest):
     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"Processing request for model: {request.model}")
+    logger.info(f"Using userSelectedModel: {user_selected_model}")
+
     json_data = {
         "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
         "previewToken": None,
@@ -93,7 +98,7 @@ async def process_streaming_response(request: ChatRequest):
         "clickedForceWebSearch": False,
         "visitFromDelta": False,
         "mobileClient": False,
-        "userSelectedModel": request.model,  # Use the requested model directly
+        "userSelectedModel": user_selected_model,
         "validated": hid
     }
 
@@ -110,7 +115,7 @@ async def process_streaming_response(request: ChatRequest):
                 async for line in response.aiter_lines():
                     timestamp = int(datetime.now().timestamp())
                     if line:
-                        content = line  # Do not modify content
+                        content = line
                         if "https://www.blackbox.ai" in content:
                             validate.getHid(True)
                             content = "hid已刷新,重新对话即可"
@@ -119,7 +124,6 @@ async def process_streaming_response(request: ChatRequest):
                             break
                         if content.startswith("$@$v=undefined-rv1$@$"):
                             content = content[21:]
-                        # Do not strip model prefix or modify content
                         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"
@@ -131,71 +135,4 @@ 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):
-    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}")
-
-    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,
-        "userSelectedModel": request.model,  # Use the requested model directly
-        "validated": hid
-    }
-    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))
-
-    if "https://www.blackbox.ai" in full_response:
-        validate.getHid(True)
-        full_response = "hid已刷新，重新对话即可"
-        logger.info("hid refreshed due to response content")
-
-    if full_response.startswith("$@$v=undefined-rv1$@$"):
-        full_response = full_response[21:]
-    # Do not strip model prefix or modify content
-    return {
-        "id": f"chatcmpl-{uuid.uuid4()}",
-        "object": "chat.completion",
-        "created": int(datetime.now().timestamp()),
-        "model": request.model,
-        "choices": [
-            {
-                "index": 0,
-                "message": {"role": "assistant", "content": full_response},
-                "finish_reason": "stop",
-            }
-        ],
-        "usage": None,
-    }
+# Similar updates for process_non_streaming_response