Refactor model name replacement logic in DashboardGrid.tsx

n4ze3m · May 3, 2024 · 0d58f33 · 0d58f33
1 parent b1b5654
commit 0d58f33
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 8 deletions.
diff --git a/app/ui/src/components/Bot/Settings/SettingsCard.tsx b/app/ui/src/components/Bot/Settings/SettingsCard.tsx
@@ -261,9 +261,20 @@ export const SettingsCard: React.FC<BotSettings> = ({
                   />
                 </Form.Item>
 
-                <Form.Item label={"Embedding Method"} name="embedding">
+                <Form.Item
+                  label={"Embedding Method"}
+                  name="embedding"
+                  help={
+                    <>
+                      <p className="text-xs text-gray-500 dark:text-gray-400">
+                        If you change the embedding method, make sure to
+                        re-fetch the data source or choose a model with the same
+                        dimensions
+                      </p>
+                    </>
+                  }
+                >
                   <Select
-                    disabled
                     placeholder="Select an embedding method"
                     options={embeddingModel}
                   />

diff --git a/server/src/handlers/api/v1/bot/bot/get.handler.ts b/server/src/handlers/api/v1/bot/bot/get.handler.ts
@@ -164,7 +164,6 @@ export const getCreateBotConfigHandler = async (
         disabled: model.model_id === "dialoqbase_eb_dialoqbase-ollama",
       };
     });
-
   if (settings?.dynamicallyFetchOllamaModels) {
     const ollamaModels = await getAllOllamaModels(settings.ollamaURL);
     chatModel.push(
@@ -201,11 +200,23 @@ export const getBotByIdSettingsHandler = async (
       user_id: request.user.user_id,
     },
   });
+  if (!bot) {
+    return reply.status(404).send({
+      message: "Bot not found",
+    });
+  }
+  const settings = await getSettings(prisma);
 
+  const not_to_hide_providers = settings?.hideDefaultModels
+    ? ["Local", "local", "ollama", "transformer", "Transformer"]
+    : undefined;
   const models = await prisma.dialoqbaseModels.findMany({
     where: {
       hide: false,
       deleted: false,
+      model_provider: {
+        in: not_to_hide_providers,
+      },
     },
   });
 
@@ -232,11 +243,19 @@ export const getBotByIdSettingsHandler = async (
         disabled: model.model_id === "dialoqbase_eb_dialoqbase-ollama",
       };
     });
-
-  if (!bot) {
-    return reply.status(404).send({
-      message: "Bot not found",
-    });
+  if (settings?.dynamicallyFetchOllamaModels) {
+    const ollamaModels = await getAllOllamaModels(settings.ollamaURL);
+    chatModel.push(
+      ...ollamaModels?.filter((model) => {
+        return (
+          !model?.details?.families?.includes("bert") &&
+          !model?.details?.families?.includes("nomic-bert")
+        );
+      })
+    );
+    embeddingModel.push(
+      ...ollamaModels.map((model) => ({ ...model, disabled: false }))
+    );
   }
   return {
     data: bot,