mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-18 01:10:14 +01:00
d39b99971f
* 🔧 fix: enhance client options handling in AgentClient and set default recursion limit
- Updated the recursion limit to default to 25 if not specified in agentsEConfig.
- Enhanced client options in AgentClient to include model parameters such as apiKey and anthropicApiUrl from agentModelParams.
- Updated requestOptions in the anthropic endpoint to use reverseProxyUrl as anthropicApiUrl.
* Enhance LLM configuration tests with edge case handling
* chore add return type annotation for getCustomEndpointConfig function
* fix: update modelOptions handling to use optional chaining and default to empty object in multiple endpoint initializations
* chore: update @librechat/agents to version 2.4.42
* refactor: streamline agent endpoint configuration and enhance client options handling for title generations
- Introduced a new `getProviderConfig` function to centralize provider configuration logic.
- Updated `AgentClient` to utilize the new provider configuration, improving clarity and maintainability.
- Removed redundant code related to endpoint initialization and model parameter handling.
- Enhanced error logging for missing endpoint configurations.
* fix: add abort handling for image generation and editing in OpenAIImageTools
* ci: enhance getLLMConfig tests to verify fetchOptions and dispatcher properties
* fix: use optional chaining for endpointOption properties in getOptions
* fix: increase title generation timeout from 25s to 45s, pass `endpointOption` to `getOptions`
* fix: update file filtering logic in getToolFilesByIds to ensure text field is properly checked
* fix: add error handling for empty OCR results in uploadMistralOCR and uploadAzureMistralOCR
* fix: enhance error handling in file upload to include 'No OCR result' message
* chore: update error messages in uploadMistralOCR and uploadAzureMistralOCR
* fix: enhance filtering logic in getToolFilesByIds to include context checks for OCR resources to only include files directly attached to agent
---------
Co-authored-by: Matt Burnett <matt.burnett@shopify.com>
79 lines
2.2 KiB
JavaScript
79 lines
2.2 KiB
JavaScript
const { EModelEndpoint, AuthKeys } = require('librechat-data-provider');
|
|
const { getUserKey, checkUserKeyExpiry } = require('~/server/services/UserService');
|
|
const { getLLMConfig } = require('~/server/services/Endpoints/google/llm');
|
|
const { isEnabled } = require('~/server/utils');
|
|
const { GoogleClient } = require('~/app');
|
|
|
|
const initializeClient = async ({ req, res, endpointOption, overrideModel, optionsOnly }) => {
|
|
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 = {};
|
|
try {
|
|
serviceKey = require('~/data/auth.json');
|
|
} catch (_e) {
|
|
// Do nothing
|
|
}
|
|
|
|
const credentials = isUserProvided
|
|
? userKey
|
|
: {
|
|
[AuthKeys.GOOGLE_SERVICE_KEY]: serviceKey,
|
|
[AuthKeys.GOOGLE_API_KEY]: GOOGLE_KEY,
|
|
};
|
|
|
|
let clientOptions = {};
|
|
|
|
/** @type {undefined | TBaseEndpoint} */
|
|
const allConfig = req.app.locals.all;
|
|
/** @type {undefined | TBaseEndpoint} */
|
|
const googleConfig = req.app.locals[EModelEndpoint.google];
|
|
|
|
if (googleConfig) {
|
|
clientOptions.streamRate = googleConfig.streamRate;
|
|
clientOptions.titleModel = googleConfig.titleModel;
|
|
}
|
|
|
|
if (allConfig) {
|
|
clientOptions.streamRate = allConfig.streamRate;
|
|
}
|
|
|
|
clientOptions = {
|
|
req,
|
|
res,
|
|
reverseProxyUrl: GOOGLE_REVERSE_PROXY ?? null,
|
|
authHeader: isEnabled(GOOGLE_AUTH_HEADER) ?? null,
|
|
proxy: PROXY ?? null,
|
|
...clientOptions,
|
|
...endpointOption,
|
|
};
|
|
|
|
if (optionsOnly) {
|
|
clientOptions = Object.assign(
|
|
{
|
|
modelOptions: endpointOption?.model_parameters ?? {},
|
|
},
|
|
clientOptions,
|
|
);
|
|
if (overrideModel) {
|
|
clientOptions.modelOptions.model = overrideModel;
|
|
}
|
|
return getLLMConfig(credentials, clientOptions);
|
|
}
|
|
|
|
const client = new GoogleClient(credentials, clientOptions);
|
|
|
|
return {
|
|
client,
|
|
credentials,
|
|
};
|
|
};
|
|
|
|
module.exports = initializeClient;
|