Merge pull request #1273 from iceljc/features/refine-membase

refine repository and coding util

Author: iceljc

src/Infrastructure/BotSharp.Abstraction/Coding/Utils/CodingUtil.cs

@@ -0,0 +1,21 @@
+namespace BotSharp.Abstraction.Coding.Utils;
+
+public static class CodingUtil
+{
+    /// <summary>
+    /// Get code execution config => (useLock, useProcess, timeout seconds)
+    /// </summary>
+    /// <param name="settings"></param>
+    /// <param name="defaultTimeoutSeconds"></param>
+    /// <returns></returns>
+    public static (bool, bool, int) GetCodeExecutionConfig(CodingSettings settings, int defaultTimeoutSeconds = 3)
+    {
+        var codeExecution = settings.CodeExecution;
+
+        var useLock = codeExecution?.UseLock ?? false;
+        var useProcess = codeExecution?.UseProcess ?? false;
+        var timeoutSeconds = codeExecution?.TimeoutSeconds > 0 ? codeExecution.TimeoutSeconds : defaultTimeoutSeconds;
+
+        return (useLock, useProcess, timeoutSeconds);
+    }
+}

src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs

@@ -1,4 +1,5 @@
 using BotSharp.Abstraction.Repositories.Filters;
+using BotSharp.Abstraction.Users.Models;
 
 namespace BotSharp.Abstraction.Conversations;
 
@@ -61,6 +62,4 @@ Task<bool> SendMessage(string agentId,
     Task SaveStates();
 
     Task<List<string>> GetConversationStateSearhKeys(ConversationStateKeysFilter filter);
-
-    Task<bool> MigrateLatestStates(int batchSize = 100, int errorLimit = 10);
 }

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

@@ -123,4 +123,4 @@ public class DialogMetaData
 
     [JsonPropertyName("create_at")]
     public DateTime CreatedTime { get; set; }
-}
+}

src/Infrastructure/BotSharp.Abstraction/Files/Models/InstructFileModel.cs

@@ -31,7 +31,7 @@ public override string ToString()
         }
         else if (!string.IsNullOrEmpty(FileData))
         {
-            return FileData.SubstringMax(20);
+            return FileData.SubstringMax(50);
         }
         return string.Empty; 
     }

src/Infrastructure/BotSharp.Abstraction/Knowledges/Models/CyperGraphModels.cs

@@ -9,11 +9,8 @@ public class GraphQueryResult
 public class GraphNode
 {
     public string Id { get; set; } = string.Empty;
-
     public List<string> Labels { get; set; } = new();
-
     public object Properties { get; set; } = new();
-
     public DateTime Time { get; set; } = DateTime.UtcNow;
 
     public override string ToString()

src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs

@@ -61,7 +61,7 @@ Task<bool> UpdateRole(Role role, bool updateRoleAgents = false)
     Task UpdateUserPhone(string userId, string Iphone, string regionCode) => throw new NotImplementedException();
     Task UpdateUserIsDisable(string userId, bool isDisable) => throw new NotImplementedException();
     Task UpdateUsersIsDisable(List<string> userIds, bool isDisable) => throw new NotImplementedException();
-    ValueTask<PagedItems<User>> GetUsers(UserFilter filter) => throw new NotImplementedException();
+    Task<PagedItems<User>> GetUsers(UserFilter filter) => throw new NotImplementedException();
     Task<List<User>> SearchLoginUsers(User filter, string source = UserSource.Internal) =>throw new NotImplementedException();
     Task<User?> GetUserDetails(string userId, bool includeAgent = false) => throw new NotImplementedException();
     Task<bool> UpdateUser(User user, bool updateUserAgents = false) => throw new NotImplementedException();
@@ -99,7 +99,7 @@ Task<bool> AppendAgentLabels(string agentId, List<string> labels)
     #endregion
 
     #region Agent Task
-    ValueTask<PagedItems<AgentTask>> GetAgentTasks(AgentTaskFilter filter)
+    Task<PagedItems<AgentTask>> GetAgentTasks(AgentTaskFilter filter)
         => throw new NotImplementedException();
     Task<AgentTask?> GetAgentTask(string agentId, string taskId)
         => throw new NotImplementedException();
@@ -143,7 +143,7 @@ Task UpdateConversationStatus(string conversationId, string status)
         => throw new NotImplementedException();
     Task<Conversation> GetConversation(string conversationId, bool isLoadStates = false)
         => throw new NotImplementedException();
-    ValueTask<PagedItems<Conversation>> GetConversations(ConversationFilter filter)
+    Task<PagedItems<Conversation>> GetConversations(ConversationFilter filter)
         => throw new NotImplementedException();
     Task UpdateConversationTitle(string conversationId, string title)
         => throw new NotImplementedException();
@@ -196,7 +196,7 @@ Task<DateTimePagination<ConversationStateLogModel>> GetConversationStateLogs(str
     Task<bool> SaveInstructionLogs(IEnumerable<InstructionLogModel> logs)
         => throw new NotImplementedException();
 
-    ValueTask<PagedItems<InstructionLogModel>> GetInstructionLogs(InstructLogFilter filter)
+    Task<PagedItems<InstructionLogModel>> GetInstructionLogs(InstructLogFilter filter)
         => throw new NotImplementedException();
 
     Task<List<string>> GetInstructionLogSearchKeys(InstructLogKeysFilter filter)
@@ -249,7 +249,7 @@ Task<bool> SaveKnolwedgeBaseFileMeta(KnowledgeDocMetaData metaData)
     /// <returns></returns>
     Task<bool> DeleteKnolwedgeBaseFileMeta(string collectionName, string vectorStoreProvider, Guid? fileId = null)
          => throw new NotImplementedException();
-    ValueTask<PagedItems<KnowledgeDocMetaData>> GetKnowledgeBaseFileMeta(string collectionName, string vectorStoreProvider, KnowledgeFileFilter filter)
+    Task<PagedItems<KnowledgeDocMetaData>> GetKnowledgeBaseFileMeta(string collectionName, string vectorStoreProvider, KnowledgeFileFilter filter)
          => throw new NotImplementedException();
     #endregion
 
@@ -258,7 +258,7 @@ Task<bool> UpsertCrontabItem(CrontabItem cron)
         => throw new NotImplementedException();
     Task<bool> DeleteCrontabItem(string conversationId)
         => throw new NotImplementedException();
-    ValueTask<PagedItems<CrontabItem>> GetCrontabItems(CrontabItemFilter filter)
+    Task<PagedItems<CrontabItem>> GetCrontabItems(CrontabItemFilter filter)
         => throw new NotImplementedException();
     #endregion
 }

src/Infrastructure/BotSharp.Core.Rules/Engines/RuleEngine.cs

@@ -4,6 +4,7 @@
 using BotSharp.Abstraction.Coding.Enums;
 using BotSharp.Abstraction.Coding.Models;
 using BotSharp.Abstraction.Coding.Settings;
+using BotSharp.Abstraction.Coding.Utils;
 using BotSharp.Abstraction.Conversations;
 using BotSharp.Abstraction.Hooks;
 using BotSharp.Abstraction.Models;
@@ -138,7 +139,7 @@ private async Task<bool> TriggerCodeScript(Agent agent, string triggerName, Rule
                 await hook.BeforeCodeExecution(agent, context);
             }
 
-            var (useLock, useProcess, timeoutSeconds) = GetCodeExecutionConfig();
+            var (useLock, useProcess, timeoutSeconds) = CodingUtil.GetCodeExecutionConfig(_codingSettings);
             using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(timeoutSeconds));
             var response = processor.Run(codeScript.Content, options: new()
             {
@@ -199,17 +200,5 @@ private List<KeyValue> BuildArguments(string? name, JsonDocument? args)
         }
         return keyValues;
     }
