From 2e77d5ef0e46d530c73501ba3a130490e52ebd6b Mon Sep 17 00:00:00 2001 From: Timothy Jaeryang Baek Date: Wed, 12 Feb 2025 01:32:49 -0800 Subject: [PATCH] refac --- src/lib/apis/index.ts | 25 +++++++++++++++++-- src/lib/components/admin/Functions.svelte | 10 ++++---- .../components/admin/Settings/Audio.svelte | 2 +- .../admin/Settings/Connections.svelte | 2 +- .../admin/Settings/Evaluations.svelte | 8 +++--- .../components/admin/Settings/Models.svelte | 6 ++--- .../Models/Manage/ManageOllama.svelte | 8 +++--- .../admin/Settings/Pipelines.svelte | 8 +++--- .../chat/ModelSelector/Selector.svelte | 2 +- src/lib/components/chat/SettingsModal.svelte | 2 +- src/lib/components/workspace/Models.svelte | 8 +++--- src/routes/(app)/+layout.svelte | 2 +- .../(app)/admin/functions/create/+page.svelte | 2 +- .../(app)/admin/functions/edit/+page.svelte | 2 +- .../(app)/workspace/models/+page.svelte | 2 +- .../workspace/models/create/+page.svelte | 2 +- .../(app)/workspace/models/edit/+page.svelte | 2 +- src/routes/s/[id]/+page.svelte | 2 +- 18 files changed, 58 insertions(+), 37 deletions(-) diff --git a/src/lib/apis/index.ts b/src/lib/apis/index.ts index d1be9c210..53c577a45 100644 --- a/src/lib/apis/index.ts +++ b/src/lib/apis/index.ts @@ -62,15 +62,28 @@ export const getModels = async ( })) }; - requests.push(() => modelList); + requests.push( + (async () => { + return modelList; + })() + ); } else { requests.push(getOpenAIModelsDirect(url, OPENAI_API_KEYS[idx])); } } else { - requests.push(() => {}); + requests.push( + (async () => { + return { + object: 'list', + data: [], + urlIdx: idx + }; + })() + ); } } } + const responses = await Promise.all(requests); for (const idx in responses) { @@ -98,6 +111,14 @@ export const getModels = async ( direct: true })) ); + + // Remove duplicates + const modelsMap = {}; + for (const model of models) { + modelsMap[model.id] = model; + } + + models = Object.values(modelsMap); } return models; diff --git a/src/lib/components/admin/Functions.svelte b/src/lib/components/admin/Functions.svelte index 1d8ccab14..9134ace55 100644 --- a/src/lib/components/admin/Functions.svelte +++ b/src/lib/components/admin/Functions.svelte @@ -129,7 +129,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); } @@ -155,7 +155,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); } @@ -372,7 +372,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); @@ -515,7 +515,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); }} @@ -541,7 +541,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); }; diff --git a/src/lib/components/admin/Settings/Audio.svelte b/src/lib/components/admin/Settings/Audio.svelte index 5d1248141..7fcfc7683 100644 --- a/src/lib/components/admin/Settings/Audio.svelte +++ b/src/lib/components/admin/Settings/Audio.svelte @@ -53,7 +53,7 @@ } else { const res = await _getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ).catch((e) => { toast.error(`${e}`); }); diff --git a/src/lib/components/admin/Settings/Connections.svelte b/src/lib/components/admin/Settings/Connections.svelte index 7b2f04531..40ef6a926 100644 --- a/src/lib/components/admin/Settings/Connections.svelte +++ b/src/lib/components/admin/Settings/Connections.svelte @@ -25,7 +25,7 @@ const getModels = async () => { const models = await _getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ); return models; }; diff --git a/src/lib/components/admin/Settings/Evaluations.svelte b/src/lib/components/admin/Settings/Evaluations.svelte index abc3d7fb8..5470cd739 100644 --- a/src/lib/components/admin/Settings/Evaluations.svelte +++ b/src/lib/components/admin/Settings/Evaluations.svelte @@ -30,7 +30,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); } @@ -44,7 +44,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); }; @@ -57,7 +57,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); }; @@ -71,7 +71,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); }; diff --git a/src/lib/components/admin/Settings/Models.svelte b/src/lib/components/admin/Settings/Models.svelte index 8e3385d5d..ea1b0c6ea 100644 --- a/src/lib/components/admin/Settings/Models.svelte +++ b/src/lib/components/admin/Settings/Models.svelte @@ -114,7 +114,7 @@ _models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); await init(); @@ -141,7 +141,7 @@ _models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); }; @@ -343,7 +343,7 @@ await _models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); diff --git a/src/lib/components/admin/Settings/Models/Manage/ManageOllama.svelte b/src/lib/components/admin/Settings/Models/Manage/ManageOllama.svelte index 8f16df06e..b786b27d5 100644 --- a/src/lib/components/admin/Settings/Models/Manage/ManageOllama.svelte +++ b/src/lib/components/admin/Settings/Models/Manage/ManageOllama.svelte @@ -238,7 +238,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); } else { @@ -402,7 +402,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); }; @@ -420,7 +420,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); }; @@ -524,7 +524,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); diff --git a/src/lib/components/admin/Settings/Pipelines.svelte b/src/lib/components/admin/Settings/Pipelines.svelte index c94a16f0b..c09168eaa 100644 --- a/src/lib/components/admin/Settings/Pipelines.svelte +++ b/src/lib/components/admin/Settings/Pipelines.svelte @@ -66,7 +66,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); saveHandler(); @@ -133,7 +133,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); } @@ -163,7 +163,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); } @@ -197,7 +197,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); } diff --git a/src/lib/components/chat/ModelSelector/Selector.svelte b/src/lib/components/chat/ModelSelector/Selector.svelte index 8a55c4537..852307a6f 100644 --- a/src/lib/components/chat/ModelSelector/Selector.svelte +++ b/src/lib/components/chat/ModelSelector/Selector.svelte @@ -197,7 +197,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); } else { diff --git a/src/lib/components/chat/SettingsModal.svelte b/src/lib/components/chat/SettingsModal.svelte index 227ac0bb5..e2be60bd6 100644 --- a/src/lib/components/chat/SettingsModal.svelte +++ b/src/lib/components/chat/SettingsModal.svelte @@ -324,7 +324,7 @@ const getModels = async () => { return await _getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ); }; diff --git a/src/lib/components/workspace/Models.svelte b/src/lib/components/workspace/Models.svelte index 60130da8a..b4fc62b92 100644 --- a/src/lib/components/workspace/Models.svelte +++ b/src/lib/components/workspace/Models.svelte @@ -71,7 +71,7 @@ await _models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); models = await getWorkspaceModels(localStorage.token); @@ -142,7 +142,7 @@ await _models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); models = await getWorkspaceModels(localStorage.token); @@ -384,7 +384,7 @@ _models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); @@ -436,7 +436,7 @@ await _models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 703d32a3f..09dbefde8 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -96,7 +96,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); banners.set(await getBanners(localStorage.token)); diff --git a/src/routes/(app)/admin/functions/create/+page.svelte b/src/routes/(app)/admin/functions/create/+page.svelte index a8e9b5a42..7a5a23899 100644 --- a/src/routes/(app)/admin/functions/create/+page.svelte +++ b/src/routes/(app)/admin/functions/create/+page.svelte @@ -50,7 +50,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); diff --git a/src/routes/(app)/admin/functions/edit/+page.svelte b/src/routes/(app)/admin/functions/edit/+page.svelte index 8d7866cff..20d36a717 100644 --- a/src/routes/(app)/admin/functions/edit/+page.svelte +++ b/src/routes/(app)/admin/functions/edit/+page.svelte @@ -51,7 +51,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); } diff --git a/src/routes/(app)/workspace/models/+page.svelte b/src/routes/(app)/workspace/models/+page.svelte index 21632624c..b1141f7df 100644 --- a/src/routes/(app)/workspace/models/+page.svelte +++ b/src/routes/(app)/workspace/models/+page.svelte @@ -10,7 +10,7 @@ models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); })() diff --git a/src/routes/(app)/workspace/models/create/+page.svelte b/src/routes/(app)/workspace/models/create/+page.svelte index 1b3cac4fa..2518db760 100644 --- a/src/routes/(app)/workspace/models/create/+page.svelte +++ b/src/routes/(app)/workspace/models/create/+page.svelte @@ -45,7 +45,7 @@ await models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); toast.success($i18n.t('Model created successfully!')); diff --git a/src/routes/(app)/workspace/models/edit/+page.svelte b/src/routes/(app)/workspace/models/edit/+page.svelte index a843ec5c0..df2ff21d7 100644 --- a/src/routes/(app)/workspace/models/edit/+page.svelte +++ b/src/routes/(app)/workspace/models/edit/+page.svelte @@ -37,7 +37,7 @@ await models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); toast.success($i18n.t('Model updated successfully')); diff --git a/src/routes/s/[id]/+page.svelte b/src/routes/s/[id]/+page.svelte index 81ea3787f..3e93a4aa0 100644 --- a/src/routes/s/[id]/+page.svelte +++ b/src/routes/s/[id]/+page.svelte @@ -64,7 +64,7 @@ await models.set( await getModels( localStorage.token, - $config?.features?.enable_direct_connetions && ($settings?.directConnections ?? null) + $config?.features?.enable_direct_connections && ($settings?.directConnections ?? null) ) ); await chatId.set($page.params.id);