feat: Assistants Support for MCP Tools

danny-avila · Dec 17, 2024 · 884c714 · 884c714
1 parent 05d7892
commit 884c714
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/api/app/clients/tools/util/handleTools.js b/api/app/clients/tools/util/handleTools.js
@@ -1,4 +1,3 @@
-const { Providers } = require('@librechat/agents');
 const { Tools, Constants } = require('librechat-data-provider');
 const { SerpAPI } = require('@langchain/community/tools/serpapi');
 const { Calculator } = require('@langchain/community/tools/calculator');
@@ -152,6 +151,7 @@ const loadToolWithAuth = (userId, authFields, ToolConstructor, options = {}) =>
  * @param {string} object.user
  * @param {Agent} [object.agent]
  * @param {string} [object.model]
+ * @param {EModelEndpoint} [object.endpoint]
  * @param {LoadToolOptions} [object.options]
  * @param {boolean} [object.useSpecs]
  * @param {Array<string>} object.tools
@@ -163,6 +163,7 @@ const loadTools = async ({
   user,
   agent,
   model,
+  endpoint,
   useSpecs,
   tools = [],
   options = {},
@@ -264,7 +265,7 @@ const loadTools = async ({
           req: options.req,
           toolKey: tool,
           model: agent?.model ?? model,
-          provider: agent?.provider ?? Providers.OPENAI,
+          provider: agent?.provider ?? endpoint,
         });
       continue;
     }

diff --git a/api/server/services/MCP.js b/api/server/services/MCP.js
@@ -1,6 +1,10 @@
-const { Constants: AgentConstants } = require('@librechat/agents');
-const { Constants, convertJsonSchemaToZod } = require('librechat-data-provider');
 const { tool } = require('@langchain/core/tools');
+const { Constants: AgentConstants } = require('@librechat/agents');
+const {
+  Constants,
+  convertJsonSchemaToZod,
+  isAssistantsEndpoint,
+} = require('librechat-data-provider');
 const { logger, getMCPManager } = require('~/config');
 
 /**
@@ -9,7 +13,7 @@ const { logger, getMCPManager } = require('~/config');
  * @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} params.provider - The provider 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.
  */
@@ -27,7 +31,11 @@ async function createMCPTool({ req, toolKey, provider }) {
   const _call = async (toolInput) => {
     try {
       const mcpManager = await getMCPManager();
-      return await mcpManager.callTool(serverName, toolName, provider, toolInput);
+      const result = await mcpManager.callTool(serverName, toolName, provider, toolInput);
+      if (isAssistantsEndpoint(provider) && Array.isArray(result)) {
+        return result[0];
+      }
+      return result;
     } catch (error) {
       logger.error(`${toolName} MCP server tool call failed`, error);
       return `${toolName} MCP server tool call failed.`;

diff --git a/api/server/services/ToolService.js b/api/server/services/ToolService.js
@@ -176,6 +176,7 @@ async function processRequiredActions(client, requiredActions) {
     model: client.req.body.model ?? 'gpt-4o-mini',
     tools,
     functions: true,
+    endpoint: client.req.body.endpoint,
     options: {
       processFileURL,
       req: client.req,

diff --git a/api/typedefs.js b/api/typedefs.js
@@ -773,6 +773,12 @@
  * @memberof typedefs
  */
 
+/**
+ * @exports EModelEndpoint
+ * @typedef {import('librechat-data-provider').EModelEndpoint} EModelEndpoint
+ * @memberof typedefs
+ */
+
 /**
  * @exports TAttachment
  * @typedef {import('librechat-data-provider').TAttachment} TAttachment