This commit is contained in:
Timothy Jaeryang Baek committed 2026-02-04 21:07:30 -06:00
1 parent 6320a9aaa9
commit 8b75d34a8a
1 file changed
+31 -18
+31 -18
View File
@@ -2400,10 +2400,20 @@ async def process_chat_payload(request, form_data, user, metadata, model):
return form_data, metadata, events return form_data, metadata, events
async def process_chat_response( async def background_tasks_handler(request, form_data, user, metadata, tasks):
request, response, form_data, user, metadata, model, events, tasks event_emitter = None
): event_caller = None
async def background_tasks_handler(): if (
"session_id" in metadata
and metadata["session_id"]
and "chat_id" in metadata
and metadata["chat_id"]
and "message_id" in metadata
and metadata["message_id"]
):
event_emitter = get_event_emitter(metadata)
event_caller = get_event_call(metadata)
message = None message = None
messages = [] messages = []
@@ -2469,9 +2479,7 @@ async def process_chat_response(
if res and isinstance(res, dict): if res and isinstance(res, dict):
if len(res.get("choices", [])) == 1: if len(res.get("choices", [])) == 1:
response_message = res.get("choices", [])[0].get( response_message = res.get("choices", [])[0].get("message", {})
"message", {}
)
follow_ups_string = response_message.get( follow_ups_string = response_message.get(
"content" "content"
@@ -2480,14 +2488,11 @@ async def process_chat_response(
follow_ups_string = "" follow_ups_string = ""
follow_ups_string = follow_ups_string[ follow_ups_string = follow_ups_string[
follow_ups_string.find("{") : follow_ups_string.rfind("}") follow_ups_string.find("{") : follow_ups_string.rfind("}") + 1
+ 1
] ]
try: try:
follow_ups = json.loads(follow_ups_string).get( follow_ups = json.loads(follow_ups_string).get("follow_ups", [])
"follow_ups", []
)
await event_emitter( await event_emitter(
{ {
"type": "chat:message:follow_ups", "type": "chat:message:follow_ups",
@@ -2559,9 +2564,7 @@ async def process_chat_response(
if not title: if not title:
title = messages[0].get("content", user_message) title = messages[0].get("content", user_message)
Chats.update_chat_title_by_id( Chats.update_chat_title_by_id(metadata["chat_id"], title)
metadata["chat_id"], title
)
await event_emitter( await event_emitter(
{ {
@@ -2624,6 +2627,10 @@ async def process_chat_response(
except Exception as e: except Exception as e:
pass pass
async def process_chat_response(
request, response, form_data, user, metadata, model, events, tasks
):
event_emitter = None event_emitter = None
event_caller = None event_caller = None
if ( if (
@@ -2756,7 +2763,9 @@ async def process_chat_response(
}, },
) )
await background_tasks_handler() await background_tasks_handler(
request, form_data, user, metadata, tasks
)
if events and isinstance(events, list): if events and isinstance(events, list):
extra_response = {} extra_response = {}
@@ -3513,7 +3522,9 @@ async def process_chat_response(
# Normalize usage data to standard format # Normalize usage data to standard format
raw_usage = data.get("usage", {}) or {} raw_usage = data.get("usage", {}) or {}
raw_usage.update(data.get("timings", {})) # llama.cpp raw_usage.update(
data.get("timings", {})
) # llama.cpp
if raw_usage: if raw_usage:
usage = normalize_usage(raw_usage) usage = normalize_usage(raw_usage)
await event_emitter( await event_emitter(
@@ -4346,7 +4357,9 @@ async def process_chat_response(
} }
) )
await background_tasks_handler() await background_tasks_handler(
request, form_data, user, metadata, tasks
)
except asyncio.CancelledError: except asyncio.CancelledError:
log.warning("Task was cancelled!") log.warning("Task was cancelled!")
await event_emitter({"type": "chat:tasks:cancel"}) await event_emitter({"type": "chat:tasks:cancel"})