Merge branch 'master' of https://github.com/SciSharp/BotSharp into features/local-test-pgt

Author: iceljc

src/Infrastructure/BotSharp.Abstraction/Agents/IAgentService.cs

@@ -53,7 +53,8 @@ public interface IAgentService
     /// <param name="id"></param>
     /// <returns>Original agent information</returns>
     Task<Agent> GetAgent(string id);
-    
+    Task<AgentTemplate?> GetAgentTemplateDetail(string agentId, string templateName);
+
     Task<bool> DeleteAgent(string id, AgentDeleteOptions? options = null);
     Task UpdateAgent(Agent agent, AgentField updateField);
 

src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentLlmConfig.cs

@@ -2,6 +2,16 @@ namespace BotSharp.Abstraction.Agents.Models;
 
 public class AgentLlmConfig
 {
+    public AgentLlmConfig() { }
+
+    public AgentLlmConfig(AgentTemplateLlmConfig templateLlmConfig) 
+    {
+        Provider = templateLlmConfig.Provider;
+        Model = templateLlmConfig.Model;
+        MaxOutputTokens = templateLlmConfig.MaxOutputTokens;
+        ReasoningEffortLevel = templateLlmConfig.ReasoningEffortLevel;
+    }
+
     /// <summary>
     /// Is inherited from default Agent Settings
     /// </summary>
@@ -72,6 +82,6 @@ public class LlmAudioTranscriptionConfig : LlmProviderModel
 {
 }
 
-public class LlmRealtimeConfig : LlmProviderModel
+public class LlmRealtimeConfig : LlmConfigBase
 {
 }

src/Infrastructure/BotSharp.Abstraction/Agents/Models/AgentTemplate.cs

@@ -1,9 +1,8 @@
 namespace BotSharp.Abstraction.Agents.Models;
 
-public class AgentTemplate
+public class AgentTemplate : AgentTemplateConfig
 {
-    public string Name { get; set; }
-    public string Content { get; set; }
+    public string Content { get; set; } = string.Empty;
 
     public AgentTemplate()
     {
@@ -20,3 +19,23 @@ public override string ToString()
         return Name;
     }
 }
+
+public class AgentTemplateConfig
+{
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Response format: json, xml, markdown, yaml, etc.
+    /// </summary>
+    [JsonPropertyName("response_format")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? ResponseFormat { get; set; }
+
+    [JsonPropertyName("llm_config")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public AgentTemplateLlmConfig? LlmConfig { get; set; }
+}
+
+public class AgentTemplateLlmConfig : LlmConfigBase
+{
+}

src/Infrastructure/BotSharp.Abstraction/Entity/Models/EntityAnalysisOptions.cs

@@ -7,7 +7,7 @@ public class EntityAnalysisOptions
     /// </summary>
     [JsonPropertyName("data_providers")]
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-    public List<string>? DataProviders { get; set; }
+    public IEnumerable<string>? DataProviders { get; set; }
 
     /// <summary>
     /// Maximum n-gram size

src/Infrastructure/BotSharp.Abstraction/Files/IFileStorageService.cs

@@ -62,17 +62,9 @@ public interface IFileStorageService
     #endregion
 
     #region Knowledge
-    bool SaveKnowledgeBaseFile(string collectionName, string vectorStoreProvider, Guid fileId, string fileName, BinaryData fileData);
-
-    /// <summary>
-    /// Delete files in a knowledge collection, given the vector store provider. If "fileId" is null, delete all files in the collection.
-    /// </summary>
-    /// <param name="collectionName"></param>
-    /// <param name="vectorStoreProvider"></param>
-    /// <param name="fileId"></param>
-    /// <returns></returns>
-    bool DeleteKnowledgeFile(string collectionName, string vectorStoreProvider, Guid? fileId = null);
-    string GetKnowledgeBaseFileUrl(string collectionName, string vectorStoreProvider, Guid fileId, string fileName);
-    BinaryData GetKnowledgeBaseFileBinaryData(string collectionName, string vectorStoreProvider, Guid fileId, string fileName);
+    bool SaveKnowledgeBaseFile(string collectionName, string knowledgebaseProvider, Guid fileId, string fileName, BinaryData fileData);
+    bool DeleteKnowledgeFile(string collectionName, string knowledgebaseProvider, Guid? fileId = null);
+    string GetKnowledgeBaseFileUrl(string collectionName, string knowledgebaseProvider, Guid fileId, string fileName);
+    BinaryData GetKnowledgeBaseFileBinaryData(string collectionName, string knowledgebaseProvider, Guid fileId, string fileName);
     #endregion
 }

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

@@ -65,6 +65,19 @@ public static BinaryData BuildBinaryDataFromFile(IFormFile file)
 
     public static string GetFileContentType(string fileName)
     {
+        if (string.IsNullOrEmpty(fileName))
+        {
+            return string.Empty;
+        }
+
+        // For URLs (e.g. signed S3/CloudFront URLs with query strings), extract the path portion
+        // so that FileExtensionContentTypeProvider can correctly resolve the extension.
+        if (Uri.TryCreate(fileName, UriKind.Absolute, out var uri)
+            && (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps))
+        {
+            fileName = uri.AbsolutePath;
+        }
+
         string contentType;
         var provider = new FileExtensionContentTypeProvider();
         if (!provider.TryGetContentType(fileName, out contentType))

src/Infrastructure/BotSharp.Abstraction/Graph/IGraphKnowledgeService.cs

@@ -1,7 +1,9 @@
 namespace BotSharp.Abstraction.Knowledges.Enums;
 
-public static class KnowledgeCollectionType
+public static class KnowledgeBaseType
 {
     public static string QuestionAnswer = "question-answer";
     public static string Document = "document";
+    public static string Taxonomy = "taxonomy";
+    public static string SemanticGraph = "semantic-graph";
 }

…wledges/Enums/KnowledgeCollectionType.cs …on/Knowledges/Enums/KnowledgeBaseType.cssrc/Infrastructure/BotSharp.Abstraction/Knowledges/Enums/KnowledgeCollectionType.cs renamed to src/Infrastructure/BotSharp.Abstraction/Knowledges/Enums/KnowledgeBaseType.cs src/Infrastructure/BotSharp.Abstraction/Knowledges/Enums/KnowledgeCollectionType.cs renamed to src/Infrastructure/BotSharp.Abstraction/Knowledges/Enums/KnowledgeBaseType.cs

@@ -2,12 +2,10 @@ namespace BotSharp.Abstraction.Knowledges.Filters;
 
 public class KnowledgeFileFilter : Pagination
 {
+    public string? DbProvider { get; set; }
     public IEnumerable<Guid>? FileIds { get; set; }
-
     public IEnumerable<string>? FileNames { get; set; }
-
     public IEnumerable<string>? ContentTypes { get; set; }
-
     public IEnumerable<string>? FileSources { get; set; }
 
     public KnowledgeFileFilter()

src/Infrastructure/BotSharp.Abstraction/Knowledges/Filters/KnowledgeFileFilter.cs

@@ -0,0 +1,65 @@
+using BotSharp.Abstraction.Knowledges.Filters;
+using BotSharp.Abstraction.Knowledges.Responses;
+
+namespace BotSharp.Abstraction.Knowledges;
+
+public interface IKnowledgeFileOrchestrator
+{
+    string Provider { get; }
+
+    /// <summary>
+    /// Save files and their contents to knowledgebase
+    /// </summary>
+    /// <param name="collectionName"></param>
+    /// <param name="files"></param>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    Task<UploadKnowledgeResponse> UploadFilesToKnowledge(string collectionName,
+        IEnumerable<ExternalFileModel> files, KnowledgeFileHandleOptions? options = null);
+
+    /// <summary>
+    /// Import file content to knowledgebase without saving the file
+    /// </summary>
+    /// <param name="collectionName"></param>
+    /// <param name="fileName"></param>
+    /// <param name="fileSource"></param>
+    /// <param name="contents"></param>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    Task<bool> ImportFileContentToKnowledge(string collectionName, string fileName, string fileSource,
+        IEnumerable<string> contents, ImportKnowledgeFileOptions? options = null);
+
+    /// <summary>
+    /// Delete one file and its related knowledge in the collection
+    /// </summary>
+    /// <param name="collectionName"></param>
+    /// <param name="fileId"></param>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    Task<bool> DeleteKnowledgeFile(string collectionName, Guid fileId, KnowledgeFileOptions? options = null);
+    
+    /// <summary>
+    /// Delete all files and their related knowledge in the collection
+    /// </summary>
+    /// <param name="collectionName"></param>
+    /// <param name="filter"></param>
+    /// <returns></returns>
+    Task<bool> DeleteKnowledgeFiles(string collectionName, KnowledgeFileFilter filter);
+
+    /// <summary>
+    /// Get knowledge files by pagination
+    /// </summary>
+    /// <param name="collectionName"></param>
+    /// <param name="filter"></param>
+    /// <returns></returns>
+    Task<PagedItems<KnowledgeFileModel>> GetPagedKnowledgeFiles(string collectionName, KnowledgeFileFilter filter);
+
+    /// <summary>
+    /// Get knowledge file binary data
+    /// </summary>
+    /// <param name="collectionName"></param>
+    /// <param name="fileId"></param>
+    /// <param name="options"></param>
+    /// <returns></returns>
+    Task<FileBinaryDataModel> GetKnowledgeFileBinaryData(string collectionName, Guid fileId, KnowledgeFileOptions? options = null);
+}