minor change

Author: Jicheng Lu

src/Infrastructure/BotSharp.Abstraction/Coding/Options/CodeGenerationOptions.cs

@@ -17,11 +17,10 @@ public class CodeGenerationOptions : LlmConfigBase
     public string? TemplateName { get; set; }
 
     /// <summary>
-    /// The programming language
+    /// Programming language
     /// </summary>
-    [JsonPropertyName("language")]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public string? Language { get; set; } = "python";
+    [JsonPropertyName("programming_language")]
+    public string? ProgrammingLanguage { get; set; }
 
     /// <summary>
     /// Data that can be used to fill in the prompt

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

@@ -2,6 +2,14 @@ namespace BotSharp.Abstraction.Rules;
 
 public interface IRuleEngine
 {
+    /// <summary>
+    /// Trigger the rule that is subscribed by agents.
+    /// </summary>
+    /// <param name="trigger"></param>
+    /// <param name="text"></param>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    /// <exception cref="NotImplementedException"></exception>
     Task<IEnumerable<string>> Trigger(IRuleTrigger trigger, string text, RuleTriggerOptions? options = null)
         => throw new NotImplementedException();
 }

src/Infrastructure/BotSharp.Abstraction/Rules/Options/RuleTriggerOptions.cs

@@ -15,14 +15,14 @@ public class RuleTriggerOptions
     public string? CodeScriptName { get; set; }
 
     /// <summary>
-    /// Json arguments
+    /// Argument name as an input key to the code script
     /// </summary>
-    public JsonDocument? Arguments { get; set; }
+    public string? ArgsName { get; set; }
 
     /// <summary>
-    /// Agent where the code script is stored
+    /// Json arguments as an input value to the code script
     /// </summary>
-    public string? AgentId { get; set; }
+    public JsonDocument? Arguments { get; set; }
 
     /// <summary>
     /// States

src/Infrastructure/BotSharp.Core.Rules/Engines/RuleEngine.cs

@@ -38,23 +38,23 @@ public async Task<IEnumerable<string>> Trigger(IRuleTrigger trigger, string text
             }
         });
 
-        var isTriggered = true;
-
-        // Code trigger
-        if (options != null)
-        {
-            isTriggered = await TriggerCodeScript(trigger.Name, options);
-        }
-
-        if (!isTriggered)
-        {
-            return newConversationIds;
-        }
-
         // Trigger agents
         var filteredAgents = agents.Items.Where(x => x.Rules.Exists(r => r.TriggerName == trigger.Name && !x.Disabled)).ToList();
         foreach (var agent in filteredAgents)
         {
+            var isTriggered = true;
+
+            // Code trigger
+            if (options != null)
+            {
+                isTriggered = await TriggerCodeScript(agent.Id, trigger.Name, options);
+            }
+
+            if (!isTriggered)
+            {
+                continue;
+            }
+
             var convService = _services.GetRequiredService<IConversationService>();
             var conv = await convService.NewConversation(new Conversation
             {
@@ -90,9 +90,8 @@ await convService.SendMessage(agent.Id,
     }
 
     #region Private methods
-    private async Task<bool> TriggerCodeScript(string triggerName, RuleTriggerOptions options)
+    private async Task<bool> TriggerCodeScript(string agentId, string triggerName, RuleTriggerOptions options)
     {
-        var agentId = options.AgentId;
         if (string.IsNullOrWhiteSpace(agentId))
         {
             return false;
@@ -123,7 +122,7 @@ private async Task<bool> TriggerCodeScript(string triggerName, RuleTriggerOption
             var response = await processor.RunAsync(codeScript, options: new()
             {
                 ScriptName = scriptName,
-                Arguments = BuildArguments(options.Arguments, options.States)
+                Arguments = BuildArguments(options.ArgsName, options.Arguments)
             });
 
             if (response == null || !response.Success)
@@ -155,26 +154,14 @@ private async Task<bool> TriggerCodeScript(string triggerName, RuleTriggerOption
         }
     }
 
-    private IEnumerable<KeyValue> BuildArguments(JsonDocument? args, IEnumerable<MessageState>? states)
+    private IEnumerable<KeyValue> BuildArguments(string? argName, JsonDocument? args)
     {
-        var dict = new Dictionary<string, string>();
-        if (!states.IsNullOrEmpty())
-        {
-            foreach (var state in states)
-            {
-                if (state.Value != null)
-                {
-                    dict[state.Key] = state.Value.ConvertToString();
-                }
-            }
-        }
-
+        var keyValues = new List<KeyValue>();
         if (args != null)
         {
-            dict["trigger_args"] = args.RootElement.GetRawText();
+            keyValues.Add(new KeyValue(argName ?? "rule_args", args.RootElement.GetRawText()));
         }
-
-        return dict.Select(x => new KeyValue(x.Key, x.Value));
+        return keyValues;
     }
 #endregion
 }

src/Infrastructure/BotSharp.OpenAPI/Controllers/Agent/AgentController.Coding.cs

@@ -61,7 +61,8 @@ public async Task<CodeGenerationResult> GenerateAgentCodeScript([FromRoute] stri
         var states = request.Options?.Data?.ToList();
         var state = _services.GetRequiredService<IConversationStateService>();
         states?.ForEach(x => state.SetState(x.Key, x.Value, source: StateSource.External));
-        state.SetState("programming_language", request.Options?.Language, source: StateSource.External);
+        state.SetState("code_processor", request.Options?.Processor, source: StateSource.External);
+        state.SetState("programming_language", request.Options?.ProgrammingLanguage, source: StateSource.External);
 
         var result = await _agentService.GenerateCodeScript(agentId, request.Text, request?.Options);
         return result;

src/Plugins/BotSharp.Plugin.PythonInterpreter/Services/PyCodeInterpreter.cs

@@ -41,10 +41,10 @@ public async Task<CodeGenerationResult> GenerateCodeScriptAsync(string text, Cod
 
         var agentId = options?.AgentId;
         var templateName = options?.TemplateName;
-
-        var agentService = _services.GetRequiredService<IAgentService>();
+        
         if (!string.IsNullOrEmpty(agentId))
         {
+            var agentService = _services.GetRequiredService<IAgentService>();
             agent = await agentService.GetAgent(agentId);
         }
 
@@ -83,7 +83,7 @@ public async Task<CodeGenerationResult> GenerateCodeScriptAsync(string text, Cod
         {
             Success = true,
             Content = response.Content,
-            Language = options?.Language ?? "python"
+            Language = options?.ProgrammingLanguage ?? "python"
         };
     }