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

add env to control tool execution result

Browse source
This commit is contained in:
Oleg Yermolenko 2025-11-28 18:21:00 +02:00
parent fc68071e1d
commit 96c7c948a1
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
backend/open_webui/env.py
View file

@ -374,6 +374,19 @@ ENABLE_REALTIME_CHAT_SAVE = (
ENABLE_QUERIES_CACHE = os.environ.get("ENABLE_QUERIES_CACHE", "False").lower() == "true" ENABLE_QUERIES_CACHE = os.environ.get("ENABLE_QUERIES_CACHE", "False").lower() == "true"
ENABLE_WRAP_TOOL_RESULT = os.environ.get("ENABLE_WRAP_TOOL_RESULT", "True").lower() == "true"
TOOL_RESULT_INDENT_SIZE = os.environ.get("TOOL_RESULT_INDENT_SIZE", 2)
if TOOL_RESULT_INDENT_SIZE == "":
TOOL_RESULT_INDENT_SIZE = 2
else:
try:
TOOL_RESULT_INDENT_SIZE = int(TOOL_RESULT_INDENT_SIZE)
except Exception:
TOOL_RESULT_INDENT_SIZE = 2
#################################### ####################################
# REDIS # REDIS
#################################### ####################################

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

@ -119,6 +119,8 @@ from open_webui.env import (
BYPASS_MODEL_ACCESS_CONTROL, BYPASS_MODEL_ACCESS_CONTROL,
ENABLE_REALTIME_CHAT_SAVE, ENABLE_REALTIME_CHAT_SAVE,
ENABLE_QUERIES_CACHE, ENABLE_QUERIES_CACHE,
ENABLE_WRAP_TOOL_RESULT,
TOOL_RESULT_INDENT_SIZE,
) )
from open_webui.constants import TASKS from open_webui.constants import TASKS
@ -276,14 +278,18 @@ def process_tool_result(
) )
tool_result.remove(item) tool_result.remove(item)
if isinstance(tool_result, list): if isinstance(tool_result, list) and ENABLE_WRAP_TOOL_RESULT:
tool_result = {"results": tool_result} tool_result = {"results": tool_result}
if isinstance(tool_result, dict) or isinstance(tool_result, list): if isinstance(tool_result, dict) or isinstance(tool_result, list):
tool_result = json.dumps(tool_result, indent=2, ensure_ascii=False) tool_result = dump_tool_result_to_json(tool_result, ensure_ascii=False)
return tool_result, tool_result_files, tool_result_embeds return tool_result, tool_result_files, tool_result_embeds
def dump_tool_result_to_json(model, ensure_ascii=True):
indent_size = None if TOOL_RESULT_INDENT_SIZE == 0 else TOOL_RESULT_INDENT_SIZE
separators = None if indent_size and indent_size > 0 else (',', ':')
return json.dumps(model, indent=indent_size, separators=separators, ensure_ascii=ensure_ascii)
async def chat_completion_tools_handler( async def chat_completion_tools_handler(
request: Request, body: dict, extra_params: dict, user: UserModel, models, tools request: Request, body: dict, extra_params: dict, user: UserModel, models, tools
@ -2069,9 +2075,9 @@ async def process_chat_response(
if tool_result is not None: if tool_result is not None:
tool_result_embeds = result.get("embeds", "") tool_result_embeds = result.get("embeds", "")
tool_calls_display_content = f'{tool_calls_display_content}<details type="tool_calls" done="true" id="{tool_call_id}" name="{tool_name}" arguments="{html.escape(json.dumps(tool_arguments))}" result="{html.escape(json.dumps(tool_result, ensure_ascii=False))}" files="{html.escape(json.dumps(tool_result_files)) if tool_result_files else ""}" embeds="{html.escape(json.dumps(tool_result_embeds))}">\n<summary>Tool Executed</summary>\n</details>\n' tool_calls_display_content = f'{tool_calls_display_content}<details type="tool_calls" done="true" id="{tool_call_id}" name="{tool_name}" arguments="{html.escape(dump_tool_result_to_json(tool_arguments))}" result="{html.escape(dump_tool_result_to_json(tool_result, ensure_ascii=True))}" files="{html.escape(dump_tool_result_to_json(tool_result_files)) if tool_result_files else ""}" embeds="{html.escape(dump_tool_result_to_json(tool_result_embeds))}">\n<summary>Tool Executed</summary>\n</details>\n'
else: else:
tool_calls_display_content = f'{tool_calls_display_content}<details type="tool_calls" done="false" id="{tool_call_id}" name="{tool_name}" arguments="{html.escape(json.dumps(tool_arguments))}">\n<summary>Executing...</summary>\n</details>\n' tool_calls_display_content = f'{tool_calls_display_content}<details type="tool_calls" done="false" id="{tool_call_id}" name="{tool_name}" arguments="{html.escape(dump_tool_result_to_json(tool_arguments))}">\n<summary>Executing...</summary>\n</details>\n'
if not raw: if not raw:
content = f"{content}{tool_calls_display_content}" content = f"{content}{tool_calls_display_content}"
@ -2087,7 +2093,7 @@ async def process_chat_response(
"arguments", "" "arguments", ""
) )
tool_calls_display_content = f'{tool_calls_display_content}\n<details type="tool_calls" done="false" id="{tool_call_id}" name="{tool_name}" arguments="{html.escape(json.dumps(tool_arguments))}">\n<summary>Executing...</summary>\n</details>\n' tool_calls_display_content = f'{tool_calls_display_content}\n<details type="tool_calls" done="false" id="{tool_call_id}" name="{tool_name}" arguments="{html.escape(dump_tool_result_to_json(tool_arguments))}">\n<summary>Executing...</summary>\n</details>\n'
if not raw: if not raw:
content = f"{content}{tool_calls_display_content}" content = f"{content}{tool_calls_display_content}"