rename namespace

iceljc · iceljc · commit a1a2a6f0d374 · 2025-10-15T19:33:15.000-05:00
diff --git a/src/Infrastructure/BotSharp.Abstraction/CodeInterpreter/ICodeInterpretService.cs b/src/Infrastructure/BotSharp.Abstraction/CodeInterpreter/ICodeInterpretService.cs
diff --git a/src/Infrastructure/BotSharp.Abstraction/CodeProcessors/ICodeProcessor.cs b/src/Infrastructure/BotSharp.Abstraction/CodeProcessors/ICodeProcessor.cs
@@ -0,0 +1,12 @@
+using BotSharp.Abstraction.Coding.Options;
+using BotSharp.Abstraction.Coding.Responses;
+
+namespace BotSharp.Abstraction.Coding;
+
+public interface ICodeProcessor
+{
+    string Provider { get; }
+
+    Task<CodeInterpretResponse> RunAsync(string codeScript, CodeInterpretOptions? options = null)
+        => throw new NotImplementedException();
+}
diff --git a/src/Infrastructure/BotSharp.Abstraction/CodeProcessors/Options/CodeInterpretOptions.cs b/src/Infrastructure/BotSharp.Abstraction/CodeProcessors/Options/CodeInterpretOptions.cs
@@ -1,6 +1,6 @@
 using System.Threading;
 
