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

Update models.py

Browse source
This commit is contained in:
Classic298 2025-08-11 23:36:48 +02:00 committed by GitHub
parent d8c4dd6f79
commit 357b57e1d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 39 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
backend/open_webui/utils/models.py
View file

@ -23,7 +23,6 @@ from open_webui.utils.access_control import has_access
from open_webui.config import ( from open_webui.config import (
DEFAULT_ARENA_MODEL, DEFAULT_ARENA_MODEL,
ENABLE_ADMIN_WORKSPACE_CONTENT_ACCESS,
) )
from open_webui.env import SRC_LOG_LEVELS, GLOBAL_LOG_LEVEL from open_webui.env import SRC_LOG_LEVELS, GLOBAL_LOG_LEVEL
@ -182,62 +181,45 @@ async def get_all_models(request, refresh: bool = False, user: UserModel = None)
elif custom_model.is_active and ( elif custom_model.is_active and (
custom_model.id not in [model["id"] for model in models] custom_model.id not in [model["id"] for model in models]
): ):
# Check access control for custom models owned_by = "openai"
should_include = False pipe = None
if user and user.role == "admin" and ENABLE_ADMIN_WORKSPACE_CONTENT_ACCESS: action_ids = []
# Admin with full workspace access filter_ids = []
should_include = True
elif user and user.id == custom_model.user_id:
# Owner always has access
should_include = True
elif user and has_access(user.id, "read", custom_model.access_control):
# User has explicit read access
should_include = True
elif not user:
# No user context - include for backwards compatibility
should_include = True
if should_include: for model in models:
owned_by = "openai" if (
pipe = None custom_model.base_model_id == model["id"]
or custom_model.base_model_id == model["id"].split(":")[0]
):
owned_by = model.get("owned_by", "unknown owner")
if "pipe" in model:
pipe = model["pipe"]
break
action_ids = [] if custom_model.meta:
filter_ids = [] meta = custom_model.meta.model_dump()
for model in models: if "actionIds" in meta:
if ( action_ids.extend(meta["actionIds"])
custom_model.base_model_id == model["id"]
or custom_model.base_model_id == model["id"].split(":")[0]
):
owned_by = model.get("owned_by", "unknown owner")
if "pipe" in model:
pipe = model["pipe"]
break
if custom_model.meta: if "filterIds" in meta:
meta = custom_model.meta.model_dump() filter_ids.extend(meta["filterIds"])
if "actionIds" in meta: models.append(
action_ids.extend(meta["actionIds"]) {
"id": f"{custom_model.id}",
if "filterIds" in meta: "name": custom_model.name,
filter_ids.extend(meta["filterIds"]) "object": "model",
"created": custom_model.created_at,
models.append( "owned_by": owned_by,
{ "info": custom_model.model_dump(),
"id": f"{custom_model.id}", "preset": True,
"name": custom_model.name, **({"pipe": pipe} if pipe is not None else {}),
"object": "model", "action_ids": action_ids,
"created": custom_model.created_at, "filter_ids": filter_ids,
"owned_by": owned_by, }
"info": custom_model.model_dump(), )
"preset": True,
**({"pipe": pipe} if pipe is not None else {}),
"action_ids": action_ids,
"filter_ids": filter_ids,
}
)
# Process action_ids to get the actions # Process action_ids to get the actions
def get_action_items_from_module(function, module): def get_action_items_from_module(function, module):