refine

Author: iceljc

src/Infrastructure/BotSharp.Abstraction/Coding/Constants/BuiltInCodeProcessor.cs

@@ -0,0 +1,6 @@
+namespace BotSharp.Abstraction.Coding.Constants;
+
+public static class BuiltInCodeProcessor
+{
+    public const string PyInterpreter = "botsharp-py-interpreter";
+}

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

@@ -12,5 +12,8 @@ public interface IRuleTrigger
 
     string EntityId { get; set; }
 
+    /// <summary>
+    /// The default arguments as input to code trigger (display purpose)
+    /// </summary>
     JsonDocument OutputArgs => JsonDocument.Parse("{}");
 }

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

@@ -7,7 +7,7 @@ public class RuleTriggerOptions
     /// <summary>
     /// Code processor provider
     /// </summary>
-    public string? CodeProcessor { get; set; } = "botsharp-py-interpreter";
+    public string? CodeProcessor { get; set; }
 
     /// <summary>
     /// Code script name

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

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Coding;
+using BotSharp.Abstraction.Coding.Constants;
 using BotSharp.Abstraction.Conversations;
 using BotSharp.Abstraction.Models;
 using BotSharp.Abstraction.Repositories.Filters;
@@ -39,23 +40,19 @@ public async Task<IEnumerable<string>> Trigger(IRuleTrigger trigger, string text
 
         var isTriggered = true;
 
-        // Apply code trigger
-        if (options != null
-            && !string.IsNullOrWhiteSpace(options.CodeProcessor)
-            && !string.IsNullOrWhiteSpace(options.AgentId))
+        // Code trigger
+        if (options != null)
         {
-            var scriptName = options.CodeScriptName ?? $"{trigger.Name}_cron.py";
-            isTriggered = await TriggerCodeScript(options.AgentId, scriptName, options.CodeProcessor, trigger.Name, options.Arguments, options.States);
+            isTriggered = await TriggerCodeScript(trigger.Name, options);
         }
 
         if (!isTriggered)
         {
             return newConversationIds;
         }
 
-        var filteredAgents = agents.Items.Where(x => x.Rules.Exists(r => r.TriggerName == trigger.Name && !x.Disabled)).ToList();
-
         // 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 convService = _services.GetRequiredService<IConversationService>();
@@ -93,32 +90,40 @@ await convService.SendMessage(agent.Id,
     }
 
     #region Private methods
-    private async Task<bool> TriggerCodeScript(string agentId, string scriptName, string codeProcessor, string triggerName, JsonDocument? args = null, IEnumerable<MessageState>? states = null)
+    private async Task<bool> TriggerCodeScript(string triggerName, RuleTriggerOptions options)
     {
-        var processor = _services.GetServices<ICodeProcessor>().FirstOrDefault(x => x.Provider.IsEqualTo(codeProcessor));
+        var agentId = options.AgentId;
+        if (string.IsNullOrWhiteSpace(agentId))
+        {
+            return false;
+        }
+
+        var provider = options.CodeProcessor ?? BuiltInCodeProcessor.PyInterpreter;
+        var processor = _services.GetServices<ICodeProcessor>().FirstOrDefault(x => x.Provider.IsEqualTo(provider));
         if (processor == null)
         {
-            _logger.LogWarning($"Unable to find code processor: {codeProcessor}.");
+            _logger.LogWarning($"Unable to find code processor: {provider}.");
             return false;
         }
 
         var agentService = _services.GetRequiredService<IAgentService>();
+        var scriptName = options.CodeScriptName ?? $"{triggerName}_rule.py";
         var codeScript = await agentService.GetAgentCodeScript(agentId, scriptName, scriptType: AgentCodeScriptType.Src);
 
+        var msg = $"rule trigger ({triggerName}) code script ({scriptName}) in agent ({agentId}) => args: {options.Arguments?.RootElement.GetRawText()}.";
+
         if (string.IsNullOrWhiteSpace(codeScript))
         {
-            _logger.LogWarning($"Unable to find code script ({scriptName}) in agent ({agentId}).");
+            _logger.LogWarning($"Unable to find {msg}.");
             return false;
         }
 
-        var msg = $"rule trigger ({triggerName}) code script ({scriptName}) in agent ({agentId}) => args: {args?.RootElement.GetRawText()}.";
-
         try
         {
             var response = await processor.RunAsync(codeScript, options: new()
             {
                 ScriptName = scriptName,
-                Arguments = BuildArguments(args, states)
+                Arguments = BuildArguments(options.Arguments, options.States)
             });
 
             if (response == null || !response.Success)
@@ -140,7 +145,7 @@ private async Task<bool> TriggerCodeScript(string agentId, string scriptName, st
                 result = false;
             }
 
-            _logger.Log(logLevel, $"Code result ({response.Result}) from {msg}");
+            _logger.Log(logLevel, $"Code script execution result ({response.Result}) from {msg}");
             return result;
         }
         catch (Exception ex)
@@ -166,7 +171,7 @@ private IEnumerable<KeyValue> BuildArguments(JsonDocument? args, IEnumerable<Mes
 
         if (args != null)
         {
-            dict["trigger_input"] = args.RootElement.GetRawText();
+            dict["trigger_args"] = args.RootElement.GetRawText();
         }
 
         return dict.Select(x => new KeyValue(x.Key, x.Value));

src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.Coding.cs

@@ -1,5 +1,6 @@
 using BotSharp.Abstraction.Agents.Options;
 using BotSharp.Abstraction.Coding;
+using BotSharp.Abstraction.Coding.Constants;
 using BotSharp.Abstraction.Coding.Options;
 
 namespace BotSharp.Core.Agents.Services;
@@ -76,7 +77,7 @@ public async Task<CodeGenerationResult> GenerateCodeScript(string agentId, strin
             };
         }
 
-        var processor = options?.Processor ?? "botsharp-py-interpreter";
+        var processor = options?.Processor ?? BuiltInCodeProcessor.PyInterpreter;
         var codeProcessor = _services.GetServices<ICodeProcessor>().FirstOrDefault(x => x.Provider.IsEqualTo(processor));
         if (codeProcessor == null)
         {

src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Execute.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Coding;
+using BotSharp.Abstraction.Coding.Constants;
 using BotSharp.Abstraction.Files.Options;
 using BotSharp.Abstraction.Files.Proccessors;
 using BotSharp.Abstraction.Instructs;
@@ -179,7 +180,7 @@ await hook.OnResponseGenerated(new InstructResponseModel
         var state = _services.GetRequiredService<IConversationStateService>();
         var hooks = _services.GetHooks<IInstructHook>(agent.Id);
 
-        var codeProvider = codeOptions?.Processor ?? "botsharp-py-interpreter";
+        var codeProvider = codeOptions?.Processor ?? BuiltInCodeProcessor.PyInterpreter;
         var codeProcessor = _services.GetServices<ICodeProcessor>()
                                        .FirstOrDefault(x => x.Provider.IsEqualTo(codeProvider));
 

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

@@ -1,4 +1,3 @@
-using BotSharp.Abstraction.Coding.Models;
 using Microsoft.Extensions.Logging;
 using Python.Runtime;
 using System.Threading;
@@ -22,7 +21,7 @@ public PyCodeInterpreter(
         _executor = executor;
     }
 
-    public string Provider => "botsharp-py-interpreter";
+    public string Provider => BuiltInCodeProcessor.PyInterpreter;
 
     public async Task<CodeInterpretResponse> RunAsync(string codeScript, CodeInterpretOptions? options = null)
     {

src/Plugins/BotSharp.Plugin.PythonInterpreter/Using.cs

@@ -21,6 +21,8 @@
 global using BotSharp.Abstraction.Messaging.Models.RichContent.Template;
 global using BotSharp.Abstraction.Routing;
 global using BotSharp.Abstraction.Coding;
+global using BotSharp.Abstraction.Coding.Constants;
+global using BotSharp.Abstraction.Coding.Models;
 global using BotSharp.Abstraction.Coding.Options;
 global using BotSharp.Abstraction.Coding.Responses;
 global using BotSharp.Core.Coding;