Update api/utils.py

api/utils.py

@@ -68,13 +68,15 @@ def message_to_dict(message, model_prefix: Optional[str] = None):
         return {"role": message.role, "content": content}
 
 async def process_streaming_response(request: ChatRequest):
-    model = request.model  # Use the requested model directly
-    agent_mode = AGENT_MODE.get(model, {})
-    trending_agent_mode = TRENDING_AGENT_MODE.get(model, {})
-    model_prefix = MODEL_PREFIXES.get(model, "")
+    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: {model}")
+    logger.info(f"Using hid: {hid} for model: {request.model}")
+
+    user_selected_model = MODEL_MAPPING.get(request.model, request.model)
+    logger.info(f"User selected model: {user_selected_model}")
 
     json_data = {
         "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
@@ -95,7 +97,7 @@ async def process_streaming_response(request: ChatRequest):
         "clickedForceWebSearch": False,
         "visitFromDelta": False,
         "mobileClient": False,
-        "userSelectedModel": model,  # Use the requested model
+        "userSelectedModel": user_selected_model,
         "validated": hid
     }
 
@@ -114,17 +116,17 @@ async def process_streaming_response(request: ChatRequest):
                     if line:
                         content = line
                         if "https://www.blackbox.ai" in content:
-                            validate.getHid(True)
-                            content = "hid已刷新,重新对话即可"
+                            logger.warning("Invalid hid detected, refreshing hid")
+                            hid = validate.getHid()
+                            content = "hid has been refreshed, please retry"
                             logger.info(f"hid refreshed due to content: {content}")
-                            yield f"data: {json.dumps(create_chat_completion_data(content, 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$@$"):
                             content = content[21:]
-                        # Do not strip model prefix or modify content
-                        yield f"data: {json.dumps(create_chat_completion_data(content, 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('', 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}")
@@ -134,13 +136,15 @@ async def process_streaming_response(request: ChatRequest):
             raise HTTPException(status_code=500, detail=str(e))
 
 async def process_non_streaming_response(request: ChatRequest):
-    model = request.model  # Use the requested model directly
-    agent_mode = AGENT_MODE.get(model, {})
-    trending_agent_mode = TRENDING_AGENT_MODE.get(model, {})
-    model_prefix = MODEL_PREFIXES.get(model, "")
+    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: {model}")
+    logger.info(f"Using hid: {hid} for model: {request.model}")
+
+    user_selected_model = MODEL_MAPPING.get(request.model, request.model)
+    logger.info(f"User selected model: {user_selected_model}")
 
     json_data = {
         "messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
@@ -161,7 +165,7 @@ async def process_non_streaming_response(request: ChatRequest):
         "clickedForceWebSearch": False,
         "visitFromDelta": False,
         "mobileClient": False,
-        "userSelectedModel": model,  # Use the requested model
+        "userSelectedModel": user_selected_model,
         "validated": hid
     }
     full_response = ""
@@ -181,18 +185,19 @@ async def process_non_streaming_response(request: ChatRequest):
             raise HTTPException(status_code=500, detail=str(e))
 
     if "https://www.blackbox.ai" in full_response:
-        validate.getHid(True)
-        full_response = "hid已刷新，重新对话即可"
+        logger.warning("Invalid hid detected in response, refreshing hid")
+        hid = validate.getHid()
+        full_response = "hid has been refreshed, please retry"
         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": model,
+        "model": request.model,
         "choices": [
             {
                 "index": 0,