mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-16 08:20:14 +01:00
* 🗑️ chore: Remove unused Legacy Provider clients and related helpers * Deleted OpenAIClient and GoogleClient files along with their associated tests. * Removed references to these clients in the clients index file. * Cleaned up typedefs by removing the OpenAISpecClient export. * Updated chat controllers to use the OpenAI SDK directly instead of the removed client classes. * chore/remove-openapi-specs * 🗑️ chore: Remove unused mergeSort and misc utility functions * Deleted mergeSort.js and misc.js files as they are no longer needed. * Removed references to cleanUpPrimaryKeyValue in messages.js and adjusted related logic. * Updated mongoMeili.ts to eliminate local implementations of removed functions. * chore: remove legacy endpoints * chore: remove all plugins endpoint related code * chore: remove unused prompt handling code and clean up imports * Deleted handleInputs.js and instructions.js files as they are no longer needed. * Removed references to these files in the prompts index.js. * Updated docker-compose.yml to simplify reverse proxy configuration. * chore: remove unused LightningIcon import from Icons.tsx * chore: clean up translation.json by removing deprecated and unused keys * chore: update Jest configuration and remove unused mock file * Simplified the setupFiles array in jest.config.js by removing the fetchEventSource mock. * Deleted the fetchEventSource.js mock file as it is no longer needed. * fix: simplify endpoint type check in Landing and ConversationStarters components * Updated the endpoint type check to use strict equality for better clarity and performance. * Ensured consistency in the handling of the azureOpenAI endpoint across both components. * chore: remove unused dependencies from package.json and package-lock.json * chore: remove legacy EditController, associated routes and imports * chore: update banResponse logic to refine request handling for banned users * chore: remove unused validateEndpoint middleware and its references * chore: remove unused 'res' parameter from initializeClient in multiple endpoint files * chore: remove unused 'isSmallScreen' prop from BookmarkNav and NewChat components; clean up imports in ArchivedChatsTable and useSetIndexOptions hooks; enhance localization in PromptVersions * chore: remove unused import of Constants and TMessage from MobileNav; retain only necessary QueryKeys import * chore: remove unused TResPlugin type and related references; clean up imports in types and schemas
83 lines
2.5 KiB
JavaScript
83 lines
2.5 KiB
JavaScript
const path = require('path');
|
|
const { EModelEndpoint, AuthKeys } = require('librechat-data-provider');
|
|
const { getGoogleConfig, isEnabled, loadServiceKey } = require('@librechat/api');
|
|
const { getUserKey, checkUserKeyExpiry } = require('~/server/services/UserService');
|
|
|
|
const initializeClient = async ({ req, endpointOption, overrideModel }) => {
|
|
const { GOOGLE_KEY, GOOGLE_REVERSE_PROXY, GOOGLE_AUTH_HEADER, PROXY } = process.env;
|
|
const isUserProvided = GOOGLE_KEY === 'user_provided';
|
|
const { key: expiresAt } = req.body;
|
|
|
|
let userKey = null;
|
|
if (expiresAt && isUserProvided) {
|
|
checkUserKeyExpiry(expiresAt, EModelEndpoint.google);
|
|
userKey = await getUserKey({ userId: req.user.id, name: EModelEndpoint.google });
|
|
}
|
|
|
|
let serviceKey = {};
|
|
|
|
/** Check if GOOGLE_KEY is provided at all (including 'user_provided') */
|
|
const isGoogleKeyProvided =
|
|
(GOOGLE_KEY && GOOGLE_KEY.trim() !== '') || (isUserProvided && userKey != null);
|
|
|
|
if (!isGoogleKeyProvided) {
|
|
/** Only attempt to load service key if GOOGLE_KEY is not provided */
|
|
try {
|
|
const serviceKeyPath =
|
|
process.env.GOOGLE_SERVICE_KEY_FILE ||
|
|
path.join(__dirname, '../../../..', 'data', 'auth.json');
|
|
serviceKey = await loadServiceKey(serviceKeyPath);
|
|
if (!serviceKey) {
|
|
serviceKey = {};
|
|
}
|
|
} catch (_e) {
|
|
// Service key loading failed, but that's okay if not required
|
|
serviceKey = {};
|
|
}
|
|
}
|
|
|
|
const credentials = isUserProvided
|
|
? userKey
|
|
: {
|
|
[AuthKeys.GOOGLE_SERVICE_KEY]: serviceKey,
|
|
[AuthKeys.GOOGLE_API_KEY]: GOOGLE_KEY,
|
|
};
|
|
|
|
let clientOptions = {};
|
|
|
|
const appConfig = req.config;
|
|
/** @type {undefined | TBaseEndpoint} */
|
|
const allConfig = appConfig.endpoints?.all;
|
|
/** @type {undefined | TBaseEndpoint} */
|
|
const googleConfig = appConfig.endpoints?.[EModelEndpoint.google];
|
|
|
|
if (googleConfig) {
|
|
clientOptions.streamRate = googleConfig.streamRate;
|
|
clientOptions.titleModel = googleConfig.titleModel;
|
|
}
|
|
|
|
if (allConfig) {
|
|
clientOptions.streamRate = allConfig.streamRate;
|
|
}
|
|
|
|
clientOptions = {
|
|
reverseProxyUrl: GOOGLE_REVERSE_PROXY ?? null,
|
|
authHeader: isEnabled(GOOGLE_AUTH_HEADER) ?? null,
|
|
proxy: PROXY ?? null,
|
|
...clientOptions,
|
|
...endpointOption,
|
|
};
|
|
|
|
clientOptions = Object.assign(
|
|
{
|
|
modelOptions: endpointOption?.model_parameters ?? {},
|
|
},
|
|
clientOptions,
|
|
);
|
|
if (overrideModel) {
|
|
clientOptions.modelOptions.model = overrideModel;
|
|
}
|
|
return getGoogleConfig(credentials, clientOptions);
|
|
};
|
|
|
|
module.exports = initializeClient;
|