Merge pull request #1209 from iceljc/bugfix/fix-code-exec-timeout

Bugfix/fix code exec timeout

Author: iceljc

src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentCodeScript.cs

@@ -11,7 +11,7 @@ public AgentCodeScript() : base()
 
     public override string ToString()
     {
-        return $"{CodePath}";
+        return base.ToString();
     }
 }
 
@@ -26,4 +26,9 @@ public class AgentCodeScriptBase
     public string ScriptType { get; set; } = null!;
 
     public string CodePath => $"{ScriptType}/{Name}";
+
+    public override string ToString()
+    {
+        return $"{CodePath}";
+    }
 }

src/Infrastructure/BotSharp.Abstraction/Agents/Settings/AgentSettings.cs

@@ -10,6 +10,5 @@ public class AgentSettings
     /// <summary>
     /// This is the default LLM config for agent
     /// </summary>
-    public AgentLlmConfig LlmConfig { get; set; }
-        = new AgentLlmConfig();
+    public AgentLlmConfig LlmConfig { get; set; } = new();
 }

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

@@ -7,5 +7,6 @@ public class CodeInterpretOptions
     public string? ScriptName { get; set; }
     public IEnumerable<KeyValue>? Arguments { get; set; }
     public bool UseMutex { get; set; }
+    public bool UseProcess { get; set; }
     public CancellationToken? CancellationToken { get; set; }
 }

src/Infrastructure/BotSharp.Abstraction/Coding/Responses/CodeInterpretResponse.cs

@@ -3,4 +3,9 @@ namespace BotSharp.Abstraction.Coding.Responses;
 public class CodeInterpretResponse : ResponseBase
 {
     public string Result { get; set; } = string.Empty;
+
+    public override string ToString()
+    {
+        return Result ?? ErrorMsg ?? $"Success: {Success}";
+    }
 }

src/Infrastructure/BotSharp.Abstraction/Coding/Settings/CodingSettings.cs

@@ -0,0 +1,26 @@
+namespace BotSharp.Abstraction.Coding.Settings;
+
+public class CodingSettings
+{
+    public CodeScriptGenerationSettings CodeGeneration { get; set; } = new();
+
+    public CodeScriptExecutionSettings CodeExecution { get; set; } = new();
+}
+
+public class CodeScriptGenerationSettings
+{
+    /// <summary>
+    /// Llm provider to generate code script
+    /// </summary>
+    public string? Provider { get; set; }
+
+    /// <summary>
+    /// Llm model to generate code script
+    /// </summary>
+    public string? Model { get; set; }
+}
+
+public class CodeScriptExecutionSettings
+{
+    public int MaxConcurrency { get; set; } = 1;
+}

src/Infrastructure/BotSharp.Abstraction/Using.cs

@@ -21,4 +21,5 @@
 global using BotSharp.Abstraction.Knowledges.Models;
 global using BotSharp.Abstraction.Crontab.Models;
 global using BotSharp.Abstraction.MCP.Models;
-global using BotSharp.Abstraction.Settings;
+global using BotSharp.Abstraction.Settings;
+global using BotSharp.Abstraction.Coding.Settings;

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

@@ -5,7 +5,6 @@
 using BotSharp.Abstraction.Templating;
 using BotSharp.Abstraction.Users.Enums;
 using BotSharp.Core.Agents.Hooks;
-using BotSharp.Core.Coding;
 using Microsoft.Extensions.Configuration;
 
 namespace BotSharp.Core.Agents;
@@ -49,8 +48,6 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
             render.RegisterType(typeof(AgentSettings));
             return settingService.Bind<AgentSettings>("Agent");
         });
-
-        services.AddSingleton<CodeScriptExecutor>();
     }
 
     public bool AttachMenu(List<PluginMenuDef> menu)

src/Infrastructure/BotSharp.Core/Coding/CodeScriptExecutor.cs

@@ -2,13 +2,19 @@ namespace BotSharp.Core.Coding;
 
 public class CodeScriptExecutor
 {
+    private readonly CodingSettings _settings;
     private readonly ILogger<CodeScriptExecutor> _logger;
     private readonly SemaphoreSlim _semLock = new(initialCount: 1, maxCount: 1);
 
     public CodeScriptExecutor(
+        CodingSettings settings,
         ILogger<CodeScriptExecutor> logger)
     {
+        _settings = settings;
         _logger = logger;
+
+        var maxConcurrency = settings.CodeExecution?.MaxConcurrency > 0 ? settings.CodeExecution.MaxConcurrency : 1;
+        _semLock = new(initialCount: maxConcurrency, maxCount: maxConcurrency);
     }
 
     public async Task<T> ExecuteAsync<T>(Func<Task<T>> func, CancellationToken cancellationToken = default)

src/Infrastructure/BotSharp.Core/Coding/CodingPlugin.cs

@@ -0,0 +1,19 @@
+using Microsoft.Extensions.Configuration;
+
+namespace BotSharp.Core.Coding;
+
+public class CodingPlugin : IBotSharpPlugin
+{
+    public string Id => "31bc334b-9462-4191-beac-cb4a139b78c1";
+    public string Name => "Coding";
+    public string Description => "Handling execution and generation of code scripts";
+
+    public void RegisterDI(IServiceCollection services, IConfiguration config)
+    {
+        var coding = new CodingSettings();
+        config.Bind("Coding", coding);
+        services.AddSingleton(provider => coding);
+
+        services.AddSingleton<CodeScriptExecutor>();
+    }
+}

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

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Coding;
+using BotSharp.Abstraction.Coding.Responses;
 using BotSharp.Abstraction.Files.Options;
 using BotSharp.Abstraction.Files.Proccessors;
 using BotSharp.Abstraction.Instructs;
@@ -253,17 +254,24 @@ await hook.OnResponseGenerated(new InstructResponseModel
         }
 
         // Run code script
+        using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(3));
         var codeResponse = await codeProcessor.RunAsync(context.CodeScript, options: new()
         {
             ScriptName = scriptName,
-            Arguments = context.Arguments
+            Arguments = context.Arguments,
+            CancellationToken = cts.Token
         });
 
+        if (codeResponse == null || !codeResponse.Success)
+        {
+            return response;
+        }
+
         response = new InstructResult
         {
             MessageId = message.MessageId,
             Template = scriptName,
-            Text = codeResponse?.Result ?? codeResponse?.ErrorMsg
+            Text = codeResponse.Result
         };
 
         if (context?.Arguments != null)