ti.sil/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-13 12:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refac: tools handling

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2025-07-07 11:42:52 +04:00
parent 05a9b72670
commit cfcfefb20c
1 changed files with 46 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
backend/open_webui/utils/middleware.py
View file

@ -249,30 +249,27 @@ async def chat_completion_tools_handler(
else f"{tool_function_name}" else f"{tool_function_name}"
) )
if tool.get("metadata", {}).get("citation", False) or tool.get( # Citation is enabled for this tool
"direct", False sources.append(
): {
# Citation is enabled for this tool "source": {
sources.append( "name": (f"TOOL:{tool_name}"),
{ },
"source": { "document": [tool_result],
"name": (f"TOOL:{tool_name}"), "metadata": [
}, {
"document": [tool_result], "source": (f"TOOL:{tool_name}"),
"metadata": [ "parameters": tool_function_params,
{ }
"source": (f"TOOL:{tool_name}"), ],
"parameters": tool_function_params, "tool_result": True,
} }
], )
} # Citation is not enabled for this tool
) body["messages"] = add_or_update_user_message(
else: f"\nTool `{tool_name}` Output: {tool_result}",
# Citation is not enabled for this tool body["messages"],
body["messages"] = add_or_update_user_message( )
f"\nTool `{tool_name}` Output: {tool_result}",
body["messages"],
)
if ( if (
tools[tool_function_name] tools[tool_function_name]
@ -931,7 +928,9 @@ async def process_chat_payload(request, form_data, user, metadata, model):
citation_idx_map = {} citation_idx_map = {}
for source in sources: for source in sources:
if "document" in source: is_tool_result = source.get("tool_result", False)
if "document" in source and not is_tool_result:
for document_text, document_metadata in zip( for document_text, document_metadata in zip(
source["document"], source["metadata"] source["document"], source["metadata"]
): ):
@ -952,34 +951,33 @@ async def process_chat_payload(request, form_data, user, metadata, model):
) )
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"])
if prompt is None: if prompt is None:
raise Exception("No user message found") raise Exception("No user message found")
if (
request.app.state.config.RELEVANCE_THRESHOLD == 0
and context_string.strip() == ""
):
log.debug(
f"With a 0 relevancy threshold for RAG, the context cannot be empty"
)
# Workaround for Ollama 2.0+ system prompt issue if context_string == "":
# TODO: replace with add_or_update_system_message if request.app.state.config.RELEVANCE_THRESHOLD == 0:
if model.get("owned_by") == "ollama": log.debug(
form_data["messages"] = prepend_to_first_user_message_content( f"With a 0 relevancy threshold for RAG, the context cannot be empty"
rag_template( )
request.app.state.config.RAG_TEMPLATE, context_string, prompt
),
form_data["messages"],
)
else: else:
form_data["messages"] = add_or_update_system_message( # Workaround for Ollama 2.0+ system prompt issue
rag_template( # TODO: replace with add_or_update_system_message
request.app.state.config.RAG_TEMPLATE, context_string, prompt if model.get("owned_by") == "ollama":
), form_data["messages"] = prepend_to_first_user_message_content(
form_data["messages"], rag_template(
) request.app.state.config.RAG_TEMPLATE, context_string, prompt
),
form_data["messages"],
)
else:
form_data["messages"] = add_or_update_system_message(
rag_template(
request.app.state.config.RAG_TEMPLATE, context_string, prompt
),
form_data["messages"],
)
# If there are citations, add them to the data_items # If there are citations, add them to the data_items
sources = [ sources = [