temp save

Jicheng Lu · Jicheng Lu · commit 0de06a929717 · 2024-12-10T12:50:13.000-06:00
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/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
@@ -4,30 +4,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(cronFile, _options);
+            File.WriteAllText(cronFile, json);
             return true;
         }
         catch (Exception ex)
@@ -47,17 +41,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);
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
@@ -19,7 +19,6 @@ public static CrontabItem ToDomainModel(CrontabItemDocument item)
     {
         return new CrontabItem
         {
-            Id = item.Id,
             UserId = item.UserId,
             AgentId = item.AgentId,
             ConversationId = item.ConversationId,
@@ -37,7 +36,6 @@ public static CrontabItemDocument ToMongoModel(CrontabItem item)
     {
         return new CrontabItemDocument
         {
-            Id = item.Id,
             UserId = item.UserId,
             AgentId = item.AgentId,
             ConversationId = item.ConversationId,
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;
         }

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
`@@ -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
`@@ -4,30 +4,24 @@ namespace BotSharp.Core.Repository;`
`4`	`4`
`5`	`5`	`public partial class FileRepository`
`6`	`6`	`{`
`7`		`- public bool InsertCrontabItem(CrontabItem item)`
	`7`	`+ public bool InsertCrontabItem(CrontabItem cron)`
`8`	`8`	`{`
`9`		`- if (item == null)`
	`9`	`+ if (cron == null \|\| string.IsNullOrWhiteSpace(cron.ConversationId))`
`10`	`10`	`{`
`11`	`11`	`return false;`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`try`
`15`	`15`	`{`
`16`		`- var baseDir = Path.Combine(_dbSettings.FileRepository, CRONTAB_FOLDER);`
`17`		`- item.Id = Guid.NewGuid().ToString();`
`18`		`- var dir = Path.Combine(baseDir, item.Id);`
`19`		`-`
`20`		`- if (Directory.Exists(dir))`
	`16`	`+ var baseDir = Path.Combine(_dbSettings.FileRepository, _conversationSettings.DataDir, cron.ConversationId);`
	`17`	`+ if (!Directory.Exists(baseDir))`
`21`	`18`	`{`
`22`	`19`	`return false;`
`23`	`20`	`}`
`24`	`21`
`25`		`- Directory.CreateDirectory(dir);`
`26`		`- Thread.Sleep(50);`
`27`		`-`
`28`		`- var itemFile = Path.Combine(dir, CRONTAB_FILE);`
`29`		`- var json = JsonSerializer.Serialize(item, _options);`
`30`		`- File.WriteAllText(itemFile, json);`
	`22`	`+ var cronFile = Path.Combine(baseDir, CRON_FILE);`
	`23`	`+ var json = JsonSerializer.Serialize(cronFile, _options);`
	`24`	`+ File.WriteAllText(cronFile, json);`
`31`	`25`	`return true;`
`32`	`26`	`}`
`33`	`27`	`catch (Exception ex)`
`@@ -47,17 +41,17 @@ public PagedItems<CrontabItem> GetCrontabItems(CrontabItemFilter filter)`
`47`	`41`	`}`
`48`	`42`
`49`	`43`	`var records = new List<CrontabItem>();`
`50`		`- var dir = Path.Combine(_dbSettings.FileRepository, CRONTAB_FOLDER);`
	`44`	`+ var baseDir = Path.Combine(_dbSettings.FileRepository, _conversationSettings.DataDir);`
`51`	`45`
`52`		`- if (!Directory.Exists(dir))`
	`46`	`+ if (!Directory.Exists(baseDir))`
`53`	`47`	`{`
`54`		`- Directory.CreateDirectory(dir);`
	`48`	`+ Directory.CreateDirectory(baseDir);`
`55`	`49`	`}`
`56`	`50`
`57`		`- var totalDirs = Directory.GetDirectories(dir);`
	`51`	`+ var totalDirs = Directory.GetDirectories(baseDir);`
`58`	`52`	`foreach (var d in totalDirs)`
`59`	`53`	`{`
`60`		`- var file = Path.Combine(d, CRONTAB_FILE);`
	`54`	`+ var file = Path.Combine(d, CRON_FILE);`
`61`	`55`	`if (!File.Exists(file)) continue;`
`62`	`56`
`63`	`57`	`var json = File.ReadAllText(file);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ public static CrontabItem ToDomainModel(CrontabItemDocument item)`
`19`	`19`	`{`
`20`	`20`	`return new CrontabItem`
`21`	`21`	`{`
`22`		`- Id = item.Id,`
`23`	`22`	`UserId = item.UserId,`
`24`	`23`	`AgentId = item.AgentId,`
`25`	`24`	`ConversationId = item.ConversationId,`
`@@ -37,7 +36,6 @@ public static CrontabItemDocument ToMongoModel(CrontabItem item)`
`37`	`36`	`{`
`38`	`37`	`return new CrontabItemDocument`
`39`	`38`	`{`
`40`		`- Id = item.Id,`
`41`	`39`	`UserId = item.UserId,`
`42`	`40`	`AgentId = item.AgentId,`
`43`	`41`	`ConversationId = item.ConversationId,`
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`	`}`