fix startup and use camel case

Jicheng Lu · Jicheng Lu · commit adfb8f4fc40f · 2025-03-31T20:59:19.000-05:00
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/AgentHookBase.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/AgentHookBase.cs
@@ -60,7 +60,7 @@ public virtual void OnAgentUtilityLoaded(Agent agent)
 
     }
 
-    public virtual void OnAgentMCPToolLoaded(Agent agent)
+    public virtual void OnAgentMcpToolLoaded(Agent agent)
     {
 
     }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/IAgentHook.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/IAgentHook.cs
@@ -27,7 +27,7 @@ public interface IAgentHook
 
     void OnAgentUtilityLoaded(Agent agent);
 
-    void OnAgentMCPToolLoaded(Agent agent);
+    void OnAgentMcpToolLoaded(Agent agent);
 
     /// <summary>
     /// Triggered when agent is loaded completely.
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/Models/Agent.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/Models/Agent.cs
@@ -107,7 +107,7 @@ public class Agent
     /// <summary>
     /// Agent MCP Tools
     /// </summary>
-    public List<MCPTool> McpTools { get; set; } = new();
+    public List<McpTool> McpTools { get; set; } = new();
 
     /// <summary>
     /// Agent rules
@@ -305,7 +305,7 @@ public Agent SetLlmConfig(AgentLlmConfig? llmConfig)
         return this;
     }
 
