Emil_Shanaty/open-webui-ai4me
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy Jaeryang Baek
2026-03-07 20:30:42 -06:00
parent 368912ca62
commit f047b6b3ae
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/open_webui/utils/middleware.py
+18 -17
View File
@@ -929,25 +929,21 @@ def apply_source_context_to_messages(
if not sources or not user_message: if not sources or not user_message:
return messages return messages
context_string = get_source_context(sources, include_content) context = get_source_context(sources, include_content)
context_string = context_string.strip() context = context.strip()
if not context_string: if not context:
return messages return messages
if RAG_SYSTEM_CONTEXT: if RAG_SYSTEM_CONTEXT:
return add_or_update_system_message( return add_or_update_system_message(
rag_template( rag_template(request.app.state.config.RAG_TEMPLATE, context, user_message),
request.app.state.config.RAG_TEMPLATE, context_string, user_message
),
messages, messages,
append=True, append=True,
) )
else: else:
return add_or_update_user_message( return add_or_update_user_message(
rag_template( rag_template(request.app.state.config.RAG_TEMPLATE, context, user_message),
request.app.state.config.RAG_TEMPLATE, context_string, user_message
),
messages, messages,
append=False, append=False,
) )
@@ -4495,26 +4491,31 @@ async def streaming_chat_response_handler(response, ctx):
# Build context: file sources with content, # Build context: file sources with content,
# tool sources as citation markers only. # tool sources as citation markers only.
ctx = get_source_context(metadata.get("sources", [])) source_context = get_source_context(
ctx += get_source_context( metadata.get("sources", [])
) + get_source_context(
all_tool_call_sources, include_content=False all_tool_call_sources, include_content=False
) )
ctx = ctx.strip() source_context = source_context.strip()
if ctx: if source_context:
rag = rag_template( rag_content = rag_template(
request.app.state.config.RAG_TEMPLATE, request.app.state.config.RAG_TEMPLATE,
ctx, source_context,
user_message, user_message,
) )
if RAG_SYSTEM_CONTEXT: if RAG_SYSTEM_CONTEXT:
form_data["messages"] = ( form_data["messages"] = (
add_or_update_system_message( add_or_update_system_message(
rag, form_data["messages"], append=True rag_content,
form_data["messages"],
append=True,
) )
) )
else: else:
form_data["messages"] = add_or_update_user_message( form_data["messages"] = add_or_update_user_message(
rag, form_data["messages"], append=False rag_content,
form_data["messages"],
append=False,
) )
tool_call_sources.clear() tool_call_sources.clear()