Merge pull request #1355 from iceljc/features/add-resolve-block

Features/add resolve block

Author: iceljc

src/Infrastructure/BotSharp.Abstraction/Agents/IInstructionResolver.cs

@@ -0,0 +1,9 @@
+namespace BotSharp.Abstraction.Agents;
+
+public interface IInstructionResolver
+{
+    string Name { get; }
+
+    Task<string> ResolveAsync(Agent agent, string instruction, IEnumerable<object?> args, IDictionary<string, object?> kwArgs)
+        => Task.FromResult(instruction);
+}

src/Infrastructure/BotSharp.Abstraction/Rules/RuleGraph.cs

@@ -177,6 +177,7 @@ public class RuleNode : GraphItem
     /// <summary>
     /// Node type: root, criteria, action, etc.
     /// </summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public override string Type { get; set; } = "action";
 
     /// <summary>
@@ -229,15 +230,28 @@ public override string ToString()
 
 public class GraphItem
 {
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public virtual string Id { get; set; } = Guid.NewGuid().ToString();
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public virtual string Name { get; set; } = null!;
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public virtual string Type { get; set; } = null!;
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public virtual IEnumerable<string> Labels { get; set; } = [];
     public virtual double Weight { get; set; } = 1.0;
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public virtual string? Description { get; set; }
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public virtual Dictionary<string, string?> Config { get; set; } = [];
 
     private string? _alias;
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public virtual string Alias
     {
         get => string.IsNullOrEmpty(_alias) ? Name : _alias;
@@ -267,6 +281,8 @@ public class EdgeItemPayload : GraphItem
 
 public class RuleGraphInfo
 {
+    [JsonPropertyName("graph_id")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string GraphId { get; set; }
     public IEnumerable<RuleNode> Nodes { get; set; } = [];
     public IEnumerable<RuleEdge> Edges { get; set; } = [];

src/Infrastructure/BotSharp.Abstraction/Templating/IRenderConfiguration.cs

@@ -0,0 +1,7 @@
+namespace BotSharp.Abstraction.Templating;
+
+public interface IRenderConfiguration
+{
+    string Render(IServiceProvider services, string template, IDictionary<string, object> dict);
+    void RegisterType(Type type);
+}

src/Infrastructure/BotSharp.Abstraction/Templating/ITemplateRender.cs

@@ -3,5 +3,4 @@ namespace BotSharp.Abstraction.Templating;
 public interface ITemplateRender
 {
     string Render(string template, IDictionary<string, object> dict);
-    void RegisterType(Type type);
 }

src/Infrastructure/BotSharp.Core/Agents/AgentPlugin.cs

@@ -44,7 +44,7 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
         services.AddScoped(provider =>
         {
             var settingService = provider.GetRequiredService<ISettingService>();
-            var render = provider.GetRequiredService<ITemplateRender>();
+            var render = provider.GetRequiredService<IRenderConfiguration>();
             render.RegisterType(typeof(AgentSettings));
             return settingService.Bind<AgentSettings>("Agent");
         });

src/Infrastructure/BotSharp.Core/BotSharpCoreExtensions.cs

@@ -25,7 +25,8 @@ public static IServiceCollection AddBotSharpCore(this IServiceCollection service
     {
         services.AddSingleton<IDistributedLocker, DistributedLocker>();
         // Register template render
-        services.AddSingleton<ITemplateRender, TemplateRender>();
+        services.AddSingleton<IRenderConfiguration, RenderConfiguration>();
+        services.AddScoped<ITemplateRender, TemplateRender>();
 
         services.AddScoped<ISettingService, SettingService>();
         services.AddScoped<IRoleService, RoleService>();

src/Infrastructure/BotSharp.Core/Conversations/ConversationPlugin.cs

@@ -37,7 +37,7 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
         services.AddScoped(provider =>
         {
             var settingService = provider.GetRequiredService<ISettingService>();
-            var render = provider.GetRequiredService<ITemplateRender>();
+            var render = provider.GetRequiredService<IRenderConfiguration>();
             render.RegisterType(typeof(ConversationSetting));
             return settingService.Bind<ConversationSetting>("Conversation");
         });