ti.sil/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-16 22:35:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

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

@ -249,9 +249,6 @@ 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(
"direct", False
):
# Citation is enabled for this tool # Citation is enabled for this tool
sources.append( sources.append(
{ {
@ -265,9 +262,9 @@ async def chat_completion_tools_handler(
"parameters": tool_function_params, "parameters": tool_function_params,
} }
], ],
"tool_result": True,
} }
) )
else:
# Citation is not enabled for this tool # Citation is not enabled for this tool
body["messages"] = add_or_update_user_message( body["messages"] = add_or_update_user_message(
f"\nTool `{tool_name}` Output: {tool_result}", f"\nTool `{tool_name}` Output: {tool_result}",
@ -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,18 +951,17 @@ 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 if context_string == "":
and context_string.strip() == "" if request.app.state.config.RELEVANCE_THRESHOLD == 0:
):
log.debug( log.debug(
f"With a 0 relevancy threshold for RAG, the context cannot be empty" f"With a 0 relevancy threshold for RAG, the context cannot be empty"
) )
else:
# Workaround for Ollama 2.0+ system prompt issue # Workaround for Ollama 2.0+ system prompt issue
# TODO: replace with add_or_update_system_message # TODO: replace with add_or_update_system_message
if model.get("owned_by") == "ollama": if model.get("owned_by") == "ollama":