Merge pull request #793 from hchen2020/master

crontab only allow 1 minute.

Author: Oceania2018

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

@@ -5,6 +5,9 @@ public class ScheduleTaskArgs
     [JsonPropertyName("cron_expression")]
     public string Cron { get; set; } = null!;
 
+    [JsonPropertyName("less_than_60_seconds")]
+    public bool LessThan60Seconds { get; set; } = false;
+
     [JsonPropertyName("title")]
     public string Title { get; set; } = null!;
 

src/Infrastructure/BotSharp.Core.Crontab/Functions/ScheduleTaskFn.cs

@@ -18,22 +18,37 @@ public ScheduleTaskFn(IServiceProvider services)
     public async Task<bool> Execute(RoleDialogModel message)
     {
         var args = JsonSerializer.Deserialize<ScheduleTaskArgs>(message.FunctionArgs);
+        if (args.LessThan60Seconds)
+        {
+            message.Content = "Cron expression should not include seconds.";
+            return false;
+        }
 
         var routing = _services.GetRequiredService<IRoutingContext>();
         var user = _services.GetRequiredService<IUserIdentity>();
-        var crontabItem = new CrontabItem
+        var db = _services.GetRequiredService<IBotSharpRepository>();
+
+        if (string.IsNullOrEmpty(args.Cron))
         {
-            Title = args.Title,
-            Description = args.Description,
-            Cron = args.Cron,
-            UserId = user.Id,
-            AgentId = routing.EntryAgentId,
-            ConversationId = routing.ConversationId,
-            Tasks = args.Tasks,
-        };
+            var ret = db.DeleteCrontabItem(routing.ConversationId);
+            message.Content = $"Task schedule canceled result: {ret}";
+        }
+        else
+        {
+            var crontabItem = new CrontabItem
+            {
+                Title = args.Title,
+                Description = args.Description,
+                Cron = args.Cron,
+                UserId = user.Id,
+                AgentId = routing.EntryAgentId,
+                ConversationId = routing.ConversationId,
+                Tasks = args.Tasks,
+            };
 
-        var db = _services.GetRequiredService<IBotSharpRepository>();
-        // var ret = db.UpsertCrontabItem(crontabItem);
+            var ret = db.UpsertCrontabItem(crontabItem);
+            message.Content = $"Task scheduled result: {ret}";
+        }
 
         return true;
     }

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

@@ -15,6 +15,7 @@ limitations under the License.
 ******************************************************************************/
 
 using BotSharp.Abstraction.Repositories;
+using BotSharp.Core.Infrastructures;
 using Microsoft.Extensions.Logging;
 
 namespace BotSharp.Core.Crontab.Services;
@@ -45,14 +46,9 @@ public async Task ScheduledTimeArrived(CrontabItem item)
     {
         _logger.LogDebug($"ScheduledTimeArrived {item}");
 
-        var hooks = _services.GetServices<ICrontabHook>();
-        foreach(var hook in hooks)
-        {
-            await hook.OnCronTriggered(item);
-        }
-        /*await HookEmitter.Emit<ICrontabHook>(_services, async hook =>
+        await HookEmitter.Emit<ICrontabHook>(_services, async hook =>
             await hook.OnCronTriggered(item)
-        );*/
+        );
         await Task.Delay(1000 * 10);
     }
 }

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

@@ -48,9 +48,11 @@ private async Task RunCronChecker(IServiceProvider services)
         {
             try
             {
+                // strip seconds from cron expression
+                item.Cron = string.Join(" ", item.Cron.Split(' ').TakeLast(5));
                 var schedule = CrontabSchedule.Parse(item.Cron, new CrontabSchedule.ParseOptions
                 {
-                    IncludingSeconds = true // Ensure you account for seconds
+                    IncludingSeconds = false // Ensure you account for seconds
                 });
 
                 // Get the current time

src/Infrastructure/BotSharp.Core.Crontab/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/functions/util-crontab-schedule_task.json

@@ -1,12 +1,16 @@
 {
   "name": "util-crontab-schedule_task",
-  "description": "Set up a scheduled task",
+  "description": "Set up or cancel a scheduled task",
   "parameters": {
     "type": "object",
     "properties": {
       "cron_expression": {
         "type": "string",
-        "description": "cron expression include seconds"
+        "description": "cron expression. Set value as empty if user wants to cancel schedule."
+      },
+      "less_than_60_seconds": {
+        "type": "boolean",
+        "description": "whether schedule interval is less than 60 seconds"
       },
       "title": {
         "type": "string",
@@ -39,6 +43,6 @@
         }
       }
     },
-    "required": [ "cron_expression", "title", "description", "to_do_list" ]
+    "required": [ "cron_expression", "include_seconds", "title", "description", "to_do_list" ]
   }
 }

src/Infrastructure/BotSharp.Core.Crontab/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/templates/util-crontab-schedule_task.fn.liquid

@@ -1 +1,2 @@
-Call schedule_task if user needs to set up a scheduled task with appropriate programming script and language type.
+Call util-crontab-schedule_task if user needs to set up a scheduled task with appropriate programming script and language type.
+Set cron_expression as empty if user wants to cancel schedule. 

src/Infrastructure/BotSharp.Core/data/agents/01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a/agent.json

@@ -16,7 +16,7 @@
     },
     {
       "type": "planner",
-      "field": "Sequential-Planner"
+      "field": "Two-Stage-Planner"
     }
   ]
 }

src/Infrastructure/BotSharp.Core/data/agents/01fcc3e5-9af7-49e6-ad7a-a760bd12dc4a/templates/reasoner.one-step-forward.liquid

@@ -1,2 +1,3 @@
 Analyze the user's problem. Which prerequisite task needs to be completed? Output the next step of routing instructions.
-Check the job responsibilities of the routable Agent and do not transfer to an Agent that exceeds the scope of responsibility.
+Check the job responsibilities of the routable Agent and do not transfer to an Agent that exceeds the scope of responsibility.
+If the user request may require other tools or services, route to the planner agent.

src/Plugins/BotSharp.Plugin.Planner/data/agents/3e75e818-a139-48a8-9e22-4662548c13a3/agent.json

@@ -1,7 +1,7 @@
 {
   "id": "3e75e818-a139-48a8-9e22-4662548c13a3",
   "name": "Sequential-Planner",
-  "description": "Plan an ordered plan steps to execute some tasks in a predefined order by the user",
+  "description": "Plan an execution steps for the user complex task, especially if the tasks are in a predefined order by the user",
   "type": "planning",
   "createdDateTime": "2023-08-27T10:39:00Z",
   "updatedDateTime": "2023-08-27T14:39:00Z",

src/Plugins/BotSharp.Plugin.SqlDriver/Helpers/SqlDriverHelper.cs

@@ -5,15 +5,15 @@ internal static class SqlDriverHelper
     internal static string GetDatabaseType(IServiceProvider services)
     {
         var settings = services.GetRequiredService<SqlDriverSetting>();
-        var dbType = "MySQL";
+        var dbType = "mysql";
 
         if (!string.IsNullOrWhiteSpace(settings?.SqlServerConnectionString))
         {
-            dbType = "SQL Server";
+            dbType = "sqlserver";
         }
         else if (!string.IsNullOrWhiteSpace(settings?.SqlLiteConnectionString))
         {
-            dbType = "SQL Lite";
+            dbType = "sqllite";
         }
         return dbType;
     }