Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2026-01-17 16:05:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

🔀 fix: Endpoint Type Mismatch when Switching Conversations (#1834)

Browse source 
* refactor(useUpdateUserKeysMutation): only invalidate the endpoint whose key is being updated by user

* fix(assistants): await `getUserKeyExpiry` call

* chore: fix spinner loading color

* refactor(initializeClient): make known which endpoint api Key is missing

* fix: prevent an `endpointType` mismatch by making it impossible to assign when the `endpointsConfig` doesn't have a `type` defined, also prefer `getQueryData` call to useQuery in useChatHelpers
This commit is contained in:
Danny Avila 2024-02-19 01:31:38 -05:00 • committed by GitHub
parent d1eb7fcfc7
commit 5291d18f38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
api/server/services/Endpoints/assistant/initializeClient.js
View file

@ -32,7 +32,10 @@ const initializeClient = async ({ req, res, endpointOption, initAppClient = fals
let userKey = null;
if (isUserProvided) {
const expiresAt = getUserKeyExpiry({ userId: req.user.id, name: EModelEndpoint.assistants });
const expiresAt = await getUserKeyExpiry({
userId: req.user.id,
name: EModelEndpoint.assistants,
});
checkUserKeyExpiry(
expiresAt,
'Your Assistants API key has expired. Please provide your API key again.',
@ -43,7 +46,7 @@ const initializeClient = async ({ req, res, endpointOption, initAppClient = fals
let apiKey = isUserProvided ? userKey : credentials;
if (!apiKey) {
throw new Error('API key not provided.');
throw new Error(`${EModelEndpoint.assistants} API key not provided.`);
}
/** @type {OpenAIClient} */

2
api/server/services/Endpoints/gptPlugins/initializeClient.js
View file

@ -66,7 +66,7 @@ const initializeClient = async ({ req, res, endpointOption }) => {
}
if (!apiKey) {
throw new Error('API key not provided.');
throw new Error(`${endpoint} API key not provided.`);
}
const client = new PluginsClient(apiKey, clientOptions);

7
api/server/services/Endpoints/gptPlugins/initializeClient.spec.js
View file

@ -1,7 +1,8 @@
// gptPlugins/initializeClient.spec.js
const { PluginsClient } = require('~/app');
const { EModelEndpoint } = require('librechat-data-provider');
const { getUserKey } = require('~/server/services/UserService');
const initializeClient = require('./initializeClient');
const { getUserKey } = require('../../UserService');
const { PluginsClient } = require('~/app');
// Mock getUserKey since it's the only function we want to mock
jest.mock('~/server/services/UserService', () => ({
@ -112,7 +113,7 @@ describe('gptPlugins/initializeClient', () => {
const endpointOption = { modelOptions: { model: 'default-model' } };
await expect(initializeClient({ req, res, endpointOption })).rejects.toThrow(
'API key not provided.',
`${EModelEndpoint.openAI} API key not provided.`,
);
});

2
api/server/services/Endpoints/openAI/initializeClient.js
View file

@ -58,7 +58,7 @@ const initializeClient = async ({ req, res, endpointOption }) => {
}
if (!apiKey) {
throw new Error('API key not provided.');
throw new Error(`${endpoint} API key not provided.`);
}
const client = new OpenAIClient(apiKey, clientOptions);

7
api/server/services/Endpoints/openAI/initializeClient.spec.js
View file

@ -1,6 +1,7 @@
const { OpenAIClient } = require('~/app');
const initializeClient = require('./initializeClient');
const { EModelEndpoint } = require('librechat-data-provider');
const { getUserKey } = require('~/server/services/UserService');
const initializeClient = require('./initializeClient');
const { OpenAIClient } = require('~/app');
// Mock getUserKey since it's the only function we want to mock
jest.mock('~/server/services/UserService', () => ({
@ -145,7 +146,7 @@ describe('initializeClient', () => {
const endpointOption = {};
await expect(initializeClient({ req, res, endpointOption })).rejects.toThrow(
'API key not provided.',
`${EModelEndpoint.openAI} API key not provided.`,
);
});