refine tokens

Author: iceljc

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

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

src/Infrastructure/BotSharp.Abstraction/Instructs/Options/CodeInstructOptions.cs

@@ -29,4 +29,11 @@ public class CodeInstructOptions
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("arguments")]
     public List<KeyValue>? Arguments { get; set; }
+
+    /// <summary>
+    /// Timeout in seconds
+    /// </summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("timeout_seconds")]
+    public int? TimeoutSeconds { get; set; }
 }

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

@@ -254,12 +254,13 @@ await hook.OnResponseGenerated(new InstructResponseModel
         }
 
         // Run code script
-        using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(3));
+        var seconds = codeOptions?.TimeoutSeconds > 0 ? codeOptions.TimeoutSeconds.Value : 3;
+        using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(seconds));
         var codeResponse = await codeProcessor.RunAsync(context.CodeScript, options: new()
         {
             ScriptName = scriptName,
             Arguments = context.Arguments,
-            CancellationToken = cts.Token
+            OperationToken = cts.Token
         });
 
         if (codeResponse == null || !codeResponse.Success)

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

@@ -32,12 +32,12 @@ public PyCodeInterpreter(
 
     public async Task<CodeInterpretResponse> RunAsync(string codeScript, CodeInterpretOptions? options = null)
     {
-        if (options?.UseMutex == true)
+        if (options?.UseLock == true)
         {
             return await _executor.ExecuteAsync(async () =>
             {
                 return await InnerRunCode(codeScript, options);
-            }, cancellationToken: options?.CancellationToken ?? CancellationToken.None);
+            }, cancellationToken: options?.LockToken ?? CancellationToken.None);
         }
 
         return await InnerRunCode(codeScript, options);
@@ -138,13 +138,11 @@ private async Task<CodeInterpretResponse> CoreRunScript(string codeScript, CodeI
     {
         _logger.LogWarning($"Begin {nameof(CoreRunScript)} in {Provider}: ${options?.ScriptName}");
 
-        var token = options?.CancellationToken ?? CancellationToken.None;
+        var token = options?.OperationToken ?? CancellationToken.None;
         token.ThrowIfCancellationRequested();
 
         using (Py.GIL())
         {
-            token.ThrowIfCancellationRequested();
-
             // Import necessary Python modules
             dynamic sys = Py.Import("sys");
             dynamic io = Py.Import("io");
@@ -214,7 +212,7 @@ private async Task<CodeInterpretResponse> CoreRunScript(string codeScript, CodeI
 
     private async Task<CodeInterpretResponse> CoreRunProcess(string codeScript, CodeInterpretOptions? options = null)
     {
-        var token = options?.CancellationToken ?? CancellationToken.None;
+        var token = options?.OperationToken ?? CancellationToken.None;
 
         var psi = new ProcessStartInfo
         {