kamp/anything-llm
1
0
Fork 0
mirror of https://github.com/Mintplex-Labs/anything-llm.git synced 2024-07-02 15:20:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Timothy Carambat 2023-12-16 10:21:36 -08:00 committed by GitHub
parent ecfd146891
commit 65c7c0a518
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/EmbeddingSelection/LocalAiOptions/index.jsx
View File

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

6
frontend/src/components/LLMSelection/LocalAiOptions/index.jsx
View File

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

5
frontend/src/components/LLMSelection/OpenAiOptions/index.jsx
View File

@ -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} />

6
server/utils/helpers/customModels.js
View File

@ -34,6 +34,8 @@ 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 };
}
@ -41,7 +43,7 @@ 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 };
}