SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #793 from hchen2020/master

Browse source 
crontab only allow 1 minute.
This commit is contained in:
Haiping 2024-12-11 22:06:23 +00:00 committed by GitHub
parent 93f156d206 0f9a01c001
commit dc8715320b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 79 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Infrastructure/BotSharp.Abstraction/Crontab/Models/ScheduleTaskArgs.cs
View file

@ -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!;

39
src/Infrastructure/BotSharp.Core.Crontab/Functions/ScheduleTaskFn.cs
View file

@ -18,22 +18,37 @@ public class ScheduleTaskFn : IFunctionCallback
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
{
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);
if (string.IsNullOrEmpty(args.Cron))
{
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 ret = db.UpsertCrontabItem(crontabItem);
message.Content = $"Task scheduled result: {ret}";
}
return true;
}

10
src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabService.cs
View file

@ -15,6 +15,7 @@
******************************************************************************/
using BotSharp.Abstraction.Repositories;
using BotSharp.Core.Infrastructures;
using Microsoft.Extensions.Logging;
namespace BotSharp.Core.Crontab.Services;
@ -45,14 +46,9 @@ public class CrontabService : ICrontabService
{
_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);
}
}

4
src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabWatcher.cs
View file

@ -48,9 +48,11 @@ public class CrontabWatcher : BackgroundService
{
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

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

@ -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" ]
}
}

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

@ -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.

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

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

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

@ -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.

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

@ -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",

6
src/Plugins/BotSharp.Plugin.SqlDriver/Helpers/SqlDriverHelper.cs
View file

@ -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;
}

55
src/Plugins/BotSharp.Plugin.SqlDriver/Hooks/SqlDriverCrontabHook.cs
View file

@ -17,38 +17,37 @@ public class SqlDriverCrontabHook : ICrontabHook
public async Task OnCronTriggered(CrontabItem item)
{
/*var conv = _services.GetRequiredService<IConversationService>();
conv.SetConversationId("abd9df25-2210-4e4d-80d7-48b6a3b905a8", []);
var conv = _services.GetRequiredService<IConversationService>();
conv.SetConversationId(item.ConversationId, []);
if (item.Language == "text")
{
var sidecar = _services.GetService<IConversationSideCar>();
var response = await sidecar.SendMessage(BuiltInAgentId.AIAssistant, item.Description, states: new List<MessageState>());
return;
}
else if (item.Language != "sql")
{
return;
}
_logger.LogWarning($"Crontab item triggered: {item.Title}. {item.Description}");
_logger.LogWarning($"Crontab item triggered: {item.Topic}. Run {item.Language}: {item.Script}");
var message = new RoleDialogModel(AgentRole.User, $"Run the query")
foreach (var task in item.Tasks)
{
FunctionName = "sql_select",
FunctionArgs = JsonSerializer.Serialize(new SqlStatement
if (task.Language == "text")
{
Statement = item.Script,
Reason = item.Description
})
};
var routing = _services.GetRequiredService<IRoutingService>();
routing.Context.Push("ec46f15b-8790-400f-a37f-1e7995b7d6e2");
await routing.InvokeFunction("sql_select", message);
var sidecar = _services.GetService<IConversationSideCar>();
var response = await sidecar.SendMessage(BuiltInAgentId.AIAssistant, $"{item.ExecutionResult}\r\n{task.Script}", states: new List<MessageState>());
}
else if (task.Language == "sql")
{
var message = new RoleDialogModel(AgentRole.User, $"Run the query")
{
FunctionName = "sql_select",
FunctionArgs = JsonSerializer.Serialize(new SqlStatement
{
Statement = task.Script,
Reason = item.Description
})
};
var routing = _services.GetRequiredService<IRoutingService>();
routing.Context.Push(BuiltInAgentId.SqlDriver);
await routing.InvokeFunction("sql_select", message);
item.ConversationId = conv.ConversationId;
item.AgentId = BuiltInAgentId.SqlDriver;
item.UserId = "41021346";
item.ExecutionResult = message.Content;*/
item.AgentId = BuiltInAgentId.SqlDriver;
item.UserId = "41021346";
item.ExecutionResult += message.Content + "\r\n";
}
}
}
}