Merge branch 'SciSharp:master' into master

Author: hchen2020

src/Infrastructure/BotSharp.Abstraction/Crontab/Models/CrontabItem.cs

@@ -29,8 +29,17 @@ public class CrontabItem : ScheduleTaskArgs
     [JsonPropertyName("created_time")]
     public DateTime CreatedTime { get; set; } = DateTime.UtcNow;
 
+    [JsonPropertyName("trigger_type")]
+    public CronTabItemTriggerType TriggerType { get; set; } = CronTabItemTriggerType.BackgroundWatcher;
+
     public override string ToString()
     {
         return $"{Title}: {Description} [AgentId: {AgentId}, UserId: {UserId}]";
     }
 }
+
+public enum CronTabItemTriggerType
+{
+    BackgroundWatcher,
+    OpenAPI
+}

src/Infrastructure/BotSharp.Abstraction/Loggers/Models/InstructionLogModel.cs

@@ -2,7 +2,56 @@
 
 namespace BotSharp.Abstraction.Loggers.Models;
 
-public class InstructionLogModel
+public class InstructionLogModel : InstructionLogBaseModel
+{
+    public Dictionary<string, string> States { get; set; } = [];
+
+    public static InstructionLogModel From(InstructionFileLogModel log)
+    {
+        return new InstructionLogModel
+        {
+            Id = log.Id,
+            AgentId = log.AgentId,
+            AgentName = log.AgentName,
+            Provider = log.Provider,
+            Model = log.Model,
+            TemplateName = log.TemplateName,
+            UserMessage = log.UserMessage,
+            SystemInstruction = log.SystemInstruction,
+            CompletionText = log.CompletionText,
+            UserId = log.UserId,
+            UserName = log.UserName,
+            CreatedTime = log.CreatedTime
+        };
+    }
+}
+
+public class InstructionFileLogModel : InstructionLogBaseModel
+{
+    [JsonPropertyName("states")]
+    public Dictionary<string, JsonDocument> States { get; set; } = [];
+
+    public static InstructionFileLogModel From(InstructionLogModel log)
+    {
+        return new InstructionFileLogModel
+        {
+            Id = log.Id,
+            AgentId = log.AgentId,
+            AgentName = log.AgentName,
+            Provider = log.Provider,
+            Model = log.Model,
+            TemplateName = log.TemplateName,
+            UserMessage = log.UserMessage,
+            SystemInstruction = log.SystemInstruction,
+            CompletionText = log.CompletionText,
+            UserId = log.UserId,
+            UserName = log.UserName,
+            CreatedTime = log.CreatedTime
+        }; 
+    }
+}
+
+public class InstructionLogBaseModel
 {
     [JsonPropertyName("id")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
@@ -43,12 +92,6 @@ public class InstructionLogModel
     [JsonIgnore]
     public string? UserName { get; set; }
 
-    [JsonIgnore]
-    public Dictionary<string, string> States { get; set; } = [];
-
-    [JsonPropertyName("states")]
-    public Dictionary<string, JsonDocument> InnerStates { get; set; } = [];
-
     [JsonPropertyName("created_time")]
     public DateTime CreatedTime { get; set; } = DateTime.UtcNow;
 }

src/Infrastructure/BotSharp.Abstraction/Repositories/Models/UpdateInstructionLogStatesModel.cs

@@ -1,15 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+namespace BotSharp.Abstraction.Repositories.Models;
 
-namespace BotSharp.Abstraction.Repositories.Models
+public class UpdateInstructionLogStatesModel
 {
-    public class UpdateInstructionLogStatesModel
-    {
-        public string LogId { get; set; }
-        public string StateKeyPrefix { get; set; } = "new_";
-        public Dictionary<string, string> States { get; set; }
-    }
+    public string LogId { get; set; } = default!;
+    public string StateKeyPrefix { get; set; } = "new_";
+    public Dictionary<string, string> States { get; set; } = [];
 }

src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabEventSubscription.cs

@@ -29,7 +29,8 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             var subscriber = scope.ServiceProvider.GetRequiredService<IEventSubscriber>();
             var cron = scope.ServiceProvider.GetRequiredService<ICrontabService>();
             var crons = await cron.GetCrontable();
-            foreach (var item in crons)
+            var allowedCrons = crons.Where(cron => cron.TriggerType == CronTabItemTriggerType.BackgroundWatcher).ToList();
+            foreach (var item in allowedCrons)
             {
                 _ = Task.Run(async () =>
                 {

src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabItemExtension.cs

@@ -0,0 +1,26 @@
+using NCrontab;
+
+namespace BotSharp.Core.Crontab.Services
+{
+    public static class CrontabItemExtension
+    {
+        public static bool CheckNextOccurrenceEveryOneMinute(this CrontabItem item)
+        {
+            // strip seconds from cron expression
+            item.Cron = string.Join(" ", item.Cron.Split(' ').TakeLast(5));
+            var schedule = CrontabSchedule.Parse(item.Cron, new CrontabSchedule.ParseOptions
+            {
+                IncludingSeconds = false // Ensure you account for seconds
+            });
+
+            var currentTime = DateTime.UtcNow;
+            var currentMinute = new DateTime(currentTime.Year, currentTime.Month, currentTime.Day,
+                                   currentTime.Hour, currentTime.Minute, 0, DateTimeKind.Utc);
+
+            var oneMinuteAgo = currentMinute.AddMinutes(-1);
+            var nextOccurrence = schedule.GetNextOccurrence(oneMinuteAgo);
+
+            return nextOccurrence == currentMinute;
+        }
+    }
+}

src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabWatcher.cs

@@ -58,10 +58,11 @@ private async Task RunCronChecker(IServiceProvider services)
     {
         var cron = services.GetRequiredService<ICrontabService>();
         var crons = await cron.GetCrontable();
+        var allowedCrons = crons.Where(cron => cron.TriggerType == CronTabItemTriggerType.BackgroundWatcher).ToList();
         var settings = services.GetRequiredService<CrontabSettings>();
         var publisher = services.GetService<IEventPublisher>();
 
-        foreach (var item in crons)
+        foreach (var item in allowedCrons)
         {
             _logger.LogDebug($"[{DateTime.UtcNow}] Cron task ({item.Title}, {item.Cron}), Last Execution Time:  {item.LastExecutionTime}");