Update api/utils.py
Browse files- api/utils.py +15 -7
api/utils.py
CHANGED
@@ -85,7 +85,7 @@ async def process_streaming_response(request: ChatRequest):
|
|
85 |
"clickedForceWebSearch": False,
|
86 |
"visitFromDelta": False,
|
87 |
"mobileClient": False,
|
88 |
-
"userSelectedModel": MODEL_MAPPING.get(request.model),
|
89 |
"validated": validate.getHid()
|
90 |
}
|
91 |
|
@@ -151,17 +151,25 @@ async def process_non_streaming_response(request: ChatRequest):
|
|
151 |
"clickedForceWebSearch": False,
|
152 |
"visitFromDelta": False,
|
153 |
"mobileClient": False,
|
154 |
-
"userSelectedModel": MODEL_MAPPING.get(request.model),
|
155 |
"validated": validate.getHid()
|
156 |
}
|
157 |
|
158 |
full_response = ""
|
159 |
async with httpx.AsyncClient() as client:
|
160 |
-
|
161 |
-
|
162 |
-
|
163 |
-
|
164 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
165 |
if "https://www.blackbox.ai" in full_response:
|
166 |
validate.getHid(True)
|
167 |
full_response = "hid已刷新,重新对话即可"
|
|
|
85 |
"clickedForceWebSearch": False,
|
86 |
"visitFromDelta": False,
|
87 |
"mobileClient": False,
|
88 |
+
"userSelectedModel": MODEL_MAPPING.get(request.model, request.model), # Added default
|
89 |
"validated": validate.getHid()
|
90 |
}
|
91 |
|
|
|
151 |
"clickedForceWebSearch": False,
|
152 |
"visitFromDelta": False,
|
153 |
"mobileClient": False,
|
154 |
+
"userSelectedModel": MODEL_MAPPING.get(request.model, request.model), # Added default
|
155 |
"validated": validate.getHid()
|
156 |
}
|
157 |
|
158 |
full_response = ""
|
159 |
async with httpx.AsyncClient() as client:
|
160 |
+
try:
|
161 |
+
async with client.stream(
|
162 |
+
method="POST", url=f"{BASE_URL}/api/chat", headers=headers, json=json_data
|
163 |
+
) as response:
|
164 |
+
response.raise_for_status()
|
165 |
+
async for chunk in response.aiter_text():
|
166 |
+
full_response += chunk
|
167 |
+
except httpx.HTTPStatusError as e:
|
168 |
+
logger.error(f"HTTP error occurred: {e}")
|
169 |
+
raise HTTPException(status_code=e.response.status_code, detail=str(e))
|
170 |
+
except httpx.RequestError as e:
|
171 |
+
logger.error(f"Error occurred during request: {e}")
|
172 |
+
raise HTTPException(status_code=500, detail=str(e))
|
173 |
if "https://www.blackbox.ai" in full_response:
|
174 |
validate.getHid(True)
|
175 |
full_response = "hid已刷新,重新对话即可"
|