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>
70 lines
2.0 KiB
JavaScript
70 lines
2.0 KiB
JavaScript
const { EModelEndpoint } = require('librechat-data-provider');
|
|
const { getUserKey, checkUserKeyExpiry } = require('~/server/services/UserService');
|
|
const { getLLMConfig } = require('~/server/services/Endpoints/anthropic/llm');
|
|
const AnthropicClient = require('~/app/clients/AnthropicClient');
|
|
|
|
const initializeClient = async ({ req, res, endpointOption, overrideModel, optionsOnly }) => {
|
|
const { ANTHROPIC_API_KEY, ANTHROPIC_REVERSE_PROXY, PROXY } = process.env;
|
|
const expiresAt = req.body.key;
|
|
const isUserProvided = ANTHROPIC_API_KEY === 'user_provided';
|
|
|
|
const anthropicApiKey = isUserProvided
|
|
? await getUserKey({ userId: req.user.id, name: EModelEndpoint.anthropic })
|
|
: ANTHROPIC_API_KEY;
|
|
|
|
if (!anthropicApiKey) {
|
|
throw new Error('Anthropic API key not provided. Please provide it again.');
|
|
}
|
|
|
|
if (expiresAt && isUserProvided) {
|
|
checkUserKeyExpiry(expiresAt, EModelEndpoint.anthropic);
|
|
}
|
|
|
|
let clientOptions = {};
|
|
|
|
/** @type {undefined | TBaseEndpoint} */
|
|
const anthropicConfig = req.app.locals[EModelEndpoint.anthropic];
|
|
|
|
if (anthropicConfig) {
|
|
clientOptions.streamRate = anthropicConfig.streamRate;
|
|
clientOptions.titleModel = anthropicConfig.titleModel;
|
|
}
|
|
|
|
/** @type {undefined | TBaseEndpoint} */
|
|
const allConfig = req.app.locals.all;
|
|
if (allConfig) {
|
|
clientOptions.streamRate = allConfig.streamRate;
|
|
}
|
|
|
|
if (optionsOnly) {
|
|
clientOptions = Object.assign(
|
|
{
|
|
reverseProxyUrl: ANTHROPIC_REVERSE_PROXY ?? null,
|
|
proxy: PROXY ?? null,
|
|
modelOptions: endpointOption?.model_parameters ?? {},
|
|
},
|
|
clientOptions,
|
|
);
|
|
if (overrideModel) {
|
|
clientOptions.modelOptions.model = overrideModel;
|
|
}
|
|
return getLLMConfig(anthropicApiKey, clientOptions);
|
|
}
|
|
|
|
const client = new AnthropicClient(anthropicApiKey, {
|
|
req,
|
|
res,
|
|
reverseProxyUrl: ANTHROPIC_REVERSE_PROXY ?? null,
|
|
proxy: PROXY ?? null,
|
|
...clientOptions,
|
|
...endpointOption,
|
|
});
|
|
|
|
return {
|
|
client,
|
|
anthropicApiKey,
|
|
};
|
|
};
|
|
|
|
module.exports = initializeClient;
|