Merge pull request #1206 from iceljc/features/refine-agent-rule

Features/refine agent rule

Author: iceljc

src/Infrastructure/BotSharp.Abstraction/Agents/IAgentService.cs

@@ -72,15 +72,15 @@ public interface IAgentService
     Task<List<AgentCodeScript>> GetAgentCodeScripts(string agentId, AgentCodeScriptFilter? filter = null)
         => Task.FromResult(new List<AgentCodeScript>());
 
-    Task<string?> GetAgentCodeScript(string agentId, string scriptName, string scriptType = AgentCodeScriptType.Src)
-        => Task.FromResult(string.Empty);
+    Task<AgentCodeScript?> GetAgentCodeScript(string agentId, string scriptName, string scriptType = AgentCodeScriptType.Src)
+        => Task.FromResult((AgentCodeScript?)null);
 
     Task<bool> UpdateAgentCodeScripts(string agentId, List<AgentCodeScript> codeScripts, AgentCodeScriptUpdateOptions? options = null)
         => Task.FromResult(false);
 
     Task<bool> DeleteAgentCodeScripts(string agentId, List<AgentCodeScript>? codeScripts = null)
         => Task.FromResult(false);
 
-    Task<CodeGenerationResult> GenerateCodeScript(string agentId, string text, CodeProcessOptions? options = null)
+    Task<CodeGenerationResult> GenerateCodeScript(string agentId, string text, CodeGenHandleOptions? options = null)
         => Task.FromResult(new CodeGenerationResult());
 }

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

@@ -5,6 +5,9 @@ public class AgentCodeScript : AgentCodeScriptBase
     public string Id { get; set; }
     public string AgentId { get; set; } = null!;
 
+    public DateTime CreatedTime { get; set; } = DateTime.UtcNow;
+    public DateTime UpdatedTime { get; set; } = DateTime.UtcNow;
+
     public AgentCodeScript() : base()
     {
     }

src/Infrastructure/BotSharp.Abstraction/Coding/Contexts/CodeExecutionContext.cs

@@ -0,0 +1,7 @@
+namespace BotSharp.Abstraction.Coding.Contexts;
+
+public class CodeExecutionContext
+{
+    public AgentCodeScript CodeScript { get; set; }
+    public List<KeyValue> Arguments { get; set; } = [];
+}

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

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

src/Infrastructure/BotSharp.Abstraction/Coding/Models/CodeExecutionResponseModel.cs

@@ -0,0 +1,10 @@
+namespace BotSharp.Abstraction.Coding.Models;
+
+public class CodeExecutionResponseModel
+{
+    public string CodeProcessor { get; set; } = default!;
+    public AgentCodeScript CodeScript { get; set; }
+    public IDictionary<string, string>? Arguments { get; set; }
+    public string Text { get; set; } = default!;
+    public string ExecutionResult { get; set; } = default!;
+}

src/Infrastructure/BotSharp.Abstraction/Coding/Options/CodeProcessOptions.cs renamed to src/Infrastructure/BotSharp.Abstraction/Coding/Options/CodeGenHandleOptions.cs

@@ -1,6 +1,6 @@
 namespace BotSharp.Abstraction.Coding.Options;
 
-public class CodeProcessOptions : CodeGenerationOptions
+public class CodeGenHandleOptions : CodeGenerationOptions
 {
     /// <summary>
     /// Code processor provider

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

@@ -17,11 +17,10 @@ public class CodeGenerationOptions : LlmConfigBase
     public string? TemplateName { get; set; }
 
     /// <summary>
-    /// The programming language
+    /// Programming language
     /// </summary>
-    [JsonPropertyName("language")]
-    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public string? Language { get; set; } = "python";
+    [JsonPropertyName("programming_language")]
+    public string? ProgrammingLanguage { get; set; }
 
     /// <summary>
     /// Data that can be used to fill in the prompt

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

@@ -6,6 +6,6 @@ public class CodeInterpretResponse : ResponseBase
 
     public override string ToString()
     {
-        return Result.IfNullOrEmptyAs(ErrorMsg ?? $"Success: {Success}")!;
+        return Result.IfNullOrEmptyAs(ErrorMsg.IfNullOrEmptyAs($"Success: {Success}"))!;
     }
 }

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

@@ -18,6 +18,6 @@ public class CodeScriptExecutionSettings
     public string? Processor { get; set; }
     public bool UseLock { get; set; }
     public bool UseProcess { get; set; }
-    public int? TimeoutSeconds { get; set; }
+    public int TimeoutSeconds { get; set; } = 3;
     public int MaxConcurrency { get; set; } = 1;
 }

src/Infrastructure/BotSharp.Abstraction/Files/Options/FileHandleOptions.cs

@@ -1,27 +1,7 @@
 namespace BotSharp.Abstraction.Files.Options;
 
-public class FileHandleOptions
+public class FileHandleOptions : LlmConfigBase
 {
-    /// <summary>
-    /// Llm provider
-    /// </summary>
-    public string? Provider { get; set; }
-
-    /// <summary>
-    /// llm model
-    /// </summary>
-    public string? Model { get; set; }
-
-    /// <summary>
-    /// Llm maximum output tokens
-    /// </summary>
-    public int? MaxOutputTokens { get; set; }
-
-    /// <summary>
-    /// Reasoning effort level
-    /// </summary>
-    public string? ReasoningEfforLevel { get; set; }
-
     /// <summary>
     /// Instruction
     /// </summary>