OpenWebUI/open-webui-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy Jaeryang Baek
2025-12-29 01:31:27 +04:00
parent 5d1459df16
commit 2453b75ff0
5 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/open_webui/utils/models.py
View File

@@ -360,7 +360,7 @@ def check_model_access(user, model):
raise Exception("Model not found")
def get_filtered_models(models, user):
def get_filtered_models(models, user, db=None):
# Filter out models that the user does not have access to
if (
user.role == "user"
@@ -373,7 +373,7 @@ def get_filtered_models(models, user):
}
filtered_models = []
user_group_ids = {group.id for group in Groups.get_groups_by_member_id(user.id)}
user_group_ids = {group.id for group in Groups.get_groups_by_member_id(user.id, db=db)}
for model in models:
if model.get("arena"):
if has_access(

17
backend/open_webui/utils/oauth.py
View File

@@ -1132,7 +1132,7 @@ class OAuthManager:
return role
def update_user_groups(self, user, user_data, default_permissions):
def update_user_groups(self, user, user_data, default_permissions, db=None):
log.debug("Running OAUTH Group management")
oauth_claim = auth_manager_config.OAUTH_GROUPS_CLAIM
@@ -1161,8 +1161,8 @@ class OAuthManager:
else:
user_oauth_groups = []
user_current_groups: list[GroupModel] = Groups.get_groups_by_member_id(user.id)
all_available_groups: list[GroupModel] = Groups.get_all_groups()
user_current_groups: list[GroupModel] = Groups.get_groups_by_member_id(user.id, db=db)
all_available_groups: list[GroupModel] = Groups.get_all_groups(db=db)
# Create groups if they don't exist and creation is enabled
if auth_manager_config.ENABLE_OAUTH_GROUP_CREATION:
@@ -1188,7 +1188,7 @@ class OAuthManager:
)
# Use determined creator ID (admin or fallback to current user)
created_group = Groups.insert_new_group(
creator_id, new_group_form
creator_id, new_group_form, db=db
)
if created_group:
log.info(
@@ -1206,7 +1206,7 @@ class OAuthManager:
# Refresh the list of all available groups if any were created
if groups_created:
all_available_groups = Groups.get_all_groups()
all_available_groups = Groups.get_all_groups(db=db)
log.debug("Refreshed list of all available groups after creation.")
log.debug(f"Oauth Groups claim: {oauth_claim}")
@@ -1227,7 +1227,7 @@ class OAuthManager:
log.debug(
f"Removing user from group {group_model.name} as it is no longer in their oauth groups"
)
Groups.remove_users_from_group(group_model.id, [user.id])
Groups.remove_users_from_group(group_model.id, [user.id], db=db)
# In case a group is created, but perms are never assigned to the group by hitting "save"
group_permissions = group_model.permissions
@@ -1242,6 +1242,7 @@ class OAuthManager:
permissions=group_permissions,
),
overwrite=False,
db=db,
)
# Add user to new groups
@@ -1257,7 +1258,7 @@ class OAuthManager:
f"Adding user to group {group_model.name} as it was found in their oauth groups"
)
Groups.add_users_to_group(group_model.id, [user.id])
Groups.add_users_to_group(group_model.id, [user.id], db=db)
# In case a group is created, but perms are never assigned to the group by hitting "save"
group_permissions = group_model.permissions
@@ -1272,6 +1273,7 @@ class OAuthManager:
permissions=group_permissions,
),
overwrite=False,
db=db,
)
async def _process_picture_url(
@@ -1566,6 +1568,7 @@ class OAuthManager:
user=user,
user_data=user_data,
default_permissions=request.app.state.config.USER_PERMISSIONS,
db=db,
)
except Exception as e: