Merge branch 'master' of https://github.com/SciSharp/BotSharp into feature/refine-cronttab

Author: Jicheng Lu

src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentType.cs

@@ -10,7 +10,7 @@ public class AgentType
     /// <summary>
     /// Planning agent
     /// </summary>
-    public const string Planning = "plan";
+    public const string Planning = "planning";
 
     public const string Evaluating = "evaluation";
 

src/Infrastructure/BotSharp.Abstraction/Agents/Enums/BuiltInAgentId.cs

@@ -32,11 +32,6 @@ public class BuiltInAgentId
     /// </summary>
     public const string Learner = "01acc3e5-0af7-49e6-ad7a-a760bd12dc40";
 
-    /// <summary>
-    /// Plan feasible implementation steps for complex problems
-    /// </summary>
-    public const string Planner = "282a7128-69a1-44b0-878c-a9159b88f3b9";
-
     /// <summary>
     /// SQL statement generation
     /// </summary>

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

@@ -19,6 +19,6 @@ public class CrontabItem : ScheduleTaskArgs
 
     public override string ToString()
     {
-        return $"{Topic}: {Description} [AgentId: {AgentId}, UserId: {UserId}]";
+        return $"{Title}: {Description} [AgentId: {AgentId}, UserId: {UserId}]";
     }
 }

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

@@ -11,8 +11,8 @@ public class CrontabItemFilter : Pagination
     [JsonPropertyName("conversation_ids")]
     public IEnumerable<string>? ConversationIds { get; set; }
 
-    [JsonPropertyName("topics")]
-    public IEnumerable<string>? Topics { get; set; }
+    [JsonPropertyName("titles")]
+    public IEnumerable<string>? Titles { get; set; }
 
     public CrontabItemFilter()
     {

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

@@ -5,12 +5,21 @@ public class ScheduleTaskArgs
     [JsonPropertyName("cron_expression")]
     public string Cron { get; set; } = null!;
 
-    [JsonPropertyName("topic")]
-    public string Topic { get; set; } = null!;
+    [JsonPropertyName("title")]
+    public string Title { get; set; } = null!;
 
     [JsonPropertyName("description")]
     public string Description { get; set; } = null!;
 
+    [JsonPropertyName("to_do_list")]
+    public ScheduleTaskItemArgs[] Tasks { get; set; } = null!; 
+}
+
+public class ScheduleTaskItemArgs
+{
+    [JsonPropertyName("topic")]
+    public string Topic { get; set; } = null!;
+
     [JsonPropertyName("script")]
     public string Script { get; set; } = null!;
 

src/Infrastructure/BotSharp.Abstraction/Planning/ITaskPlanner.cs

@@ -8,6 +8,7 @@ namespace BotSharp.Abstraction.Planning;
 /// </summary>
 public interface ITaskPlanner
 {
+    string Name => "Unamed Task Planner";
     Task<FunctionCallFromLlm> GetNextInstruction(Agent router, string messageId, List<RoleDialogModel> dialogs);
     Task<bool> AgentExecuting(Agent router, FunctionCallFromLlm inst, RoleDialogModel message, List<RoleDialogModel> dialogs);
     Task<bool> AgentExecuted(Agent router, FunctionCallFromLlm inst, RoleDialogModel message, List<RoleDialogModel> dialogs);

src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutableAgent.cs

@@ -13,6 +13,9 @@ public class RoutableAgent
     [JsonPropertyName("description")]
     public string Description { get; set; } = string.Empty;
 
+    [JsonPropertyName("type")]
+    public string Type { get; set; } = AgentType.Task;
+
     [JsonPropertyName("profiles")]
     public List<string> Profiles { get; set; }
         = new List<string>();

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

@@ -1,3 +1,4 @@
+using BotSharp.Abstraction.Repositories;
 using BotSharp.Abstraction.Routing;
 using BotSharp.Abstraction.Users;
 using BotSharp.Core.Crontab.Hooks;
@@ -22,16 +23,18 @@ public async Task<bool> Execute(RoleDialogModel message)
         var user = _services.GetRequiredService<IUserIdentity>();
         var crontabItem = new CrontabItem
         {
-            Topic = args.Topic,
+            Title = args.Title,
             Description = args.Description,
             Cron = args.Cron,
-            Script = args.Script,
-            Language = args.Language,
             UserId = user.Id,
             AgentId = routing.EntryAgentId,
-            ConversationId = routing.ConversationId
+            ConversationId = routing.ConversationId,
+            Tasks = args.Tasks,
         };
 
+        var db = _services.GetRequiredService<IBotSharpRepository>();
+        // var ret = db.InsertCrontabItem(crontabItem);
+
         return true;
     }
 }

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

@@ -14,28 +14,7 @@ You may obtain a copy of the License at
   limitations under the License.
 ******************************************************************************/
 
-using BotSharp.Abstraction.Agents.Enums;
-using BotSharp.Abstraction.Conversations;
-using BotSharp.Abstraction.Routing;
-using BotSharp.Core.Infrastructures;
-
-
-/*****************************************************************************
-  Copyright 2024 Written by Haiping Chen. All Rights Reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-******************************************************************************/
-
+using BotSharp.Abstraction.Repositories;
 using Microsoft.Extensions.Logging;
 
 namespace BotSharp.Core.Crontab.Services;
@@ -57,24 +36,9 @@ public CrontabService(IServiceProvider services, ILogger<CrontabService> logger)
 
     public async Task<List<CrontabItem>> GetCrontable()
     {
-        var convService = _services.GetRequiredService<IConversationService>();
-        var conv = await convService.GetConversation("73a9ee27-d597-4739-958f-3bd79760ac8e");
-        if (conv == null || !conv.States.ContainsKey("cron_expression"))
-        {
-            return [];
-        }
-
-        return 
-        [
-            new CrontabItem 
-            {
-                Topic = conv.States["topic"],
-                Cron = conv.States["cron_expression"],
-                Description = conv.States["description"],
-                Script = conv.States["script"],
-                Language = conv.States["language"]
-            }
-        ];
+        var repo = _services.GetRequiredService<IBotSharpRepository>();
+        var crontable = repo.GetCrontabItems(CrontabItemFilter.Empty());
+        return crontable.Items.ToList();
     }
 
     public async Task ScheduledTimeArrived(CrontabItem item)

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

@@ -8,24 +8,37 @@
         "type": "string",
         "description": "cron expression include seconds"
       },
-      "topic": {
+      "title": {
         "type": "string",
-        "description": "task topic in 1-3 keywords related to business entities"
+        "description": "task short title"
       },
       "description": {
         "type": "string",
-        "description": "task description without cron infromation, should include all key business entities"
+        "description": "the task summary"
       },
-      "script": {
-        "type": "string",
-        "description": "task related script, commands or provided function with parameters"
-      },
-      "language": {
-        "type": "string",
-        "enum": ["sql", "function"],
-        "description": "script programming language"
+      "to_do_list": {
+        "type": "array",
+        "description": "task to do list, should include all key business entities",
+        "items": {
+          "type": "object",
+          "properties": {
+            "topic": {
+              "type": "string",
+              "description": "task topic in 1-3 keywords related to the step"
+            },
+            "script": {
+              "type": "string",
+              "description": "task related script, function with parameters or plain text"
+            },
+            "language": {
+              "type": "string",
+              "enum": [ "function", "sql", "python", "text" ],
+              "description": "programming language script, function or plain text"
+            }
+          }
+        }
       }
     },
-    "required": [ "cron_expression", "topic", "description", "script", "language" ]
+    "required": [ "cron_expression", "title", "description", "to_do_list" ]
   }
 }