Merge pull request #751 from iceljc/master

minor changes

src/Infrastructure/BotSharp.Abstraction/Roles/IRoleService.cs

@@ -8,6 +8,6 @@ public interface IRoleService
     Task<bool> RefreshRoles();
     Task<IEnumerable<string>> GetRoleOptions();
     Task<IEnumerable<Role>> GetRoles(RoleFilter filter);
-    Task<Role?> GetRoleDetails(string roleId);
+    Task<Role?> GetRoleDetails(string roleId, bool includeAgent = false);
     Task<bool> UpdateRole(Role role, bool isUpdateRoleAgents = false);
 }

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

@@ -8,7 +8,7 @@ public interface IUserService
 {
     Task<User> GetUser(string id);
     Task<PagedItems<User>> GetUsers(UserFilter filter);
-    Task<User?> GetUserDetails(string userId);
+    Task<User?> GetUserDetails(string userId, bool includeAgent = false);
     Task<bool> IsAdminUser(string userId);
     Task<UserAuthorization> GetUserAuthorizations(IEnumerable<string>? agentIds = null);
     Task<bool> UpdateUser(User user, bool isUpdateUserAgents = false);

src/Infrastructure/BotSharp.Core/Roles/Services/RoleService.cs

@@ -43,10 +43,10 @@ public class RoleService : IRoleService
         return roles;
     }
 
-    public async Task<Role?> GetRoleDetails(string roleId)
+    public async Task<Role?> GetRoleDetails(string roleId, bool includeAgent = false)
     {
         var db = _services.GetRequiredService<IBotSharpRepository>();
-        var role = db.GetRoleDetails(roleId, includeAgent: true);
+        var role = db.GetRoleDetails(roleId, includeAgent);
         return role;
     }
 

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

@@ -452,10 +452,10 @@ public class UserService : IUserService
         return auth;
     }
 
-    public async Task<User?> GetUserDetails(string userId)
+    public async Task<User?> GetUserDetails(string userId, bool includeAgent = false)
     {
         var db = _services.GetRequiredService<IBotSharpRepository>();
-        return db.GetUserDetails(userId, includeAgent: true);
+        return db.GetUserDetails(userId, includeAgent);
     }
 
     public async Task<bool> UpdateUser(User user, bool isUpdateUserAgents = false)

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

@@ -120,12 +120,13 @@ public class KnowledgeBaseController : ControllerBase
     [HttpPost("/knowledge/document/{collection}/upload")]
     public async Task<UploadKnowledgeResponse> UploadKnowledgeDocuments([FromRoute] string collection, [FromBody] VectorKnowledgeUploadRequest request)
     {
-        var response = await _knowledgeService.UploadDocumentsToKnowledge(collection, request.Files);
+        var response = await _knowledgeService.UploadDocumentsToKnowledge(collection, request.Files, request.ChunkOption);
         return response;
     }
 
     [HttpPost("/knowledge/document/{collection}/form-upload")]
-    public async Task<UploadKnowledgeResponse> UploadKnowledgeDocuments([FromRoute] string collection, [FromForm] IEnumerable<IFormFile> files)
+    public async Task<UploadKnowledgeResponse> UploadKnowledgeDocuments([FromRoute] string collection,
+        [FromForm] IEnumerable<IFormFile> files, [FromForm] ChunkOption? option = null)
     {
         if (files.IsNullOrEmpty())
         {
@@ -143,7 +144,7 @@ public class KnowledgeBaseController : ControllerBase
             });
         }
 
-        var response = await _knowledgeService.UploadDocumentsToKnowledge(collection, docs);
+        var response = await _knowledgeService.UploadDocumentsToKnowledge(collection, docs, option);
         return response;
     }
 

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

@@ -61,7 +61,7 @@ public class RoleController : ControllerBase
     [HttpGet("/role/{id}/details")]
     public async Task<RoleViewModel> GetRoleDetails([FromRoute] string id)
     {
-        var role = await _roleService.GetRoleDetails(id);
+        var role = await _roleService.GetRoleDetails(id, includeAgent: true);
         return RoleViewModel.FromRole(role);
     }
 

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

@@ -202,7 +202,7 @@ public class UserController : ControllerBase
     public async Task<UserViewModel> GetUserDetails(string id)
     {
         var userService = _services.GetRequiredService<IUserService>();
-        var user = await userService.GetUserDetails(id);
+        var user = await userService.GetUserDetails(id, includeAgent: true);
         return UserViewModel.FromUser(user);
     }
 

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

@@ -6,4 +6,7 @@ public class VectorKnowledgeUploadRequest
 {
     [JsonPropertyName("files")]
     public IEnumerable<ExternalFileModel> Files { get; set; } = new List<ExternalFileModel>();
+
+    [JsonPropertyName("chunk_option")]
+    public ChunkOption? ChunkOption { get; set; }
 }