Update api/utils.py
Browse files- api/utils.py +10 -19
api/utils.py
CHANGED
|
@@ -67,13 +67,6 @@ def message_to_dict(message, model_prefix: Optional[str] = None):
|
|
| 67 |
content = f"{model_prefix} {content}"
|
| 68 |
return {"role": message.role, "content": content}
|
| 69 |
|
| 70 |
-
def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
|
| 71 |
-
"""Remove the model prefix from the response content if present."""
|
| 72 |
-
if model_prefix and content.startswith(model_prefix):
|
| 73 |
-
logger.debug(f"Stripping prefix '{model_prefix}' from content.")
|
| 74 |
-
return content[len(model_prefix):].lstrip()
|
| 75 |
-
return content
|
| 76 |
-
|
| 77 |
async def process_streaming_response(request: ChatRequest):
|
| 78 |
agent_mode = AGENT_MODE.get(request.model, {})
|
| 79 |
trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
|
|
@@ -118,18 +111,17 @@ async def process_streaming_response(request: ChatRequest):
|
|
| 118 |
async for line in response.aiter_lines():
|
| 119 |
timestamp = int(datetime.now().timestamp())
|
| 120 |
if line:
|
| 121 |
-
content = line
|
| 122 |
if "https://www.blackbox.ai" in content:
|
| 123 |
validate.getHid(True)
|
| 124 |
-
content = "
|
| 125 |
logger.info(f"hid refreshed due to content: {content}")
|
| 126 |
yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
|
| 127 |
break
|
| 128 |
if content.startswith("$@$v=undefined-rv1$@$"):
|
| 129 |
-
content = content[21:]
|
| 130 |
-
#
|
| 131 |
-
|
| 132 |
-
yield f"data: {json.dumps(create_chat_completion_data(cleaned_content, request.model, timestamp))}\n\n"
|
| 133 |
|
| 134 |
yield f"data: {json.dumps(create_chat_completion_data('', request.model, timestamp, 'stop'))}\n\n"
|
| 135 |
yield "data: [DONE]\n\n"
|
|
@@ -188,13 +180,12 @@ async def process_non_streaming_response(request: ChatRequest):
|
|
| 188 |
|
| 189 |
if "https://www.blackbox.ai" in full_response:
|
| 190 |
validate.getHid(True)
|
| 191 |
-
full_response = "
|
| 192 |
-
logger.info("
|
| 193 |
|
| 194 |
if full_response.startswith("$@$v=undefined-rv1$@$"):
|
| 195 |
-
full_response = full_response[21:]
|
| 196 |
-
#
|
| 197 |
-
cleaned_full_response = strip_model_prefix(full_response.strip(), model_prefix)
|
| 198 |
return {
|
| 199 |
"id": f"chatcmpl-{uuid.uuid4()}",
|
| 200 |
"object": "chat.completion",
|
|
@@ -203,7 +194,7 @@ async def process_non_streaming_response(request: ChatRequest):
|
|
| 203 |
"choices": [
|
| 204 |
{
|
| 205 |
"index": 0,
|
| 206 |
-
"message": {"role": "assistant", "content":
|
| 207 |
"finish_reason": "stop",
|
| 208 |
}
|
| 209 |
],
|
|
|
|
| 67 |
content = f"{model_prefix} {content}"
|
| 68 |
return {"role": message.role, "content": content}
|
| 69 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 70 |
async def process_streaming_response(request: ChatRequest):
|
| 71 |
agent_mode = AGENT_MODE.get(request.model, {})
|
| 72 |
trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
|
|
|
|
| 111 |
async for line in response.aiter_lines():
|
| 112 |
timestamp = int(datetime.now().timestamp())
|
| 113 |
if line:
|
| 114 |
+
content = line # Do not modify content
|
| 115 |
if "https://www.blackbox.ai" in content:
|
| 116 |
validate.getHid(True)
|
| 117 |
+
content = "hid已刷新,重新对话即可"
|
| 118 |
logger.info(f"hid refreshed due to content: {content}")
|
| 119 |
yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
|
| 120 |
break
|
| 121 |
if content.startswith("$@$v=undefined-rv1$@$"):
|
| 122 |
+
content = content[21:]
|
| 123 |
+
# Do not strip model prefix or modify content
|
| 124 |
+
yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
|
|
|
|
| 125 |
|
| 126 |
yield f"data: {json.dumps(create_chat_completion_data('', request.model, timestamp, 'stop'))}\n\n"
|
| 127 |
yield "data: [DONE]\n\n"
|
|
|
|
| 180 |
|
| 181 |
if "https://www.blackbox.ai" in full_response:
|
| 182 |
validate.getHid(True)
|
| 183 |
+
full_response = "hid已刷新,重新对话即可"
|
| 184 |
+
logger.info("hid refreshed due to response content")
|
| 185 |
|
| 186 |
if full_response.startswith("$@$v=undefined-rv1$@$"):
|
| 187 |
+
full_response = full_response[21:]
|
| 188 |
+
# Do not strip model prefix or modify content
|
|
|
|
| 189 |
return {
|
| 190 |
"id": f"chatcmpl-{uuid.uuid4()}",
|
| 191 |
"object": "chat.completion",
|
|
|
|
| 194 |
"choices": [
|
| 195 |
{
|
| 196 |
"index": 0,
|
| 197 |
+
"message": {"role": "assistant", "content": full_response},
|
| 198 |
"finish_reason": "stop",
|
| 199 |
}
|
| 200 |
],
|