Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-17 08:50:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix(handleTools.js): refactor loading of openAIApiKey to handle user_provided value (#603)

Browse source 
fix(PluginController.js): handle user_provided value in isPluginAuthenticated function
refactor(PluginService.js): remove commented out code
This commit is contained in:
Danny Avila 2023-07-07 13:59:59 -04:00 • committed by GitHub
parent 9eefa3e24c
commit a64342f515
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
api/app/clients/tools/util/handleTools.js
View file

@ -84,10 +84,9 @@ const loadTools = async ({ user, model, functions = null, tools = [], options =
const customConstructors = { const customConstructors = {
browser: async () => { browser: async () => {
let openAIApiKey = process.env.OPENAI_API_KEY; let openAIApiKey = options.openAIApiKey ?? process.env.OPENAI_API_KEY;
if (!openAIApiKey) { openAIApiKey = openAIApiKey === 'user_provided' ? null : openAIApiKey;
openAIApiKey = await getUserPluginAuthValue(user, 'OPENAI_API_KEY'); openAIApiKey = openAIApiKey || await getUserPluginAuthValue(user, 'OPENAI_API_KEY');
}
return new WebBrowser({ model, embeddings: new OpenAIEmbeddings({ openAIApiKey }) }); return new WebBrowser({ model, embeddings: new OpenAIEmbeddings({ openAIApiKey }) });
}, },
serpapi: async () => { serpapi: async () => {

3
api/server/controllers/PluginController.js
View file

@ -18,6 +18,9 @@ const isPluginAuthenticated = (plugin) => {
return plugin.authConfig.every((authFieldObj) => { return plugin.authConfig.every((authFieldObj) => {
const envValue = process.env[authFieldObj.authField]; const envValue = process.env[authFieldObj.authField];
if (envValue === 'user_provided') {
return false;
}
return envValue && envValue.trim() !== ''; return envValue && envValue.trim() !== '';
}); });
}; };

1
api/server/services/PluginService.js
View file

@ -40,7 +40,6 @@ const getUserPluginAuthValue = async (user, authField) => {
// } // }
// }; // };
const updateUserPluginAuth = async (userId, authField, pluginKey, value) => { const updateUserPluginAuth = async (userId, authField, pluginKey, value) => {
try { try {
const encryptedValue = encrypt(value); const encryptedValue = encrypt(value);