OpenWebUI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-06-25 17:57:20 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy Jaeryang Baek 2025-03-30 00:44:09 -07:00
parent 2cee5a4a03
commit 215f991326
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,7 +203,7 @@ async def chat_completion_tools_handler(
} }
if tool.get("direct", False): if tool.get("direct", False):
tool_output = await event_caller( tool_result = await event_caller(
{ {
"type": "execute:tool", "type": "execute:tool",
"data": { "data": {
@ -217,15 +217,15 @@ async def chat_completion_tools_handler(
) )
else: else:
tool_function = tool["callable"] tool_function = tool["callable"]
tool_output = await tool_function(**tool_function_params) tool_result = await tool_function(**tool_function_params)
except Exception as e: except Exception as e:
tool_output = str(e) tool_result = str(e)
if isinstance(tool_output, dict): if isinstance(tool_result, dict) or isinstance(tool_result, list):
tool_output = json.dumps(tool_output, indent=4) tool_result = json.dumps(tool_result, indent=2)
if isinstance(tool_output, 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("citation", False) or tool.get("direct", False):
@ -239,7 +239,7 @@ async def chat_completion_tools_handler(
else f"{tool_function_name}" else f"{tool_function_name}"
), ),
}, },
"document": [tool_output], "document": [tool_result],
"metadata": [ "metadata": [
{ {
"source": ( "source": (
@ -255,7 +255,7 @@ async def chat_completion_tools_handler(
sources.append( sources.append(
{ {
"source": {}, "source": {},
"document": [tool_output], "document": [tool_result],
"metadata": [ "metadata": [
{ {
"source": ( "source": (
@ -1891,8 +1891,10 @@ async def process_chat_response(
except Exception as e: except Exception as e:
tool_result = str(e) tool_result = str(e)
if isinstance(tool_result, dict): if isinstance(tool_result, dict) or isinstance(
tool_result = json.dumps(tool_result) tool_result, list
):
tool_result = json.dumps(tool_result, indent=2)
results.append( results.append(
{ {