mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 08:12:00 +02:00

* refactor: add gemini-pro to google Models list; use defaultModels for central model listing * refactor(SetKeyDialog): create useMultipleKeys hook to use for Azure, export `isJson` from utils, use EModelEndpoint * refactor(useUserKey): change variable names to make keyName setting more clear * refactor(FileUpload): allow passing container className string * feat(GoogleClient): Gemini support * refactor(GoogleClient): alternate stream speed for Gemini models * feat(Gemini): styling/settings configuration for Gemini * refactor(GoogleClient): substract max response tokens from max context tokens if context is above 32k (I/O max is combined between the two) * refactor(tokens): correct google max token counts and subtract max response tokens when input/output count are combined towards max context count * feat(google/initializeClient): handle both local and user_provided credentials and write tests * fix(GoogleClient): catch if credentials are undefined, handle if serviceKey is string or object correctly, handle no examples passed, throw error if not a Generative Language model and no service account JSON key is provided, throw error if it is a Generative m odel, but not google API key was provided * refactor(loadAsyncEndpoints/google): activate Google endpoint if either the service key JSON file is provided in /api/data, or a GOOGLE_KEY is defined. * docs: updated Google configuration * fix(ci): Mock import of Service Account Key JSON file (auth.json) * Update apis_and_tokens.md * feat: increase max output tokens slider for gemini pro * refactor(GoogleSettings): handle max and default maxOutputTokens on model change * chore: add sensitive redact regex * docs: add warning about data privacy * Update apis_and_tokens.md
84 lines
2.8 KiB
JavaScript
84 lines
2.8 KiB
JavaScript
const initializeClient = require('./initializeClient');
|
|
const { GoogleClient } = require('~/app');
|
|
const { checkUserKeyExpiry, getUserKey } = require('../../UserService');
|
|
|
|
jest.mock('../../UserService', () => ({
|
|
checkUserKeyExpiry: jest.fn().mockImplementation((expiresAt, errorMessage) => {
|
|
if (new Date(expiresAt) < new Date()) {
|
|
throw new Error(errorMessage);
|
|
}
|
|
}),
|
|
getUserKey: jest.fn().mockImplementation(() => ({})),
|
|
}));
|
|
|
|
describe('google/initializeClient', () => {
|
|
afterEach(() => {
|
|
jest.clearAllMocks();
|
|
});
|
|
|
|
test('should initialize GoogleClient with user-provided credentials', async () => {
|
|
process.env.GOOGLE_KEY = 'user_provided';
|
|
process.env.GOOGLE_REVERSE_PROXY = 'http://reverse.proxy';
|
|
process.env.PROXY = 'http://proxy';
|
|
|
|
const expiresAt = new Date(Date.now() + 60000).toISOString();
|
|
|
|
const req = {
|
|
body: { key: expiresAt },
|
|
user: { id: '123' },
|
|
};
|
|
const res = {};
|
|
const endpointOption = { modelOptions: { model: 'default-model' } };
|
|
|
|
const { client, credentials } = await initializeClient({ req, res, endpointOption });
|
|
|
|
expect(getUserKey).toHaveBeenCalledWith({ userId: '123', name: 'google' });
|
|
expect(client).toBeInstanceOf(GoogleClient);
|
|
expect(client.options.reverseProxyUrl).toBe('http://reverse.proxy');
|
|
expect(client.options.proxy).toBe('http://proxy');
|
|
expect(credentials).toEqual({});
|
|
});
|
|
|
|
test('should initialize GoogleClient with service key credentials', async () => {
|
|
process.env.GOOGLE_KEY = 'service_key';
|
|
process.env.GOOGLE_REVERSE_PROXY = 'http://reverse.proxy';
|
|
process.env.PROXY = 'http://proxy';
|
|
|
|
const req = {
|
|
body: { key: null },
|
|
user: { id: '123' },
|
|
};
|
|
const res = {};
|
|
const endpointOption = { modelOptions: { model: 'default-model' } };
|
|
|
|
const { client, credentials } = await initializeClient({ req, res, endpointOption });
|
|
|
|
expect(client).toBeInstanceOf(GoogleClient);
|
|
expect(client.options.reverseProxyUrl).toBe('http://reverse.proxy');
|
|
expect(client.options.proxy).toBe('http://proxy');
|
|
expect(credentials).toEqual({
|
|
GOOGLE_SERVICE_KEY: {},
|
|
GOOGLE_API_KEY: 'service_key',
|
|
});
|
|
});
|
|
|
|
test('should handle expired user-provided key', async () => {
|
|
process.env.GOOGLE_KEY = 'user_provided';
|
|
|
|
const expiresAt = new Date(Date.now() - 10000).toISOString(); // Expired
|
|
const req = {
|
|
body: { key: expiresAt },
|
|
user: { id: '123' },
|
|
};
|
|
const res = {};
|
|
const endpointOption = { modelOptions: { model: 'default-model' } };
|
|
|
|
checkUserKeyExpiry.mockImplementation((expiresAt, errorMessage) => {
|
|
throw new Error(errorMessage);
|
|
});
|
|
|
|
await expect(initializeClient({ req, res, endpointOption })).rejects.toThrow(
|
|
/Your Google Credentials have expired/,
|
|
);
|
|
});
|
|
});
|