Merge pull request #1128 from iceljc/features/add-agent-function-visibility

Add agent function visibility and init web search

Author: iceljc

src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentField.cs

@@ -9,6 +9,7 @@ public enum AgentField
     Disabled,
     Type,
     RoutingMode,
+    FuncVisMode,
     InheritAgentId,
     Profile,
     Label,

src/Infrastructure/BotSharp.Abstraction/Agents/Enums/AgentFuncVisMode.cs

@@ -0,0 +1,7 @@
+namespace BotSharp.Abstraction.Agents.Enums;
+
+public class AgentFuncVisMode
+{
+    public const string Manual = "manual";
+    public const string Auto = "auto";
+}

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

@@ -29,16 +29,21 @@ public interface IAgentService
     /// <returns></returns>
     Task InheritAgent(Agent agent);
 
-    string RenderedInstruction(Agent agent);
+    string RenderInstruction(Agent agent);
 
-    string RenderedTemplate(Agent agent, string templateName);
+    string RenderTemplate(Agent agent, string templateName);
 
     bool RenderFunction(Agent agent, FunctionDef def);
 
     FunctionParametersDef? RenderFunctionProperty(Agent agent, FunctionDef def);
 
+    (string, IEnumerable<FunctionDef>) PrepareInstructionAndFunctions(Agent agent, StringComparer? comparer = null);
+    IEnumerable<FunctionDef> FilterFunctions(string instruction, Agent agent, StringComparer? comparer = null);
+    IEnumerable<FunctionDef> FilterFunctions(string instruction, IEnumerable<FunctionDef> functions, StringComparer? comparer = null);
+
     bool RenderVisibility(string? visibilityExpression, Dictionary<string, object> dict);
 
+
     /// <summary>
     /// Get agent detail without trigger any hook.
     /// </summary>

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

@@ -21,6 +21,13 @@ public class Agent
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? Mode { get; set; }
 
+    /// <summary>
+    /// Function Visibility Mode: Manual or Auto
+    /// </summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("functionVisibilityMode")]
+    public string? FuncVisMode { get; set; }
+
     public DateTime CreatedDateTime { get; set; }
     public DateTime UpdatedDateTime { get; set; }
 
@@ -296,6 +303,12 @@ public Agent SetRoutingMode(string? mode)
         return this;
     }
 
+    public Agent SetFuncVisMode(string? visMode)
+    {
+        FuncVisMode = visMode;
+        return this;
+    }
+
     public Agent SetProfiles(List<string> profiles)
     {
         Profiles = profiles ?? [];

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/ChatAnnotation.cs

@@ -0,0 +1,9 @@
+namespace BotSharp.Abstraction.Conversations.Models;
+
+public class ChatAnnotation
+{
+    public string Title { get; set; }
+    public string Url { get; set; }
+    public int StartIndex { get; set; }
+    public int EndIndex { get; set; }
+}

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/RoleDialogModel.cs

@@ -105,14 +105,21 @@ public class RoleDialogModel : ITrackableMessage
     /// <summary>
     /// Files to be used in conversation
     /// </summary>
-    public List<BotSharpFile> Files { get; set; } = new List<BotSharpFile>();
+    public List<BotSharpFile>? Files { get; set; }
 
     /// <summary>
     /// The images generated by AI
     /// </summary>
     [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     [JsonPropertyName("generated_images")]
-    public List<ImageGeneration> GeneratedImages { get; set; } = new List<ImageGeneration>();
+    public List<ImageGeneration>? GeneratedImages { get; set; }
+
+    /// <summary>
+    /// The web annotations generated by AI
+    /// </summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("annotations")]
+    public List<ChatAnnotation>? Annotations { get; set; }
 
     [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
     public string RenderedInstruction { get; set; } = string.Empty;
@@ -163,7 +170,8 @@ public static RoleDialogModel From(RoleDialogModel source,
             StopCompletion = source.StopCompletion,
             Instruction = source.Instruction,
             Data = source.Data,
-            IsStreaming = source.IsStreaming
+            IsStreaming = source.IsStreaming,
+            Annotations = source.Annotations
         };
     }
 }

src/Infrastructure/BotSharp.Abstraction/Crontab/ICrontabHook.cs

@@ -7,9 +7,7 @@ public interface ICrontabHook : IHookBase
     string[]? Triggers
         => null;
 
-    void OnAuthenticate(CrontabItem item)
-    {
-    }
+    void OnAuthenticate(CrontabItem item) { }
 
     Task OnCronTriggered(CrontabItem item)
         => Task.CompletedTask;

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

@@ -1,5 +1,4 @@
 using BotSharp.Abstraction.Graph.Models;
-using BotSharp.Abstraction.Models;
 using BotSharp.Abstraction.VectorStorage.Models;
 
 namespace BotSharp.Abstraction.Knowledges;
@@ -8,7 +7,7 @@ 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> CreateVectorCollection(string collectionName, string collectionType, VectorCollectionCreateOptions options);
     Task<bool> DeleteVectorCollection(string collectionName);
     Task<IEnumerable<VectorCollectionConfig>> GetVectorCollections(string? type = null);
     Task<VectorCollectionDetails?> GetVectorCollectionDetails(string collectionName);
@@ -44,7 +43,7 @@ public interface IKnowledgeService
     /// <param name="refData"></param>
     /// <returns></returns>
     Task<bool> ImportDocumentContentToKnowledge(string collectionName, string fileName, string fileSource, IEnumerable<string> contents,
-        DocMetaRefData? refData = null, Dictionary<string, object>? payload = null);
+        DocMetaRefData? refData = null, Dictionary<string, VectorPayloadValue>? payload = null);
     /// <summary>
     /// Delete one document and its related knowledge in the collection
     /// </summary>

