This commit is contained in:
Timothy Jaeryang Baek 2025-02-12 23:49:00 -08:00
parent c28d82b10d
commit a1dc2664c2
3 changed files with 3 additions and 13 deletions

View File

@ -74,7 +74,6 @@ async def generate_direct_chat_completion(
session_id = metadata.get("session_id") session_id = metadata.get("session_id")
request_id = str(uuid.uuid4()) # Generate a unique request ID request_id = str(uuid.uuid4()) # Generate a unique request ID
event_emitter = get_event_emitter(metadata)
event_caller = get_event_call(metadata) event_caller = get_event_call(metadata)
channel = f"{user_id}:{session_id}:{request_id}" channel = f"{user_id}:{session_id}:{request_id}"
@ -191,7 +190,7 @@ async def generate_chat_completion(
except Exception as e: except Exception as e:
raise e raise e
if request.state.direct: if getattr(request.state, "direct", False):
return await generate_direct_chat_completion( return await generate_direct_chat_completion(
request, form_data, user=user, models=models request, form_data, user=user, models=models
) )

View File

@ -778,17 +778,7 @@ async def process_chat_payload(request, form_data, metadata, user, model):
if "document" in source: if "document" in source:
for doc_idx, doc_context in enumerate(source["document"]): for doc_idx, doc_context in enumerate(source["document"]):
doc_metadata = source.get("metadata") context_string += f"<source><source_id>{doc_idx}</source_id><source_context>{doc_context}</source_context></source>\n"
doc_source_id = None
if doc_metadata:
doc_source_id = doc_metadata[doc_idx].get("source", source_id)
if source_id:
context_string += f"<source><source_id>{doc_source_id if doc_source_id is not None else source_id}</source_id><source_context>{doc_context}</source_context></source>\n"
else:
# If there is no source_id, then do not include the source_id tag
context_string += f"<source><source_context>{doc_context}</source_context></source>\n"
context_string = context_string.strip() context_string = context_string.strip()
prompt = get_last_user_message(form_data["messages"]) prompt = get_last_user_message(form_data["messages"])

View File

@ -294,6 +294,7 @@
cb({ cb({
status: true status: true
}); });
console.log({ status: true });
// res will either be SSE or JSON // res will either be SSE or JSON
const reader = res.body.getReader(); const reader = res.body.getReader();