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

* refactor: move `loadAuthValues` to `~/services/Tools/credentials` * feat: add createAxiosInstance function to configure axios with proxy support * WIP: First pass mistral ocr * refactor: replace getConvoFiles with getToolFiles for improved file retrieval logic * refactor: improve document formatting in encodeAndFormat function * refactor: remove unused resendFiles parameter from buildOptions function (this option comes from the agent config) * fix: update getFiles call to include files with `text` property as well * refactor: move file handling to `initializeAgentOptions` * refactor: enhance addImageURLs method to handle OCR text and improve message formatting * refactor: update message formatting to handle OCR text in various content types * refactor: remove unused resendFiles property from compactAgentsSchema * fix: add error handling for Mistral OCR document upload and logging * refactor: integrate OCR capability into file upload options and configuration * refactor: skip processing for text source files in delete request, as they are directly tied to database * feat: add metadata field to ExtendedFile type and update PanelColumns and PanelTable components for localization and metadata handling * fix: source icon styling * wip: first pass, frontend file context agent resources * refactor: add hover card with contextual information for File Context (OCR) in FileContext component * feat: enhance file processing by integrating file retrieval for OCR resources in agent initialization * feat: implement OCR config; fix: agent resource deletion for ocr files * feat: enhance agent initialization by adding OCR capability check in resource priming * ci: fix `~/config` module mock * ci: add OCR property expectation in AppService tests * refactor: simplify OCR config loading by removing environment variable extraction, to be done when OCR is actually performed * ci: add unit test to ensure environment variable references are not parsed in OCR config * refactor: disable base64 image inclusion in OCR request * refactor: enhance OCR configuration handling by validating environment variables and providing defaults * refactor: use file stream from disk for mistral ocr api
296 lines
8.8 KiB
JavaScript
296 lines
8.8 KiB
JavaScript
const { createContentAggregator, Providers } = require('@librechat/agents');
|
|
const {
|
|
EModelEndpoint,
|
|
getResponseSender,
|
|
AgentCapabilities,
|
|
providerEndpointMap,
|
|
} = require('librechat-data-provider');
|
|
const {
|
|
getDefaultHandlers,
|
|
createToolEndCallback,
|
|
} = require('~/server/controllers/agents/callbacks');
|
|
const initAnthropic = require('~/server/services/Endpoints/anthropic/initialize');
|
|
const getBedrockOptions = require('~/server/services/Endpoints/bedrock/options');
|
|
const initOpenAI = require('~/server/services/Endpoints/openAI/initialize');
|
|
const initCustom = require('~/server/services/Endpoints/custom/initialize');
|
|
const initGoogle = require('~/server/services/Endpoints/google/initialize');
|
|
const generateArtifactsPrompt = require('~/app/clients/prompts/artifacts');
|
|
const { getCustomEndpointConfig } = require('~/server/services/Config');
|
|
const { processFiles } = require('~/server/services/Files/process');
|
|
const { loadAgentTools } = require('~/server/services/ToolService');
|
|
const AgentClient = require('~/server/controllers/agents/client');
|
|
const { getToolFiles } = require('~/models/Conversation');
|
|
const { getModelMaxTokens } = require('~/utils');
|
|
const { getAgent } = require('~/models/Agent');
|
|
const { getFiles } = require('~/models/File');
|
|
const { logger } = require('~/config');
|
|
|
|
const providerConfigMap = {
|
|
[Providers.XAI]: initCustom,
|
|
[Providers.OLLAMA]: initCustom,
|
|
[Providers.DEEPSEEK]: initCustom,
|
|
[Providers.OPENROUTER]: initCustom,
|
|
[EModelEndpoint.openAI]: initOpenAI,
|
|
[EModelEndpoint.google]: initGoogle,
|
|
[EModelEndpoint.azureOpenAI]: initOpenAI,
|
|
[EModelEndpoint.anthropic]: initAnthropic,
|
|
[EModelEndpoint.bedrock]: getBedrockOptions,
|
|
};
|
|
|
|
/**
|
|
* @param {ServerRequest} req
|
|
* @param {Promise<Array<MongoFile | null>> | undefined} _attachments
|
|
* @param {AgentToolResources | undefined} _tool_resources
|
|
* @returns {Promise<{ attachments: Array<MongoFile | undefined> | undefined, tool_resources: AgentToolResources | undefined }>}
|
|
*/
|
|
const primeResources = async (req, _attachments, _tool_resources) => {
|
|
try {
|
|
/** @type {Array<MongoFile | undefined> | undefined} */
|
|
let attachments;
|
|
const tool_resources = _tool_resources ?? {};
|
|
const isOCREnabled = (req.app.locals?.[EModelEndpoint.agents]?.capabilities ?? []).includes(
|
|
AgentCapabilities.ocr,
|
|
);
|
|
if (tool_resources.ocr?.file_ids && isOCREnabled) {
|
|
const context = await getFiles(
|
|
{
|
|
file_id: { $in: tool_resources.ocr.file_ids },
|
|
},
|
|
{},
|
|
{},
|
|
);
|
|
attachments = (attachments ?? []).concat(context);
|
|
}
|
|
if (!_attachments) {
|
|
return { attachments, tool_resources };
|
|
}
|
|
/** @type {Array<MongoFile | undefined> | undefined} */
|
|
const files = await _attachments;
|
|
if (!attachments) {
|
|
/** @type {Array<MongoFile | undefined>} */
|
|
attachments = [];
|
|
}
|
|
|
|
for (const file of files) {
|
|
if (!file) {
|
|
continue;
|
|
}
|
|
if (file.metadata?.fileIdentifier) {
|
|
const execute_code = tool_resources.execute_code ?? {};
|
|
if (!execute_code.files) {
|
|
tool_resources.execute_code = { ...execute_code, files: [] };
|
|
}
|
|
tool_resources.execute_code.files.push(file);
|
|
} else if (file.embedded === true) {
|
|
const file_search = tool_resources.file_search ?? {};
|
|
if (!file_search.files) {
|
|
tool_resources.file_search = { ...file_search, files: [] };
|
|
}
|
|
tool_resources.file_search.files.push(file);
|
|
}
|
|
|
|
attachments.push(file);
|
|
}
|
|
return { attachments, tool_resources };
|
|
} catch (error) {
|
|
logger.error('Error priming resources', error);
|
|
return { attachments: _attachments, tool_resources: _tool_resources };
|
|
}
|
|
};
|
|
|
|
/**
|
|
* @param {object} params
|
|
* @param {ServerRequest} params.req
|
|
* @param {ServerResponse} params.res
|
|
* @param {Agent} params.agent
|
|
* @param {object} [params.endpointOption]
|
|
* @param {boolean} [params.isInitialAgent]
|
|
* @returns {Promise<Agent>}
|
|
*/
|
|
const initializeAgentOptions = async ({
|
|
req,
|
|
res,
|
|
agent,
|
|
endpointOption,
|
|
isInitialAgent = false,
|
|
}) => {
|
|
let currentFiles;
|
|
const requestFiles = req.body.files ?? [];
|
|
if (
|
|
isInitialAgent &&
|
|
req.body.conversationId != null &&
|
|
agent.model_parameters?.resendFiles === true
|
|
) {
|
|
const fileIds = (await getToolFiles(req.body.conversationId)).map((f) => f.file_id);
|
|
if (requestFiles.length || fileIds.length) {
|
|
currentFiles = await processFiles(requestFiles, fileIds);
|
|
}
|
|
} else if (isInitialAgent && requestFiles.length) {
|
|
currentFiles = await processFiles(requestFiles);
|
|
}
|
|
|
|
const { attachments, tool_resources } = await primeResources(
|
|
req,
|
|
currentFiles,
|
|
agent.tool_resources,
|
|
);
|
|
const { tools, toolContextMap } = await loadAgentTools({
|
|
req,
|
|
res,
|
|
agent,
|
|
tool_resources,
|
|
});
|
|
|
|
const provider = agent.provider;
|
|
agent.endpoint = provider;
|
|
let getOptions = providerConfigMap[provider];
|
|
if (!getOptions && providerConfigMap[provider.toLowerCase()] != null) {
|
|
agent.provider = provider.toLowerCase();
|
|
getOptions = providerConfigMap[agent.provider];
|
|
} else if (!getOptions) {
|
|
const customEndpointConfig = await getCustomEndpointConfig(provider);
|
|
if (!customEndpointConfig) {
|
|
throw new Error(`Provider ${provider} not supported`);
|
|
}
|
|
getOptions = initCustom;
|
|
agent.provider = Providers.OPENAI;
|
|
}
|
|
const model_parameters = Object.assign(
|
|
{},
|
|
agent.model_parameters ?? { model: agent.model },
|
|
isInitialAgent === true ? endpointOption?.model_parameters : {},
|
|
);
|
|
const _endpointOption =
|
|
isInitialAgent === true
|
|
? Object.assign({}, endpointOption, { model_parameters })
|
|
: { model_parameters };
|
|
|
|
const options = await getOptions({
|
|
req,
|
|
res,
|
|
optionsOnly: true,
|
|
overrideEndpoint: provider,
|
|
overrideModel: agent.model,
|
|
endpointOption: _endpointOption,
|
|
});
|
|
|
|
if (options.provider != null) {
|
|
agent.provider = options.provider;
|
|
}
|
|
|
|
agent.model_parameters = Object.assign(model_parameters, options.llmConfig);
|
|
if (options.configOptions) {
|
|
agent.model_parameters.configuration = options.configOptions;
|
|
}
|
|
|
|
if (!agent.model_parameters.model) {
|
|
agent.model_parameters.model = agent.model;
|
|
}
|
|
|
|
if (typeof agent.artifacts === 'string' && agent.artifacts !== '') {
|
|
agent.additional_instructions = generateArtifactsPrompt({
|
|
endpoint: agent.provider,
|
|
artifacts: agent.artifacts,
|
|
});
|
|
}
|
|
|
|
const tokensModel =
|
|
agent.provider === EModelEndpoint.azureOpenAI ? agent.model : agent.model_parameters.model;
|
|
|
|
return {
|
|
...agent,
|
|
tools,
|
|
attachments,
|
|
toolContextMap,
|
|
maxContextTokens:
|
|
agent.max_context_tokens ??
|
|
getModelMaxTokens(tokensModel, providerEndpointMap[provider]) ??
|
|
4000,
|
|
};
|
|
};
|
|
|
|
const initializeClient = async ({ req, res, endpointOption }) => {
|
|
if (!endpointOption) {
|
|
throw new Error('Endpoint option not provided');
|
|
}
|
|
|
|
// TODO: use endpointOption to determine options/modelOptions
|
|
/** @type {Array<UsageMetadata>} */
|
|
const collectedUsage = [];
|
|
/** @type {ArtifactPromises} */
|
|
const artifactPromises = [];
|
|
const { contentParts, aggregateContent } = createContentAggregator();
|
|
const toolEndCallback = createToolEndCallback({ req, res, artifactPromises });
|
|
const eventHandlers = getDefaultHandlers({
|
|
res,
|
|
aggregateContent,
|
|
toolEndCallback,
|
|
collectedUsage,
|
|
});
|
|
|
|
if (!endpointOption.agent) {
|
|
throw new Error('No agent promise provided');
|
|
}
|
|
|
|
// Initialize primary agent
|
|
const primaryAgent = await endpointOption.agent;
|
|
if (!primaryAgent) {
|
|
throw new Error('Agent not found');
|
|
}
|
|
|
|
const agentConfigs = new Map();
|
|
|
|
// Handle primary agent
|
|
const primaryConfig = await initializeAgentOptions({
|
|
req,
|
|
res,
|
|
agent: primaryAgent,
|
|
endpointOption,
|
|
isInitialAgent: true,
|
|
});
|
|
|
|
const agent_ids = primaryConfig.agent_ids;
|
|
if (agent_ids?.length) {
|
|
for (const agentId of agent_ids) {
|
|
const agent = await getAgent({ id: agentId });
|
|
if (!agent) {
|
|
throw new Error(`Agent ${agentId} not found`);
|
|
}
|
|
const config = await initializeAgentOptions({
|
|
req,
|
|
res,
|
|
agent,
|
|
endpointOption,
|
|
});
|
|
agentConfigs.set(agentId, config);
|
|
}
|
|
}
|
|
|
|
const sender =
|
|
primaryAgent.name ??
|
|
getResponseSender({
|
|
...endpointOption,
|
|
model: endpointOption.model_parameters.model,
|
|
});
|
|
|
|
const client = new AgentClient({
|
|
req,
|
|
sender,
|
|
contentParts,
|
|
agentConfigs,
|
|
eventHandlers,
|
|
collectedUsage,
|
|
artifactPromises,
|
|
agent: primaryConfig,
|
|
spec: endpointOption.spec,
|
|
iconURL: endpointOption.iconURL,
|
|
endpoint: EModelEndpoint.agents,
|
|
attachments: primaryConfig.attachments,
|
|
maxContextTokens: primaryConfig.maxContextTokens,
|
|
resendFiles: primaryConfig.model_parameters?.resendFiles ?? true,
|
|
});
|
|
|
|
return { client };
|
|
};
|
|
|
|
module.exports = { initializeClient };
|