OpenWebUI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-06-13 18:02:50 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy Jaeryang Baek 2025-04-05 04:49:07 -06:00
parent 9747a0e1f1
commit c9e9ce931b
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/open_webui/utils/middleware.py
View File

@ -227,7 +227,9 @@ async def chat_completion_tools_handler(
if isinstance(tool_result, str): if isinstance(tool_result, str):
tool = tools[tool_function_name] tool = tools[tool_function_name]
tool_id = tool.get("toolkit_id", "") tool_id = tool.get("toolkit_id", "")
if tool.get("citation", False) or tool.get("direct", False): if tool.get("metadata", {}).get("citation", False) or tool.get(
"direct", False
):
sources.append( sources.append(
{ {
@ -267,7 +269,11 @@ async def chat_completion_tools_handler(
} }
) )
if tools[tool_function_name].get("file_handler", False): if (
tools[tool_function_name]
.get("metadata", {})
.get("file_handler", False)
):
skip_files = True skip_files = True
# check if "tool_calls" in result # check if "tool_calls" in result

21
backend/open_webui/utils/tools.py
View File

@ -47,6 +47,20 @@ def get_tools(
for tool_id in tool_ids: for tool_id in tool_ids:
tools = Tools.get_tool_by_id(tool_id) tools = Tools.get_tool_by_id(tool_id)
if tools is None: if tools is None:
tool_dict = {
"spec": spec,
"callable": callable,
"toolkit_id": tool_id,
"pydantic_model": function_to_pydantic_model(callable),
# Misc info
"metadata": {
"file_handler": hasattr(module, "file_handler")
and module.file_handler,
"citation": hasattr(module, "citation") and module.citation,
},
}
continue continue
module = request.app.state.TOOLS.get(tool_id, None) module = request.app.state.TOOLS.get(tool_id, None)
@ -97,8 +111,11 @@ def get_tools(
"toolkit_id": tool_id, "toolkit_id": tool_id,
"pydantic_model": function_to_pydantic_model(callable), "pydantic_model": function_to_pydantic_model(callable),
# Misc info # Misc info
"file_handler": hasattr(module, "file_handler") and module.file_handler, "metadata": {
"citation": hasattr(module, "citation") and module.citation, "file_handler": hasattr(module, "file_handler")
and module.file_handler,
"citation": hasattr(module, "citation") and module.citation,
},
} }
# TODO: if collision, prepend toolkit name # TODO: if collision, prepend toolkit name