From 95bde946ba4db0e6f88970e8507d5c404c53d6b1 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Mon, 23 Feb 2026 03:22:19 -0600
Subject: [PATCH] refac

---
 backend/open_webui/utils/models.py |  2 +-
 src/routes/(app)/+layout.svelte    | 11 +++++++----
 src/routes/+layout.svelte          |  8 ++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/backend/open_webui/utils/models.py b/backend/open_webui/utils/models.py
index 285de54fc..6040c0645 100644
--- a/backend/open_webui/utils/models.py
+++ b/backend/open_webui/utils/models.py
@@ -459,7 +459,7 @@ def get_filtered_models(models, user, db=None):
             if model_info:
                 if (
                     (user.role == "admin" and BYPASS_ADMIN_ACCESS_CONTROL)
-                    or user.id == model_info["user_id"]
+                    or user.id == model_info.get("user_id")
                     or model["id"] in accessible_model_ids
                 ):
                     filtered_models.append(model)
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 51c7c23cf..01fd713d3 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -152,11 +152,14 @@
 		clearChatInputStorage();
 		await Promise.all([
 			checkLocalDBChats(),
-			setBanners(),
-			setTools(),
+			setBanners().catch((e) => console.error('Failed to load banners:', e)),
+			setTools().catch((e) => console.error('Failed to load tools:', e)),
 			setUserSettings(async () => {
-				await Promise.all([setModels(), setToolServers()]);
-			})
+				await Promise.all([
+					setModels().catch((e) => console.error('Failed to load models:', e)),
+					setToolServers().catch((e) => console.error('Failed to load tool servers:', e))
+				]);
+			}).catch((e) => console.error('Failed to load user settings:', e))
 		]);
 
 		// Helper function to check if the pressed keys match the shortcut definition
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 66f66676f..3af997c32 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -770,7 +770,7 @@
 			const browserLanguages = navigator.languages
 				? navigator.languages
 				: [navigator.language || navigator.userLanguage];
-			const lang = backendConfig.default_locale
+			const lang = backendConfig?.default_locale
 				? backendConfig.default_locale
 				: bestMatchingLanguage(languages, browserLanguages, 'en-US');
 			changeLanguage(lang);
@@ -797,7 +797,11 @@
 
 					if (sessionUser) {
 						await user.set(sessionUser);
-						await config.set(await getBackendConfig());
+						try {
+							await config.set(await getBackendConfig());
+						} catch (error) {
+							console.error('Error refreshing backend config:', error);
+						}
 					} else {
 						// Redirect Invalid Session User to /auth Page
 						localStorage.removeItem('token');