Merge branch 'SciSharp:master' into master

Author: geffzhang

Directory.Packages.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <MSExtensionsVersion>8.0.0</MSExtensionsVersion>
-	  <AspNetCoreVersion>2.3.0</AspNetCoreVersion>
+    <AspNetCoreVersion>2.3.0</AspNetCoreVersion>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
@@ -13,7 +13,7 @@
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
-	<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.0.0" />
@@ -51,7 +51,7 @@
     <PackageVersion Include="PdfPig" Version="0.1.8" />
     <PackageVersion Include="TensorFlow.Keras" Version="0.15.0" />
     <PackageVersion Include="LangChain.Providers.Google.VertexAI" Version="0.15.3-dev.58" />
-    <PackageVersion Include="LLamaSharp" Version="0.20.0" />
+    <PackageVersion Include="LLamaSharp" Version="0.21.0" />
     <PackageVersion Include="FaissMask" Version="0.2.0" />
     <PackageVersion Include="FastText.NetWrapper" Version="1.3.0" />
     <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25161.3" />
@@ -108,7 +108,9 @@
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
   </ItemGroup>
   <ItemGroup>
+    <PackageVersion Include="BotSharp.Core" Version="$(BotSharpVersion)" />
     <PackageVersion Include="BotSharp.Logger" Version="$(BotSharpVersion)" />
+    <PackageVersion Include="BotSharp.Core.Realtime" Version="$(BotSharpVersion)" />
     <PackageVersion Include="BotSharp.OpenAPI" Version="$(BotSharpVersion)" />
     <PackageVersion Include="BotSharp.Plugin.Dashboard" Version="$(BotSharpVersion)" />
     <PackageVersion Include="BotSharp.Plugin.AzureOpenAI" Version="$(BotSharpVersion)" />
@@ -127,7 +129,6 @@
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.5" />
     <PackageVersion Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.5" />
   </ItemGroup>
-  
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.27" />
     <PackageVersion Include="AspNet.Security.OAuth.GitHub" Version="6.0.15" />

src/Infrastructure/BotSharp.Abstraction/Browsing/Models/PageActionArgs.cs

@@ -20,7 +20,7 @@ public class PageActionArgs
     public bool OpenNewTab { get; set; } = true;
     [JsonPropertyName("open_blank_page")]
     public bool OpenBlankPage { get; set; } = true;
-
+    [JsonPropertyName("enable_response_callback")]
     public bool EnableResponseCallback { get; set; } = false;
 
     /// <summary>

src/Infrastructure/BotSharp.Abstraction/Browsing/Models/WebPageResponseData.cs

@@ -7,9 +7,20 @@ public class WebPageResponseData
     public string ResponseData { get; set; } = null!;
     public bool ResponseInMemory { get; set; }
     public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
+    public string Method { get; set; }
+    public List<WebPageCookieData> Cookies { get; set; }
+    public int ResponseCode { get; set; }
 
     public override string ToString()
     {
         return $"{Url} {ResponseData.Length}";
     }
 }
+public class WebPageCookieData
+{
+    public string Name { get; set; } = null!;
+    public string Value { get; set; } = null!;
+    public string Domain { get; set; } = null!;
+    public string Path { get; set; } = null!;
+    public float Expires { get; set; }
+}

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/Infrastructures/Enums/StateConst.cs

@@ -16,4 +16,5 @@ public class StateConst
 
     public const string SUB_CONVERSATION_ID = "sub_conversation_id";
     public const string ORIGIN_CONVERSATION_ID = "origin_conversation_id";
+    public const string WEB_DRIVER_TASK_ID = "web_driver_task_id";
 }

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; }
+}