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

---
 eng/Versions.props                                |  2 +-
 .../CausalLMPipelineChatClient.cs                 | 15 ++++++++-------
 .../Utility/IChatTemplateBuilder.cs               |  2 +-
 .../Llama3CausalLMChatClient.cs                   |  8 ++++----
 .../Llama3_1ChatTemplateBuilder.cs                |  2 +-
 .../Phi3/Phi3CausalLMChatClient.cs                |  8 ++++----
 .../Phi3/Phi3ChatTemplateBuilder.cs               |  2 +-
 7 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index f9f481e657..5c7bc08bab 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -46,7 +46,7 @@
     <MicrosoftDotNetInteractiveVersion>1.0.0-beta.24375.2</MicrosoftDotNetInteractiveVersion>
     <MicrosoftMLOnnxRuntimeVersion>1.18.1</MicrosoftMLOnnxRuntimeVersion>
     <MlNetMklDepsVersion>0.0.0.12</MlNetMklDepsVersion>
-    <MicrosoftExtensionsAIVersion>9.3.0-preview.1.25114.11</MicrosoftExtensionsAIVersion>
+    <MicrosoftExtensionsAIVersion>9.3.0-preview.1.25161.3</MicrosoftExtensionsAIVersion>
     <!-- runtime.native.System.Data.SqlClient.sni is not updated by dependency flow as it is not produced live anymore. -->
     <RuntimeNativeSystemDataSqlClientSniVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniVersion>
     <!--
diff --git a/src/Microsoft.ML.GenAI.Core/CausalLMPipelineChatClient.cs b/src/Microsoft.ML.GenAI.Core/CausalLMPipelineChatClient.cs
index 9a6c7c222b..75fa6acbfd 100644
--- a/src/Microsoft.ML.GenAI.Core/CausalLMPipelineChatClient.cs
+++ b/src/Microsoft.ML.GenAI.Core/CausalLMPipelineChatClient.cs
@@ -33,9 +33,9 @@ public CausalLMPipelineChatClient(
         _pipeline = pipeline;
     }
 
-    public virtual Task<ChatResponse> GetResponseAsync(IList<ChatMessage> chatMessages, ChatOptions? options = null, CancellationToken cancellationToken = default)
+    public virtual Task<ChatResponse> GetResponseAsync(IEnumerable<ChatMessage> messages, ChatOptions? options = null, CancellationToken cancellationToken = default)
     {
-        var prompt = _chatTemplateBuilder.BuildPrompt(chatMessages, options);
+        var prompt = _chatTemplateBuilder.BuildPrompt(messages, options);
         var stopSequences = options?.StopSequences ?? Array.Empty<string>();
 
         var output = _pipeline.Generate(
@@ -49,30 +49,31 @@ public virtual Task<ChatResponse> GetResponseAsync(IList<ChatMessage> chatMessag
         {
             CreatedAt = DateTime.UtcNow,
             FinishReason = ChatFinishReason.Stop,
+            ResponseId = Guid.NewGuid().ToString("N"),
         });
     }
 
 #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
     public virtual async IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
 #pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
-        IList<ChatMessage> chatMessages,
+        IEnumerable<ChatMessage> messages,
         ChatOptions? options = null,
         [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
-        var prompt = _chatTemplateBuilder.BuildPrompt(chatMessages, options);
+        var prompt = _chatTemplateBuilder.BuildPrompt(messages, options);
         var stopSequences = options?.StopSequences ?? Array.Empty<string>();
 
+        string responseId = Guid.NewGuid().ToString("N");
         foreach (var output in _pipeline.GenerateStreaming(
             prompt,
             maxLen: options?.MaxOutputTokens ?? 1024,
             temperature: options?.Temperature ?? 0.7f,
             stopSequences: stopSequences.ToArray()))
         {
-            yield return new ChatResponseUpdate
+            yield return new(ChatRole.Assistant, output)
             {
-                Role = ChatRole.Assistant,
-                Text = output,
                 CreatedAt = DateTime.UtcNow,
+                ResponseId = responseId,
             };
         }
     }
diff --git a/src/Microsoft.ML.GenAI.Core/Utility/IChatTemplateBuilder.cs b/src/Microsoft.ML.GenAI.Core/Utility/IChatTemplateBuilder.cs
index a0433f02a1..ac7f6e210d 100644
--- a/src/Microsoft.ML.GenAI.Core/Utility/IChatTemplateBuilder.cs
+++ b/src/Microsoft.ML.GenAI.Core/Utility/IChatTemplateBuilder.cs
@@ -32,7 +32,7 @@ public interface IMEAIChatTemplateBuilder
     /// <param name="options"></param>
     /// <param name="appendAssistantTag">true if append assistant tag at the end of prompt.</param>
     /// <returns></returns>
-    string BuildPrompt(IList<ChatMessage> messages, ChatOptions? options = null, bool appendAssistantTag = true);
+    string BuildPrompt(IEnumerable<ChatMessage> messages, ChatOptions? options = null, bool appendAssistantTag = true);
 }
 
 public interface IChatTemplateBuilder : IAutoGenChatTemplateBuilder, ISemanticKernelChatTemplateBuilder
