Merge branch 'main' into feat/azure-assistant-v2-filesearch

danny-avila · Dec 18, 2024 · bc30159 · bc30159
2 parents f6d684b + 649c7a6
commit bc30159
Show file tree

Hide file tree

Showing 85 changed files with 5,094 additions and 651 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -18,6 +18,10 @@ module.exports = {
     'client/dist/**/*',
     'client/public/**/*',
     'e2e/playwright-report/**/*',
+    'packages/mcp/types/**/*',
+    'packages/mcp/dist/**/*',
+    'packages/mcp/test_bundle/**/*',
+    'api/demo/**/*',
     'packages/data-provider/types/**/*',
     'packages/data-provider/dist/**/*',
     'packages/data-provider/test_bundle/**/*',
@@ -136,6 +140,30 @@ module.exports = {
         },
       ],
     },
+    {
+      files: './api/demo/**/*.ts',
+      overrides: [
+        {
+          files: '**/*.ts',
+          parser: '@typescript-eslint/parser',
+          parserOptions: {
+            project: './packages/data-provider/tsconfig.json',
+          },
+        },
+      ],
+    },
+    {
+      files: './packages/mcp/**/*.ts',
+      overrides: [
+        {
+          files: '**/*.ts',
+          parser: '@typescript-eslint/parser',
+          parserOptions: {
+            project: './packages/mcp/tsconfig.json',
+          },
+        },
+      ],
+    },
     {
       files: './config/translations/**/*.ts',
       parser: '@typescript-eslint/parser',
@@ -149,6 +177,18 @@ module.exports = {
         project: './packages/data-provider/tsconfig.spec.json',
       },
     },
