Merge pull request #663 from Qtoss-AI/master

return not found if no records.

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Browsing/Models/BrowserActionResult.cs

@@ -2,6 +2,7 @@ namespace BotSharp.Abstraction.Browsing.Models;
 
 public class BrowserActionResult
 {
+    public int ResponseStatusCode { get; set; }
     public bool IsSuccess { get; set; }
     public string? Message { get; set; }
     public string? StackTrace { get; set; }

src/Infrastructure/BotSharp.Abstraction/Infrastructures/ICacheService.cs

@@ -5,4 +5,5 @@ public interface ICacheService
     Task<T?> GetAsync<T>(string key);
     Task<object> GetAsync(string key, Type type);
     Task SetAsync<T>(string key, T value, TimeSpan? expiry);
+    Task RemoveAsync(string key);
 }

src/Infrastructure/BotSharp.Abstraction/Infrastructures/SharpCacheAttribute.cs

@@ -31,7 +31,13 @@ public override void OnEntry(MethodContext context)
         var value = cache.GetAsync(key, context.TaskReturnType).Result;
         if (value != null)
         {
-            context.ReplaceReturnValue(this, value);
+            // check if the cache is out of date
+            var isOutOfDate = IsOutOfDate(context, value).Result;
+
+            if (!isOutOfDate)
+            {
+                context.ReplaceReturnValue(this, value);
+            }
         }
     }
 
@@ -58,6 +64,11 @@ public override void OnSuccess(MethodContext context)
         }
     }
 
+    public virtual Task<bool> IsOutOfDate(MethodContext context, object value)
+    {
+        return Task.FromResult(false);
+    }
+
     private string GetCacheKey(SharpCacheSettings settings, MethodContext context)
     {
         var key = settings.Prefix + "-" + context.Method.Name;

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

@@ -14,25 +14,26 @@ public interface IBotSharpRepository
     void Add<TTableInterface>(object entity);
 
     #region Plugin
-    PluginConfig GetPluginConfig(); 
+    PluginConfig GetPluginConfig();
     void SavePluginConfig(PluginConfig config);
     #endregion
 
     #region User
     User? GetUserByEmail(string email) => throw new NotImplementedException();
     User? GetUserByPhone(string phone) => throw new NotImplementedException();
     User? GetAffiliateUserByPhone(string phone) => throw new NotImplementedException();
-    User? GetUserById(string id) => throw new NotImplementedException();   
+    User? GetUserById(string id) => throw new NotImplementedException();
     List<User> GetUserByIds(List<string> ids) => throw new NotImplementedException();
     User? GetUserByAffiliateId(string affiliateId) => throw new NotImplementedException();
     User? GetUserByUserName(string userName) => throw new NotImplementedException();
     void CreateUser(User user) => throw new NotImplementedException();
     void UpdateUserVerified(string userId) => throw new NotImplementedException();
     void UpdateUserVerificationCode(string userId, string verficationCode) => throw new NotImplementedException();
     void UpdateUserPassword(string userId, string password) => throw new NotImplementedException();
-    void UpdateUserEmail(string userId, string email)=> throw new NotImplementedException();
+    void UpdateUserEmail(string userId, string email) => throw new NotImplementedException();
     void UpdateUserPhone(string userId, string Iphone) => throw new NotImplementedException();
     void UpdateUserIsDisable(string userId, bool isDisable) => throw new NotImplementedException();
+    void UpdateUsersIsDisable(List<string> userIds, bool isDisable) => throw new NotImplementedException();
     #endregion
 
     #region Agent
@@ -76,7 +77,7 @@ public interface IBotSharpRepository
     List<string> GetIdleConversations(int batchSize, int messageLimit, int bufferHours, IEnumerable<string> excludeAgentIds);
     IEnumerable<string> TruncateConversation(string conversationId, string messageId, bool cleanLog = false);
     #endregion
-    
+
     #region Execution Log
     void AddExecutionLogs(string conversationId, List<string> logs);
     List<string> GetExecutionLogs(string conversationId);

src/Infrastructure/BotSharp.Abstraction/Users/IAuthenticationHook.cs

@@ -10,4 +10,5 @@ public interface IAuthenticationHook
     void BeforeSending(Token token);
     Task UserCreated(User user);
     Task VerificationCodeResetPassword(User user);
+    Task DelUsers(List<string> userIds);
 }

src/Infrastructure/BotSharp.Abstraction/Users/IUserIdentity.cs

@@ -10,4 +10,5 @@ public interface IUserIdentity
     string FullName { get; }
     string? UserLanguage { get; }
     string? Phone { get; }
+    string? AffiliateId { get; }
 }

src/Infrastructure/BotSharp.Abstraction/Users/IUserService.cs

@@ -19,4 +19,5 @@ public interface IUserService
     Task<bool> ModifyUserPhone(string phone);
     Task<bool> UpdatePassword(string newPassword, string verificationCode);
     Task<DateTime> GetUserTokenExpires();
+    Task<bool> UpdateUsersIsDisable(List<string> userIds, bool isDisable);
 }

src/Infrastructure/BotSharp.Abstraction/VectorStorage/IVectorDb.cs

@@ -12,7 +12,7 @@ public interface IVectorDb
     Task<IEnumerable<VectorCollectionData>> GetCollectionData(string collectionName, IEnumerable<Guid> ids, bool withPayload = false, bool withVector = false);
     Task<bool> CreateCollection(string collectionName, int dimension);
     Task<bool> DeleteCollection(string collectionName);
-    Task<bool> Upsert(string collectionName, Guid id, float[] vector, string text, Dictionary<string, string>? payload = null);
+    Task<bool> Upsert(string collectionName, Guid id, float[] vector, string text, Dictionary<string, object>? payload = null);
     Task<IEnumerable<VectorCollectionData>> Search(string collectionName, float[] vector, IEnumerable<string>? fields, int limit = 5, float confidence = 0.5f, bool withVector = false);
     Task<bool> DeleteCollectionData(string collectionName, List<Guid> ids);
     Task<bool> DeleteCollectionAllData(string collectionName);

src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCollectionData.cs

@@ -3,7 +3,7 @@ namespace BotSharp.Abstraction.VectorStorage.Models;
 public class VectorCollectionData
 {
     public string Id { get; set; }
-    public Dictionary<string, string> Data { get; set; } = new();
+    public Dictionary<string, object> Data { get; set; } = new();
     public double? Score { get; set; }
 
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]

src/Infrastructure/BotSharp.Abstraction/VectorStorage/Models/VectorCreateModel.cs

@@ -6,5 +6,5 @@ public class VectorCreateModel
 {
     public string Text { get; set; }
     public string DataSource { get; set; } = VectorDataSource.Api;
-    public Dictionary<string, string>? Payload { get; set; }
+    public Dictionary<string, object>? Payload { get; set; }
 }