mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 08:12:00 +02:00
63afb317c6
* 🤖 refactor: streamline model selection logic for title model in GoogleClient
* refactor: add options for empty object schemas in convertJsonSchemaToZod
* refactor: add utility function to check for empty object schemas in convertJsonSchemaToZod
* fix: Google MCP Tool errors, and remove Object Unescaping as Google fixed this
* fix: google safetySettings
* feat: add safety settings exclusion via GOOGLE_EXCLUDE_SAFETY_SETTINGS environment variable
* fix: rename environment variable for console JSON string length
* fix: disable portal for dropdown in ExportModal component
* fix: screenshot functionality to use image placeholder for remote images
* feat: add visionMode property to BaseClient and initialize in GoogleClient to fix resendFiles issue
* fix: enhance formatMessages to include image URLs in message content for Vertex AI
* fix: safety settings for titleChatCompletion
* fix: remove deprecated model assignment in GoogleClient and streamline title model retrieval
* fix: remove unused image preloading logic in ScreenshotContext
* chore: update default google models to latest models shared by vertex ai and gen ai
* refactor: enhance Google error messaging
* fix: update token values and model limits for Gemini models
* ci: fix model matching
* chore: bump version of librechat-data-provider to 0.7.699
70 lines
2.5 KiB
JavaScript
70 lines
2.5 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 name of the tool.
|
|
* @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);
|
|
/** @type {(toolInput: Object | string) => Promise<unknown>} */
|
|
const _call = async (toolInput) => {
|
|
try {
|
|
const mcpManager = await getMCPManager();
|
|
const result = await mcpManager.callTool(serverName, toolName, provider, toolInput);
|
|
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(`${toolName} MCP server tool call failed`, error);
|
|
return `${toolName} MCP server tool call failed.`;
|
|
}
|
|
};
|
|
|
|
const toolInstance = tool(_call, {
|
|
schema,
|
|
name: toolKey,
|
|
description: description || '',
|
|
responseFormat: AgentConstants.CONTENT_AND_ARTIFACT,
|
|
});
|
|
toolInstance.mcp = true;
|
|
return toolInstance;
|
|
}
|
|
|
|
module.exports = {
|
|
createMCPTool,
|
|
};
|