mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-16 16:30:15 +01:00
* fix: Ensure safe access to agent capabilities in AgentConfig * fix: don't show agent builder if agents endpoint is not enabled * fix: Improve error logging for MCP tool calls * fix: Enhance error message for MCP tool failures * feat: Add optional spec and iconURL properties to TEndpointOption type * chore: Update condition to use constant for new conversation parameter * feat: Enhance abort error handling with additional endpoint options to properly render error message fields * fix: Throw error instead of returning message for failed MCP tool calls * refactor: separate logic to generate new S3 URLs for expired links * feat: Implement S3 URL refresh for user avatars with error handling * fix: authcontext error in chats where agent chain is used * refactor: streamline balance configuration logic in getBalanceConfig function * fix: enhance icon resolution logic in SpecIcon component * fix: allow null values for spec and iconURL in TEndpointOption type * fix: update balance check to allow null tokenCredits
94 lines
3 KiB
JavaScript
94 lines
3 KiB
JavaScript
const { z } = require('zod');
|
|
const { tool } = require('@langchain/core/tools');
|
|
const { Constants: AgentConstants, Providers } = require('@librechat/agents');
|
|
const {
|
|
Constants,
|
|
ContentTypes,
|
|
isAssistantsEndpoint,
|
|
convertJsonSchemaToZod,
|
|
} = require('librechat-data-provider');
|
|
const { logger, getMCPManager } = require('~/config');
|
|
|
|
/**
|
|
* Creates a general tool for an entire action set.
|
|
*
|
|
* @param {Object} params - The parameters for loading action sets.
|
|
* @param {ServerRequest} params.req - The Express request object, containing user/request info.
|
|
* @param {string} params.toolKey - The toolKey for the tool.
|
|
* @param {import('@librechat/agents').Providers | EModelEndpoint} params.provider - The provider for the tool.
|
|
* @param {string} params.model - The model for the tool.
|
|
* @returns { Promise<typeof tool | { _call: (toolInput: Object | string) => unknown}> } An object with `_call` method to execute the tool input.
|
|
*/
|
|
async function createMCPTool({ req, toolKey, provider }) {
|
|
const toolDefinition = req.app.locals.availableTools[toolKey]?.function;
|
|
if (!toolDefinition) {
|
|
logger.error(`Tool ${toolKey} not found in available tools`);
|
|
return null;
|
|
}
|
|
/** @type {LCTool} */
|
|
const { description, parameters } = toolDefinition;
|
|
const isGoogle = provider === Providers.VERTEXAI || provider === Providers.GOOGLE;
|
|
let schema = convertJsonSchemaToZod(parameters, {
|
|
allowEmptyObject: !isGoogle,
|
|
});
|
|
|
|
if (!schema) {
|
|
schema = z.object({ input: z.string().optional() });
|
|
}
|
|
|
|
const [toolName, serverName] = toolKey.split(Constants.mcp_delimiter);
|
|
const userId = req.user?.id;
|
|
|
|
if (!userId) {
|
|
logger.error(
|
|
`[MCP][${serverName}][${toolName}] User ID not found on request. Cannot create tool.`,
|
|
);
|
|
throw new Error(`User ID not found on request. Cannot create tool for ${toolKey}.`);
|
|
}
|
|
|
|
/** @type {(toolArguments: Object | string, config?: GraphRunnableConfig) => Promise<unknown>} */
|
|
const _call = async (toolArguments, config) => {
|
|
try {
|
|
const mcpManager = await getMCPManager();
|
|
const result = await mcpManager.callTool({
|
|
serverName,
|
|
toolName,
|
|
provider,
|
|
toolArguments,
|
|
options: {
|
|
userId,
|
|
signal: config?.signal,
|
|
},
|
|
});
|
|
|
|
if (isAssistantsEndpoint(provider) && Array.isArray(result)) {
|
|
return result[0];
|
|
}
|
|
if (isGoogle && Array.isArray(result[0]) && result[0][0]?.type === ContentTypes.TEXT) {
|
|
return [result[0][0].text, result[1]];
|
|
}
|
|
return result;
|
|
} catch (error) {
|
|
logger.error(
|
|
`[MCP][User: ${userId}][${serverName}] Error calling "${toolName}" MCP tool:`,
|
|
error,
|
|
);
|
|
throw new Error(
|
|
`"${toolKey}" tool call failed${error?.message ? `: ${error?.message}` : '.'}`,
|
|
);
|
|
}
|
|
};
|
|
|
|
const toolInstance = tool(_call, {
|
|
schema,
|
|
name: toolKey,
|
|
description: description || '',
|
|
responseFormat: AgentConstants.CONTENT_AND_ARTIFACT,
|
|
});
|
|
toolInstance.mcp = true;
|
|
return toolInstance;
|
|
}
|
|
|
|
module.exports = {
|
|
createMCPTool,
|
|
};
|