From d0850a0288aa06a1069aca398bd210cd021cd318 Mon Sep 17 00:00:00 2001
From: Weves <chrisweaver101@gmail.com>
Date: Tue, 14 May 2024 13:13:25 -0700
Subject: [PATCH] Fix model names for enabled LLM providers

---
 backend/danswer/server/manage/llm/models.py                | 2 +-
 .../app/admin/models/llm/ConfiguredLLMProviderDisplay.tsx  | 6 ++++--
 web/src/app/admin/models/llm/LLMConfiguration.tsx          | 7 -------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/backend/danswer/server/manage/llm/models.py b/backend/danswer/server/manage/llm/models.py
index 54ec9d8b171..c989063df7e 100644
--- a/backend/danswer/server/manage/llm/models.py
+++ b/backend/danswer/server/manage/llm/models.py
@@ -87,7 +87,7 @@ class FullLLMProvider(LLMProvider):
             is_default_provider=llm_provider_model.is_default_provider,
             model_names=(
                 llm_provider_model.model_names
-                or fetch_models_for_provider(llm_provider_model.name)
+                or fetch_models_for_provider(llm_provider_model.provider)
                 or [llm_provider_model.default_model_name]
             ),
         )
diff --git a/web/src/app/admin/models/llm/ConfiguredLLMProviderDisplay.tsx b/web/src/app/admin/models/llm/ConfiguredLLMProviderDisplay.tsx
index 3c28f25cdfb..701b032e642 100644
--- a/web/src/app/admin/models/llm/ConfiguredLLMProviderDisplay.tsx
+++ b/web/src/app/admin/models/llm/ConfiguredLLMProviderDisplay.tsx
@@ -7,6 +7,7 @@ import { useState } from "react";
 import { LLM_PROVIDERS_ADMIN_URL } from "./constants";
 import { mutate } from "swr";
 import { Badge, Button } from "@tremor/react";
+import isEqual from "lodash/isEqual";
 
 function LLMProviderUpdateModal({
   llmProviderDescriptor,
@@ -165,7 +166,6 @@ export function ConfiguredLLMProviderDisplay({
           (llmProviderDescriptors) =>
             llmProviderDescriptors.name === provider.provider
         );
-        console.log(provider.model_names.length);
 
         return (
           <LLMProviderDisplay
@@ -174,7 +174,9 @@ export function ConfiguredLLMProviderDisplay({
             // then the provider is custom - don't use the default
             // provider descriptor
             llmProviderDescriptor={
-              provider.model_names.length > 0 ? null : defaultProviderDesciptor
+              isEqual(provider.model_names, defaultProviderDesciptor?.llm_names)
+                ? defaultProviderDesciptor
+                : null
             }
             existingLlmProvider={provider}
           />
diff --git a/web/src/app/admin/models/llm/LLMConfiguration.tsx b/web/src/app/admin/models/llm/LLMConfiguration.tsx
index d23e8a4e37a..f8fb7512740 100644
--- a/web/src/app/admin/models/llm/LLMConfiguration.tsx
+++ b/web/src/app/admin/models/llm/LLMConfiguration.tsx
@@ -136,13 +136,6 @@ export function LLMConfiguration() {
     return <ThreeDotsLoader />;
   }
 
-  const wellKnownLLMProviderNames = llmProviderDescriptors.map(
-    (llmProviderDescriptor) => llmProviderDescriptor.name
-  );
-  const customLLMProviders = existingLlmProviders.filter(
-    (llmProvider) => !wellKnownLLMProviderNames.includes(llmProvider.name)
-  );
-
   return (
     <>
       <Title className="mb-2">Enabled LLM Providers</Title>