Merge remote-tracking branch 'origin/master' into jason_dev

Author: jason

docs/architecture/agent-utility.md

@@ -419,7 +419,7 @@ public class HttpHandlerPlugin : IBotSharpPlugin
 }
 ```
 
-[Fig 4.1.2](#register-assembly) demonstrates the utility assembly registration in “appsettings.json”. It is important to note that we are required to add the project reference to the Startup project, e.g., WebStarter. Moreover, we are required to add any new custom agent utility in the “Plugin” folder instead of the “BotSharp” folder.
+[Fig 4.1.1](#register-assembly) demonstrates the utility assembly registration in “appsettings.json”. It is important to note that we are required to add the project reference to the Startup project, e.g., WebStarter. Moreover, we are required to add any new custom agent utility in the “Plugin” folder instead of the “BotSharp” folder.
 
 <div style="text-align: center;" id="register-assembly">
     <img src="assets/agent-utility/register-assembly.png" />

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

@@ -1,10 +1,5 @@
 using BotSharp.Abstraction.Agents.Settings;
-using BotSharp.Abstraction.Conversations;
 using BotSharp.Abstraction.Functions.Models;
-using BotSharp.Abstraction.Repositories;
-using BotSharp.Abstraction.Routing;
-using Microsoft.Extensions.DependencyInjection;
-using System.Data;
 
 namespace BotSharp.Abstraction.Agents;
 
@@ -60,72 +55,5 @@ public virtual void OnAgentLoaded(Agent agent)
 
     public virtual void OnAgentUtilityLoaded(Agent agent)
     {
-        if (agent.Type == AgentType.Routing) return;
-
-        var conv = _services.GetRequiredService<IConversationService>();
-        var isConvMode = conv.IsConversationMode();
-        if (!isConvMode) return;
-
-        agent.Functions ??= [];
-        agent.Utilities ??= [];
-
-        var (functions, templates) = GetUtilityContent(agent);
-
-        foreach (var fn in functions)
-        {
-            if (!agent.Functions.Any(x => x.Name.Equals(fn.Name, StringComparison.OrdinalIgnoreCase)))
-            {
-                agent.Functions.Add(fn);
-            }
-        }
-
-        foreach (var prompt in templates)
-        {
-            agent.Instruction += $"\r\n\r\n{prompt}\r\n\r\n";
-        }
-    }
-
-    private (IEnumerable<FunctionDef>, IEnumerable<string>) GetUtilityContent(Agent agent)
-    {
-        var db = _services.GetRequiredService<IBotSharpRepository>();
-        var (functionNames, templateNames) = GetUniqueContent(agent.Utilities);
-
-        if (agent.MergeUtility)
-        {
-            var routing = _services.GetRequiredService<IRoutingContext>();
-            var entryAgentId = routing.EntryAgentId;
-            if (!string.IsNullOrEmpty(entryAgentId))
-            {
-                var entryAgent = db.GetAgent(entryAgentId);
-                var (fns, tps) = GetUniqueContent(entryAgent?.Utilities);
-                functionNames = functionNames.Concat(fns).Distinct().ToList();
-                templateNames = templateNames.Concat(tps).Distinct().ToList();
-            }
-        }
-
-        var ua = db.GetAgent(BuiltInAgentId.UtilityAssistant);
-        var functions = ua?.Functions?.Where(x => functionNames.Contains(x.Name, StringComparer.OrdinalIgnoreCase))?.ToList() ?? [];
-        var templates = ua?.Templates?.Where(x => templateNames.Contains(x.Name, StringComparer.OrdinalIgnoreCase))?.Select(x => x.Content)?.ToList() ?? [];
-        return (functions, templates);
-    }
-
-    private (IEnumerable<string>, IEnumerable<string>) GetUniqueContent(IEnumerable<AgentUtility>? utilities)
-    {
-        if (utilities.IsNullOrEmpty())
-        {
-            return ([], []);
-        }
-
-        utilities = utilities?.Where(x => !string.IsNullOrEmpty(x.Name) && !x.Disabled)?.ToList() ?? [];
-        var functionNames = utilities.SelectMany(x => x.Functions)
-                                     .Where(x => !string.IsNullOrEmpty(x.Name))
-                                     .Select(x => x.Name)
-                                     .Distinct().ToList();
-        var templateNames = utilities.SelectMany(x => x.Templates)
-                                     .Where(x => !string.IsNullOrEmpty(x.Name))
-                                     .Select(x => x.Name)
-                                     .Distinct().ToList();
-
-        return (functionNames, templateNames);
     }
 }

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

@@ -56,9 +56,4 @@ public class BuiltInAgentId
     /// Translates user-defined natural language rules into programmatic code
     /// </summary>
     public const string RuleEncoder = "6acfb93c-3412-402e-9ba5-c5d3cd8f0161";
-
-    /// <summary>
-    /// Schedule job
-    /// </summary>
-    public const string Crontab = "c2o139da-a62a-4355-8605-fdf0ffaca58e";
 }

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

@@ -21,6 +21,11 @@ public AgentUtility(
         Functions = functions ?? [];
         Templates = templates ?? [];
     }
+
+    public override string ToString()
+    {
+        return Name;
+    }
 }
 
 

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs

@@ -2,9 +2,11 @@
 using BotSharp.Abstraction.Functions.Models;
 using BotSharp.Abstraction.Messaging;
 using BotSharp.Abstraction.Messaging.Models.RichContent;
+using System.Diagnostics;
 
 namespace BotSharp.Abstraction.Conversations.Models;
 
+[DebuggerStepThrough]
 public class RoleDialogModel : ITrackableMessage
 {
     /// <summary>

src/Infrastructure/BotSharp.Abstraction/Users/Models/UserActivationModel.cs

@@ -4,4 +4,5 @@ public class UserActivationModel
 {
     public string UserName { get; set; }
     public string VerificationCode { get; set; }
+    public string RegionCode { get; set; } = "CN";
 }

src/Infrastructure/BotSharp.Core.Crontab/BotSharp.Core.Crontab.csproj

@@ -7,11 +7,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="data\agents\c2o139da-a62a-4355-8605-fdf0ffaca58e\agent.json" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\util-crontab-schedule_task.json" />
+    <None Remove="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\util-crontab-schedule_task.fn.liquid" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="data\agents\c2o139da-a62a-4355-8605-fdf0ffaca58e\agent.json">
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\functions\util-crontab-schedule_task.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\agents\6745151e-6d46-4a02-8de4-1c4f21c7da95\templates\util-crontab-schedule_task.fn.liquid">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

src/Infrastructure/BotSharp.Core.Crontab/CrontabPlugin.cs

@@ -14,6 +14,8 @@ You may obtain a copy of the License at
   limitations under the License.
 ******************************************************************************/
 
+using BotSharp.Core.Crontab.Hooks;
+
 namespace BotSharp.Core.Crontab;
 
 /// <summary>
@@ -27,13 +29,9 @@ public class CrontabPlugin : IBotSharpPlugin
     public string Description => "Crontab plugin is a time-based job scheduler in agent framework. The cron system is used to trigger AI Agent to do specific task periodically.";
     public string IconUrl => "https://icon-library.com/images/stop-watch-icon/stop-watch-icon-10.jpg";
 
-    public string[] AgentIds =
-    [
-        BuiltInAgentId.Crontab
-    ];
-
     public void RegisterDI(IServiceCollection services, IConfiguration config)
     {
+        services.AddScoped<IAgentUtilityHook, CrontabUtilityHook>();
         services.AddScoped<ICrontabService, CrontabService>();
         services.AddHostedService<CrontabWatcher>();
     }

src/Infrastructure/BotSharp.Core.Crontab/Enum/UtilityName.cs

@@ -0,0 +1,6 @@
+namespace BotSharp.Core.Crontab.Enum;
+
+public class UtilityName
+{
+    public const string ScheduleTask = "crontab.schedule-task";
+}

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

@@ -0,0 +1,37 @@
+using BotSharp.Abstraction.Routing;
+using BotSharp.Abstraction.Users;
+using BotSharp.Core.Crontab.Hooks;
+
+namespace BotSharp.Core.Crontab.Functions;
+
+public class ScheduleTaskFn : IFunctionCallback
+{
+    public string Name => $"{CrontabUtilityHook.PREFIX}schedule_task";
+    private readonly IServiceProvider _services;
+
+    public ScheduleTaskFn(IServiceProvider services)
+    {
+        _services = services;
+    }
+
+    public async Task<bool> Execute(RoleDialogModel message)
+    {
+        var args = JsonSerializer.Deserialize<ScheduleTaskArgs>(message.FunctionArgs);
+
+        var routing = _services.GetRequiredService<IRoutingContext>();
+        var user = _services.GetRequiredService<IUserIdentity>();
+        var crontabItem = new CrontabItem
+        {
+            Topic = args.Topic,
+            Description = args.Description,
+            Cron = args.Cron,
+            Script = args.Script,
+            Language = args.Language,
+            UserId = user.Id,
+            AgentId = routing.EntryAgentId,
+            ConversationId = routing.ConversationId
+        };
+
+        return true;
+    }
+}