feat： McpClientTool replace Tool

geffzhang · geffzhang · commit 013901fc48fa · 2025-03-29T10:05:52.000+08:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -19,8 +19,7 @@
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.0.0" />
-    <PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.0-preview.1.25080.5" />
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.0.0" />   
     <PackageVersion Include="System.Memory.Data" Version="8.0.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
@@ -110,8 +109,7 @@
     <PackageVersion Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageVersion Include="ModelContextProtocol" Version="0.1.0-preview.2" />
-    <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
+    <PackageVersion Include="ModelContextProtocol" Version="0.1.0-preview.2" /> 
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="BotSharp.Core" Version="$(BotSharpVersion)" />
diff --git a/src/Infrastructure/BotSharp.MCP/AIFunctionUtilities.cs b/src/Infrastructure/BotSharp.MCP/AIFunctionUtilities.cs
@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Functions.Models;
+using ModelContextProtocol.Client;
 using ModelContextProtocol.Protocol.Types;
 using System;
 using System.Collections.Generic;
@@ -8,15 +9,15 @@ namespace BotSharp.Core.MCP;
 
 internal static class AIFunctionUtilities
 {
-    public static FunctionDef MapToFunctionDef(Tool tool)
+    public static FunctionDef MapToFunctionDef(McpClientTool tool)
     {
         if (tool == null)
         {
             throw new ArgumentNullException(nameof(tool));
         }
 
-        var properties = tool.InputSchema.GetProperty("properties");
-        var required = tool.InputSchema.GetProperty("required");
+        var properties = tool.JsonSchema.GetProperty("properties");
+        var required = tool.JsonSchema.GetProperty("required");
 
         FunctionDef funDef = new FunctionDef
         {
diff --git a/src/Infrastructure/BotSharp.MCP/BotSharp.MCP.csproj b/src/Infrastructure/BotSharp.MCP/BotSharp.MCP.csproj
@@ -10,7 +10,6 @@
 
   <ItemGroup>
     <PackageReference Include="ModelContextProtocol" />
-    <PackageReference Include="System.Linq.AsyncEnumerable" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Infrastructure/BotSharp.MCP/Functions/McpToolAdapter.cs b/src/Infrastructure/BotSharp.MCP/Functions/McpToolAdapter.cs
@@ -15,11 +15,11 @@ namespace BotSharp.Core.Mcp.Functions;
 
 public class McpToolAdapter : IFunctionCallback
 {
-    private readonly Tool _tool;
+    private readonly McpClientTool _tool;
     private readonly MCPClientManager _clientManager;
     private readonly IServiceProvider _serviceProvider;
 
-    public McpToolAdapter(IServiceProvider provider, Tool tool, MCPClientManager client)
+    public McpToolAdapter(IServiceProvider provider, McpClientTool tool, MCPClientManager client)
     {
         _serviceProvider = provider ?? throw new ArgumentNullException(nameof(provider));
         _tool = tool ?? throw new ArgumentNullException(nameof(tool));
diff --git a/src/Infrastructure/BotSharp.MCP/Hooks/MCPToolAgentHook.cs b/src/Infrastructure/BotSharp.MCP/Hooks/MCPToolAgentHook.cs
@@ -55,9 +55,9 @@ private async Task<IEnumerable<FunctionDef>> GetMCPContent(Agent agent)
             var mcpClient =  await mcpClientManager.GetMcpClientAsync(item.ServerId);
             if (mcpClient != null)
             {
-                var tools = await mcpClient.ListToolsAsync().ToListAsync();
+                var tools = await mcpClient.ListToolsAsync();
                 var toolnames = item.Functions.Select(x => x.Name).ToList();
-                foreach (var tool in tools.Where(x => toolnames.Contains(x.Name, StringComparer.OrdinalIgnoreCase)))
+                foreach (var tool in tools.ToList().Where(x => toolnames.Contains(x.Name, StringComparer.OrdinalIgnoreCase)))
                 {
                     var funDef = AIFunctionUtilities.MapToFunctionDef(tool);
                     functionDefs.Add(funDef);
diff --git a/src/Infrastructure/BotSharp.MCP/McpPlugin.cs b/src/Infrastructure/BotSharp.MCP/McpPlugin.cs
@@ -45,7 +45,7 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
     private async Task RegisterFunctionCall(IServiceCollection services, McpServerConfig server)
     {
         var client = await clientManager.GetMcpClientAsync(server.Id);
-        var tools = await client.ListToolsAsync().ToListAsync(); 
+        var tools = await client.ListToolsAsync(); 
 
         foreach (var tool in tools)
         {
diff --git a/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs b/src/Infrastructure/BotSharp.OpenAPI/Controllers/AgentController.cs
@@ -175,10 +175,10 @@ public IEnumerable<AgentUtility> GetAgentUtilityOptions()
     }
 
     [HttpGet("/agent/mcp/tools")]
-    public async Task<IEnumerable<Tool>> GetMCPTools(string serverId)
+    public async Task<IEnumerable<McpClientTool>> GetMCPTools(string serverId)
     {
         var client = await _clientManager.GetMcpClientAsync(serverId);
-        var tools = await client.ListToolsAsync().ToListAsync();
+        var tools = await client.ListToolsAsync();
          
         return tools.Where(x => !string.IsNullOrWhiteSpace(x.Name))
             .OrderBy(x => x.Name).ToList();

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using BotSharp.Abstraction.Functions.Models;`
	`2`	`+using ModelContextProtocol.Client;`
`2`	`3`	`using ModelContextProtocol.Protocol.Types;`
`3`	`4`	`using System;`
`4`	`5`	`using System.Collections.Generic;`
`@@ -8,15 +9,15 @@ namespace BotSharp.Core.MCP;`
`8`	`9`
`9`	`10`	`internal static class AIFunctionUtilities`
`10`	`11`	`{`
`11`		`- public static FunctionDef MapToFunctionDef(Tool tool)`
	`12`	`+ public static FunctionDef MapToFunctionDef(McpClientTool tool)`
`12`	`13`	`{`
`13`	`14`	`if (tool == null)`
`14`	`15`	`{`
`15`	`16`	`throw new ArgumentNullException(nameof(tool));`
`16`	`17`	`}`
`17`	`18`
`18`		`- var properties = tool.InputSchema.GetProperty("properties");`
`19`		`- var required = tool.InputSchema.GetProperty("required");`
	`19`	`+ var properties = tool.JsonSchema.GetProperty("properties");`
	`20`	`+ var required = tool.JsonSchema.GetProperty("required");`
`20`	`21`
`21`	`22`	`FunctionDef funDef = new FunctionDef`
`22`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@ namespace BotSharp.Core.Mcp.Functions;`
`15`	`15`
`16`	`16`	`public class McpToolAdapter : IFunctionCallback`
`17`	`17`	`{`
`18`		`- private readonly Tool _tool;`
	`18`	`+ private readonly McpClientTool _tool;`
`19`	`19`	`private readonly MCPClientManager _clientManager;`
`20`	`20`	`private readonly IServiceProvider _serviceProvider;`
`21`	`21`
`22`		`- public McpToolAdapter(IServiceProvider provider, Tool tool, MCPClientManager client)`
	`22`	`+ public McpToolAdapter(IServiceProvider provider, McpClientTool tool, MCPClientManager client)`
`23`	`23`	`{`
`24`	`24`	`_serviceProvider = provider ?? throw new ArgumentNullException(nameof(provider));`
`25`	`25`	`_tool = tool ?? throw new ArgumentNullException(nameof(tool));`
Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,9 @@ private async Task<IEnumerable<FunctionDef>> GetMCPContent(Agent agent)`
`55`	`55`	`var mcpClient = await mcpClientManager.GetMcpClientAsync(item.ServerId);`
`56`	`56`	`if (mcpClient != null)`
`57`	`57`	`{`
`58`		`- var tools = await mcpClient.ListToolsAsync().ToListAsync();`
	`58`	`+ var tools = await mcpClient.ListToolsAsync();`
`59`	`59`	`var toolnames = item.Functions.Select(x => x.Name).ToList();`
`60`		`- foreach (var tool in tools.Where(x => toolnames.Contains(x.Name, StringComparer.OrdinalIgnoreCase)))`
	`60`	`+ foreach (var tool in tools.ToList().Where(x => toolnames.Contains(x.Name, StringComparer.OrdinalIgnoreCase)))`
`61`	`61`	`{`
`62`	`62`	`var funDef = AIFunctionUtilities.MapToFunctionDef(tool);`
`63`	`63`	`functionDefs.Add(funDef);`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)`
`45`	`45`	`private async Task RegisterFunctionCall(IServiceCollection services, McpServerConfig server)`
`46`	`46`	`{`
`47`	`47`	`var client = await clientManager.GetMcpClientAsync(server.Id);`
`48`		`- var tools = await client.ListToolsAsync().ToListAsync();`
	`48`	`+ var tools = await client.ListToolsAsync();`
`49`	`49`
`50`	`50`	`foreach (var tool in tools)`
`51`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -175,10 +175,10 @@ public IEnumerable<AgentUtility> GetAgentUtilityOptions()`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`[HttpGet("/agent/mcp/tools")]`
`178`		`- public async Task<IEnumerable<Tool>> GetMCPTools(string serverId)`
	`178`	`+ public async Task<IEnumerable<McpClientTool>> GetMCPTools(string serverId)`
`179`	`179`	`{`
`180`	`180`	`var client = await _clientManager.GetMcpClientAsync(serverId);`
`181`		`- var tools = await client.ListToolsAsync().ToListAsync();`
	`181`	`+ var tools = await client.ListToolsAsync();`
`182`	`182`
`183`	`183`	`return tools.Where(x => !string.IsNullOrWhiteSpace(x.Name))`
`184`	`184`	`.OrderBy(x => x.Name).ToList();`