src/Infrastructure/BotSharp.Abstraction/MLTasks/Settings/LlmModelSetting.cs

@@ -43,15 +43,25 @@ public class LlmModelSetting
     public bool ImageGeneration { get; set; }
 
     /// <summary>
-    /// Embedding dimension
+    /// Settings for embedding
     /// </summary>
-    public int Dimension { get; set; }
+    public EmbeddingSetting? Embedding { get; set; }
 
     /// <summary>
     /// Settings for reasoning model
     /// </summary>
     public ReasoningSetting? Reasoning { get; set; }
 
+    /// <summary>
+    /// Settings for web search
+    /// </summary>
+    public WebSearchSetting? WebSearch { get; set; }
+
+    /// <summary>
+    /// Settings for images
+    /// </summary>
+    public ImageSetting? Image { get; set; }
+
     /// <summary>
     /// Settings for llm cost
     /// </summary>
@@ -63,12 +73,57 @@ public override string ToString()
     }
 }
 
+public class EmbeddingSetting
+{
+    public int Dimension { get; set; }
+}
+
 public class ReasoningSetting
 {
     public float Temperature { get; set; } = 1.0f;
     public string? EffortLevel { get; set; }
 }
 
+public class WebSearchSetting
+{
+    public string? SearchContextSize { get; set; }
+}
+
+public class ImageSetting
+{
+    public ImageGenerationSetting? Generation { get; set; }
+    public ImageEditSetting? Edit { get; set; }
+    public ImageVariationSetting? Variation { get; set; }
+}
+
+public class ImageGenerationSetting
+{
+    public ModelSettingBase? Style { get; set; }
+    public ModelSettingBase? Size { get; set; }
+    public ModelSettingBase? Quality { get; set; }
+    public ModelSettingBase? ResponseFormat { get; set; }
+}
+
+public class ImageEditSetting
+{
+    public ModelSettingBase? Size { get; set; }
+    public ModelSettingBase? ResponseFormat { get; set; }
+}
+
+public class ImageVariationSetting
+{
+    public ModelSettingBase? Size { get; set; }
+    public ModelSettingBase? ResponseFormat { get; set; }
+}
+
+
+public class ModelSettingBase
+{
+    public string? Default { get; set; }
+    public IEnumerable<string>? Options { get; set; }
+}
+
+
 /// <summary>
 /// Cost per 1K tokens
 /// </summary>

src/Infrastructure/BotSharp.Abstraction/VectorStorage/Enums/VectorPayloadDataType.cs

@@ -0,0 +1,11 @@
+namespace BotSharp.Abstraction.VectorStorage.Enums;
+
+public enum VectorPayloadDataType
+{
+    Unknown = 0,
+    String = 1,
+    Boolean = 2,
+    Integer = 3,
+    Double = 4,
+    Datetime = 5
+}