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

Author: Jicheng Lu

Directory.Packages.props

@@ -54,7 +54,7 @@
     <PackageVersion Include="LLamaSharp" Version="0.20.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.25114.11" />
+    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25161.3" />
     <PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
     <PackageVersion Include="MongoDB.Driver" Version="3.1.0" />
     <PackageVersion Include="Docnet.Core" Version="2.7.0-alpha.1" />

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

@@ -4,4 +4,6 @@ public class WebBrowsingSettings
 {
     public string Driver { get; set; } = "Playwright";
     public bool Headless { get; set; }
+    // Default timeout in milliseconds
+    public float DefaultTimeout { get; set; } = 30000;
 }

src/Infrastructure/BotSharp.Core.Realtime/Services/RealtimeHub.cs

@@ -233,7 +233,8 @@ private async Task HandleUserDtmfReceived()
         }
 
         await _completer.InsertConversationItem(message);
-        await _completer.TriggerModelInference("Reply based on the user input");
+        var instruction = await _completer.UpdateSession(_conn);
+        await _completer.TriggerModelInference($"{instruction}\r\n\r\nReply based on the user input: {message.Content}");
     }
 
     private async Task HandleUserDisconnected()

src/Plugins/BotSharp.Plugin.MicrosoftExtensionsAI/MicrosoftExtensionsAIChatCompletionProvider.cs

@@ -27,7 +27,6 @@ public sealed class MicrosoftExtensionsAIChatCompletionProvider : IChatCompletio
     private readonly IChatClient _client;
     private readonly ILogger<MicrosoftExtensionsAIChatCompletionProvider> _logger;
     private readonly IServiceProvider _services;
-    private List<string> renderedInstructions = [];
     private string? _model;
 
     /// <summary>
@@ -46,7 +45,7 @@ public MicrosoftExtensionsAIChatCompletionProvider(
 
     /// <inheritdoc/>
     public string Provider => "microsoft.extensions.ai";
-    public string Model => _model;
+    public string Model => _model ?? "";
 
     /// <inheritdoc/>
     public void SetModelName(string model) => _model = model;
@@ -56,7 +55,7 @@ public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDial
     {
         // Before chat completion hook
         var hooks = _services.GetServices<IContentGeneratingHook>().ToArray();
-        renderedInstructions = [];
+        List<string> renderedInstructions = [];
         await Task.WhenAll(hooks.Select(hook => hook.BeforeGenerating(agent, conversations)));
 
         // Configure options
@@ -145,13 +144,13 @@ public async Task<RoleDialogModel> GetChatCompletions(Agent agent, List<RoleDial
 
         var completion = await _client.GetResponseAsync(messages);
 
-        RoleDialogModel result = new(AgentRole.Assistant, string.Concat(completion.Message.Contents.OfType<TextContent>()))
+        RoleDialogModel result = new(AgentRole.Assistant, completion.Text)
         {
             CurrentAgentId = agent.Id,
-            RenderedInstruction = string.Join("\r\n", renderedInstructions)
+            //RenderedInstruction = renderedInstructions,
         };
 
-        if (completion.Message.Contents.OfType<FunctionCallContent>().FirstOrDefault() is { } fcc)
+        if (completion.Messages.SelectMany(m => m.Contents).OfType<FunctionCallContent>().FirstOrDefault() is { } fcc)
         {
             result.Role = AgentRole.Function;
             result.MessageId = conversations.LastOrDefault()?.MessageId ?? string.Empty;

src/Plugins/BotSharp.Plugin.MicrosoftExtensionsAI/MicrosoftExtensionsAITextCompletionProvider.cs

@@ -51,7 +51,7 @@ public async Task<string> GetCompletion(string text, string agentId, string mess
 
         _tokenStatistics.StartTimer();
         var completion = await _chatClient.GetResponseAsync(text);
-        var result = string.Concat(completion.Message.Contents.OfType<TextContent>());
+        var result = completion.Text;
         _tokenStatistics.StopTimer();
 
         // After chat completion hook

src/Plugins/BotSharp.Plugin.WebDriver/Functions/GoToPageFn.cs

@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Browsing.Settings;
+
 namespace BotSharp.Plugin.WebDriver.Functions;
 
 public class GoToPageFn : IFunctionCallback
@@ -25,15 +27,16 @@ public async Task<bool> Execute(RoleDialogModel message)
         var url = webDriverService.ReplaceToken(args.Url);
 
         url = url.Replace("https://https://", "https://");
-
+        var _webDriver = _services.GetRequiredService<WebBrowsingSettings>();
         var result = await _browser.GoToPage(new MessageInfo
         {
             AgentId = message.CurrentAgentId,
             ContextId = convService.ConversationId,
             MessageId = message.MessageId
         }, new PageActionArgs
         {
-            Url = url
+            Url = url,
+            Timeout = _webDriver.DefaultTimeout
         });
         message.Content = result.IsSuccess ? $"Page {url} is open." : $"Page {url} open failed. {result.Message}";
 

src/Plugins/BotSharp.Plugin.WebDriver/Functions/OpenBrowserFn.cs

@@ -26,7 +26,7 @@ public async Task<bool> Execute(RoleDialogModel message)
 
         var webDriverService = _services.GetRequiredService<WebDriverService>();
         var url = webDriverService.ReplaceToken(args.Url);
-
+        var _webDriver = _services.GetRequiredService<WebBrowsingSettings>();
         url = url.Replace("https://https://", "https://");
         var msgInfo = new MessageInfo
         {
@@ -40,7 +40,8 @@ public async Task<bool> Execute(RoleDialogModel message)
         });
         result = await _browser.GoToPage(msgInfo, new PageActionArgs
         {
-            Url = url
+            Url = url,
+            Timeout = _webDriver.DefaultTimeout
         });
 
         if (result.IsSuccess)

src/Plugins/BotSharp.Plugin.WebDriver/UtilFunctions/UtilWebGoToPageFn.cs

@@ -1,3 +1,5 @@
+using BotSharp.Abstraction.Browsing.Settings;
+
 namespace BotSharp.Plugin.WebDriver.UtilFunctions;
 
 public class UtilWebGoToPageFn : IFunctionCallback
@@ -21,6 +23,8 @@ public async Task<bool> Execute(RoleDialogModel message)
         {
             PropertyNamingPolicy = JsonNamingPolicy.CamelCase
         });
+        var _webDriver = _services.GetRequiredService<WebBrowsingSettings>();
+        args.Timeout = _webDriver.DefaultTimeout;
         args.WaitForNetworkIdle = false;
         args.WaitTime = 5;
         args.OpenNewTab = true;