refac

backend/open_webui/routers/auths.py

@@ -111,7 +111,7 @@ ADMIN_CONFIG_KEYS = {
     'API_KEYS_ALLOWED_ENDPOINTS': 'auth.api_key.allowed_endpoints',
     'DEFAULT_USER_ROLE': 'ui.default_user_role',
     'DEFAULT_GROUP_ID': 'ui.default_group_id',
-    'DEFAULT_USER_UI_SETTINGS': 'ui.default_user_settings',
+    'DEFAULT_UI_SETTINGS': 'ui.default_settings',
     'JWT_EXPIRES_IN': 'auth.jwt_expiry',
     'ENABLE_COMMUNITY_SHARING': 'ui.enable_community_sharing',
     'ENABLE_MESSAGE_RATING': 'ui.enable_message_rating',
@@ -1197,7 +1197,7 @@ class AdminConfig(BaseModel):
     API_KEYS_ALLOWED_ENDPOINTS: str
     DEFAULT_USER_ROLE: str
     DEFAULT_GROUP_ID: str
-    DEFAULT_USER_UI_SETTINGS: dict | None = None
+    DEFAULT_UI_SETTINGS: dict | None = None
     JWT_EXPIRES_IN: str
     ENABLE_COMMUNITY_SHARING: bool
     ENABLE_MESSAGE_RATING: bool
@@ -1222,7 +1222,7 @@ class AdminConfig(BaseModel):
 @router.post('/admin/config')
 async def update_admin_config(request: Request, form_data: AdminConfig, user=Depends(get_admin_user)):
     updates = config_updates(form_data.model_dump(), ADMIN_CONFIG_KEYS)
-    updates['ui.default_user_settings'] = form_data.DEFAULT_USER_UI_SETTINGS or {}
+    updates['ui.default_settings'] = form_data.DEFAULT_UI_SETTINGS or {}
     updates['folders.max_file_count'] = int(form_data.FOLDER_MAX_FILE_COUNT) if form_data.FOLDER_MAX_FILE_COUNT else ''
     updates['automations.max_count'] = int(form_data.AUTOMATION_MAX_COUNT) if form_data.AUTOMATION_MAX_COUNT else ''
     updates['automations.min_interval'] = (

backend/open_webui/routers/users.py

@@ -56,6 +56,9 @@ router = APIRouter()
 def merge_user_ui_settings(defaults: dict, settings: dict) -> dict:
     merged = dict(defaults)
     for key, value in settings.items():
+        if value is None:
+            continue
+
         default_value = merged.get(key)
         merged[key] = (
             merge_user_ui_settings(default_value, value)
@@ -65,6 +68,23 @@ def merge_user_ui_settings(defaults: dict, settings: dict) -> dict:
     return merged
 
 
+def strip_default_ui_settings(defaults: dict, settings: dict) -> dict:
+    stripped = {}
+    for key, value in settings.items():
+        if value is None:
+            continue
+
+        default_value = defaults.get(key)
+        if isinstance(default_value, dict) and isinstance(value, dict):
+            nested = strip_default_ui_settings(default_value, value)
+            if nested:
+                stripped[key] = nested
+        elif value != default_value:
+            stripped[key] = value
+
+    return stripped
+
+
 ############################
 # GetUsers
 # A house is only as strong as its care for the least of
@@ -452,7 +472,7 @@ async def get_user_settings_by_session_user(
     user=Depends(get_verified_user), db: AsyncSession = Depends(get_async_session)
 ):
     # user already fetched by get_verified_user — no need to refetch
-    default_ui_settings = await Config.get('ui.default_user_settings')
+    default_ui_settings = await Config.get('ui.default_settings')
     if not isinstance(default_ui_settings, dict) or not default_ui_settings:
         return user.settings
 
@@ -515,6 +535,11 @@ async def update_user_settings_by_session_user(
         if isinstance(ui_notifications, dict):
             ui_notifications.pop('webhook_url', None)
 
+    default_ui_settings = await Config.get('ui.default_settings')
+    ui_settings = updated_user_settings.get('ui')
+    if isinstance(default_ui_settings, dict) and isinstance(ui_settings, dict):
+        updated_user_settings['ui'] = strip_default_ui_settings(default_ui_settings, ui_settings)
+
     user = await Users.update_user_settings_by_id(user.id, updated_user_settings, db=db)
     if user:
         await publish_event(