-
-    private (bool, bool, int) GetCodeExecutionConfig()
-    {
-        var codeExecution = _codingSettings.CodeExecution;
-        var defaultTimeoutSeconds = 3;
-
-        var useLock = codeExecution?.UseLock ?? false;
-        var useProcess = codeExecution?.UseProcess ?? false;
-        var timeoutSeconds = codeExecution?.TimeoutSeconds > 0 ? codeExecution.TimeoutSeconds : defaultTimeoutSeconds;
-
-        return (useLock, useProcess, timeoutSeconds);
-    }
     #endregion
 }

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.Migration.cs

@@ -1,4 +1,6 @@
 using BotSharp.Abstraction.Models;
+using BotSharp.Abstraction.Users.Models;
+using System.Threading.Tasks;
 
 namespace BotSharp.Core.Conversations.Services;
 

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.cs

@@ -1,6 +1,7 @@
 using BotSharp.Abstraction.Coding;
 using BotSharp.Abstraction.Coding.Contexts;
 using BotSharp.Abstraction.Coding.Enums;
+using BotSharp.Abstraction.Coding.Utils;
 using BotSharp.Abstraction.Files.Options;
 using BotSharp.Abstraction.Files.Proccessors;
 using BotSharp.Abstraction.Instructs;
@@ -156,7 +157,7 @@ public async Task<InstructResult> Execute(
         }
 
         // Run code script
-        var (useLock, useProcess, timeoutSeconds) = GetCodeExecutionConfig(codingSettings);
+        var (useLock, useProcess, timeoutSeconds) = CodingUtil.GetCodeExecutionConfig(codingSettings);
         using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(timeoutSeconds));
         var codeResponse = codeProcessor.Run(context.CodeScript?.Content ?? string.Empty, options: new()
         {
@@ -350,20 +351,4 @@ private async Task<string> GetChatCompletion(
 
         return result.Content;
     }
-
-    /// <summary>
-    /// Returns (useLock, useProcess, timeoutSeconds)
-    /// </summary>
-    /// <returns></returns>
-    private (bool, bool, int) GetCodeExecutionConfig(CodingSettings settings)
-    {
-        var codeExecution = settings.CodeExecution;
-        var defaultTimeoutSeconds = 3;
-
-        var useLock = codeExecution?.UseLock ?? false;
-        var useProcess = codeExecution?.UseProcess ?? false;
-        var timeoutSeconds = codeExecution?.TimeoutSeconds > 0 ? codeExecution.TimeoutSeconds : defaultTimeoutSeconds;
-
-        return (useLock, useProcess, timeoutSeconds);
-    }
 }