refac

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;

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)
 				)
 			);
 		};

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}`);
 			});

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;
 	};

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)
 			)
 		);
 	};

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)
 									)
 								);

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)
 			)
 		);
 

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)
 				)
 			);
 		}

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 {

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)
 		);
 	};
 

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)
 								)
 							);

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));

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)
 				)
 			);
 

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)
 				)
 			);
 		}

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)
 					)
 				);
 			})()

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!'));

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'));

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);