refac
This commit is contained in:
1 parent
b1048fc9bc
commit
368912ca62
1 file changed
+22
-7
@@ -4493,14 +4493,29 @@ async def streaming_chat_response_handler(response, ctx):
|
|||||||
form_data["messages"],
|
form_data["messages"],
|
||||||
)
|
)
|
||||||
|
|
||||||
# Combine file and tool sources into one RAG
|
# Build context: file sources with content,
|
||||||
# template application.
|
# tool sources as citation markers only.
|
||||||
form_data["messages"] = apply_source_context_to_messages(
|
ctx = get_source_context(metadata.get("sources", []))
|
||||||
request,
|
ctx += get_source_context(
|
||||||
form_data["messages"],
|
all_tool_call_sources, include_content=False
|
||||||
metadata.get("sources", []) + all_tool_call_sources,
|
|
||||||
user_message,
|
|
||||||
)
|
)
|
||||||
|
ctx = ctx.strip()
|
||||||
|
if ctx:
|
||||||
|
rag = rag_template(
|
||||||
|
request.app.state.config.RAG_TEMPLATE,
|
||||||
|
ctx,
|
||||||
|
user_message,
|
||||||
|
)
|
||||||
|
if RAG_SYSTEM_CONTEXT:
|
||||||
|
form_data["messages"] = (
|
||||||
|
add_or_update_system_message(
|
||||||
|
rag, form_data["messages"], append=True
|
||||||
|
)
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
form_data["messages"] = add_or_update_user_message(
|
||||||
|
rag, form_data["messages"], append=False
|
||||||
|
)
|
||||||
tool_call_sources.clear()
|
tool_call_sources.clear()
|
||||||
|
|
||||||
await event_emitter(
|
await event_emitter(
|
||||||
|
|||||||
Reference in new issue
Block a user