mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-16 16:30:15 +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>
100 lines
3 KiB
JavaScript
100 lines
3 KiB
JavaScript
const { logger } = require('@librechat/data-schemas');
|
|
const { getUserMCPAuthMap } = require('@librechat/api');
|
|
const { CacheKeys, EModelEndpoint } = require('librechat-data-provider');
|
|
const { normalizeEndpointName, isEnabled } = require('~/server/utils');
|
|
const loadCustomConfig = require('./loadCustomConfig');
|
|
const { getCachedTools } = require('./getCachedTools');
|
|
const { findPluginAuthsByKeys } = require('~/models');
|
|
const getLogStores = require('~/cache/getLogStores');
|
|
|
|
/**
|
|
* Retrieves the configuration object
|
|
* @function getCustomConfig
|
|
* @returns {Promise<TCustomConfig | null>}
|
|
* */
|
|
async function getCustomConfig() {
|
|
const cache = getLogStores(CacheKeys.CONFIG_STORE);
|
|
return (await cache.get(CacheKeys.CUSTOM_CONFIG)) || (await loadCustomConfig());
|
|
}
|
|
|
|
/**
|
|
* Retrieves the configuration object
|
|
* @function getBalanceConfig
|
|
* @returns {Promise<TCustomConfig['balance'] | null>}
|
|
* */
|
|
async function getBalanceConfig() {
|
|
const isLegacyEnabled = isEnabled(process.env.CHECK_BALANCE);
|
|
const startBalance = process.env.START_BALANCE;
|
|
/** @type {TCustomConfig['balance']} */
|
|
const config = {
|
|
enabled: isLegacyEnabled,
|
|
startBalance: startBalance != null && startBalance ? parseInt(startBalance, 10) : undefined,
|
|
};
|
|
const customConfig = await getCustomConfig();
|
|
if (!customConfig) {
|
|
return config;
|
|
}
|
|
return { ...config, ...(customConfig?.['balance'] ?? {}) };
|
|
}
|
|
|
|
/**
|
|
*
|
|
* @param {string | EModelEndpoint} endpoint
|
|
* @returns {Promise<TEndpoint | undefined>}
|
|
*/
|
|
const getCustomEndpointConfig = async (endpoint) => {
|
|
const customConfig = await getCustomConfig();
|
|
if (!customConfig) {
|
|
throw new Error(`Config not found for the ${endpoint} custom endpoint.`);
|
|
}
|
|
|
|
const { endpoints = {} } = customConfig;
|
|
const customEndpoints = endpoints[EModelEndpoint.custom] ?? [];
|
|
return customEndpoints.find(
|
|
(endpointConfig) => normalizeEndpointName(endpointConfig.name) === endpoint,
|
|
);
|
|
};
|
|
|
|
async function createGetMCPAuthMap() {
|
|
const customConfig = await getCustomConfig();
|
|
const mcpServers = customConfig?.mcpServers;
|
|
const hasCustomUserVars = Object.values(mcpServers ?? {}).some((server) => server.customUserVars);
|
|
if (!hasCustomUserVars) {
|
|
return;
|
|
}
|
|
|
|
/**
|
|
* @param {Object} params
|
|
* @param {GenericTool[]} [params.tools]
|
|
* @param {string} params.userId
|
|
* @returns {Promise<Record<string, Record<string, string>> | undefined>}
|
|
*/
|
|
return async function ({ tools, userId }) {
|
|
try {
|
|
if (!tools || tools.length === 0) {
|
|
return;
|
|
}
|
|
const appTools = await getCachedTools({
|
|
userId,
|
|
});
|
|
return await getUserMCPAuthMap({
|
|
tools,
|
|
userId,
|
|
appTools,
|
|
findPluginAuthsByKeys,
|
|
});
|
|
} catch (err) {
|
|
logger.error(
|
|
`[api/server/controllers/agents/client.js #chatCompletion] Error getting custom user vars for agent`,
|
|
err,
|
|
);
|
|
}
|
|
};
|
|
}
|
|
|
|
module.exports = {
|
|
getCustomConfig,
|
|
getBalanceConfig,
|
|
createGetMCPAuthMap,
|
|
getCustomEndpointConfig,
|
|
};
|