diff --git a/src/Microsoft.ML.GenAI.LLaMA/Llama3CausalLMChatClient.cs b/src/Microsoft.ML.GenAI.LLaMA/Llama3CausalLMChatClient.cs
index cc275e7686..e454834618 100644
--- a/src/Microsoft.ML.GenAI.LLaMA/Llama3CausalLMChatClient.cs
+++ b/src/Microsoft.ML.GenAI.LLaMA/Llama3CausalLMChatClient.cs
@@ -25,7 +25,7 @@ public Llama3CausalLMChatClient(
     }
 
     public override Task<ChatResponse> GetResponseAsync(
-        IList<ChatMessage> chatMessages,
+        IEnumerable<ChatMessage> messages,
         ChatOptions? options = null,
         CancellationToken cancellationToken = default)
     {
@@ -40,11 +40,11 @@ public override Task<ChatResponse> GetResponseAsync(
             options.StopSequences = new List<string> { _eotToken };
         }
 
-        return base.GetResponseAsync(chatMessages, options, cancellationToken);
+        return base.GetResponseAsync(messages, options, cancellationToken);
     }
 
     public override IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
-        IList<ChatMessage> chatMessages,
+        IEnumerable<ChatMessage> messages,
         ChatOptions? options = null,
         CancellationToken cancellationToken = default)
     {
@@ -52,6 +52,6 @@ public override IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
         options.StopSequences ??= [];
         options.StopSequences.Add(_eotToken);
 
-        return base.GetStreamingResponseAsync(chatMessages, options, cancellationToken);
+        return base.GetStreamingResponseAsync(messages, options, cancellationToken);
     }
 }
diff --git a/src/Microsoft.ML.GenAI.LLaMA/Llama3_1ChatTemplateBuilder.cs b/src/Microsoft.ML.GenAI.LLaMA/Llama3_1ChatTemplateBuilder.cs
index 2dd4a1b725..f8e50262db 100644
--- a/src/Microsoft.ML.GenAI.LLaMA/Llama3_1ChatTemplateBuilder.cs
+++ b/src/Microsoft.ML.GenAI.LLaMA/Llama3_1ChatTemplateBuilder.cs
@@ -88,7 +88,7 @@ public string BuildPrompt(ChatHistory chatHistory)
         return sb.ToString();
     }
 
-    public string BuildPrompt(IList<ChatMessage> messages, ChatOptions? options = null, bool appendAssistantTag = true)
+    public string BuildPrompt(IEnumerable<ChatMessage> messages, ChatOptions? options = null, bool appendAssistantTag = true)
     {
         var availableRoles = new[] { ChatRole.System, ChatRole.User, ChatRole.Assistant };
         if (messages.Any(m => m.Text is null))
diff --git a/src/Microsoft.ML.GenAI.Phi/Phi3/Phi3CausalLMChatClient.cs b/src/Microsoft.ML.GenAI.Phi/Phi3/Phi3CausalLMChatClient.cs
index d63823ea51..a1de8c25d3 100644
--- a/src/Microsoft.ML.GenAI.Phi/Phi3/Phi3CausalLMChatClient.cs
+++ b/src/Microsoft.ML.GenAI.Phi/Phi3/Phi3CausalLMChatClient.cs
@@ -30,7 +30,7 @@ public Phi3CausalLMChatClient(
     }
 
     public override Task<ChatResponse> GetResponseAsync(
-        IList<ChatMessage> chatMessages,
+        IEnumerable<ChatMessage> messages,
         ChatOptions? options = null,
         CancellationToken cancellationToken = default)
     {
@@ -45,11 +45,11 @@ public override Task<ChatResponse> GetResponseAsync(
             options.StopSequences = [_eotToken];
         }
 
-        return base.GetResponseAsync(chatMessages, options, cancellationToken);
+        return base.GetResponseAsync(messages, options, cancellationToken);
     }
 
     public override IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
-        IList<ChatMessage> chatMessages,
+        IEnumerable<ChatMessage> messages,
         ChatOptions? options = null,
         CancellationToken cancellationToken = default)
     {
@@ -57,6 +57,6 @@ public override IAsyncEnumerable<ChatResponseUpdate> GetStreamingResponseAsync(
         options.StopSequences ??= [];
         options.StopSequences.Add(_eotToken);
 
-        return base.GetStreamingResponseAsync(chatMessages, options, cancellationToken);
+        return base.GetStreamingResponseAsync(messages, options, cancellationToken);
     }
 }
diff --git a/src/Microsoft.ML.GenAI.Phi/Phi3/Phi3ChatTemplateBuilder.cs b/src/Microsoft.ML.GenAI.Phi/Phi3/Phi3ChatTemplateBuilder.cs
index 9c4f887d75..862cf2547d 100644
--- a/src/Microsoft.ML.GenAI.Phi/Phi3/Phi3ChatTemplateBuilder.cs
+++ b/src/Microsoft.ML.GenAI.Phi/Phi3/Phi3ChatTemplateBuilder.cs
@@ -89,7 +89,7 @@ public string BuildPrompt(ChatHistory chatHistory)
         return sb.ToString();
     }
 
-    public string BuildPrompt(IList<ChatMessage> messages, ChatOptions? options = null, bool appendAssistantTag = true)
+    public string BuildPrompt(IEnumerable<ChatMessage> messages, ChatOptions? options = null, bool appendAssistantTag = true)
     {
         var availableRoles = new[] { ChatRole.System, ChatRole.User, ChatRole.Assistant };
         if (messages.Any(m => m.Text is null))