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-02 17:26:01 -06:00
parent 65fbbf5e35
commit e0d4c3ec92
1 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/open_webui/utils/middleware.py
+47 -21
View File
@@ -91,6 +91,7 @@ from open_webui.utils.misc import (
get_last_user_message_item, get_last_user_message_item,
get_last_assistant_message, get_last_assistant_message,
get_system_message, get_system_message,
replace_system_message_content,
prepend_to_first_user_message_content, prepend_to_first_user_message_content,
convert_logit_bias_input_to_json, convert_logit_bias_input_to_json,
get_content_from_message, get_content_from_message,
@@ -4090,6 +4091,22 @@ async def streaming_chat_response_handler(response, ctx):
all_tool_call_sources = [] # Accumulated sources across all iterations all_tool_call_sources = [] # Accumulated sources across all iterations
user_message = get_last_user_message(form_data["messages"]) user_message = get_last_user_message(form_data["messages"])
# Check if citations are enabled for this model
citations_enabled = (
model.get("info", {}).get("meta", {}).get("capabilities") or {}
).get("citations", True)
# Save original system message so we can restore it before
# re-applying source context (prevents duplication when
# RAG_SYSTEM_CONTEXT is enabled and the template is appended
# to the system message on each iteration).
original_system_message = get_system_message(form_data["messages"])
original_system_content = (
get_content_from_message(original_system_message)
if original_system_message
else None
)
while ( while (
len(tool_calls) > 0 len(tool_calls) > 0
and tool_call_retries < CHAT_RESPONSE_MAX_TOOL_CALL_RETRIES and tool_call_retries < CHAT_RESPONSE_MAX_TOOL_CALL_RETRIES
@@ -4244,7 +4261,8 @@ async def streaming_chat_response_handler(response, ctx):
# Extract citation sources from tool results # Extract citation sources from tool results
if ( if (
tool_function_name citations_enabled
and tool_function_name
in [ in [
"search_web", "search_web",
"fetch_url", "fetch_url",
@@ -4334,27 +4352,35 @@ async def streaming_chat_response_handler(response, ctx):
} }
) )
# Emit citation sources for UI display # Emit citation sources and apply source context to messages
for source in tool_call_sources: if citations_enabled:
await event_emitter({"type": "source", "data": source}) for source in tool_call_sources:
await event_emitter({"type": "source", "data": source})
# Apply source context to messages for model # Apply source context to messages for model.
# Use metadata_only=True to avoid duplicating content # Use include_content=False to avoid duplicating content
# that is already in the tool result message. # that is already in the tool result message.
all_tool_call_sources.extend(tool_call_sources) all_tool_call_sources.extend(tool_call_sources)
if all_tool_call_sources and user_message: if all_tool_call_sources and user_message:
# Restore original user message before re-applying to avoid recursive nesting # Restore original messages before re-applying to
set_last_user_message_content( # avoid recursive nesting (user message) and
user_message, form_data["messages"] # duplication (system message with RAG_SYSTEM_CONTEXT).
) set_last_user_message_content(
form_data["messages"] = apply_source_context_to_messages( user_message, form_data["messages"]
request, )
form_data["messages"], if original_system_content is not None:
all_tool_call_sources, replace_system_message_content(
user_message, original_system_content,
include_content=False, form_data["messages"],
) )
tool_call_sources.clear() form_data["messages"] = apply_source_context_to_messages(
request,
form_data["messages"],
all_tool_call_sources,
user_message,
include_content=False,
)
tool_call_sources.clear()
await event_emitter( await event_emitter(
{ {