Merge branch 'master' into lida_dev

Author: AnonymousDotNet

src/Infrastructure/BotSharp.Abstraction/Files/Utilities/FileUtility.cs

@@ -58,4 +58,20 @@ public static string GetFileContentType(string fileName)
 
         return contentType;
     }
+
+    public static List<string> GetMimeFileTypes(IEnumerable<string> fileTypes)
+    {
+        var provider = new FileExtensionContentTypeProvider();
+        var mimeTypes = provider.Mappings.Where(x => fileTypes.Any(type => x.Value.Contains(type))).Select(x => x.Key).ToList();
+
+        return mimeTypes;
+    }
+
+    public static List<string> GetContentFileTypes(IEnumerable<string> mimeTypes)
+    {
+        var provider = new FileExtensionContentTypeProvider();
+        var mappings = provider.Mappings.Where(x => mimeTypes.Any(type => x.Key.Contains(type))).Select(x => x.Value).ToList();
+
+        return mappings;
+    }
 }

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

src/Infrastructure/BotSharp.Core/Infrastructures/MemoryCacheService.cs

@@ -32,4 +32,9 @@ public async Task SetAsync<T>(string key, T value, TimeSpan? expiry)
             AbsoluteExpirationRelativeToNow = expiry
         });
     }
+
+    public async Task RemoveAsync(string key)
+    {
+        _cache.Remove(key);
+    }
 }

src/Infrastructure/BotSharp.Core/Infrastructures/RedisCacheService.cs

@@ -76,4 +76,20 @@ public async Task SetAsync<T>(string key, T value, TimeSpan? expiry)
         var db = redis.GetDatabase();
         await db.StringSetAsync(key, JsonConvert.SerializeObject(value), expiry);
     }
+
+    public async Task RemoveAsync(string key)
+    {
+        if (string.IsNullOrEmpty(_settings.Redis))
+        {
+            return;
+        }
+
+        if (redis == null)
+        {
+            redis = ConnectionMultiplexer.Connect(_settings.Redis);
+        }
+
+        var db = redis.GetDatabase();
+        await db.KeyDeleteAsync(key);
+    }
 }

src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs

@@ -291,8 +291,13 @@ private string GenerateJwtToken(User user)
 
     private async Task SaveUserTokenExpiresCache(string userId, DateTime expires, int expireInMinutes)
     {
-        var _cacheService = _services.GetRequiredService<ICacheService>();
-        await _cacheService.SetAsync<DateTime>(GetUserTokenExpiresCacheKey(userId), expires, TimeSpan.FromMinutes(expireInMinutes));
+        var config = _services.GetService<IConfiguration>();
+        var enableSingleLogin = bool.Parse(config["Jwt:EnableSingleLogin"] ?? "false");
+        if (enableSingleLogin)
+        {
+            var _cacheService = _services.GetRequiredService<ICacheService>();
+            await _cacheService.SetAsync(GetUserTokenExpiresCacheKey(userId), expires, TimeSpan.FromMinutes(expireInMinutes));
+        }
     }
 
     private string GetUserTokenExpiresCacheKey(string userId)

src/Infrastructure/BotSharp.OpenAPI/ViewModels/Knowledges/VectorKnowledgeCreateRequest.cs

@@ -11,5 +11,5 @@ public class VectorKnowledgeCreateRequest
     public string DataSource { get; set; } = VectorDataSource.Api;
 
     [JsonPropertyName("payload")]
-    public Dictionary<string, string>? Payload { get; set; }
+    public Dictionary<string, object>? Payload { get; set; }
 }