fix: patch api key not persisting when setting LLM/Embedder (#458)

Mintplex-Labs · Dec 16, 2023 · 65c7c0a · 65c7c0a
1 parent ecfd146
commit 65c7c0a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/frontend/src/components/EmbeddingSelection/LocalAiOptions/index.jsx b/frontend/src/components/EmbeddingSelection/LocalAiOptions/index.jsx
@@ -91,7 +91,11 @@ function LocalAIModelSelection({ settings, apiKey = null, basePath = null }) {
         return;
       }
       setLoading(true);
-      const { models } = await System.customModels("localai", apiKey, basePath);
+      const { models } = await System.customModels(
+        "localai",
+        typeof apiKey === "boolean" ? null : apiKey,
+        basePath
+      );
       setCustomModels(models || []);
       setLoading(false);
     }

diff --git a/frontend/src/components/LLMSelection/LocalAiOptions/index.jsx b/frontend/src/components/LLMSelection/LocalAiOptions/index.jsx
@@ -108,7 +108,11 @@ function LocalAIModelSelection({ settings, basePath = null, apiKey = null }) {
         return;
       }
       setLoading(true);
-      const { models } = await System.customModels("localai", apiKey, basePath);
+      const { models } = await System.customModels(
+        "localai",
+        typeof apiKey === "boolean" ? null : apiKey,
+        basePath
+      );
       setCustomModels(models || []);
       setLoading(false);
     }

diff --git a/frontend/src/components/LLMSelection/OpenAiOptions/index.jsx b/frontend/src/components/LLMSelection/OpenAiOptions/index.jsx
@@ -4,9 +4,6 @@ import System from "@/models/system";
 export default function OpenAiOptions({ settings }) {
   const [inputValue, setInputValue] = useState(settings?.OpenAiKey);
   const [openAIKey, setOpenAIKey] = useState(settings?.OpenAiKey);
-  function updateOpenAiKey() {
-    setOpenAIKey(inputValue);
-  }
 
   return (
     <>
@@ -24,7 +21,7 @@ export default function OpenAiOptions({ settings }) {
           autoComplete="off"
           spellCheck={false}
           onChange={(e) => setInputValue(e.target.value)}
-          onBlur={updateOpenAiKey}
+          onBlur={() => setOpenAIKey(inputValue)}
         />
       </div>
       <OpenAIModelSelection settings={settings} apiKey={openAIKey} />

diff --git a/server/utils/helpers/customModels.js b/server/utils/helpers/customModels.js
@@ -34,14 +34,16 @@ async function openAiModels(apiKey = null) {
     (model) => !model.owned_by.includes("openai") && model.owned_by !== "system"
   );
 
+  // Api Key was successful so lets save it for future uses
+  if (models.length > 0 && !!apiKey) process.env.OPEN_AI_KEY = apiKey;
   return { models, error: null };
 }
 
 async function localAIModels(basePath = null, apiKey = null) {
   const { Configuration, OpenAIApi } = require("openai");
   const config = new Configuration({
     basePath,
-    ...(!!apiKey ? { apiKey } : {}),
+    apiKey: apiKey || process.env.LOCAL_AI_API_KEY,
   });
   const openai = new OpenAIApi(config);
   const models = await openai
@@ -52,6 +54,8 @@ async function localAIModels(basePath = null, apiKey = null) {
       return [];
     });
 
+  // Api Key was successful so lets save it for future uses
+  if (models.length > 0 && !!apiKey) process.env.LOCAL_AI_API_KEY = apiKey;
   return { models, error: null };
 }