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

refac

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2025-11-25 03:12:21 -05:00
parent 743199f2d0
commit f0c7bd3f79
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1409,9 +1409,12 @@ async def process_chat_payload(request, form_data, user, metadata, model):
headers=headers if headers else None, headers=headers if headers else None,
) )
function_name_filter_list = mcp_server_connection.get( function_name_filter_list = (
"function_name_filter_list", None mcp_server_connection.get("config", {})
.get("function_name_filter_list", "")
.split(",")
) )
tool_specs = await mcp_clients[server_id].list_tool_specs() tool_specs = await mcp_clients[server_id].list_tool_specs()
for tool_spec in tool_specs: for tool_spec in tool_specs:
@ -1424,9 +1427,7 @@ async def process_chat_payload(request, form_data, user, metadata, model):
return tool_function return tool_function
if function_name_filter_list and isinstance( if function_name_filter_list:
function_name_filter_list, list
):
if not is_string_allowed( if not is_string_allowed(
tool_spec["name"], function_name_filter_list tool_spec["name"], function_name_filter_list
): ):

6
backend/open_webui/utils/misc.py
View file

@ -35,10 +35,10 @@ def get_allow_block_lists(filter_list):
for d in filter_list: for d in filter_list:
if d.startswith("!"): if d.startswith("!"):
# Domains starting with "!" → blocked # Domains starting with "!" → blocked
block_list.append(d[1:]) block_list.append(d[1:].strip())
else: else:
# Domains starting without "!" → allowed # Domains starting without "!" → allowed
allow_list.append(d) allow_list.append(d.strip())
return allow_list, block_list return allow_list, block_list
@ -54,6 +54,8 @@ def is_string_allowed(string: str, filter_list: Optional[list[str]] = None) -> b
return True return True
allow_list, block_list = get_allow_block_lists(filter_list) allow_list, block_list = get_allow_block_lists(filter_list)
print(string, allow_list, block_list)
# If allow list is non-empty, require domain to match one of them # If allow list is non-empty, require domain to match one of them
if allow_list: if allow_list:
if not any(string.endswith(allowed) for allowed in allow_list): if not any(string.endswith(allowed) for allowed in allow_list):

10
backend/open_webui/utils/tools.py
View file

@ -150,15 +150,15 @@ async def get_tools(
) )
specs = tool_server_data.get("specs", []) specs = tool_server_data.get("specs", [])
function_name_filter_list = tool_server_connection.get( function_name_filter_list = (
"function_name_filter_list", None tool_server_connection.get("config", {})
.get("function_name_filter_list", "")
.split(",")
) )
for spec in specs: for spec in specs:
function_name = spec["name"] function_name = spec["name"]
if function_name_filter_list and isinstance( if function_name_filter_list:
function_name_filter_list, list
):
if not is_string_allowed( if not is_string_allowed(
function_name, function_name_filter_list function_name, function_name_filter_list
): ):