Merge branch 'master' of https://github.com/hchen2020/BotSharp

Author: Haiping Chen

src/Infrastructure/BotSharp.Abstraction/Browsing/Settings/WebBrowsingSettings.cs

@@ -6,6 +6,7 @@ public class WebBrowsingSettings
     public bool Headless { get; set; }
     // Default timeout in milliseconds
     public float DefaultTimeout { get; set; } = 30000;
+    public float DefaultNavigationTimeout { get; set; } = 30000;
     public bool IsEnableScreenshot { get; set; }
     // Default wait time in seconds after page is opened
     public int DefaultWaitTime { get; set; } = 5;

src/Infrastructure/BotSharp.Abstraction/Conversations/IConversationService.cs

@@ -9,7 +9,7 @@ public interface IConversationService
     string ConversationId { get; }
     Task<Conversation> NewConversation(Conversation conversation);
     void SetConversationId(string conversationId, List<MessageState> states, bool isReadOnly = false);
-    Task<Conversation> GetConversation(string id);
+    Task<Conversation> GetConversation(string id, bool isLoadStates = false);
     Task<PagedItems<Conversation>> GetConversations(ConversationFilter filter);
     Task<Conversation> UpdateConversationTitle(string id, string title);
     Task<Conversation> UpdateConversationTitleAlias(string id, string titleAlias);

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

@@ -6,6 +6,7 @@ public class TokenStatsModel
     public string Model { get; set; }
     public string Prompt { get; set; }
     public int PromptCount { get; set; }
+    public int CachedPromptCount { get; set; }
     public int CompletionCount { get; set; }
     public AgentLlmConfig LlmConfig { get; set; }
 }

src/Infrastructure/BotSharp.Abstraction/Functions/Models/FunctionDef.cs

@@ -25,6 +25,10 @@ public class FunctionDef
     [JsonPropertyName("parameters")]
     public FunctionParametersDef Parameters { get; set; } = new FunctionParametersDef();
 
+    [JsonPropertyName("output")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Output { get; set; }
+
     public override string ToString()
     {
         return $"{Name}: {Description}";

src/Infrastructure/BotSharp.Abstraction/Instructs/InstructHookBase.cs

@@ -8,16 +8,16 @@ public class InstructHookBase : IInstructHook
 
     public virtual async Task BeforeCompletion(Agent agent, RoleDialogModel message)
     {
-        return;
+        await Task.CompletedTask;
     }
 
     public virtual async Task AfterCompletion(Agent agent, InstructResult result)
     {
-        return;
+        await Task.CompletedTask;
     }
 
     public virtual async Task OnResponseGenerated(InstructResponseModel response)
     {
-        return;
+        await Task.CompletedTask;
     }
 }

src/Infrastructure/BotSharp.Abstraction/Instructs/Models/ExecuteTemplateArgs.cs

@@ -0,0 +1,7 @@
+namespace BotSharp.Abstraction.Instructs.Models;
+
+public class ExecuteTemplateArgs
+{
+    [JsonPropertyName("template_name")]
+    public string? TemplateName { get; set; }
+}

src/Infrastructure/BotSharp.Abstraction/Instructs/Settings/InstructionSettings.cs

@@ -2,5 +2,11 @@ namespace BotSharp.Abstraction.Instructs.Settings;
 
 public class InstructionSettings
 {
-    public bool EnableLog { get; set; }
+    public InstructionLogSetting Logging { get; set; } = new();
 }
+
+public class InstructionLogSetting
+{
+    public bool Enabled { get; set; } = true;
+    public List<string> ExcludedAgentIds { get; set; } = [];
+}

src/Infrastructure/BotSharp.Abstraction/Loggers/Models/InstructionLogModel.cs

@@ -5,6 +5,7 @@ namespace BotSharp.Abstraction.Loggers.Models;
 public class InstructionLogModel
 {
     [JsonPropertyName("id")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string Id { get; set; } = default!;
 
     [JsonPropertyName("agent_id")]

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

@@ -62,12 +62,22 @@ public class LlmModelSetting
     /// </summary>
     public int Dimension { get; set; }
 
+    public LlmCost AdditionalCost { get; set; } = new();
+
     public override string ToString()
     {
         return $"[{Type}] {Name} {Endpoint}";
     }
 }
 
+public class LlmCost
+{
+    public float CachedPromptCost { get; set; } = 0f;
+    public float AudioPromptCost { get; set; } = 0f;
+    public float ReasoningCompletionCost { get; } = 0f;
+    public float AudioCompletionCost { get; } = 0f;
+}
+
 public enum LlmModelType
 {
     Text = 1,

src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/ConversationFilter.cs

@@ -27,6 +27,8 @@ public class ConversationFilter
 
     public List<string>? Tags { get; set; }
 
+    public bool IsLoadLatestStates { get; set; }
+
     public static ConversationFilter Empty()
     {
         return new ConversationFilter();