Mirrors/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-16 11:57:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into fix_model_access

Browse Source
This commit is contained in:
Tim Jaeryang Baek
2025-08-13 18:07:29 +04:00
committed by GitHub
parent df314fda1d 2cb87a71f7
commit 8a745b9bbf
70 changed files with 1677 additions and 1566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/open_webui/main.py
View File

@@ -327,6 +327,7 @@ from open_webui.config import (
ENABLE_MESSAGE_RATING,
ENABLE_USER_WEBHOOKS,
ENABLE_EVALUATION_ARENA_MODELS,
ENABLE_ADMIN_WORKSPACE_CONTENT_ACCESS,
USER_PERMISSIONS,
DEFAULT_USER_ROLE,
PENDING_USER_OVERLAY_CONTENT,
@@ -1320,7 +1321,7 @@ async def get_models(
model_order_dict = {model_id: i for i, model_id in enumerate(model_order_list)}
# Sort models by order list priority, with fallback for those not in the list
models.sort(
key=lambda x: (model_order_dict.get(x["id"], float("inf")), x["name"])
key=lambda x: (model_order_dict.get(x["id"], float("inf")), x.get("name"))
)
# Filter out models that the user does not have access to
@@ -1395,7 +1396,9 @@ async def chat_completion(
model_info = Models.get_model_by_id(model_id)
# Check if user has access to the model
if not BYPASS_MODEL_ACCESS_CONTROL and user.role == "user":
if not BYPASS_MODEL_ACCESS_CONTROL and (
user.role != "admin" or not ENABLE_ADMIN_WORKSPACE_CONTENT_ACCESS
):
try:
check_model_access(user, model)
except Exception as e: