Update api/utils.py
Browse files- api/utils.py +13 -2
api/utils.py
CHANGED
@@ -67,6 +67,9 @@ 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 |
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, {})
|
@@ -78,6 +81,9 @@ async def process_streaming_response(request: ChatRequest):
|
|
78 |
user_selected_model = MODEL_MAPPING.get(request.model, request.model)
|
79 |
logger.info(f"User selected model: {user_selected_model}")
|
80 |
|
|
|
|
|
|
|
81 |
json_data = {
|
82 |
"messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
|
83 |
"previewToken": None,
|
@@ -97,6 +103,7 @@ async def process_streaming_response(request: ChatRequest):
|
|
97 |
"clickedForceWebSearch": False,
|
98 |
"visitFromDelta": False,
|
99 |
"mobileClient": False,
|
|
|
100 |
"userSelectedModel": user_selected_model,
|
101 |
"validated": hid
|
102 |
}
|
@@ -117,7 +124,7 @@ async def process_streaming_response(request: ChatRequest):
|
|
117 |
content = line
|
118 |
if "https://www.blackbox.ai" in content:
|
119 |
logger.warning("Invalid hid detected, refreshing hid")
|
120 |
-
|
121 |
content = "hid has been refreshed, please retry"
|
122 |
logger.info(f"hid refreshed due to content: {content}")
|
123 |
yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
|
@@ -146,6 +153,9 @@ async def process_non_streaming_response(request: ChatRequest):
|
|
146 |
user_selected_model = MODEL_MAPPING.get(request.model, request.model)
|
147 |
logger.info(f"User selected model: {user_selected_model}")
|
148 |
|
|
|
|
|
|
|
149 |
json_data = {
|
150 |
"messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
|
151 |
"previewToken": None,
|
@@ -165,6 +175,7 @@ async def process_non_streaming_response(request: ChatRequest):
|
|
165 |
"clickedForceWebSearch": False,
|
166 |
"visitFromDelta": False,
|
167 |
"mobileClient": False,
|
|
|
168 |
"userSelectedModel": user_selected_model,
|
169 |
"validated": hid
|
170 |
}
|
@@ -186,7 +197,7 @@ async def process_non_streaming_response(request: ChatRequest):
|
|
186 |
|
187 |
if "https://www.blackbox.ai" in full_response:
|
188 |
logger.warning("Invalid hid detected in response, refreshing hid")
|
189 |
-
|
190 |
full_response = "hid has been refreshed, please retry"
|
191 |
logger.info("hid refreshed due to response content")
|
192 |
|
|
|
67 |
content = f"{model_prefix} {content}"
|
68 |
return {"role": message.role, "content": content}
|
69 |
|
70 |
+
def generate_chat_id() -> str:
|
71 |
+
return str(uuid.uuid4())
|
72 |
+
|
73 |
async def process_streaming_response(request: ChatRequest):
|
74 |
agent_mode = AGENT_MODE.get(request.model, {})
|
75 |
trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
|
|
|
81 |
user_selected_model = MODEL_MAPPING.get(request.model, request.model)
|
82 |
logger.info(f"User selected model: {user_selected_model}")
|
83 |
|
84 |
+
chat_id = generate_chat_id()
|
85 |
+
logger.info(f"Generated chat_id: {chat_id} for request.")
|
86 |
+
|
87 |
json_data = {
|
88 |
"messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
|
89 |
"previewToken": None,
|
|
|
103 |
"clickedForceWebSearch": False,
|
104 |
"visitFromDelta": False,
|
105 |
"mobileClient": False,
|
106 |
+
"id": chat_id,
|
107 |
"userSelectedModel": user_selected_model,
|
108 |
"validated": hid
|
109 |
}
|
|
|
124 |
content = line
|
125 |
if "https://www.blackbox.ai" in content:
|
126 |
logger.warning("Invalid hid detected, refreshing hid")
|
127 |
+
validate.getHid(force_refresh=True)
|
128 |
content = "hid has been refreshed, please retry"
|
129 |
logger.info(f"hid refreshed due to content: {content}")
|
130 |
yield f"data: {json.dumps(create_chat_completion_data(content, request.model, timestamp))}\n\n"
|
|
|
153 |
user_selected_model = MODEL_MAPPING.get(request.model, request.model)
|
154 |
logger.info(f"User selected model: {user_selected_model}")
|
155 |
|
156 |
+
chat_id = generate_chat_id()
|
157 |
+
logger.info(f"Generated chat_id: {chat_id} for request.")
|
158 |
+
|
159 |
json_data = {
|
160 |
"messages": [message_to_dict(msg, model_prefix=model_prefix) for msg in request.messages],
|
161 |
"previewToken": None,
|
|
|
175 |
"clickedForceWebSearch": False,
|
176 |
"visitFromDelta": False,
|
177 |
"mobileClient": False,
|
178 |
+
"id": chat_id,
|
179 |
"userSelectedModel": user_selected_model,
|
180 |
"validated": hid
|
181 |
}
|
|
|
197 |
|
198 |
if "https://www.blackbox.ai" in full_response:
|
199 |
logger.warning("Invalid hid detected in response, refreshing hid")
|
200 |
+
validate.getHid(force_refresh=True)
|
201 |
full_response = "hid has been refreshed, please retry"
|
202 |
logger.info("hid refreshed due to response content")
|
203 |
|