perf: update models for common user

ibuler · ibuler · commit b10b3106561f · 2025-12-03T15:51:15.000+08:00
diff --git a/backend/open_webui/config.py b/backend/open_webui/config.py
@@ -1098,7 +1098,8 @@ def feishu_oauth_register(oauth: OAuth):
         "key": "",
         "config": {
             "enable": True,
-            "access_control": None
+            "access_control": None,
+            "require_admin": True
         },
         "spec_type": "url",
         "spec": "",
diff --git a/backend/open_webui/env.py b/backend/open_webui/env.py
@@ -525,14 +525,14 @@ def parse_section(section):
 # MODELS
 ####################################
 
-MODELS_CACHE_TTL = os.environ.get("MODELS_CACHE_TTL", "1")
+MODELS_CACHE_TTL = os.environ.get("MODELS_CACHE_TTL", "30")
 if MODELS_CACHE_TTL == "":
     MODELS_CACHE_TTL = None
 else:
     try:
         MODELS_CACHE_TTL = int(MODELS_CACHE_TTL)
     except Exception:
-        MODELS_CACHE_TTL = 1
+        MODELS_CACHE_TTL = 30
 
 ####################################
 # CHAT
diff --git a/backend/open_webui/models/models.py b/backend/open_webui/models/models.py
@@ -216,6 +216,7 @@ def get_models_by_user_id(
         ]
 
     def get_model_by_id(self, id: str) -> Optional[ModelModel]:
+        return None
         try:
             with get_db() as db:
                 model = db.get(Model, id)
diff --git a/backend/open_webui/routers/tools.py b/backend/open_webui/routers/tools.py
@@ -96,6 +96,10 @@ async def get_tools(request: Request, user=Depends(get_verified_user)):
 
     # MCP Tool Servers
     for server in request.app.state.config.TOOL_SERVER_CONNECTIONS:
+        require_admin = server.get("config", {}).get("require_admin", False)
+        if require_admin and user.role != "admin":
+            continue
+
         if server.get("type", "openapi") == "mcp":
             server_id = server.get("info", {}).get("id")
             auth_type = server.get("auth_type", "none")
diff --git a/backend/open_webui/utils/access_control.py b/backend/open_webui/utils/access_control.py
@@ -110,7 +110,7 @@ def has_access(
     type: str = "write",
     access_control: Optional[dict] = None,
     user_group_ids: Optional[Set[str]] = None,
-    strict: bool = True,
+    strict: bool = False,
 ) -> bool:
     if access_control is None:
         if strict:
diff --git a/backend/open_webui/utils/models.py b/backend/open_webui/utils/models.py
@@ -27,7 +27,7 @@
     DEFAULT_ARENA_MODEL,
 )
 
-from open_webui.env import BYPASS_MODEL_ACCESS_CONTROL, SRC_LOG_LEVELS, GLOBAL_LOG_LEVEL
+from open_webui.env import BYPASS_MODEL_ACCESS_CONTROL, SRC_LOG_LEVELS, GLOBAL_LOG_LEVEL, MODELS_CACHE_TTL
 from open_webui.models.users import UserModel
 
 
@@ -58,6 +58,10 @@ async def fetch_openai_models(request: Request, user: UserModel = None):
     return openai_response["data"]
 
 
+@cached(
+    ttl=MODELS_CACHE_TTL,
+    key=lambda _, user: f"all_base_models_{user.id}" if user else "all_base_models",
+)
 async def get_all_base_models(request: Request, user: UserModel = None):
     openai_task = (
         fetch_openai_models(request, user)
@@ -356,9 +360,11 @@ def check_model_access(user, model):
         ):
             raise Exception("Model not found")
     else:
-        model_info = Models.get_model_by_id(model.get("id"))
+        # model_info = Models.get_model_by_id(model.get("id"))
+        model_info = None
         if not model_info:
-            raise Exception("Model not found")
+            return True
+            # raise Exception("Model not found")
         elif not (
             user.id == model_info.user_id
             or has_access(
@@ -395,10 +401,13 @@ def get_filtered_models(models, user):
                     or has_access(
                         user.id,
                         type="read",
+                        strict=False,
                         access_control=model_info.access_control,
                     )
                 ):
                     filtered_models.append(model)
+            else:
+                filtered_models.append(model)
 
         return filtered_models
     else:
diff --git a/src/app.html b/src/app.html
@@ -2,27 +2,12 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<link rel="icon" type="image/png" href="/kael/static/favicon.png" crossorigin="use-credentials" />
-		<link
-			rel="icon"
-			type="image/png"
-			href="/kael/static/favicon-96x96.png"
-			sizes="96x96"
-			crossorigin="use-credentials"
-		/>
 		<link
 			rel="icon"
 			type="image/svg+xml"
 			href="/kael/static/favicon.svg"
 			crossorigin="use-credentials"
 		/>
-		<link rel="shortcut icon" href="/kael/static/favicon.ico" crossorigin="use-credentials" />
-		<link
-			rel="apple-touch-icon"
-			sizes="180x180"
-			href="/kael/static/apple-touch-icon.png"
-			crossorigin="use-credentials"
-		/>
 		<link rel="manifest" href="/kael/manifest.json" crossorigin="use-credentials" />
 		<meta
 			name="viewport"
diff --git a/src/lib/components/chat/ModelSelector/Selector.svelte b/src/lib/components/chat/ModelSelector/Selector.svelte
@@ -337,7 +337,7 @@
 		console.log('Items: ');
 		console.log(items);
 
-		if (!selectedModel) {
+		if (!selectedModel && items.length > 0) {
 			selectedModel = items[0];
 			value = selectedModel.value;
 		}
diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte
@@ -1240,6 +1240,12 @@
 										}}
 									/>
 								{/each}
+								
+								{#if $chats.length === 0 && !chatListLoading}
+									<div class="w-full flex justify-center py-1 text-xs items-center gap-2">
+										<div class=" ">{$i18n.t('No chats found')}</div>
+									</div>
+								{/if}
 
 								{#if $scrollPaginationEnabled && !allChatsLoaded}
 									<Loader

Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,7 @@ def get_models_by_user_id(`
`216`	`216`	`]`
`217`	`217`
`218`	`218`	`def get_model_by_id(self, id: str) -> Optional[ModelModel]:`
	`219`	`+ return None`
`219`	`220`	`try:`
`220`	`221`	`with get_db() as db:`
`221`	`222`	`model = db.get(Model, id)`
Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@`
`337`	`337`	`console.log('Items: ');`
`338`	`338`	`console.log(items);`
`339`	`339`
`340`		`- if (!selectedModel) {`
	`340`	`+ if (!selectedModel && items.length > 0) {`
`341`	`341`	`selectedModel = items[0];`
`342`	`342`	`value = selectedModel.value;`
`343`	`343`	`}`