scriptoriumadmin/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2026-10-09 03:18:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refac

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2026-10-07 17:18:05 +04:00
parent a1bb3b3923
commit 55e1c44c94
4 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2778,7 +2778,9 @@ async def process_chat_payload(request, form_data, user, metadata, model):
if note_files:
files = [*(files or []), *note_files]
if skill_ids or use_builtin_tools:
model_builtin_tools = model.get('info', {}).get('meta', {}).get('builtinTools') or {}
if skill_ids or (use_builtin_tools and model_builtin_tools.get('skills', True)):
from open_webui.models.skills import Skills as SkillsModel
from open_webui.utils.terminals import (
format_terminal_skill_context,
@ -2791,7 +2793,7 @@ async def process_chat_payload(request, form_data, user, metadata, model):
db_skill_ids = [sid for sid in skill_ids if not sid.startswith(terminal_skill_prefix)]
terminal_skill_ids = [sid for sid in skill_ids if sid.startswith(terminal_skill_prefix)]
if use_builtin_tools:
if use_builtin_tools and model_builtin_tools.get('skills', True):
accessible_skills = {s.id: s for s in await SkillsModel.get_skills(user_id=user.id)}
db_skill_ids = sorted(accessible_skills)
else:
@ -2804,7 +2806,7 @@ async def process_chat_payload(request, form_data, user, metadata, model):
skill_manifest = ''
for skill in available_skills:
if skill.id in mentioned_skill_ids or not use_builtin_tools:
if skill.id in mentioned_skill_ids or not use_builtin_tools or not model_builtin_tools.get('skills', True):
form_data['messages'] = add_or_update_system_message(
f'<skill name="{skill.name}">\n{skill.content}\n</skill>',
form_data['messages'],
@ -2825,7 +2827,7 @@ async def process_chat_payload(request, form_data, user, metadata, model):
listed_terminal_skills = listed if isinstance(listed, list) else []
if terminal_id and use_builtin_tools:
if terminal_id and use_builtin_tools and model_builtin_tools.get('skills', True):
terminal_skills = listed_terminal_skills
elif terminal_skill_ids:
terminal_skill_map = {skill['id']: skill for skill in listed_terminal_skills}
@ -2833,7 +2835,7 @@ async def process_chat_payload(request, form_data, user, metadata, model):
for skill in terminal_skills:
sid = skill['id']
if sid in mentioned_skill_ids or not use_builtin_tools:
if sid in mentioned_skill_ids or not use_builtin_tools or not model_builtin_tools.get('skills', True):
skill_name = unquote(sid.removeprefix(terminal_skill_prefix))
loaded = await get_terminal_skill(request, user.model_dump(), metadata, skill_name, extra_params)
if loaded:
@ -3058,7 +3060,7 @@ async def process_chat_payload(request, form_data, user, metadata, model):
# Only inject when the request originates from the UI (identified by session_id).
# API callers don't expect hidden tools; they can explicitly request tools via tool_ids.
if use_builtin_tools:
if (model.get('info', {}).get('meta', {}).get('builtinTools') or {}).get('knowledge', True):
if model_builtin_tools.get('knowledge', True):
from html import escape
knowledge_tags = []

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

@ -811,7 +811,7 @@ async def get_builtin_tools(
)
# Skills tools - view_skill allows model to load full skill instructions on demand
if extra_params.get('__skill_ids__'):
if is_builtin_tool_enabled('skills') and extra_params.get('__skill_ids__'):
builtin_functions.append(view_skill)
# Task management - break down complex work into trackable steps

4
src/lib/components/workspace/Models/BuiltinTools.svelte
View file

@ -73,6 +73,10 @@
subagents: {
label: $i18n.t('settings.admin.models.builtinTools.subagents.label'),
description: $i18n.t('settings.admin.models.builtinTools.subagents.description')
},
skills: {
label: $i18n.t('settings.admin.models.builtinTools.skills.label'),
description: $i18n.t('settings.admin.models.builtinTools.skills.description')
}
};

2
src/lib/i18n/locales/en-US/translation.json
View file

@ -2631,6 +2631,8 @@
"settings.admin.models.builtinTools.notes.label": "Notes",
"settings.admin.models.builtinTools.notifications.description": "Send notifications to configured webhook targets",
"settings.admin.models.builtinTools.notifications.label": "Notifications",
"settings.admin.models.builtinTools.skills.description": "Find and load skill instructions on demand",
"settings.admin.models.builtinTools.skills.label": "Skills",
"settings.admin.models.builtinTools.subagents.description": "Delegate focused work to parallel sub-agents",
"settings.admin.models.builtinTools.subagents.label": "Sub-agents",
"settings.admin.models.builtinTools.tasks.description": "Break down complex requests into trackable steps",