From 23baf7008868c9118a50be4e95f8256fafc1a0ed Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Tue, 11 Mar 2025 16:48:44 -0400
Subject: [PATCH] Update to M.E.AI 9.3.0-preview.1.25161.3

---
 Directory.Packages.props                              |  2 +-
 .../MicrosoftExtensionsAIChatCompletionProvider.cs    | 11 +++++------
 .../MicrosoftExtensionsAITextCompletionProvider.cs    |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4683fc9df..aa76cf61b 100644
--- a/Directory.Packages.props
+++ b/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" />
diff --git a/src/Plugins/BotSharp.Plugin.MicrosoftExtensionsAI/MicrosoftExtensionsAIChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.MicrosoftExtensionsAI/MicrosoftExtensionsAIChatCompletionProvider.cs
index 37d3877c8..6ee777727 100644
--- a/src/Plugins/BotSharp.Plugin.MicrosoftExtensionsAI/MicrosoftExtensionsAIChatCompletionProvider.cs
+++ b/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;
diff --git a/src/Plugins/BotSharp.Plugin.MicrosoftExtensionsAI/MicrosoftExtensionsAITextCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.MicrosoftExtensionsAI/MicrosoftExtensionsAITextCompletionProvider.cs
index ed0e94d92..ef3b35c71 100644
--- a/src/Plugins/BotSharp.Plugin.MicrosoftExtensionsAI/MicrosoftExtensionsAITextCompletionProvider.cs
+++ b/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