refac: base models endpoint

backend/open_webui/main.py

@@ -915,8 +915,7 @@ app.mount("/api/v1", webui_app)
 webui_app.state.EMBEDDING_FUNCTION = retrieval_app.state.EMBEDDING_FUNCTION
 
 
-async def get_all_models():
+async def get_all_base_models():
-    # TODO: Optimize this function
     open_webui_models = []
     openai_models = []
     ollama_models = []
@@ -942,6 +941,11 @@ async def get_all_models():
     open_webui_models = await get_open_webui_models()
 
     models = open_webui_models + openai_models + ollama_models
+    return models
+
+
+async def get_all_models():
+    models = await get_all_base_models()
 
     # If there are no models, return an empty list
     if len([model for model in models if model["owned_by"] != "arena"]) == 0:
@@ -1084,6 +1088,12 @@ async def get_models(user=Depends(get_verified_user)):
     return {"data": models}
 
 
+@app.get("/api/models/base")
+async def get_base_models(user=Depends(get_admin_user)):
+    models = await get_all_base_models()
+    return {"data": models}
+
+
 @app.post("/api/chat/completions")
 async def generate_chat_completions(
     form_data: dict, user=Depends(get_verified_user), bypass_filter: bool = False

src/lib/apis/index.ts

@@ -1,9 +1,10 @@
 import { WEBUI_API_BASE_URL, WEBUI_BASE_URL } from '$lib/constants';
 
-export const getModels = async (token: string = '') => {
+export const getModels = async (token: string = '', base: boolean = false) => {
 	let error = null;
-
+	const res = await fetch(`${WEBUI_BASE_URL}/api/models${
-	const res = await fetch(`${WEBUI_BASE_URL}/api/models`, {
+		base ? '/base' : ''
+	}`, {
 		method: 'GET',
 		headers: {
 			Accept: 'application/json',
@@ -16,17 +17,17 @@ export const getModels = async (token: string = '') => {
 			return res.json();
 		})
 		.catch((err) => {
-			console.log(err);
 			error = err;
+			console.log(err);
 			return null;
 		});
 	
+
 	if (error) {
 		throw error;
 	}
 
 	let models = res?.data ?? [];
-
 	models = models
 		.filter((models) => models)
 		// Sort the models

src/lib/components/admin/Settings/Models.svelte

@@ -43,7 +43,7 @@
 
 	const init = async () => {
 		const workspaceModels = await getBaseModels(localStorage.token);
-		const allModels = await getModels(localStorage.token);
+		const allModels = await getModels(localStorage.token, true);
 
 		models = allModels
 			.filter((m) => !(m?.preset ?? false))