Merge pull request #789 from iceljc/feature/refine-cronttab

iceljc · web-flow · commit ba96443c1512 · 2024-12-10T13:48:34.000-06:00
Feature/refine cronttab
diff --git a/src/Infrastructure/BotSharp.Abstraction/Crontab/Models/CrontabItem.cs b/src/Infrastructure/BotSharp.Abstraction/Crontab/Models/CrontabItem.cs
@@ -2,9 +2,6 @@ namespace BotSharp.Abstraction.Crontab.Models;
 
 public class CrontabItem : ScheduleTaskArgs
 {
-    [JsonPropertyName("id")]
-    public string Id { get; set; }
-
     [JsonPropertyName("user_id")]
     public string UserId { get; set; } = null!;
 
diff --git a/src/Infrastructure/BotSharp.Abstraction/Crontab/Models/CrontabItemFilter.cs b/src/Infrastructure/BotSharp.Abstraction/Crontab/Models/CrontabItemFilter.cs
@@ -11,9 +11,6 @@ public class CrontabItemFilter : Pagination
     [JsonPropertyName("conversation_ids")]
     public IEnumerable<string>? ConversationIds { get; set; }
 
-    [JsonPropertyName("titles")]
-    public IEnumerable<string>? Titles { get; set; }
-
     public CrontabItemFilter()
     {
         
diff --git a/src/Infrastructure/BotSharp.Abstraction/Crontab/Models/ScheduleTaskArgs.cs b/src/Infrastructure/BotSharp.Abstraction/Crontab/Models/ScheduleTaskArgs.cs
@@ -12,7 +12,7 @@ public class ScheduleTaskArgs
     public string Description { get; set; } = null!;
 
     [JsonPropertyName("to_do_list")]
-    public ScheduleTaskItemArgs[] Tasks { get; set; } = null!; 
+    public ScheduleTaskItemArgs[] Tasks { get; set; } = []; 
 }
 
 public class ScheduleTaskItemArgs
diff --git a/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs b/src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs
@@ -147,7 +147,7 @@ public interface IBotSharpRepository : IHaveServiceProvider
     #endregion
 
     #region Crontab
-    bool InsertCrontabItem(CrontabItem item) => throw new NotImplementedException();
+    bool InsertCrontabItem(CrontabItem cron) => throw new NotImplementedException();
     PagedItems<CrontabItem> GetCrontabItems(CrontabItemFilter filter) => throw new NotImplementedException();
     #endregion
 }
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Crontab.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Crontab.cs
@@ -5,30 +5,24 @@ namespace BotSharp.Core.Repository;
 
 public partial class FileRepository
 {
-    public bool InsertCrontabItem(CrontabItem item)
+    public bool InsertCrontabItem(CrontabItem cron)
     {
-        if (item == null)
+        if (cron == null || string.IsNullOrWhiteSpace(cron.ConversationId))
         {
             return false;
         }
 
         try
         {
-            var baseDir = Path.Combine(_dbSettings.FileRepository, CRONTAB_FOLDER);
-            item.Id = Guid.NewGuid().ToString();
-            var dir = Path.Combine(baseDir, item.Id);
-
-            if (Directory.Exists(dir))
+            var baseDir = Path.Combine(_dbSettings.FileRepository, _conversationSettings.DataDir, cron.ConversationId);
+            if (!Directory.Exists(baseDir))
             {
                 return false;
             }
 
-            Directory.CreateDirectory(dir);
-            Thread.Sleep(50);
-
-            var itemFile = Path.Combine(dir, CRONTAB_FILE);
-            var json = JsonSerializer.Serialize(item, _options);
-            File.WriteAllText(itemFile, json);
+            var cronFile = Path.Combine(baseDir, CRON_FILE);
+            var json = JsonSerializer.Serialize(cron, _options);
+            File.WriteAllText(cronFile, json);
             return true;
         }
         catch (Exception ex)
@@ -48,17 +42,17 @@ public PagedItems<CrontabItem> GetCrontabItems(CrontabItemFilter filter)
         }
 
         var records = new List<CrontabItem>();
-        var dir = Path.Combine(_dbSettings.FileRepository, CRONTAB_FOLDER);
+        var baseDir = Path.Combine(_dbSettings.FileRepository, _conversationSettings.DataDir);
 
-        if (!Directory.Exists(dir))
+        if (!Directory.Exists(baseDir))
         {
-            Directory.CreateDirectory(dir);
+            Directory.CreateDirectory(baseDir);
         }
 
-        var totalDirs = Directory.GetDirectories(dir);
+        var totalDirs = Directory.GetDirectories(baseDir);
         foreach (var d in totalDirs)
         {
-            var file = Path.Combine(d, CRONTAB_FILE);
+            var file = Path.Combine(d, CRON_FILE);
             if (!File.Exists(file)) continue;
 
             var json = File.ReadAllText(file);
@@ -78,10 +72,6 @@ public PagedItems<CrontabItem> GetCrontabItems(CrontabItemFilter filter)
             {
                 matched = matched && filter.UserIds.Contains(record.UserId);
             }
-            if (filter?.Titles != null)
-            {
-                matched = matched && filter.Titles.Contains(record.Title);
-            }
 
             if (!matched) continue;
 
diff --git a/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.cs b/src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.cs
@@ -55,8 +55,7 @@ public partial class FileRepository : IBotSharpRepository
     private const string PLUGIN_CONFIG_FILE = "config.json";
     private const string STATS_FILE = "stats.json";
 
-    private const string CRONTAB_FOLDER = "crontabs";
-    private const string CRONTAB_FILE = "crontab.json";
+    private const string CRON_FILE = "cron.json";
 
     public FileRepository(
         IServiceProvider services,
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Collections/CrontabItemDocument.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Collections/CrontabItemDocument.cs
@@ -11,20 +11,21 @@ public class CrontabItemDocument : MongoBase
     public string Cron { get; set; }
     public string Title { get; set; }
     public string Description { get; set; }
+    public IEnumerable<CronTaskMongoElement> Tasks { get; set; } = [];
     public DateTime CreatedTime { get; set; } = DateTime.UtcNow;
 
     public static CrontabItem ToDomainModel(CrontabItemDocument item)
     {
         return new CrontabItem
         {
-            Id = item.Id,
             UserId = item.UserId,
             AgentId = item.AgentId,
             ConversationId = item.ConversationId,
             ExecutionResult = item.ExecutionResult,
             Cron = item.Cron,
             Title = item.Title,
             Description = item.Description,
+            Tasks = item.Tasks?.Select(x => CronTaskMongoElement.ToDomainElement(x))?.ToArray() ?? [],
             CreatedTime = item.CreatedTime
         };
     }
@@ -33,14 +34,14 @@ public static CrontabItemDocument ToMongoModel(CrontabItem item)
     {
         return new CrontabItemDocument
         {
-            Id = item.Id,
             UserId = item.UserId,
             AgentId = item.AgentId,
             ConversationId = item.ConversationId,
             ExecutionResult = item.ExecutionResult,
             Cron = item.Cron,
             Title = item.Title,
             Description = item.Description,
+            Tasks = item.Tasks?.Select(x => CronTaskMongoElement.ToMongoElement(x))?.ToList() ?? [],
             CreatedTime = item.CreatedTime
         };
     }
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Models/CronTaskMongoElement.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Models/CronTaskMongoElement.cs
@@ -0,0 +1,30 @@
+using BotSharp.Abstraction.Crontab.Models;
+
+namespace BotSharp.Plugin.MongoStorage.Models;
+
+public class CronTaskMongoElement
+{
+    public string Topic { get; set; }
+    public string Script { get; set; }
+    public string Language { get; set; }
+
+    public static CronTaskMongoElement ToMongoElement(ScheduleTaskItemArgs model)
+    {
+        return new CronTaskMongoElement
+        {
+            Topic = model.Topic,
+            Script = model.Script,
+            Language = model.Language
+        };
+    }
+
+    public static ScheduleTaskItemArgs ToDomainElement(CronTaskMongoElement model)
+    {
+        return new ScheduleTaskItemArgs
+        {
+            Topic = model.Topic,
+            Script = model.Script,
+            Language = model.Language
+        };
+    }
+}
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Conversation.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Conversation.cs
@@ -56,18 +56,21 @@ public bool DeleteConversations(IEnumerable<string> conversationIds)
         var filterPromptLog = Builders<LlmCompletionLogDocument>.Filter.In(x => x.ConversationId, conversationIds);
         var filterContentLog = Builders<ConversationContentLogDocument>.Filter.In(x => x.ConversationId, conversationIds);
         var filterStateLog = Builders<ConversationStateLogDocument>.Filter.In(x => x.ConversationId, conversationIds);
+        var conbTabItems = Builders<CrontabItemDocument>.Filter.In(x => x.ConversationId, conversationIds);
 
         var exeLogDeleted = _dc.ExectionLogs.DeleteMany(filterExeLog);
         var promptLogDeleted = _dc.LlmCompletionLogs.DeleteMany(filterPromptLog);
         var contentLogDeleted = _dc.ContentLogs.DeleteMany(filterContentLog);
         var stateLogDeleted = _dc.StateLogs.DeleteMany(filterStateLog);
         var statesDeleted = _dc.ConversationStates.DeleteMany(filterSates);
         var dialogDeleted = _dc.ConversationDialogs.DeleteMany(filterDialog);
+        var cronDeleted = _dc.CrontabItems.DeleteMany(conbTabItems);
         var convDeleted = _dc.Conversations.DeleteMany(filterConv);
 
         return convDeleted.DeletedCount > 0 || dialogDeleted.DeletedCount > 0 || statesDeleted.DeletedCount > 0
             || exeLogDeleted.DeletedCount > 0 || promptLogDeleted.DeletedCount > 0
-            || contentLogDeleted.DeletedCount > 0 || stateLogDeleted.DeletedCount > 0;
+            || contentLogDeleted.DeletedCount > 0 || stateLogDeleted.DeletedCount > 0
+            || convDeleted.DeletedCount > 0;
     }
 
     [SideCar]
diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Crontab.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Crontab.cs
@@ -14,8 +14,8 @@ public bool InsertCrontabItem(CrontabItem item)
 
         try
         {
-            item.Id = Guid.NewGuid().ToString();
             var cronDoc = CrontabItemDocument.ToMongoModel(item);
+            cronDoc.Id = Guid.NewGuid().ToString();
             _dc.CrontabItems.InsertOne(cronDoc);
             return true;
         }
@@ -46,10 +46,6 @@ public PagedItems<CrontabItem> GetCrontabItems(CrontabItemFilter filter)
         {
             cronFilters.Add(cronBuilder.In(x => x.ConversationId, filter.ConversationIds));
         }
-        if (filter?.Titles != null)
-        {
-            cronFilters.Add(cronBuilder.In(x => x.Title, filter.Titles));
-        }
         if (filter?.UserIds != null)
         {
             cronFilters.Add(cronBuilder.In(x => x.UserId, filter.UserIds));

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,6 @@ namespace BotSharp.Abstraction.Crontab.Models;`
`2`	`2`
`3`	`3`	`public class CrontabItem : ScheduleTaskArgs`
`4`	`4`	`{`
`5`		`- [JsonPropertyName("id")]`
`6`		`- public string Id { get; set; }`
`7`		`-`
`8`	`5`	`[JsonPropertyName("user_id")]`
`9`	`6`	`public string UserId { get; set; } = null!;`
`10`	`7`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,6 @@ public class CrontabItemFilter : Pagination`
`11`	`11`	`[JsonPropertyName("conversation_ids")]`
`12`	`12`	`public IEnumerable<string>? ConversationIds { get; set; }`
`13`	`13`
`14`		`- [JsonPropertyName("titles")]`
`15`		`- public IEnumerable<string>? Titles { get; set; }`
`16`		`-`
`17`	`14`	`public CrontabItemFilter()`
`18`	`15`	`{`
`19`	`16`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class ScheduleTaskArgs`
`12`	`12`	`public string Description { get; set; } = null!;`
`13`	`13`
`14`	`14`	`[JsonPropertyName("to_do_list")]`
`15`		`- public ScheduleTaskItemArgs[] Tasks { get; set; } = null!;`
	`15`	`+ public ScheduleTaskItemArgs[] Tasks { get; set; } = [];`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public class ScheduleTaskItemArgs`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public interface IBotSharpRepository : IHaveServiceProvider`
`147`	`147`	`#endregion`
`148`	`148`
`149`	`149`	`#region Crontab`
`150`		`- bool InsertCrontabItem(CrontabItem item) => throw new NotImplementedException();`
	`150`	`+ bool InsertCrontabItem(CrontabItem cron) => throw new NotImplementedException();`
`151`	`151`	`PagedItems<CrontabItem> GetCrontabItems(CrontabItemFilter filter) => throw new NotImplementedException();`
`152`	`152`	`#endregion`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,30 +5,24 @@ namespace BotSharp.Core.Repository;`
`5`	`5`
`6`	`6`	`public partial class FileRepository`
`7`	`7`	`{`
`8`		`- public bool InsertCrontabItem(CrontabItem item)`
	`8`	`+ public bool InsertCrontabItem(CrontabItem cron)`
`9`	`9`	`{`
`10`		`- if (item == null)`
	`10`	`+ if (cron == null \|\| string.IsNullOrWhiteSpace(cron.ConversationId))`
`11`	`11`	`{`
`12`	`12`	`return false;`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`try`
`16`	`16`	`{`
`17`		`- var baseDir = Path.Combine(_dbSettings.FileRepository, CRONTAB_FOLDER);`
`18`		`- item.Id = Guid.NewGuid().ToString();`
`19`		`- var dir = Path.Combine(baseDir, item.Id);`
`20`		`-`
`21`		`- if (Directory.Exists(dir))`
	`17`	`+ var baseDir = Path.Combine(_dbSettings.FileRepository, _conversationSettings.DataDir, cron.ConversationId);`
	`18`	`+ if (!Directory.Exists(baseDir))`
`22`	`19`	`{`
`23`	`20`	`return false;`
`24`	`21`	`}`
`25`	`22`
`26`		`- Directory.CreateDirectory(dir);`
`27`		`- Thread.Sleep(50);`
`28`		`-`
`29`		`- var itemFile = Path.Combine(dir, CRONTAB_FILE);`
`30`		`- var json = JsonSerializer.Serialize(item, _options);`
`31`		`- File.WriteAllText(itemFile, json);`
	`23`	`+ var cronFile = Path.Combine(baseDir, CRON_FILE);`
	`24`	`+ var json = JsonSerializer.Serialize(cron, _options);`
	`25`	`+ File.WriteAllText(cronFile, json);`
`32`	`26`	`return true;`
`33`	`27`	`}`
`34`	`28`	`catch (Exception ex)`
`@@ -48,17 +42,17 @@ public PagedItems<CrontabItem> GetCrontabItems(CrontabItemFilter filter)`
`48`	`42`	`}`
`49`	`43`
`50`	`44`	`var records = new List<CrontabItem>();`
`51`		`- var dir = Path.Combine(_dbSettings.FileRepository, CRONTAB_FOLDER);`
	`45`	`+ var baseDir = Path.Combine(_dbSettings.FileRepository, _conversationSettings.DataDir);`
`52`	`46`
`53`		`- if (!Directory.Exists(dir))`
	`47`	`+ if (!Directory.Exists(baseDir))`
`54`	`48`	`{`
`55`		`- Directory.CreateDirectory(dir);`
	`49`	`+ Directory.CreateDirectory(baseDir);`
`56`	`50`	`}`
`57`	`51`
`58`		`- var totalDirs = Directory.GetDirectories(dir);`
	`52`	`+ var totalDirs = Directory.GetDirectories(baseDir);`
`59`	`53`	`foreach (var d in totalDirs)`
`60`	`54`	`{`
`61`		`- var file = Path.Combine(d, CRONTAB_FILE);`
	`55`	`+ var file = Path.Combine(d, CRON_FILE);`
`62`	`56`	`if (!File.Exists(file)) continue;`
`63`	`57`
`64`	`58`	`var json = File.ReadAllText(file);`
`@@ -78,10 +72,6 @@ public PagedItems<CrontabItem> GetCrontabItems(CrontabItemFilter filter)`
`78`	`72`	`{`
`79`	`73`	`matched = matched && filter.UserIds.Contains(record.UserId);`
`80`	`74`	`}`
`81`		`- if (filter?.Titles != null)`
`82`		`- {`
`83`		`- matched = matched && filter.Titles.Contains(record.Title);`
`84`		`- }`
`85`	`75`
`86`	`76`	`if (!matched) continue;`
`87`	`77`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ public bool InsertCrontabItem(CrontabItem item)`
`14`	`14`
`15`	`15`	`try`
`16`	`16`	`{`
`17`		`- item.Id = Guid.NewGuid().ToString();`
`18`	`17`	`var cronDoc = CrontabItemDocument.ToMongoModel(item);`
	`18`	`+ cronDoc.Id = Guid.NewGuid().ToString();`
`19`	`19`	`_dc.CrontabItems.InsertOne(cronDoc);`
`20`	`20`	`return true;`
`21`	`21`	`}`
`@@ -46,10 +46,6 @@ public PagedItems<CrontabItem> GetCrontabItems(CrontabItemFilter filter)`
`46`	`46`	`{`
`47`	`47`	`cronFilters.Add(cronBuilder.In(x => x.ConversationId, filter.ConversationIds));`
`48`	`48`	`}`
`49`		`- if (filter?.Titles != null)`
`50`		`- {`
`51`		`- cronFilters.Add(cronBuilder.In(x => x.Title, filter.Titles));`
`52`		`- }`
`53`	`49`	`if (filter?.UserIds != null)`
`54`	`50`	`{`
`55`	`51`	`cronFilters.Add(cronBuilder.In(x => x.UserId, filter.UserIds));`