Refactor InvokeFunction code #1044
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace BotSharp.Core.Routing | ||
| { | ||
| public interface IFunctionExecutor | ||
| { | ||
| public Task<bool> Execute(RoleDialogModel message); | ||
|
|
||
| public Task<string> GetIndication(RoleDialogModel message); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| using BotSharp.Core.MCP.Hooks; | ||
| using BotSharp.Core.MCP.Managers; | ||
| using BotSharp.Core.MCP.Services; | ||
| using BotSharp.Core.MCP.Settings; | ||
| using Microsoft.Extensions.Configuration; | ||
|
|
||
| namespace BotSharp.Core.MCP; | ||
|
|
||
| public static class BotSharpMcpExtensions | ||
| { | ||
| /// <summary> | ||
| /// Add mcp | ||
| /// </summary> | ||
| /// <param name="services"></param> | ||
| /// <param name="config"></param> | ||
| /// <returns></returns> | ||
| public static IServiceCollection AddBotSharpMCP(this IServiceCollection services, IConfiguration config) | ||
| { | ||
| var settings = config.GetSection("MCP").Get<McpSettings>(); | ||
| services.AddScoped(provider => settings); | ||
|
|
||
| if (settings != null && settings.Enabled && !settings.McpServerConfigs.IsNullOrEmpty()) | ||
| { | ||
| services.AddScoped<IMcpService, McpService>(); | ||
|
|
||
| var clientManager = new McpClientManager(settings); | ||
| services.AddScoped(provider => clientManager); | ||
|
|
||
| // Register hooks | ||
| services.AddScoped<IAgentHook, McpToolAgentHook>(); | ||
| } | ||
| return services; | ||
| } | ||
|
|
||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| using BotSharp.Abstraction.Templating; | ||
|
|
||
| namespace BotSharp.Core.Routing.Executor; | ||
|
|
||
| public class DummyFunctionExecutor: IFunctionExecutor | ||
| { | ||
| private FunctionDef functionDef; | ||
| private readonly IServiceProvider _services; | ||
|
|
||
| public DummyFunctionExecutor(FunctionDef function, IServiceProvider services) | ||
| { | ||
| functionDef = function; | ||
| _services = services; | ||
| } | ||
|
|
||
|
|
||
| public async Task<bool> ExecuteAsync(RoleDialogModel message) | ||
| { | ||
| var render = _services.GetRequiredService<ITemplateRender>(); | ||
| var state = _services.GetRequiredService<IConversationStateService>(); | ||
|
|
||
| var dict = new Dictionary<string, object>(); | ||
| foreach (var item in state.GetStates()) | ||
| { | ||
| dict[item.Key] = item.Value; | ||
| } | ||
|
|
||
| var text = render.Render(functionDef.Output, dict); | ||
| message.Content = text; | ||
| return true; | ||
| } | ||
|
|
||
| public async Task<string> GetIndicatorAsync(RoleDialogModel message) | ||
| { | ||
| return "Running"; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| using BotSharp.Abstraction.Functions; | ||
|
|
||
| namespace BotSharp.Core.Routing.Executor; | ||
|
|
||
| public class FunctionCallbackExecutor : IFunctionExecutor | ||
| { | ||
| IFunctionCallback functionCallback; | ||
|
|
||
| public FunctionCallbackExecutor(IFunctionCallback functionCallback) | ||
| { | ||
| this.functionCallback = functionCallback; | ||
| } | ||
|
|
||
| public async Task<bool> ExecuteAsync(RoleDialogModel message) | ||
| { | ||
| return await functionCallback.Execute(message); | ||
| } | ||
|
|
||
| public async Task<string> GetIndicatorAsync(RoleDialogModel message) | ||
| { | ||
| return await functionCallback.GetIndication(message); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| using BotSharp.Abstraction.Functions; | ||
|
|
||
| namespace BotSharp.Core.Routing.Executor; | ||
|
|
||
| internal class FunctionExecutorFactory | ||
| { | ||
| public static IFunctionExecutor Create(string functionName, Agent agent, IFunctionCallback functioncall, IServiceProvider serviceProvider) | ||
|
There was a problem hiding this comment. I think it is not necessary to pass "functionCallback" from outside. Just function name will be enough. There was a problem hiding this comment. functionCallback is botsharp functionexecutor：FunctionCallbackExecutor，Determine whether it is a FunctionCalling defined within the BotSharp framework by checking if FunctionCallback is null |
||
| { | ||
| if(functioncall != null) | ||
| { | ||
| return new FunctionCallbackExecutor(functioncall); | ||
| } | ||
|
|
||
| var funDef = agent?.Functions?.FirstOrDefault(x => x.Name == functionName); | ||
| if (funDef != null) | ||
| { | ||
| if (!string.IsNullOrWhiteSpace(funDef?.Output)) | ||
| { | ||
| return new DummyFunctionExecutor(funDef,serviceProvider); | ||
| } | ||
| } | ||
| else | ||
| { | ||
| funDef = agent?.SecondaryFunctions?.FirstOrDefault(x => x.Name == functionName); | ||
| if (funDef != null) | ||
| { | ||
| if (!string.IsNullOrWhiteSpace(funDef?.Output)) | ||
| { | ||
| return new DummyFunctionExecutor(funDef, serviceProvider); | ||
| } | ||
| else | ||
| { | ||
| var mcpServerId = agent?.McpTools?.Where(x => x.Functions.Any(y => y.Name == funDef.Name)) | ||
| .FirstOrDefault().ServerId; | ||
| return new MCPToolExecutor(mcpServerId, functionName, serviceProvider); | ||
| } | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| namespace BotSharp.Core.Routing.Executor; | ||
|
|
||
| public interface IFunctionExecutor | ||
| { | ||
| public Task<bool> ExecuteAsync(RoleDialogModel message); | ||
|
|
||
| public Task<string> GetIndicatorAsync(RoleDialogModel message); | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.