refine

Author: Jicheng Lu

src/Infrastructure/BotSharp.Abstraction/Files/Proccessors/IFileProcessor.cs

@@ -1,5 +1,7 @@
 using BotSharp.Abstraction.Files.Options;
 using BotSharp.Abstraction.Files.Responses;
+using BotSharp.Abstraction.Knowledges.Options;
+using BotSharp.Abstraction.Knowledges.Responses;
 
 namespace BotSharp.Abstraction.Files.Proccessors;
 
@@ -9,4 +11,7 @@ public interface IFileProcessor
 
     Task<FileHandleResponse> HandleFilesAsync(Agent agent, string text, IEnumerable<InstructFileModel> files, FileHandleOptions? options = null)
         => throw new NotImplementedException();
+
+    Task<FileKnowledgeResponse> GetFileKnowledgeAsync(FileBinaryDataModel file, FileKnowledgeProcessOptions? options = null)
+        => throw new NotImplementedException();
 }

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

@@ -36,8 +36,9 @@ public interface IKnowledgeService
     /// </summary>
     /// <param name="collectionName"></param>
     /// <param name="files"></param>
+    /// <param name="option"></param>
     /// <returns></returns>
-    Task<UploadKnowledgeResponse> UploadDocumentsToKnowledge(string collectionName, IEnumerable<ExternalFileModel> files, ChunkOption? option = null);
+    Task<UploadKnowledgeResponse> UploadDocumentsToKnowledge(string collectionName, IEnumerable<ExternalFileModel> files, KnowledgeDocOptions? options = null);
     /// <summary>
     /// Save document content to knowledgebase without saving the document
     /// </summary>

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

@@ -0,0 +1,18 @@
+using BotSharp.Abstraction.VectorStorage.Models;
+
+namespace BotSharp.Abstraction.Knowledges.Models;
+
+public class FileKnowledgeModel
+{
+    public IEnumerable<string> Contents { get; set; } = [];
+    public IDictionary<string, VectorPayloadValue>? Payload { get; set; }
+}
+
+
+public class FileKnowledgeWrapper
+{
+    public Guid FileId { get; set; }
+    public string? FileSource { get; set; }
+    public FileBinaryDataModel FileData { get; set; }
+    public IEnumerable<FileKnowledgeModel> FileKnowledges { get; set; } = [];
+}

src/Infrastructure/BotSharp.Abstraction/Files/Models/KnowledgeFileModel.cs renamed to src/Infrastructure/BotSharp.Abstraction/Knowledges/Models/KnowledgeFileModel.cs

@@ -1,4 +1,4 @@
-namespace BotSharp.Abstraction.Files.Models;
+namespace BotSharp.Abstraction.Knowledges.Models;
 
 public class KnowledgeFileModel
 {

src/Infrastructure/BotSharp.Abstraction/Knowledges/Options/FileKnowledgeProcessOptions.cs

@@ -0,0 +1,5 @@
+namespace BotSharp.Abstraction.Knowledges.Options;
+
+public class FileKnowledgeProcessOptions
+{
+}

src/Infrastructure/BotSharp.Abstraction/Knowledges/Options/KnowledgeDocOptions.cs

@@ -0,0 +1,6 @@
+namespace BotSharp.Abstraction.Knowledges.Options;
+
+public class KnowledgeDocOptions
+{
+    public string? Processor { get; set; }
+}

src/Infrastructure/BotSharp.Abstraction/Knowledges/Responses/FileKnowledgeResponse.cs

@@ -0,0 +1,6 @@
+namespace BotSharp.Abstraction.Knowledges.Responses;
+
+public class FileKnowledgeResponse
+{
+    public IEnumerable<FileKnowledgeModel> Knowledges { get; set; } = [];
+}

src/Infrastructure/BotSharp.Abstraction/Rules/IRuleEngine.cs

@@ -11,6 +11,6 @@ public interface IRuleEngine
     /// <param name="options"></param>
     /// <returns></returns>
     /// <exception cref="NotImplementedException"></exception>
-    Task<IEnumerable<string>> Trigger(IRuleTrigger trigger, string text, IEnumerable<MessageState>? states = null, RuleTriggerOptions? options = null)
+    Task<IEnumerable<string>> Triggered(IRuleTrigger trigger, string text, IEnumerable<MessageState>? states = null, RuleTriggerOptions? options = null)
         => throw new NotImplementedException();
 }

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

@@ -24,7 +24,7 @@ public RuleEngine(
         _logger = logger;
     }
 
-    public async Task<IEnumerable<string>> Trigger(IRuleTrigger trigger, string text, IEnumerable<MessageState>? states = null, RuleTriggerOptions? options = null)
+    public async Task<IEnumerable<string>> Triggered(IRuleTrigger trigger, string text, IEnumerable<MessageState>? states = null, RuleTriggerOptions? options = null)
     {
         var newConversationIds = new List<string>();
 

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

@@ -207,13 +207,15 @@ public async Task<bool> DeleteVectorCollectionSnapshots([FromRoute] string colle
     [HttpPost("/knowledge/document/{collection}/upload")]
     public async Task<UploadKnowledgeResponse> UploadKnowledgeDocuments([FromRoute] string collection, [FromBody] VectorKnowledgeUploadRequest request)
     {
-        var response = await _knowledgeService.UploadDocumentsToKnowledge(collection, request.Files, request.ChunkOption);
+        var response = await _knowledgeService.UploadDocumentsToKnowledge(collection, request.Files, request.Options);
         return response;
     }
 
-    [HttpPost("/knowledge/document/{collection}/form-upload")]
-    public async Task<UploadKnowledgeResponse> UploadKnowledgeDocuments([FromRoute] string collection,
-        [FromForm] IEnumerable<IFormFile> files, [FromForm] ChunkOption? option = null)
+    [HttpPost("/knowledge/document/{collection}/form")]
+    public async Task<UploadKnowledgeResponse> UploadKnowledgeDocuments(
+        [FromRoute] string collection,
+        [FromForm] IEnumerable<IFormFile> files,
+        [FromForm] KnowledgeDocOptions? options = null)
     {
         if (files.IsNullOrEmpty())
         {
@@ -231,7 +233,7 @@ public async Task<UploadKnowledgeResponse> UploadKnowledgeDocuments([FromRoute]
             });
         }
 
-        var response = await _knowledgeService.UploadDocumentsToKnowledge(collection, docs, option);
+        var response = await _knowledgeService.UploadDocumentsToKnowledge(collection, docs, options);
         return response;
     }