+    {
+      files: ['./api/demo/specs/**/*.ts'],
+      parserOptions: {
+        project: './packages/data-provider/tsconfig.spec.json',
+      },
+    },
+    {
+      files: ['./packages/mcp/specs/**/*.ts'],
+      parserOptions: {
+        project: './packages/mcp/tsconfig.spec.json',
+      },
+    },
   ],
   settings: {
     react: {

diff --git a/.github/workflows/backend-review.yml b/.github/workflows/backend-review.yml
@@ -33,8 +33,11 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: Install Data Provider
+      - name: Install Data Provider Package
         run: npm run build:data-provider
+
+      - name: Install MCP Package
+        run: npm run build:mcp
 
       - name: Create empty auth.json file
         run: |

diff --git a/Dockerfile.multi b/Dockerfile.multi
@@ -10,6 +10,7 @@ RUN npm config set fetch-retry-maxtimeout 600000 && \
     npm config set fetch-retry-mintimeout 15000
 COPY package*.json ./
 COPY packages/data-provider/package*.json ./packages/data-provider/
+COPY packages/mcp/package*.json ./packages/mcp/
 COPY client/package*.json ./client/
 COPY api/package*.json ./api/
 RUN npm ci
@@ -21,6 +22,14 @@ COPY packages/data-provider ./
 RUN npm run build
 RUN npm prune --production
 
+# Build mcp package
+FROM base AS mcp-build
+WORKDIR /app/packages/mcp
+COPY packages/mcp ./
+COPY --from=data-provider-build /app/packages/data-provider/dist /app/packages/data-provider/dist
+RUN npm run build
+RUN npm prune --production
+
 # Client build
 FROM base AS client-build
 WORKDIR /app/client
@@ -36,9 +45,10 @@ WORKDIR /app
 COPY api ./api
 COPY config ./config
 COPY --from=data-provider-build /app/packages/data-provider/dist ./packages/data-provider/dist
+COPY --from=mcp-build /app/packages/mcp/dist ./packages/mcp/dist
 COPY --from=client-build /app/client/dist ./client/dist
 WORKDIR /app/api
 RUN npm prune --production
 EXPOSE 3080
 ENV HOST=0.0.0.0
-CMD ["node", "server/index.js"]
+CMD ["node", "server/index.js"]
diff --git a/api/app/clients/tools/util/fileSearch.js b/api/app/clients/tools/util/fileSearch.js
@@ -50,9 +50,10 @@ const primeFiles = async (options) => {
  * @param {Object} options
  * @param {ServerRequest} options.req
  * @param {Array<{ file_id: string; filename: string }>} options.files
+ * @param {string} [options.entity_id]
  * @returns
  */
-const createFileSearchTool = async ({ req, files }) => {
+const createFileSearchTool = async ({ req, files, entity_id }) => {
   return tool(
     async ({ query }) => {
       if (files.length === 0) {
@@ -62,27 +63,36 @@ const createFileSearchTool = async ({ req, files }) => {
       if (!jwtToken) {
         return 'There was an error authenticating the file search request.';
       }
+
+      /**
+       *
+       * @param {import('librechat-data-provider').TFile} file
+       * @returns {{ file_id: string, query: string, k: number, entity_id?: string }}
+       */
+      const createQueryBody = (file) => {
+        const body = {
+          file_id: file.file_id,
+          query,
+          k: 5,
+        };
+        if (!entity_id) {
+          return body;
+        }
+        body.entity_id = entity_id;
+        logger.debug(`[${Tools.file_search}] RAG API /query body`, body);
+        return body;
+      };
+
       const queryPromises = files.map((file) =>
         axios
-          .post(
-            `${process.env.RAG_API_URL}/query`,
-            {
-              file_id: file.file_id,
-              query,
-              k: 5,
-            },
-            {
-              headers: {
-                Authorization: `Bearer ${jwtToken}`,
-                'Content-Type': 'application/json',
-              },
+          .post(`${process.env.RAG_API_URL}/query`, createQueryBody(file), {
+            headers: {
+              Authorization: `Bearer ${jwtToken}`,
+              'Content-Type': 'application/json',
             },
-          )
+          })
           .catch((error) => {
-            logger.error(
-              `Error encountered in \`file_search\` while querying file_id ${file._id}:`,
-              error,
-            );
+            logger.error('Error encountered in `file_search` while querying file:', error);
             return null;
           }),
       );

diff --git a/api/app/clients/tools/util/handleTools.js b/api/app/clients/tools/util/handleTools.js
@@ -1,4 +1,4 @@
-const { Tools } = require('librechat-data-provider');
+const { Tools, Constants } = require('librechat-data-provider');
 const { SerpAPI } = require('@langchain/community/tools/serpapi');
 const { Calculator } = require('@langchain/community/tools/calculator');
 const { createCodeExecutionTool, EnvVar } = require('@librechat/agents');
@@ -17,9 +17,12 @@ const {
 } = require('../');
 const { primeFiles: primeCodeFiles } = require('~/server/services/Files/Code/process');
 const { createFileSearchTool, primeFiles: primeSearchFiles } = require('./fileSearch');
+const { createMCPTool } = require('~/server/services/MCP');
 const { loadSpecs } = require('./loadSpecs');
 const { logger } = require('~/config');
 
+const mcpToolPattern = new RegExp(`^.+${Constants.mcp_delimiter}.+$`);
+
 /**
  * Validates the availability and authentication of tools for a user based on environment variables or user-specific plugin authentication values.
  * Tools without required authentication or with valid authentication are considered valid.
@@ -142,10 +145,25 @@ const loadToolWithAuth = (userId, authFields, ToolConstructor, options = {}) =>
   };
 };
 
+/**
+ *
+ * @param {object} object
+ * @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
+ * @param {boolean} [object.functions]
+ * @param {boolean} [object.returnMap]
+ * @returns {Promise<{ loadedTools: Tool[], toolContextMap: Object<string, any> } | Record<string,Tool>>}
+ */
 const loadTools = async ({
   user,
+  agent,
   model,
-  isAgent,
+  endpoint,
   useSpecs,
   tools = [],
   options = {},
@@ -182,8 +200,9 @@ const loadTools = async ({
     toolConstructors.dalle = DALLE3;
   }
 
+  /** @type {ImageGenOptions} */
   const imageGenOptions = {
-    isAgent,
+    isAgent: !!agent,
     req: options.req,
     fileStrategy: options.fileStrategy,
     processFileURL: options.processFileURL,
@@ -237,9 +256,18 @@ const loadTools = async ({
         if (toolContext) {
           toolContextMap[tool] = toolContext;
         }
-        return createFileSearchTool({ req: options.req, files });
+        return createFileSearchTool({ req: options.req, files, entity_id: agent?.id });
       };
       continue;
+    } else if (mcpToolPattern.test(tool)) {
+      requestedTools[tool] = async () =>
+        createMCPTool({
+          req: options.req,
+          toolKey: tool,
+          model: agent?.model ?? model,
+          provider: agent?.provider ?? endpoint,
+        });
+      continue;
     }
 
     if (customConstructors[tool]) {

diff --git a/api/config/index.js b/api/config/index.js
@@ -1,5 +1,22 @@
+const { EventSource } = require('eventsource');
 const logger = require('./winston');
 
+global.EventSource = EventSource;
+
+let mcpManager = null;
+
+/**
+ * @returns {Promise<MCPManager>}
+ */
+async function getMCPManager() {
+  if (!mcpManager) {
+    const { MCPManager } = await import('librechat-mcp');
+    mcpManager = MCPManager.getInstance(logger);
+  }
+  return mcpManager;
+}
+
 module.exports = {
   logger,
+  getMCPManager,
 };
diff --git a/api/models/Agent.js b/api/models/Agent.js
@@ -20,7 +20,7 @@ const Agent = mongoose.model('agent', agentSchema);
  * @throws {Error} If the agent creation fails.
  */
 const createAgent = async (agentData) => {
-  return await Agent.create(agentData);
+  return (await Agent.create(agentData)).toObject();
 };
 
 /**

diff --git a/api/models/tx.js b/api/models/tx.js
@@ -1,22 +1,50 @@
 const { matchModelName } = require('../utils');
 const defaultRate = 6;
 
-/** AWS Bedrock pricing */
+/**
+ * AWS Bedrock pricing
+ * source: https://aws.amazon.com/bedrock/pricing/
+ * */
 const bedrockValues = {
+  // Basic llama2 patterns
   'llama2-13b': { prompt: 0.75, completion: 1.0 },
-  'llama2-70b': { prompt: 1.95, completion: 2.56 },
-  'llama3-8b': { prompt: 0.3, completion: 0.6 },
-  'llama3-70b': { prompt: 2.65, completion: 3.5 },
-  'llama3-1-8b': { prompt: 0.3, completion: 0.6 },
-  'llama3-1-70b': { prompt: 2.65, completion: 3.5 },
-  'llama3-1-405b': { prompt: 5.32, completion: 16.0 },
   'llama2:13b': { prompt: 0.75, completion: 1.0 },
   'llama2:70b': { prompt: 1.95, completion: 2.56 },
+  'llama2-70b': { prompt: 1.95, completion: 2.56 },
+
+  // Basic llama3 patterns
+  'llama3-8b': { prompt: 0.3, completion: 0.6 },
   'llama3:8b': { prompt: 0.3, completion: 0.6 },
+  'llama3-70b': { prompt: 2.65, completion: 3.5 },
   'llama3:70b': { prompt: 2.65, completion: 3.5 },
-  'llama3.1:8b': { prompt: 0.3, completion: 0.6 },
-  'llama3.1:70b': { prompt: 2.65, completion: 3.5 },
-  'llama3.1:405b': { prompt: 5.32, completion: 16.0 },
+
+  // llama3-x-Nb pattern
+  'llama3-1-8b': { prompt: 0.22, completion: 0.22 },
+  'llama3-1-70b': { prompt: 0.72, completion: 0.72 },
+  'llama3-1-405b': { prompt: 2.4, completion: 2.4 },
+  'llama3-2-1b': { prompt: 0.1, completion: 0.1 },
+  'llama3-2-3b': { prompt: 0.15, completion: 0.15 },
+  'llama3-2-11b': { prompt: 0.16, completion: 0.16 },
+  'llama3-2-90b': { prompt: 0.72, completion: 0.72 },
+
+  // llama3.x:Nb pattern
+  'llama3.1:8b': { prompt: 0.22, completion: 0.22 },
+  'llama3.1:70b': { prompt: 0.72, completion: 0.72 },
+  'llama3.1:405b': { prompt: 2.4, completion: 2.4 },
+  'llama3.2:1b': { prompt: 0.1, completion: 0.1 },
+  'llama3.2:3b': { prompt: 0.15, completion: 0.15 },
+  'llama3.2:11b': { prompt: 0.16, completion: 0.16 },
+  'llama3.2:90b': { prompt: 0.72, completion: 0.72 },
+
+  // llama-3.x-Nb pattern
+  'llama-3.1-8b': { prompt: 0.22, completion: 0.22 },
+  'llama-3.1-70b': { prompt: 0.72, completion: 0.72 },
+  'llama-3.1-405b': { prompt: 2.4, completion: 2.4 },
+  'llama-3.2-1b': { prompt: 0.1, completion: 0.1 },
+  'llama-3.2-3b': { prompt: 0.15, completion: 0.15 },
+  'llama-3.2-11b': { prompt: 0.16, completion: 0.16 },
+  'llama-3.2-90b': { prompt: 0.72, completion: 0.72 },
+  'llama-3.3-70b': { prompt: 2.65, completion: 3.5 },
   'mistral-7b': { prompt: 0.15, completion: 0.2 },
   'mistral-small': { prompt: 0.15, completion: 0.2 },
   'mixtral-8x7b': { prompt: 0.45, completion: 0.7 },

diff --git a/api/package.json b/api/package.json
@@ -44,7 +44,7 @@
     "@langchain/google-genai": "^0.1.4",
     "@langchain/google-vertexai": "^0.1.2",
     "@langchain/textsplitters": "^0.1.0",
-    "@librechat/agents": "^1.8.5",
+    "@librechat/agents": "^1.8.8",
     "axios": "^1.7.7",
     "bcryptjs": "^2.4.3",
     "cheerio": "^1.0.0-rc.12",
@@ -73,6 +73,7 @@
     "klona": "^2.0.6",
     "langchain": "^0.2.19",
     "librechat-data-provider": "*",
+    "librechat-mcp": "*",
     "lodash": "^4.17.21",
     "meilisearch": "^0.38.0",
     "mime": "^3.0.0",

diff --git a/api/server/controllers/PluginController.js b/api/server/controllers/PluginController.js
@@ -1,6 +1,8 @@
 const { promises: fs } = require('fs');
 const { CacheKeys, AuthType } = require('librechat-data-provider');
 const { addOpenAPISpecs } = require('~/app/clients/tools/util/addOpenAPISpecs');
+const { getCustomConfig } = require('~/server/services/Config');
+const { getMCPManager } = require('~/config');
 const { getLogStores } = require('~/cache');
 
 /**
@@ -107,6 +109,12 @@ const getAvailableTools = async (req, res) => {
     const pluginManifest = await fs.readFile(req.app.locals.paths.pluginManifest, 'utf8');
 
     const jsonData = JSON.parse(pluginManifest);
+    const customConfig = await getCustomConfig();
+    if (customConfig?.mcpServers != null) {
+      const mcpManager = await getMCPManager();
+      await mcpManager.loadManifestTools(jsonData);
+    }
+
     /** @type {TPlugin[]} */
     const uniquePlugins = filterUniquePlugins(jsonData);