Merge branch 'master' of https://github.com/Qtoss-AI/BotSharp

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Knowledges/IKnowledgeService.cs

@@ -6,6 +6,7 @@ namespace BotSharp.Abstraction.Knowledges;
 public interface IKnowledgeService
 {
     #region Vector
+    Task<bool> ExistVectorCollection(string collectionName);
     Task<bool> CreateVectorCollection(string collectionName, string collectionType, int dimension, string provider, string model);
     Task<bool> DeleteVectorCollection(string collectionName);
     Task<IEnumerable<string>> GetVectorCollections(string type);

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

@@ -116,7 +116,6 @@ public interface IBotSharpRepository
     bool AddKnowledgeCollectionConfigs(List<VectorCollectionConfig> configs, bool reset = false);
     bool DeleteKnowledgeCollectionConfig(string collectionName);
     IEnumerable<VectorCollectionConfig> GetKnowledgeCollectionConfigs(VectorCollectionConfigFilter filter);
-
     bool SaveKnolwedgeBaseFileMeta(KnowledgeDocMetaData metaData);
     /// <summary>
     /// Delete file meta data in a knowledge collection, given the vector store provider. If "fileId" is null, delete all in the collection.

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/VectorStorage/IVectorDb.cs

@@ -5,7 +5,8 @@ namespace BotSharp.Abstraction.VectorStorage;
 public interface IVectorDb
 {
     string Provider { get; }
-    
+
+    Task<bool> DoesCollectionExist(string collectionName);
     Task<IEnumerable<string>> GetCollections();
     Task<StringIdPagedItems<VectorCollectionData>> GetPagedCollectionData(string collectionName, VectorFilter filter);
     Task<IEnumerable<VectorCollectionData>> GetCollectionData(string collectionName, IEnumerable<Guid> ids, bool withPayload = false, bool withVector = false);

src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.KnowledgeBase.cs

@@ -213,7 +213,7 @@ public PagedItems<KnowledgeDocMetaData> GetKnowledgeBaseFileMeta(string collecti
 
         return new PagedItems<KnowledgeDocMetaData>
         {
-            Items = records.Skip(filter.Offset).Take(filter.Size),
+            Items = records.OrderByDescending(x => x.CreateDate).Skip(filter.Offset).Take(filter.Size),
             Count = records.Count
         };
     }

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

@@ -69,4 +69,7 @@ public string? UserLanguage
 
     [JsonPropertyName("phone")]
     public string? Phone => _claims?.FirstOrDefault(x => x.Type == "phone")?.Value;
+
+    [JsonPropertyName("affiliateId")]
+    public string? AffiliateId => _claims?.FirstOrDefault(x => x.Type == "affiliateId")?.Value;
 }

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

@@ -254,7 +254,8 @@ private string GenerateJwtToken(User user)
             new Claim("type", user.Type ?? UserType.Client),
             new Claim("role", user.Role ?? UserRole.User),
             new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
-            new Claim("phone", user.Phone ?? string.Empty)
+            new Claim("phone", user.Phone ?? string.Empty),
+            new Claim("affiliateId", user.AffiliateId ?? string.Empty)
         };
 
         var validators = _services.GetServices<IAuthenticationHook>();
@@ -280,14 +281,14 @@ private string GenerateJwtToken(User user)
         };
         var tokenHandler = new JwtSecurityTokenHandler();
         var token = tokenHandler.CreateToken(tokenDescriptor);
-        SaveUserTokenExpiresCache(user.Id, expires).GetAwaiter().GetResult();
+        SaveUserTokenExpiresCache(user.Id, expires, expireInMinutes).GetAwaiter().GetResult();
         return tokenHandler.WriteToken(token);
     }
 
-    private async Task SaveUserTokenExpiresCache(string userId, DateTime expires)
+    private async Task SaveUserTokenExpiresCache(string userId, DateTime expires, int expireInMinutes)
     {
         var _cacheService = _services.GetRequiredService<ICacheService>();
-        await _cacheService.SetAsync<DateTime>(GetUserTokenExpiresCacheKey(userId), expires, null);
+        await _cacheService.SetAsync<DateTime>(GetUserTokenExpiresCacheKey(userId), expires, TimeSpan.FromMinutes(expireInMinutes));
     }
 
     private string GetUserTokenExpiresCacheKey(string userId)

src/Infrastructure/BotSharp.OpenAPI/Controllers/KnowledgeBaseController.cs

@@ -1,6 +1,5 @@
 using BotSharp.Abstraction.Files.Utilities;
 using BotSharp.Abstraction.Graph.Models;
-using BotSharp.Abstraction.Knowledges.Models;
 using BotSharp.Abstraction.VectorStorage.Models;
 using BotSharp.OpenAPI.ViewModels.Knowledges;
 
@@ -20,6 +19,12 @@ public KnowledgeBaseController(IKnowledgeService knowledgeService, IServiceProvi
     }
 
     #region Vector
+    [HttpGet("knowledge/vector/{collection}/exist")]
+    public async Task<bool> ExistVectorCollection([FromRoute] string collection)
+    {
+        return await _knowledgeService.ExistVectorCollection(collection);
+    }
+
     [HttpGet("knowledge/vector/collections")]
     public async Task<IEnumerable<string>> GetVectorCollections([FromQuery] string type)
     {

src/Plugins/BotSharp.Plugin.KnowledgeBase/MemVecDb/MemoryVectorDb.cs

@@ -10,6 +10,12 @@ public class MemoryVectorDb : IVectorDb
 
     public string Provider => "MemoryVector";
 
+
+    public async Task<bool> DoesCollectionExist(string collectionName)
+    {
+        return false;
+    }
+
     public async Task<bool> CreateCollection(string collectionName, int dimension)
     {
         _collections[collectionName] = dimension;

src/Plugins/BotSharp.Plugin.KnowledgeBase/Services/KnowledgeService.Document.cs

@@ -3,7 +3,6 @@
 using BotSharp.Abstraction.Files.Utilities;
 using BotSharp.Abstraction.Knowledges.Helpers;
 using BotSharp.Abstraction.VectorStorage.Enums;
-using System.Collections;
 using System.Net.Http;
 using System.Net.Mime;
 
@@ -13,13 +12,21 @@ public partial class KnowledgeService
 {
     public async Task<UploadKnowledgeResponse> UploadDocumentsToKnowledge(string collectionName, IEnumerable<ExternalFileModel> files)
     {
+        var res = new UploadKnowledgeResponse
+        {
+            Success = [],
+            Failed = files?.Select(x => x.FileName) ?? new List<string>()
+        };
+
         if (string.IsNullOrWhiteSpace(collectionName) || files.IsNullOrEmpty())
         {
-            return new UploadKnowledgeResponse
-            {
-                Success = [],
-                Failed = files?.Select(x => x.FileName) ?? new List<string>()
-            };
+            return res;
+        }
+
+        var exist = await ExistVectorCollection(collectionName);
+        if (!exist)
+        {
+            return res;
         }
 
         var db = _services.GetRequiredService<IBotSharpRepository>();
@@ -103,6 +110,9 @@ public async Task<bool> ImportDocumentContentToKnowledge(string collectionName,
 
         try
         {
+            var exist = await ExistVectorCollection(collectionName);
+            if (!exist) return false;
+
             var db = _services.GetRequiredService<IBotSharpRepository>();
             var userId = await GetUserId();
             var vectorStoreProvider = _settings.VectorDb.Provider;