Merge branch 'master' of https://github.com/SciSharp/BotSharp

Author: iceljc

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

@@ -0,0 +1,9 @@
+namespace BotSharp.Abstraction.Agents;
+
+public interface IInstructionResolver
+{
+    string Name { get; }
+
+    Task<string> ResolveAsync(Agent agent, string instruction, IEnumerable<object?> args, IDictionary<string, object?> kwArgs)
+        => Task.FromResult(instruction);
+}

src/Infrastructure/BotSharp.Abstraction/Conversations/Settings/ConversationSetting.cs

@@ -23,6 +23,8 @@ public class CleanConversationSetting
     public int BatchSize { get; set; }
     public int MessageLimit { get; set; }
     public int BufferHours { get; set; }
+    public int LogRetentionDays { get; set; }
+    public int LogBatchSize { get; set; } = 2000;
     public IEnumerable<string> ExcludeAgentIds { get; set; } = new List<string>();
 }
 

src/Infrastructure/BotSharp.Abstraction/Models/Gpt4xModelConstants.cs

@@ -3,13 +3,8 @@ namespace BotSharp.Abstraction.Models;
 public static class Gpt4xModelConstants
 {
     public const string GPT_4o = "gpt-4o";
-    public const string GPT_4o_2024_11_20 = "gpt-4o-2024-11-20";
     public const string GPT_4o_Mini = "gpt-4o-mini";
-    public const string GPT_4_1 = "gpt-4.1";
-    public const string GPT_4_1_Mini = "gpt-4.1-mini";
-    public const string GPT_4_1_Nano = "gpt-4.1-nano";
     public const string GPT_4o_Mini_Realtime_Preview = "gpt-4o-mini-realtime-preview";
-    public const string GPT_4o_Realtime_Preview = "gpt-4o-realtime-preview";
     public const string GPT_4o_Mini_Search_Preview = "gpt-4o-mini-search-preview";
     public const string GPT_4o_Mini_Transcribe = "gpt-4o-mini-transcribe";
     public const string GPT_4o_Transcribe = "gpt-4o-transcribe";

src/Infrastructure/BotSharp.Abstraction/Realtime/Settings/RealtimeModelSettings.cs

@@ -4,8 +4,8 @@ namespace BotSharp.Abstraction.Realtime.Settings;
 
 public class RealtimeModelSettings
 {
-    public string Provider { get; set; } = "openai";
-    public string Model { get; set; } = Gpt4xModelConstants.GPT_4o_Mini_Realtime_Preview;
+    public string Provider { get; set; }
+    public string Model { get; set; }
     public string[] Modalities { get; set; } = ["text", "audio"];
     public bool InterruptResponse { get; set; } = true;
     public string InputAudioFormat { get; set; } = "g711_ulaw";

src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs

@@ -198,6 +198,11 @@ Task<DateTimePagination<ConversationStateLogModel>> GetConversationStateLogs(str
         => throw new NotImplementedException();
     #endregion
 
+    #region Log Cleanup
+    Task<int> DeleteOldConversationLogs(int retentionDays, int batchSize)
+        => throw new NotImplementedException();
+    #endregion
+
     #region Instruction Log
     Task<bool> SaveInstructionLogs(IEnumerable<InstructionLogModel> logs)
         => throw new NotImplementedException();

src/Infrastructure/BotSharp.Abstraction/Rules/RuleGraph.cs

@@ -177,6 +177,7 @@ public class RuleNode : GraphItem
     /// <summary>
     /// Node type: root, criteria, action, etc.
     /// </summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public override string Type { get; set; } = "action";
 
     /// <summary>
@@ -229,15 +230,28 @@ public override string ToString()
 
 public class GraphItem
 {
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public virtual string Id { get; set; } = Guid.NewGuid().ToString();
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public virtual string Name { get; set; } = null!;
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public virtual string Type { get; set; } = null!;
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public virtual IEnumerable<string> Labels { get; set; } = [];
     public virtual double Weight { get; set; } = 1.0;
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public virtual string? Description { get; set; }
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public virtual Dictionary<string, string?> Config { get; set; } = [];
 
     private string? _alias;
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public virtual string Alias
     {
         get => string.IsNullOrEmpty(_alias) ? Name : _alias;
@@ -267,6 +281,8 @@ public class EdgeItemPayload : GraphItem
 
 public class RuleGraphInfo
 {
+    [JsonPropertyName("graph_id")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string GraphId { get; set; }
     public IEnumerable<RuleNode> Nodes { get; set; } = [];
     public IEnumerable<RuleEdge> Edges { get; set; } = [];

src/Infrastructure/BotSharp.Abstraction/Templating/IRenderConfiguration.cs

@@ -0,0 +1,7 @@
+namespace BotSharp.Abstraction.Templating;
+
+public interface IRenderConfiguration
+{
+    string Render(IServiceProvider services, string template, IDictionary<string, object> dict);
+    void RegisterType(Type type);
+}

src/Infrastructure/BotSharp.Abstraction/Templating/ITemplateRender.cs

@@ -3,5 +3,4 @@ namespace BotSharp.Abstraction.Templating;
 public interface ITemplateRender
 {
     string Render(string template, IDictionary<string, object> dict);
-    void RegisterType(Type type);
 }

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

@@ -44,7 +44,7 @@ public void RegisterDI(IServiceCollection services, IConfiguration config)
         services.AddScoped(provider =>
         {
             var settingService = provider.GetRequiredService<ISettingService>();
-            var render = provider.GetRequiredService<ITemplateRender>();
+            var render = provider.GetRequiredService<IRenderConfiguration>();
             render.RegisterType(typeof(AgentSettings));
             return settingService.Bind<AgentSettings>("Agent");
         });

src/Infrastructure/BotSharp.Core/BotSharpCoreExtensions.cs

@@ -25,7 +25,8 @@ public static IServiceCollection AddBotSharpCore(this IServiceCollection service
     {
         services.AddSingleton<IDistributedLocker, DistributedLocker>();
         // Register template render
-        services.AddSingleton<ITemplateRender, TemplateRender>();
+        services.AddSingleton<IRenderConfiguration, RenderConfiguration>();
+        services.AddScoped<ITemplateRender, TemplateRender>();
 
         services.AddScoped<ISettingService, SettingService>();
         services.AddScoped<IRoleService, RoleService>();