-    public Agent SetMcps(List<MCPTool> mcps)
+    public Agent SetMcpTools(List<McpTool>? mcps)
     {
         McpTools = mcps ?? [];
         return this;
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/Models/MCPTool.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/Models/MCPTool.cs
@@ -1,22 +1,22 @@
 namespace BotSharp.Abstraction.Agents.Models;
 
-public class MCPTool
+public class McpTool
 {
     public string Name { get; set; }
     public string ServerId { get; set; }
     public bool Disabled { get; set; }
-    public IEnumerable<MCPFunction> Functions { get; set; } = [];
+    public IEnumerable<McpFunction> Functions { get; set; } = [];
 
-    public MCPTool()
+    public McpTool()
     {
         
     }
 
-    public MCPTool(
+    public McpTool(
         string name,
         string serverId,
         bool disabled = false,
-        IEnumerable<MCPFunction>? functions = null)
+        IEnumerable<McpFunction>? functions = null)
     {
         Name = name;
         ServerId = serverId;
@@ -31,11 +31,11 @@ public override string ToString()
 }
 
 
-public class MCPFunction
+public class McpFunction
 {
     public string Name { get; set; }
 
-    public MCPFunction(string name)
+    public McpFunction(string name)
     {
         Name = name;
     } 
diff --git a/src/Infrastructure/BotSharp.Abstraction/Plugins/PluginLoaderSettings.cs b/src/Infrastructure/BotSharp.Abstraction/Plugins/PluginLoaderSettings.cs
@@ -3,4 +3,6 @@ namespace BotSharp.Abstraction.Plugins;
 public class PluginSettings
 {
     public string[] Assemblies { get; set; } = new string[0];
+
+    public string[] ExcludedFunctions { get; set; } = new string[0];
 }
diff --git a/src/Infrastructure/BotSharp.Core.MCP/BotSharpMCPExtensions.cs b/src/Infrastructure/BotSharp.Core.MCP/BotSharpMCPExtensions.cs
@@ -4,10 +4,11 @@
 using Microsoft.Extensions.Configuration;
 using ModelContextProtocol.Configuration;
 using ModelContextProtocol.Client;
+using BotSharp.Core.MCP.Managers;
 
 namespace BotSharp.Core.MCP;
 
-public static class BotSharpMCPExtensions
+public static class BotSharpMcpExtensions
 {
     /// <summary>
     /// Add mcp 
@@ -17,11 +18,11 @@ public static class BotSharpMCPExtensions
     /// <returns></returns>
     public static IServiceCollection AddBotSharpMCP(this IServiceCollection services, IConfiguration config)
     {
-        var settings = config.GetSection("MCPSettings").Get<MCPSettings>();
-        services.AddScoped<MCPSettings>(provider => { return settings; });
-        if (settings != null)
+        var settings = config.GetSection("MCPSettings").Get<McpSettings>();
+        services.AddScoped<McpSettings>(provider => { return settings; });
+        if (settings != null && !settings.McpServerConfigs.IsNullOrEmpty())
         {
-            var clientManager = new MCPClientManager(settings);
+            var clientManager = new McpClientManager(settings);
             services.AddSingleton(clientManager);
 
             foreach (var server in settings.McpServerConfigs)
@@ -31,13 +32,14 @@ public static IServiceCollection AddBotSharpMCP(this IServiceCollection services
                     .GetAwaiter()
                     .GetResult();
             }
+
             // Register hooks
-            services.AddScoped<IAgentHook, MCPToolAgentHook>();
+            services.AddScoped<IAgentHook, McpToolAgentHook>();
         }
         return services;
     }
 
-    private static async Task RegisterFunctionCall(IServiceCollection services, McpServerConfig server, MCPClientManager clientManager)
+    private static async Task RegisterFunctionCall(IServiceCollection services, McpServerConfig server, McpClientManager clientManager)
     {
         var client = await clientManager.GetMcpClientAsync(server.Id);
         var tools = await client.ListToolsAsync();
diff --git a/src/Infrastructure/BotSharp.Core.MCP/Functions/McpToolAdapter.cs b/src/Infrastructure/BotSharp.Core.MCP/Functions/McpToolAdapter.cs
@@ -1,15 +1,16 @@
 using System.Text.Json;
+using BotSharp.Core.MCP.Managers;
 using ModelContextProtocol.Client;
 
 namespace BotSharp.Core.MCP.Functions;
 
 public class McpToolAdapter : IFunctionCallback
 {
     private readonly McpClientTool _tool;
-    private readonly MCPClientManager _clientManager;
+    private readonly McpClientManager _clientManager;
     private readonly IServiceProvider _services;
 
-    public McpToolAdapter(IServiceProvider services, McpClientTool tool, MCPClientManager client)
+    public McpToolAdapter(IServiceProvider services, McpClientTool tool, McpClientManager client)
     {
         _services = services ?? throw new ArgumentNullException(nameof(services));
         _tool = tool ?? throw new ArgumentNullException(nameof(tool));
diff --git a/src/Infrastructure/BotSharp.Core.MCP/Helpers/AiFunctionHelper.cs b/src/Infrastructure/BotSharp.Core.MCP/Helpers/AiFunctionHelper.cs
@@ -1,10 +1,9 @@
 using System.Text.Json;
-
 using ModelContextProtocol.Client;
 
-namespace BotSharp.Core.MCP;
+namespace BotSharp.Core.MCP.Helpers;
 
-internal static class AIFunctionUtilities
+internal static class AiFunctionHelper
 {
     public static FunctionDef MapToFunctionDef(McpClientTool tool)
     {
diff --git a/src/Infrastructure/BotSharp.Core.MCP/Hooks/MCPToolAgentHook.cs b/src/Infrastructure/BotSharp.Core.MCP/Hooks/MCPToolAgentHook.cs
@@ -1,17 +1,19 @@
+using BotSharp.Core.MCP.Helpers;
+using BotSharp.Core.MCP.Managers;
 using ModelContextProtocol.Client;
 
 namespace BotSharp.Core.MCP.Hooks;
 
-public class MCPToolAgentHook : AgentHookBase
+public class McpToolAgentHook : AgentHookBase
 {
     public override string SelfId => string.Empty;
 
-    public MCPToolAgentHook(IServiceProvider services, AgentSettings settings)
+    public McpToolAgentHook(IServiceProvider services, AgentSettings settings)
         : base(services, settings)
     {
     }
 
-    public override void OnAgentMCPToolLoaded(Agent agent)
+    public override void OnAgentMcpToolLoaded(Agent agent)
     {
         if (agent.Type == AgentType.Routing)
         {
@@ -24,7 +26,7 @@ public override void OnAgentMCPToolLoaded(Agent agent)
 
         agent.SecondaryFunctions ??= [];
 
-        var functions = GetMCPContent(agent).Result;
+        var functions = GetMcpContent(agent).Result;
         foreach (var fn in functions)
         {
             if (!agent.SecondaryFunctions.Any(x => x.Name.Equals(fn.Name, StringComparison.OrdinalIgnoreCase)))
@@ -34,11 +36,11 @@ public override void OnAgentMCPToolLoaded(Agent agent)
         }
     }
 
-    private async Task<IEnumerable<FunctionDef>> GetMCPContent(Agent agent)
+    private async Task<IEnumerable<FunctionDef>> GetMcpContent(Agent agent)
     {
         var functionDefs = new List<FunctionDef>();
-        var mcpClientManager = _services.GetRequiredService<MCPClientManager>();
-        var mcps = agent.McpTools;
+        var mcpClientManager = _services.GetRequiredService<McpClientManager>();
+        var mcps = agent.McpTools.Where(x => !x.Disabled);
         foreach (var item in mcps)
         {
             var mcpClient =  await mcpClientManager.GetMcpClientAsync(item.ServerId);
@@ -48,7 +50,7 @@ private async Task<IEnumerable<FunctionDef>> GetMCPContent(Agent agent)
                 var toolnames = item.Functions.Select(x => x.Name).ToList();
                 foreach (var tool in tools.Where(x => toolnames.Contains(x.Name, StringComparer.OrdinalIgnoreCase)))
                 {
-                    var funDef = AIFunctionUtilities.MapToFunctionDef(tool);
+                    var funDef = AiFunctionHelper.MapToFunctionDef(tool);
                     functionDefs.Add(funDef);
                 }
             }
diff --git a/src/Infrastructure/BotSharp.Core.MCP/MCPClientManager.cs b/src/Infrastructure/BotSharp.Core.MCP/MCPClientManager.cs
diff --git a/src/Infrastructure/BotSharp.Core.MCP/Managers/McpClientManager.cs b/src/Infrastructure/BotSharp.Core.MCP/Managers/McpClientManager.cs
@@ -0,0 +1,27 @@
+using BotSharp.Core.MCP.Settings;
+using ModelContextProtocol.Client;
+
+namespace BotSharp.Core.MCP.Managers;
+
+public class McpClientManager : IDisposable
+{
+
+    private readonly McpSettings mcpSettings;
+
+    public McpClientManager(McpSettings settings)
+    {
+        mcpSettings = settings;
+    }
+
+    public async Task<IMcpClient> GetMcpClientAsync(string serverId)
+    {
+        return await McpClientFactory.CreateAsync(
+            mcpSettings.McpServerConfigs.Where(x=> x.Name == serverId).First(),
+            mcpSettings.McpClientOptions);
+    }
+
+    public void Dispose()
+    {
+
+    }
+}
diff --git a/src/Infrastructure/BotSharp.Core.MCP/Settings/MCPSettings.cs b/src/Infrastructure/BotSharp.Core.MCP/Settings/MCPSettings.cs
@@ -3,7 +3,7 @@
 
 namespace BotSharp.Core.MCP.Settings;
 
-public class MCPSettings
+public class McpSettings
 {
     public McpClientOptions McpClientOptions { get; set; }
     public List<McpServerConfig> McpServerConfigs { get; set; } = new();
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.LoadAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.LoadAgent.cs
@@ -74,7 +74,7 @@ public async Task<Agent> LoadAgent(string id, bool loadUtility = true)
 
             if(!agent.McpTools.IsNullOrEmpty())
             {
-                hook.OnAgentMCPToolLoaded(agent);
+                hook.OnAgentMcpToolLoaded(agent);
             }
             
             hook.OnAgentLoaded(agent);
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.UpdateAgent.cs
@@ -107,7 +107,7 @@ public async Task<string> UpdateAgentFromFile(string id)
                        .SetResponses(foundAgent.Responses)
                        .SetSamples(foundAgent.Samples)
                        .SetUtilities(foundAgent.Utilities)
-                       .SetMcps(foundAgent.McpTools)
+                       .SetMcpTools(foundAgent.McpTools)
                        .SetKnowledgeBases(foundAgent.KnowledgeBases)
                        .SetRules(foundAgent.Rules)
                        .SetLlmConfig(foundAgent.LlmConfig);
diff --git a/src/Infrastructure/BotSharp.Core/BotSharpCoreExtensions.cs b/src/Infrastructure/BotSharp.Core/BotSharpCoreExtensions.cs
@@ -135,6 +135,8 @@ public static void RegisterPlugins(IServiceCollection services, IConfiguration c
     {
         var pluginSettings = new PluginSettings();
         config.Bind("PluginLoader", pluginSettings);
+        var excludedFunctions = pluginSettings.ExcludedFunctions ?? [];
+
         services.AddScoped(provider =>
         {
             var settingService = provider.GetRequiredService<ISettingService>();
@@ -161,8 +163,9 @@ public static void RegisterPlugins(IServiceCollection services, IConfiguration c
 
             // Register function callback
             var functions = assembly.GetTypes()
-                .Where(x => x.IsClass)
-                .Where(x => x.GetInterface(nameof(IFunctionCallback)) != null)
+                .Where(x => x.IsClass
+                        && x.GetInterface(nameof(IFunctionCallback)) != null
+                        && !excludedFunctions.Contains(x.Name))
                 .ToArray();
 
             foreach (var function in functions)
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Agent.cs
@@ -194,7 +194,7 @@ private void UpdateAgentUtilities(string agentId, bool mergeUtility, List<AgentU
             File.WriteAllText(agentFile, json);
         }
 
-        private void UpdateAgentMcpTools(string agentId, List<MCPTool> mcptools)
+        private void UpdateAgentMcpTools(string agentId, List<McpTool> mcptools)
         {
             if (mcptools == null) return;
 
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/Request/AgentCreationModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/Request/AgentCreationModel.cs
@@ -55,7 +55,7 @@ public class AgentCreationModel
     public int? MaxMessageCount { get; set; }
 
     public List<AgentUtility> Utilities { get; set; } = new();
-    public List<MCPTool> McpTools { get; set; } = new();
+    public List<McpTool> McpTools { get; set; } = new();
     public List<RoutingRuleUpdateModel> RoutingRules { get; set; } = new();
     public List<AgentKnowledgeBase> KnowledgeBases { get; set; } = new();
     public List<AgentRule> Rules { get; set; } = new();
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/Request/AgentUpdateModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/Request/AgentUpdateModel.cs
@@ -42,7 +42,7 @@ public class AgentUpdateModel
     /// <summary>
     /// McpTools
     /// </summary>
-    public List<MCPTool>? McpTools { get; set; }
+    public List<McpTool>? McpTools { get; set; }
 
     /// <summary>
     /// knowledge bases
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/View/AgentViewModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/View/AgentViewModel.cs
@@ -24,7 +24,9 @@ public class AgentViewModel
     [JsonPropertyName("merge_utility")]
     public bool MergeUtility { get; set; }
     public List<AgentUtility> Utilities { get; set; }
-    public List<MCPTool> McpTools { get; set; }
+
+    [JsonPropertyName("mcp_tools")]
+    public List<McpTool> McpTools { get; set; }
 
     [JsonPropertyName("knowledge_bases")]
     public List<AgentKnowledgeBase> KnowledgeBases { get; set; }
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Collections/AgentDocument.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Collections/AgentDocument.cs
@@ -18,7 +18,7 @@ public class AgentDocument : MongoBase
     public List<AgentResponseMongoElement> Responses { get; set; }
     public List<string> Samples { get; set; }
     public List<AgentUtilityMongoElement> Utilities { get; set; }
-    public List<AgentMCPToolMongoElement> McpTools { get; set; }
+    public List<AgentMcpToolMongoElement> McpTools { get; set; }
     public List<AgentKnowledgeBaseMongoElement> KnowledgeBases { get; set; }
     public List<string> Profiles { get; set; }
     public List<string> Labels { get; set; }
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Models/AgentMCPToolMongoElement.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Models/AgentMCPToolMongoElement.cs
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Agent.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Agent.cs
diff --git a/src/WebStarter/appsettings.json b/src/WebStarter/appsettings.json

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public virtual void OnAgentUtilityLoaded(Agent agent)`
`60`	`60`
`61`	`61`	`}`
`62`	`62`
`63`		`- public virtual void OnAgentMCPToolLoaded(Agent agent)`
	`63`	`+ public virtual void OnAgentMcpToolLoaded(Agent agent)`
`64`	`64`	`{`
`65`	`65`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,22 @@`
`1`	`1`	`namespace BotSharp.Abstraction.Agents.Models;`
`2`	`2`
`3`		`-public class MCPTool`
	`3`	`+public class McpTool`
`4`	`4`	`{`
`5`	`5`	`public string Name { get; set; }`
`6`	`6`	`public string ServerId { get; set; }`
`7`	`7`	`public bool Disabled { get; set; }`
`8`		`- public IEnumerable<MCPFunction> Functions { get; set; } = [];`
	`8`	`+ public IEnumerable<McpFunction> Functions { get; set; } = [];`
`9`	`9`
`10`		`- public MCPTool()`
	`10`	`+ public McpTool()`
`11`	`11`	`{`
`12`	`12`
`13`	`13`	`}`
`14`	`14`
`15`		`- public MCPTool(`
	`15`	`+ public McpTool(`
`16`	`16`	`string name,`
`17`	`17`	`string serverId,`
`18`	`18`	`bool disabled = false,`
`19`		`- IEnumerable<MCPFunction>? functions = null)`
	`19`	`+ IEnumerable<McpFunction>? functions = null)`
`20`	`20`	`{`
`21`	`21`	`Name = name;`
`22`	`22`	`ServerId = serverId;`
`@@ -31,11 +31,11 @@ public override string ToString()`
`31`	`31`	`}`
`32`	`32`
`33`	`33`
`34`		`-public class MCPFunction`
	`34`	`+public class McpFunction`
`35`	`35`	`{`
`36`	`36`	`public string Name { get; set; }`
`37`	`37`
`38`		`- public MCPFunction(string name)`
	`38`	`+ public McpFunction(string name)`
`39`	`39`	`{`
`40`	`40`	`Name = name;`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,6 @@ namespace BotSharp.Abstraction.Plugins;`
`3`	`3`	`public class PluginSettings`
`4`	`4`	`{`
`5`	`5`	`public string[] Assemblies { get; set; } = new string[0];`
	`6`	`+`
	`7`	`+ public string[] ExcludedFunctions { get; set; } = new string[0];`
`6`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`	`1`	`using System.Text.Json;`
`2`		`-`
`3`	`2`	`using ModelContextProtocol.Client;`
`4`	`3`
`5`		`-namespace BotSharp.Core.MCP;`
	`4`	`+namespace BotSharp.Core.MCP.Helpers;`
`6`	`5`
`7`		`-internal static class AIFunctionUtilities`
	`6`	`+internal static class AiFunctionHelper`
`8`	`7`	`{`
`9`	`8`	`public static FunctionDef MapToFunctionDef(McpClientTool tool)`
`10`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,19 @@`
	`1`	`+using BotSharp.Core.MCP.Helpers;`
	`2`	`+using BotSharp.Core.MCP.Managers;`
`1`	`3`	`using ModelContextProtocol.Client;`
`2`	`4`
`3`	`5`	`namespace BotSharp.Core.MCP.Hooks;`
`4`	`6`
`5`		`-public class MCPToolAgentHook : AgentHookBase`
	`7`	`+public class McpToolAgentHook : AgentHookBase`
`6`	`8`	`{`
`7`	`9`	`public override string SelfId => string.Empty;`
`8`	`10`
`9`		`- public MCPToolAgentHook(IServiceProvider services, AgentSettings settings)`
	`11`	`+ public McpToolAgentHook(IServiceProvider services, AgentSettings settings)`
`10`	`12`	`: base(services, settings)`
`11`	`13`	`{`
`12`	`14`	`}`
`13`	`15`
`14`		`- public override void OnAgentMCPToolLoaded(Agent agent)`
	`16`	`+ public override void OnAgentMcpToolLoaded(Agent agent)`
`15`	`17`	`{`
`16`	`18`	`if (agent.Type == AgentType.Routing)`
`17`	`19`	`{`
`@@ -24,7 +26,7 @@ public override void OnAgentMCPToolLoaded(Agent agent)`
`24`	`26`
`25`	`27`	`agent.SecondaryFunctions ??= [];`
`26`	`28`
`27`		`- var functions = GetMCPContent(agent).Result;`
	`29`	`+ var functions = GetMcpContent(agent).Result;`
`28`	`30`	`foreach (var fn in functions)`
`29`	`31`	`{`
`30`	`32`	`if (!agent.SecondaryFunctions.Any(x => x.Name.Equals(fn.Name, StringComparison.OrdinalIgnoreCase)))`
`@@ -34,11 +36,11 @@ public override void OnAgentMCPToolLoaded(Agent agent)`
`34`	`36`	`}`
`35`	`37`	`}`
`36`	`38`
`37`		`- private async Task<IEnumerable<FunctionDef>> GetMCPContent(Agent agent)`
	`39`	`+ private async Task<IEnumerable<FunctionDef>> GetMcpContent(Agent agent)`
`38`	`40`	`{`
`39`	`41`	`var functionDefs = new List<FunctionDef>();`
`40`		`- var mcpClientManager = _services.GetRequiredService<MCPClientManager>();`
`41`		`- var mcps = agent.McpTools;`
	`42`	`+ var mcpClientManager = _services.GetRequiredService<McpClientManager>();`
	`43`	`+ var mcps = agent.McpTools.Where(x => !x.Disabled);`
`42`	`44`	`foreach (var item in mcps)`
`43`	`45`	`{`
`44`	`46`	`var mcpClient = await mcpClientManager.GetMcpClientAsync(item.ServerId);`
`@@ -48,7 +50,7 @@ private async Task<IEnumerable<FunctionDef>> GetMCPContent(Agent agent)`
`48`	`50`	`var toolnames = item.Functions.Select(x => x.Name).ToList();`
`49`	`51`	`foreach (var tool in tools.Where(x => toolnames.Contains(x.Name, StringComparer.OrdinalIgnoreCase)))`
`50`	`52`	`{`
`51`		`- var funDef = AIFunctionUtilities.MapToFunctionDef(tool);`
	`53`	`+ var funDef = AiFunctionHelper.MapToFunctionDef(tool);`
`52`	`54`	`functionDefs.Add(funDef);`
`53`	`55`	`}`
`54`	`56`	`}`