move token out of options

Author: iceljc

src/Infrastructure/BotSharp.Abstraction/Coding/ICodeProcessor.cs

@@ -1,6 +1,7 @@
 using BotSharp.Abstraction.Coding.Models;
 using BotSharp.Abstraction.Coding.Options;
 using BotSharp.Abstraction.Coding.Responses;
+using System.Threading;
 
 namespace BotSharp.Abstraction.Coding;
 
@@ -13,9 +14,10 @@ public interface ICodeProcessor
     /// </summary>
     /// <param name="codeScript">The code scirpt to run</param>
     /// <param name="options">Code script execution options</param>
+    /// <param name="cancellationToken">The cancellation token</param>
     /// <returns></returns>
     /// <exception cref="NotImplementedException"></exception>
-    Task<CodeInterpretResponse> RunAsync(string codeScript, CodeInterpretOptions? options = null)
+    Task<CodeInterpretResponse> RunAsync(string codeScript, CodeInterpretOptions? options = null, CancellationToken? cancellationToken = null)
         => throw new NotImplementedException();
 
     /// <summary>

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

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

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

@@ -259,9 +259,8 @@ await hook.OnResponseGenerated(new InstructResponseModel
         var codeResponse = await codeProcessor.RunAsync(context.CodeScript, options: new()
         {
             ScriptName = scriptName,
-            Arguments = context.Arguments,
-            OperationToken = cts.Token
-        });
+            Arguments = context.Arguments
+        }, cancellationToken: cts.Token);
 
         if (codeResponse == null || !codeResponse.Success)
         {

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

@@ -30,17 +30,17 @@ public PyCodeInterpreter(
 
     public string Provider => "botsharp-py-interpreter";
 
-    public async Task<CodeInterpretResponse> RunAsync(string codeScript, CodeInterpretOptions? options = null)
+    public async Task<CodeInterpretResponse> RunAsync(string codeScript, CodeInterpretOptions? options = null, CancellationToken? cancellationToken = null)
     {
         if (options?.UseLock == true)
         {
             return await _executor.ExecuteAsync(async () =>
             {
-                return await InnerRunCode(codeScript, options);
-            }, cancellationToken: options?.LockToken ?? CancellationToken.None);
+                return await InnerRunCode(codeScript, options, cancellationToken);
+            }, cancellationToken: cancellationToken ?? CancellationToken.None);
         }
 
-        return await InnerRunCode(codeScript, options);
+        return await InnerRunCode(codeScript, options, cancellationToken);
     }
 
     public async Task<CodeGenerationResult> GenerateCodeScriptAsync(string text, CodeGenerationOptions? options = null)
@@ -98,7 +98,7 @@ public async Task<CodeGenerationResult> GenerateCodeScriptAsync(string text, Cod
 
 
     #region Private methods
-    private async Task<CodeInterpretResponse> InnerRunCode(string codeScript, CodeInterpretOptions? options = null)
+    private async Task<CodeInterpretResponse> InnerRunCode(string codeScript, CodeInterpretOptions? options = null, CancellationToken? cancellationToken = null)
     {
         var response = new CodeInterpretResponse();
         var scriptName = options?.ScriptName ?? codeScript.SubstringMax(30);
@@ -109,11 +109,11 @@ private async Task<CodeInterpretResponse> InnerRunCode(string codeScript, CodeIn
 
             if (options?.UseProcess == true)
             {
-                response = await CoreRunProcess(codeScript, options);
+                response = await CoreRunProcess(codeScript, options, cancellationToken);
             }
             else
             {
-                response = await CoreRunScript(codeScript, options);
+                response = await CoreRunScript(codeScript, options, cancellationToken);
             }
 
             _logger.LogWarning($"End running python code script in {Provider}: {scriptName}");
@@ -134,11 +134,11 @@ private async Task<CodeInterpretResponse> InnerRunCode(string codeScript, CodeIn
         }
     }
 
-    private async Task<CodeInterpretResponse> CoreRunScript(string codeScript, CodeInterpretOptions? options = null)
+    private async Task<CodeInterpretResponse> CoreRunScript(string codeScript, CodeInterpretOptions? options = null, CancellationToken? cancellationToken = null)
     {
         _logger.LogWarning($"Begin {nameof(CoreRunScript)} in {Provider}: ${options?.ScriptName}");
 
-        var token = options?.OperationToken ?? CancellationToken.None;
+        var token = cancellationToken ?? CancellationToken.None;
         token.ThrowIfCancellationRequested();
 
         using (Py.GIL())
@@ -210,9 +210,9 @@ private async Task<CodeInterpretResponse> CoreRunScript(string codeScript, CodeI
     }
 
 
-    private async Task<CodeInterpretResponse> CoreRunProcess(string codeScript, CodeInterpretOptions? options = null)
+    private async Task<CodeInterpretResponse> CoreRunProcess(string codeScript, CodeInterpretOptions? options = null, CancellationToken? cancellationToken = null)
     {
-        var token = options?.OperationToken ?? CancellationToken.None;
+        var token = cancellationToken ?? CancellationToken.None;
 
         var psi = new ProcessStartInfo
         {