-namespace BotSharp.Abstraction.CodeInterpreter.Models;
+namespace BotSharp.Abstraction.Coding.Options;
 
 public class CodeInterpretOptions
 {
diff --git a/src/Infrastructure/BotSharp.Abstraction/CodeProcessors/Responses/CodeInterpretResponse.cs b/src/Infrastructure/BotSharp.Abstraction/CodeProcessors/Responses/CodeInterpretResponse.cs
@@ -1,6 +1,6 @@
-namespace BotSharp.Abstraction.CodeInterpreter.Models;
+namespace BotSharp.Abstraction.Coding.Responses;
 
-public class CodeInterpretResult
+public class CodeInterpretResponse
 {
     public string Result { get; set; } = string.Empty;
     public bool Success { get; set; }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Files/Options/FileHandleOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Files/Options/FileHandleOptions.cs
@@ -1,6 +1,6 @@
 namespace BotSharp.Abstraction.Files.Options;
 
-public class FileLlmProcessOptions
+public class FileHandleOptions
 {
     /// <summary>
     /// Llm provider
diff --git a/src/Infrastructure/BotSharp.Abstraction/Files/Proccessors/IFileProcessor.cs b/src/Infrastructure/BotSharp.Abstraction/Files/Proccessors/IFileProcessor.cs
@@ -3,10 +3,10 @@
 
 namespace BotSharp.Abstraction.Files.Proccessors;
 
-public interface IFileLlmProcessor
+public interface IFileProcessor
 {
     public string Provider { get; }
 
-    Task<FileLlmInferenceResponse> GetFileLlmInferenceAsync(Agent agent, string text, IEnumerable<InstructFileModel> files, FileLlmProcessOptions? options = null)
+    Task<FileHandleResponse> HandleFilesAsync(Agent agent, string text, IEnumerable<InstructFileModel> files, FileHandleOptions? options = null)
         => throw new NotImplementedException();
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Files/Responses/FileHandleResponse.cs b/src/Infrastructure/BotSharp.Abstraction/Files/Responses/FileHandleResponse.cs
@@ -1,6 +1,6 @@
 namespace BotSharp.Abstraction.Files.Responses;
 
-public class FileLlmInferenceResponse
+public class FileHandleResponse
 {
     public string Result { get; set; } = string.Empty;
     public bool Success { get; set; }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Instructs/Options/CodeInstructOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Instructs/Options/CodeInstructOptions.cs
@@ -2,7 +2,7 @@ namespace BotSharp.Abstraction.Instructs.Options;
 
 public class CodeInstructOptions
 {
+    public string? Processor { get; set; }
     public string? CodeScriptName { get; set; }
-    public string? CodeInterpretProvider { get; set; }
     public List<KeyValue>? Arguments { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Instructs/Options/FileInstructOptions.cs b/src/Infrastructure/BotSharp.Abstraction/Instructs/Options/FileInstructOptions.cs
@@ -2,5 +2,5 @@ namespace BotSharp.Abstraction.Instructs.Options;
 
 public class FileInstructOptions
 {
-    public string? FileLlmProcessorProvider { get; set; }
+    public string? Processor { get; set; }
 }
diff --git a/src/Infrastructure/BotSharp.Core/Coding/CodeScriptExecutor.cs b/src/Infrastructure/BotSharp.Core/Coding/CodeScriptExecutor.cs
@@ -1,6 +1,4 @@
-using BotSharp.Abstraction.CodeInterpreter.Models;
-
-namespace BotSharp.Core.CodeInterpreter;
+namespace BotSharp.Core.Coding;
 
 public class CodeScriptExecutor
 {
@@ -13,7 +11,7 @@ public CodeScriptExecutor(
         _logger = logger;
     }
 
-    public async Task<T> Execute<T>(Func<Task<T>> func, CancellationToken cancellationToken = default)
+    public async Task<T> ExecuteAsync<T>(Func<Task<T>> func, CancellationToken cancellationToken = default)
     {
         await _semLock.WaitAsync(cancellationToken);
 
diff --git a/src/Infrastructure/BotSharp.Core/Conversations/ConversationPlugin.cs b/src/Infrastructure/BotSharp.Core/Conversations/ConversationPlugin.cs
@@ -1,14 +1,13 @@
 using BotSharp.Abstraction.Google.Settings;
 using BotSharp.Abstraction.Instructs;
-using BotSharp.Abstraction.MessageHub;
 using BotSharp.Abstraction.MessageHub.Observers;
 using BotSharp.Abstraction.MessageHub.Services;
 using BotSharp.Abstraction.Messaging;
 using BotSharp.Abstraction.Planning;
 using BotSharp.Abstraction.Plugins.Models;
 using BotSharp.Abstraction.Settings;
 using BotSharp.Abstraction.Templating;
-using BotSharp.Core.CodeInterpreter;
+using BotSharp.Core.Coding;
 using BotSharp.Core.Instructs;
 using BotSharp.Core.MessageHub;
 using BotSharp.Core.MessageHub.Observers;
@@ -18,7 +17,6 @@
 using BotSharp.Core.Templating;
 using BotSharp.Core.Translation;
 using BotSharp.Core.WebSearch.Hooks;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 
 namespace BotSharp.Core.Conversations;
diff --git a/src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Execute.cs b/src/Infrastructure/BotSharp.Core/Instructs/Services/InstructService.Execute.cs
@@ -1,4 +1,4 @@
-using BotSharp.Abstraction.CodeInterpreter;
+using BotSharp.Abstraction.Coding;
 using BotSharp.Abstraction.Files.Options;
 using BotSharp.Abstraction.Files.Proccessors;
 using BotSharp.Abstraction.Instructs;
@@ -47,7 +47,7 @@ public async Task<InstructResult> Execute(
 
 
         // Run code template
-        var codeResponse = await GetCodeResponse(agent, message, templateName, codeOptions);
+        var codeResponse = await RunCode(agent, message, templateName, codeOptions);
         if (codeResponse != null)
         {
             return codeResponse;
@@ -105,16 +105,16 @@ public async Task<InstructResult> Execute(
                 prompt = message.Content;
             }
 
-            IFileLlmProcessor? fileProcessor = null;
+            IFileProcessor? fileProcessor = null;
             if (!files.IsNullOrEmpty() && fileOptions != null)
             {
-                fileProcessor = _services.GetServices<IFileLlmProcessor>()
-                                         .FirstOrDefault(x => x.Provider.IsEqualTo(fileOptions.FileLlmProcessorProvider));
+                fileProcessor = _services.GetServices<IFileProcessor>()
+                                         .FirstOrDefault(x => x.Provider.IsEqualTo(fileOptions.Processor));
             }
 
             if (fileProcessor != null)
             {
-                var inference = await fileProcessor.GetFileLlmInferenceAsync(agent, prompt, files, new FileLlmProcessOptions
+                var fileResponse = await fileProcessor.HandleFilesAsync(agent, prompt, files, new FileHandleOptions
                 {
                     Provider = provider,
                     Model = model,
@@ -124,7 +124,7 @@ public async Task<InstructResult> Execute(
                     InvokeFrom = $"{nameof(InstructService)}.{nameof(Execute)}",
                     Data = state.GetStates().ToDictionary(x => x.Key, x => (object)x.Value)
                 });
-                result = inference.Result.IfNullOrEmptyAs(string.Empty);
+                result = fileResponse.Result.IfNullOrEmptyAs(string.Empty);
             }
             else
             {
@@ -160,7 +160,7 @@ await hook.OnResponseGenerated(new InstructResponseModel
     /// <param name="templateName"></param>
     /// <param name="codeOptions"></param>
     /// <returns></returns>
-    private async Task<InstructResult?> GetCodeResponse(
+    private async Task<InstructResult?> RunCode(
         Agent agent,
         RoleDialogModel message,
         string templateName,
@@ -177,8 +177,8 @@ await hook.OnResponseGenerated(new InstructResponseModel
         var state = _services.GetRequiredService<IConversationStateService>();
         var hooks = _services.GetHooks<IInstructHook>(agent.Id);
 
-        var codeProvider = codeOptions?.CodeInterpretProvider ?? "botsharp-py-interpreter";
-        var codeInterpreter = _services.GetServices<ICodeInterpretService>()
+        var codeProvider = codeOptions?.Processor ?? "botsharp-py-interpreter";
+        var codeInterpreter = _services.GetServices<ICodeProcessor>()
                                        .FirstOrDefault(x => x.Provider.IsEqualTo(codeProvider));
         
         if (codeInterpreter == null)
@@ -248,7 +248,7 @@ await hook.OnResponseGenerated(new InstructResponseModel
         }
 
         // Run code script
-        var result = await codeInterpreter.RunCode(context.CodeScript, options: new()
+        var result = await codeInterpreter.RunAsync(context.CodeScript, options: new()
         {
             ScriptName = scriptName,
             Arguments = context.Arguments
diff --git a/src/Plugins/BotSharp.Plugin.PythonInterpreter/PythonInterpreterPlugin.cs b/src/Plugins/BotSharp.Plugin.PythonInterpreter/PythonInterpreterPlugin.cs
@@ -22,7 +22,7 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
         services.AddSingleton(x => settings);
 
         services.AddScoped<IAgentUtilityHook, PyProgrammerUtilityHook>();
-        services.AddScoped<ICodeInterpretService, PyInterpretService>();
+        services.AddScoped<ICodeProcessor, PyCodeInterpreter>();
     }
 
     public void Configure(IApplicationBuilder app)
diff --git a/src/Plugins/BotSharp.Plugin.PythonInterpreter/Services/PyCodeInterpreter.cs b/src/Plugins/BotSharp.Plugin.PythonInterpreter/Services/PyCodeInterpreter.cs
@@ -1,20 +1,19 @@
-using BotSharp.Core.CodeInterpreter;
 using Microsoft.Extensions.Logging;
 using Python.Runtime;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace BotSharp.Plugin.PythonInterpreter.Services;
 
-public class PyInterpretService : ICodeInterpretService
+public class PyCodeInterpreter : ICodeProcessor
 {
     private readonly IServiceProvider _services;
-    private readonly ILogger<PyInterpretService> _logger;
+    private readonly ILogger<PyCodeInterpreter> _logger;
     private readonly CodeScriptExecutor _executor;
 
-    public PyInterpretService(
+    public PyCodeInterpreter(
         IServiceProvider services,
-        ILogger<PyInterpretService> logger,
+        ILogger<PyCodeInterpreter> logger,
         CodeScriptExecutor executor)
     {
         _services = services;
@@ -24,38 +23,38 @@ public PyInterpretService(
 
     public string Provider => "botsharp-py-interpreter";
 
-    public async Task<CodeInterpretResult> RunCode(string codeScript, CodeInterpretOptions? options = null)
+    public async Task<CodeInterpretResponse> RunAsync(string codeScript, CodeInterpretOptions? options = null)
     {
         if (options?.UseMutex == true)
         {
-            return await _executor.Execute(async () =>
+            return await _executor.ExecuteAsync(async () =>
             {
                 return InnerRunCode(codeScript, options);
             }, cancellationToken: options?.CancellationToken ?? CancellationToken.None);
         }
         return InnerRunCode(codeScript, options);
     }
 
-    private CodeInterpretResult InnerRunCode(string codeScript, CodeInterpretOptions? options = null)
+    private CodeInterpretResponse InnerRunCode(string codeScript, CodeInterpretOptions? options = null)
     {
         try
         {
             return CoreRun(codeScript, options);
         }
         catch (Exception ex)
         {
-            var errorMsg = $"Error when executing inner python code in {nameof(PyInterpretService)}: {Provider}.";
+            var errorMsg = $"Error when executing inner python code in {nameof(PyCodeInterpreter)}: {Provider}.";
             _logger.LogError(ex, errorMsg);
 
-            return new CodeInterpretResult
+            return new CodeInterpretResponse
             {
                 Success = false,
                 ErrorMsg = errorMsg
             };
         }
     }
 
-    private CodeInterpretResult CoreRun(string codeScript, CodeInterpretOptions? options = null)
+    private CodeInterpretResponse CoreRun(string codeScript, CodeInterpretOptions? options = null)
     {
         using (Py.GIL())
         {
@@ -100,18 +99,18 @@ private CodeInterpretResult CoreRun(string codeScript, CodeInterpretOptions? opt
                 // Get result
                 var result = stringIO.getvalue()?.ToString() as string;
 
-                return new CodeInterpretResult
+                return new CodeInterpretResponse
                 {
                     Result = result?.TrimEnd('\r', '\n'),
                     Success = true
                 };
             }
             catch (Exception ex)
             {
-                var errorMsg = $"Error when executing core python code in {nameof(PyInterpretService)}: {Provider}. {ex.Message}";
+                var errorMsg = $"Error when executing core python code in {nameof(PyCodeInterpreter)}: {Provider}. {ex.Message}";
                 _logger.LogError(ex, errorMsg);
 
-                return new CodeInterpretResult
+                return new CodeInterpretResponse
                 {
                     Success = false,
                     ErrorMsg = errorMsg
diff --git a/src/Plugins/BotSharp.Plugin.PythonInterpreter/Using.cs b/src/Plugins/BotSharp.Plugin.PythonInterpreter/Using.cs
@@ -20,9 +20,10 @@
 global using BotSharp.Abstraction.Messaging.Models.RichContent;
 global using BotSharp.Abstraction.Messaging.Models.RichContent.Template;
 global using BotSharp.Abstraction.Routing;
-global using BotSharp.Abstraction.CodeInterpreter.Models;
-global using BotSharp.Abstraction.CodeInterpreter;
-
+global using BotSharp.Abstraction.Coding;
+global using BotSharp.Abstraction.Coding.Options;
+global using BotSharp.Abstraction.Coding.Responses;
+global using BotSharp.Core.Coding;
 global using BotSharp.Core.Infrastructures;
 
 global using BotSharp.Plugin.PythonInterpreter.Enums;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Threading;`
`2`	`2`
`3`		`-namespace BotSharp.Abstraction.CodeInterpreter.Models;`
	`3`	`+namespace BotSharp.Abstraction.Coding.Options;`
`4`	`4`
`5`	`5`	`public class CodeInterpretOptions`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace BotSharp.Abstraction.Files.Options;`
`2`	`2`
`3`		`-public class FileLlmProcessOptions`
	`3`	`+public class FileHandleOptions`
`4`	`4`	`{`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// Llm provider`
Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,10 @@`
`3`	`3`
`4`	`4`	`namespace BotSharp.Abstraction.Files.Proccessors;`
`5`	`5`
`6`		`-public interface IFileLlmProcessor`
	`6`	`+public interface IFileProcessor`
`7`	`7`	`{`
`8`	`8`	`public string Provider { get; }`
`9`	`9`
`10`		`- Task<FileLlmInferenceResponse> GetFileLlmInferenceAsync(Agent agent, string text, IEnumerable<InstructFileModel> files, FileLlmProcessOptions? options = null)`
	`10`	`+ Task<FileHandleResponse> HandleFilesAsync(Agent agent, string text, IEnumerable<InstructFileModel> files, FileHandleOptions? options = null)`
`11`	`11`	`=> throw new NotImplementedException();`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace BotSharp.Abstraction.Files.Responses;`
`2`	`2`
`3`		`-public class FileLlmInferenceResponse`
	`3`	`+public class FileHandleResponse`
`4`	`4`	`{`
`5`	`5`	`public string Result { get; set; } = string.Empty;`
`6`	`6`	`public bool Success { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ namespace BotSharp.Abstraction.Instructs.Options;`
`2`	`2`
`3`	`3`	`public class CodeInstructOptions`
`4`	`4`	`{`
	`5`	`+ public string? Processor { get; set; }`
`5`	`6`	`public string? CodeScriptName { get; set; }`
`6`		`- public string? CodeInterpretProvider { get; set; }`
`7`	`7`	`public List<KeyValue>? Arguments { get; set; }`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ namespace BotSharp.Abstraction.Instructs.Options;`
`2`	`2`
`3`	`3`	`public class FileInstructOptions`
`4`	`4`	`{`
`5`		`- public string? FileLlmProcessorProvider { get; set; }`
	`5`	`+ public string? Processor { get; set; }`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using BotSharp.Abstraction.CodeInterpreter.Models;`
`2`		`-`
`3`		`-namespace BotSharp.Core.CodeInterpreter;`
	`1`	`+namespace BotSharp.Core.Coding;`
`4`	`2`
`5`	`3`	`public class CodeScriptExecutor`
`6`	`4`	`{`
`@@ -13,7 +11,7 @@ public CodeScriptExecutor(`
`13`	`11`	`_logger = logger;`
`14`	`12`	`}`
`15`	`13`
`16`		`- public async Task<T> Execute<T>(Func<Task<T>> func, CancellationToken cancellationToken = default)`
	`14`	`+ public async Task<T> ExecuteAsync<T>(Func<Task<T>> func, CancellationToken cancellationToken = default)`
`17`	`15`	`{`
`18`	`16`	`await _semLock.WaitAsync(cancellationToken);`
`19`	`17`