Compare commits

...

5 Commits

Author SHA1 Message Date
github-actions[bot] 2cbdf71669 Release 0.9.16 (#1811)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: marcusschiesser <17126+marcusschiesser@users.noreply.github.com>
2025-04-04 11:12:27 +02:00
Huu Le ead657aedd feat: add MCP tools integration and example usage (#1819) 2025-04-04 11:03:10 +02:00
Marcus Schiesser f5e4d098b0 chore: remove gpt-tokenizer (#1815) 2025-04-03 14:23:31 +02:00
dependabot[bot] 4d97226e50 chore(deps): bump next from 15.2.3 to 15.2.4 (#1812)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-04-03 13:57:39 +07:00
Marcus Schiesser 4999df18cc chore: bump nextjs to "^15.2.3" (#1810) 2025-04-02 21:24:57 +07:00
35 changed files with 803 additions and 359 deletions
+8
View File
@@ -1,5 +1,13 @@
# @llamaindex/doc
## 0.2.5
### Patch Changes
- 4999df1: bump nextjs
- Updated dependencies [f5e4d09]
- llamaindex@0.9.16
## 0.2.4
### Patch Changes
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@llamaindex/doc",
"version": "0.2.4",
"version": "0.2.5",
"private": true,
"scripts": {
"postinstall": "fumadocs-mdx",
@@ -46,7 +46,7 @@
"hast-util-to-jsx-runtime": "^2.3.2",
"llamaindex": "workspace:*",
"lucide-react": "^0.460.0",
"next": "^15.2.1",
"next": "^15.2.4",
"next-themes": "^0.4.3",
"react": "^19.0.0",
"react-dom": "^19.0.0",
@@ -1,5 +1,12 @@
# @llamaindex/cloudflare-worker-agent-test
## 0.0.150
### Patch Changes
- Updated dependencies [f5e4d09]
- llamaindex@0.9.16
## 0.0.149
### Patch Changes
@@ -1,6 +1,6 @@
{
"name": "@llamaindex/cloudflare-worker-agent-test",
"version": "0.0.149",
"version": "0.0.150",
"type": "module",
"private": true,
"scripts": {
+8
View File
@@ -1,5 +1,13 @@
# @llamaindex/next-agent-test
## 0.1.150
### Patch Changes
- 4999df1: bump nextjs
- Updated dependencies [f5e4d09]
- llamaindex@0.9.16
## 0.1.149
### Patch Changes
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@llamaindex/next-agent-test",
"version": "0.1.149",
"version": "0.1.150",
"private": true,
"scripts": {
"dev": "next dev",
@@ -10,7 +10,7 @@
"dependencies": {
"ai": "^4.0.0",
"llamaindex": "workspace:*",
"next": "15.2.0",
"next": "^15.2.4",
"react": "19.0.0",
"react-dom": "19.0.0"
},
@@ -1,5 +1,13 @@
# test-edge-runtime
## 0.1.149
### Patch Changes
- 4999df1: bump nextjs
- Updated dependencies [f5e4d09]
- llamaindex@0.9.16
## 0.1.148
### Patch Changes
@@ -1,6 +1,6 @@
{
"name": "@llamaindex/nextjs-edge-runtime-test",
"version": "0.1.148",
"version": "0.1.149",
"private": true,
"scripts": {
"dev": "next dev",
@@ -9,7 +9,7 @@
},
"dependencies": {
"llamaindex": "workspace:*",
"next": "15.2.0",
"next": "^15.2.4",
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
@@ -1,5 +1,13 @@
# @llamaindex/next-node-runtime
## 0.1.16
### Patch Changes
- 4999df1: bump nextjs
- Updated dependencies [f5e4d09]
- llamaindex@0.9.16
## 0.1.15
### Patch Changes
@@ -1,6 +1,6 @@
{
"name": "@llamaindex/next-node-runtime-test",
"version": "0.1.15",
"version": "0.1.16",
"private": true,
"scripts": {
"dev": "next dev",
@@ -11,7 +11,7 @@
"@llamaindex/huggingface": "workspace:*",
"@llamaindex/readers": "workspace:*",
"llamaindex": "workspace:*",
"next": "15.2.0",
"next": "^15.2.4",
"react": "19.0.0",
"react-dom": "19.0.0"
},
@@ -1,5 +1,12 @@
# vite-import-llamaindex
## 0.0.16
### Patch Changes
- Updated dependencies [f5e4d09]
- llamaindex@0.9.16
## 0.0.15
### Patch Changes
@@ -1,7 +1,7 @@
{
"name": "vite-import-llamaindex",
"private": true,
"version": "0.0.15",
"version": "0.0.16",
"type": "module",
"scripts": {
"build": "vite build",
@@ -1,5 +1,12 @@
# @llamaindex/waku-query-engine-test
## 0.0.150
### Patch Changes
- Updated dependencies [f5e4d09]
- llamaindex@0.9.16
## 0.0.149
### Patch Changes
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@llamaindex/waku-query-engine-test",
"version": "0.0.149",
"version": "0.0.150",
"type": "module",
"private": true,
"scripts": {
+9
View File
@@ -1,5 +1,14 @@
# examples
## 0.3.3
### Patch Changes
- Updated dependencies [f5e4d09]
- Updated dependencies [ead657a]
- llamaindex@0.9.16
- @llamaindex/tools@0.0.5
## 0.3.2
### Patch Changes
+34
View File
@@ -0,0 +1,34 @@
import { openai } from "@llamaindex/openai";
import { mcp } from "@llamaindex/tools";
import { agent } from "llamaindex";
async function main() {
// Create an MCP server for filesystem tools
const server = mcp({
command: "npx",
args: ["-y", "@modelcontextprotocol/server-filesystem", "."],
verbose: true,
});
try {
// Create an agent that uses the MCP tools
const myAgent = agent({
name: "Assistant",
systemPrompt: "Use the tools to achieve the task.",
tools: await server.tools(),
llm: openai({ model: "gpt-4o" }),
verbose: true,
});
// Run a task
const response = await myAgent.run(
"what are the files in the current directory?",
);
console.log("Agent response:", response.data);
} finally {
await server.cleanup();
}
}
main().catch(console.error);
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "@llamaindex/examples",
"version": "0.3.2",
"version": "0.3.3",
"private": true,
"scripts": {
"lint": "eslint .",
@@ -51,7 +51,7 @@
"@llamaindex/jinaai": "^0.0.8",
"@llamaindex/perplexity": "^0.0.5",
"@llamaindex/supabase": "^0.1.1",
"@llamaindex/tools": "^0.0.4",
"@llamaindex/tools": "^0.0.5",
"@notionhq/client": "^2.2.15",
"@pinecone-database/pinecone": "^4.0.0",
"@vercel/postgres": "^0.10.0",
@@ -60,7 +60,7 @@
"commander": "^12.1.0",
"dotenv": "^16.4.5",
"js-tiktoken": "^1.0.14",
"llamaindex": "^0.9.15",
"llamaindex": "^0.9.16",
"mongodb": "6.7.0",
"postgres": "^3.4.4",
"wikipedia": "^2.1.2",
+8
View File
@@ -1,5 +1,13 @@
# @llamaindex/autotool
## 6.0.16
### Patch Changes
- 4999df1: bump nextjs
- Updated dependencies [f5e4d09]
- llamaindex@0.9.16
## 6.0.15
### Patch Changes
@@ -1,5 +1,14 @@
# @llamaindex/autotool-01-node-example
## 0.0.97
### Patch Changes
- Updated dependencies [4999df1]
- Updated dependencies [f5e4d09]
- @llamaindex/autotool@6.0.16
- llamaindex@0.9.16
## 0.0.96
### Patch Changes
@@ -13,5 +13,5 @@
"scripts": {
"start": "node --import tsx --import @llamaindex/autotool/node ./src/index.ts"
},
"version": "0.0.96"
"version": "0.0.97"
}
+2 -2
View File
@@ -6,7 +6,7 @@
"url": "git+https://github.com/run-llama/LlamaIndexTS.git",
"directory": "packages/autotool"
},
"version": "6.0.15",
"version": "6.0.16",
"description": "auto transpile your JS function to LLM Agent compatible",
"files": [
"dist",
@@ -77,7 +77,7 @@
"@types/node": "^22.9.0",
"bunchee": "6.4.0",
"llamaindex": "workspace:*",
"next": "15.2.0",
"next": "^15.2.4",
"rollup": "^4.28.1",
"tsx": "^4.19.3",
"typescript": "^5.7.3",
+7
View File
@@ -1,5 +1,12 @@
# @llamaindex/experimental
## 0.0.166
### Patch Changes
- Updated dependencies [f5e4d09]
- llamaindex@0.9.16
## 0.0.165
### Patch Changes
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@llamaindex/experimental",
"description": "Experimental package for LlamaIndexTS",
"version": "0.0.165",
"version": "0.0.166",
"type": "module",
"types": "dist/type/index.d.ts",
"main": "dist/cjs/index.js",
+6
View File
@@ -1,5 +1,11 @@
# llamaindex
## 0.9.16
### Patch Changes
- f5e4d09: Remove gpt-tokenizer from llamaindex
## 0.9.15
### Patch Changes
+1 -2
View File
@@ -1,6 +1,6 @@
{
"name": "llamaindex",
"version": "0.9.15",
"version": "0.9.16",
"license": "MIT",
"type": "module",
"keywords": [
@@ -29,7 +29,6 @@
"@types/lodash": "^4.17.7",
"@types/node": "^22.9.0",
"ajv": "^8.17.1",
"gpt-tokenizer": "^2.6.2",
"lodash": "^4.17.21",
"magic-bytes.js": "^1.10.0"
},
+8
View File
@@ -1,5 +1,13 @@
# @llamaindex/server
## 0.0.7
### Patch Changes
- 4999df1: bump nextjs
- Updated dependencies [f5e4d09]
- llamaindex@0.9.16
## 0.0.6
### Patch Changes
+2 -2
View File
@@ -1,7 +1,7 @@
{
"name": "@llamaindex/server",
"description": "LlamaIndex Server",
"version": "0.0.6",
"version": "0.0.7",
"type": "module",
"main": "./dist/index.cjs",
"module": "./dist/index.js",
@@ -56,7 +56,7 @@
"ai": "^4.2.0",
"@llamaindex/env": "workspace:*",
"llamaindex": "workspace:*",
"next": "15.2.3",
"next": "^15.2.4",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"@radix-ui/react-tabs": "^1.1.0",
+6
View File
@@ -1,5 +1,11 @@
# @llamaindex/tools
## 0.0.5
### Patch Changes
- ead657a: Add adapter to use stdio MCP server as tools
## 0.0.4
### Patch Changes
+2 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@llamaindex/tools",
"description": "LlamaIndex Tools",
"version": "0.0.4",
"version": "0.0.5",
"type": "module",
"main": "./dist/index.cjs",
"module": "./dist/index.js",
@@ -41,6 +41,7 @@
"@apidevtools/swagger-parser": "^10.1.0",
"@llamaindex/core": "workspace:*",
"@llamaindex/env": "workspace:*",
"@modelcontextprotocol/sdk": "^1.8.0",
"@e2b/code-interpreter": "^1.0.4",
"duck-duck-scrape": "^2.2.5",
"papaparse": "^5.4.1",
+1
View File
@@ -4,6 +4,7 @@ export * from "./tools/duckduckgo";
export * from "./tools/form-filling";
export * from "./tools/img-gen";
export * from "./tools/interpreter";
export * from "./tools/mcp";
export * from "./tools/openapi-action";
export * from "./tools/weather";
export * from "./tools/wiki";
+113
View File
@@ -0,0 +1,113 @@
import type { JSONValue } from "@llamaindex/core/global";
import type { BaseToolWithCall } from "@llamaindex/core/llms";
import { FunctionTool } from "@llamaindex/core/tools";
import { Client } from "@modelcontextprotocol/sdk/client/index.js";
import {
StdioClientTransport,
type StdioServerParameters,
} from "@modelcontextprotocol/sdk/client/stdio.js";
import type { Tool } from "@modelcontextprotocol/sdk/types.js";
import type { JSONSchemaType } from "ajv";
interface ToolInput {
[key: string]: unknown;
}
type MCPClientOptions = StdioServerParameters & {
/**
* The prefix to add to the tool name
*/
toolNamePrefix?: string;
/**
* The name of the client
*/
clientName?: string;
/**
* The version of the client
*/
clientVersion?: string;
/**
* Whether to log verbose output
*/
verbose?: boolean;
};
class MCPClient {
private mcp: Client;
private transport: StdioClientTransport | null = null;
private verbose: boolean;
private toolNamePrefix?: string | undefined;
constructor(options: MCPClientOptions) {
this.mcp = new Client({
name: options.clientName ?? "mcp-client-cli",
version: options.clientVersion ?? "1.0.0",
});
this.verbose = options.verbose ?? false;
this.toolNamePrefix = options.toolNamePrefix;
this.connectToSever(options);
}
async connectToSever(options: StdioServerParameters) {
if (this.verbose) {
console.log("Connecting to MCP server...");
}
this.transport = new StdioClientTransport(options);
await this.mcp.connect(this.transport);
}
async listTools(): Promise<Tool[]> {
const tools = await this.mcp.listTools();
return tools.tools;
}
async cleanup() {
await this.mcp.close();
this.transport?.close();
}
/**
* Get the tools from the MCP server and map to LlamaIndex tools
*/
async tools(): Promise<BaseToolWithCall[]> {
const mcpTools = await this.listTools();
return mcpTools.map((tool) => {
const parameters =
tool.inputSchema as unknown as JSONSchemaType<ToolInput>;
const functionTool = FunctionTool.from(
async (input: unknown) => {
if (this.verbose) {
console.log("Calling tool:", tool.name, "with input:", input);
}
const result = await this.mcp.callTool({
name: tool.name,
arguments: input as unknown as Record<string, unknown>,
});
if (this.verbose) {
console.log("Tool result:", result);
}
return result as JSONValue;
},
{
name: this.toolNamePrefix
? `${this.toolNamePrefix}_${tool.name}`
: tool.name,
description: tool.description ?? "",
parameters,
},
);
return functionTool;
});
}
}
/**
* Create a MCP client
* @param options - The options for the MCP client
* @returns A MCP client
*/
export function mcp(options: MCPClientOptions) {
return new MCPClient(options);
}
+48
View File
@@ -0,0 +1,48 @@
import { mkdtemp, rm } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { afterAll, beforeAll, describe, expect, test } from "vitest";
import { mcp } from "../src/tools/mcp";
describe("MCP Tools", () => {
let server: ReturnType<typeof mcp>;
let tempDir: string;
beforeAll(async () => {
// Create a temporary directory for tests
tempDir = await mkdtemp(join(tmpdir(), "mcp-test-"));
server = mcp({
command: "npx",
args: ["-y", "@modelcontextprotocol/server-filesystem", tempDir],
toolNamePrefix: "test",
verbose: true,
});
// Wait for server to be ready by calling tools() once
await server.tools();
}, 20000);
afterAll(async () => {
// Clean up server resources
await server.cleanup();
// Remove temporary directory
await rm(tempDir, { recursive: true, force: true });
}, 20000);
test("MCP should list tools", async () => {
const tools = await server.tools();
expect(tools.length).toBeGreaterThan(0);
}, 20000);
test("MCP should call a tool to list files in a directory", async () => {
const tools = await server.tools();
const listDirectoryTool = tools.find(
(tool) => tool.metadata.name === "test_list_directory",
);
const result = await listDirectoryTool?.call({
path: tempDir,
});
expect(result).toBeDefined();
}, 20000);
});
+470 -335
View File
File diff suppressed because it is too large Load Diff
+7
View File
@@ -1,5 +1,12 @@
# @llamaindex/unit-test
## 0.1.16
### Patch Changes
- Updated dependencies [f5e4d09]
- llamaindex@0.9.16
## 0.1.15
### Patch Changes
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@llamaindex/unit-test",
"private": true,
"version": "0.1.15",
"version": "0.1.16",
"type": "module",
"scripts": {
"test": "vitest run"