Merge remote-tracking branch 'upstream/main' into conversationid

Author: stephentoub

src/Libraries/Microsoft.Extensions.AI.Abstractions/CHANGELOG.md

@@ -2,8 +2,15 @@
 
 ## NOT YET RELEASED
 
+- Updated `AIFunctionFactory` to respect `[DisplayName(...)]` on functions as a way to override the function name.
+- Updated `AIFunctionFactory` to respect `[DefaultValue(...)]` on function parameters as a way to specify default values.
+
+## 9.10.1
+
 - Updated `HostedMcpServerTool` to allow for non-`Uri` server addresses, in order to enable built-in names.
 - Updated `HostedMcpServerTool` to replace the header collection with an `AuthorizationToken` property.
+- Fixed `ToChatResponse{Async}` to not discard `TextReasoningContent.ProtectedData` when coalescing messages.
+- Fixed `AIFunctionFactory.Create` to special-case return types of `AIContent` and `IEnumerable<AIContent>` to not automatically JSON serialize them.
 
 ## 9.10.0
 

src/Libraries/Microsoft.Extensions.AI.Abstractions/Contents/UserInputRequestContent.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Text.Json.Serialization;
 using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.Extensions.AI;
@@ -11,6 +12,9 @@ namespace Microsoft.Extensions.AI;
 /// Represents a request for user input.
 /// </summary>
 [Experimental("MEAI001")]
+[JsonPolymorphic(TypeDiscriminatorPropertyName = "$type")]
+[JsonDerivedType(typeof(FunctionApprovalRequestContent), "functionApprovalRequest")]
+[JsonDerivedType(typeof(McpServerToolApprovalRequestContent), "mcpServerToolApprovalRequest")]
 public class UserInputRequestContent : AIContent
 {
     /// <summary>

src/Libraries/Microsoft.Extensions.AI.Abstractions/Contents/UserInputResponseContent.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Text.Json.Serialization;
 using Microsoft.Shared.Diagnostics;
 
 namespace Microsoft.Extensions.AI;
@@ -11,6 +12,9 @@ namespace Microsoft.Extensions.AI;
 /// Represents the response to a request for user input.
 /// </summary>
 [Experimental("MEAI001")]
+[JsonPolymorphic(TypeDiscriminatorPropertyName = "$type")]
+[JsonDerivedType(typeof(FunctionApprovalResponseContent), "functionApprovalResponse")]
+[JsonDerivedType(typeof(McpServerToolApprovalResponseContent), "mcpServerToolApprovalResponse")]
 public class UserInputResponseContent : AIContent
 {
     /// <summary>

src/Libraries/Microsoft.Extensions.AI.Abstractions/Utilities/AIJsonUtilities.Defaults.cs

@@ -121,6 +121,8 @@ private static JsonSerializerOptions CreateDefaultOptions()
 
     // Temporary workaround: These should be implicitly added in once they're no longer [Experimental]
     // and are included via [JsonDerivedType] on AIContent.
+    [JsonSerializable(typeof(UserInputRequestContent))]
+    [JsonSerializable(typeof(UserInputResponseContent))]
     [JsonSerializable(typeof(FunctionApprovalRequestContent))]
     [JsonSerializable(typeof(FunctionApprovalResponseContent))]
     [JsonSerializable(typeof(McpServerToolCallContent))]

src/Libraries/Microsoft.Extensions.AI.AzureAIInference/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History
 
+## 9.10.1-preview.1.25521.4
+
+- No changes.
+
 ## 9.10.0-preview.1.25513.3
 
 - Updated to accommodate the additions in `Microsoft.Extensions.AI.Abstractions`.

src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/TypeScript/package-lock.json

@@ -1,8 +1,9 @@
 # Release History
 
-## NOT YET RELEASED
+## 9.10.1-preview.1.25521.4
 
-- Updated `IChatClient` for Responses API to support connectors with `HostedMcpServerTool`.
+- Updated the `IChatClient` for the OpenAI Responses API to support connectors with `HostedMcpServerTool`.
+- Fixed the `IChatClient` for the OpenAI Responses API to roundtrip a `ResponseItem` stored in an `AIContent` in a `ChatRole.User` message.
 - Updated to accommodate the additions in `Microsoft.Extensions.AI.Abstractions`.
 
 ## 9.10.0-preview.1.25513.3

src/Libraries/Microsoft.Extensions.AI.OpenAI/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Release History
 
-## NOT YET RELEASED
+## 9.10.1
+
+- Added an `[Experimental]` implementation of tool reduction component for constraining the set of tools exposed.
+- Fixed `SummarizingChatReducer` to preserve function calling content in the chat history.
 
 ## 9.10.0
 

src/Libraries/Microsoft.Extensions.AI/CHANGELOG.md

@@ -239,6 +239,7 @@ internal static string SerializeChatMessages(
                     message.Role == ChatRole.Tool ? "tool" :
                     message.Role == ChatRole.System || message.Role == new ChatRole("developer") ? "system" :
                     "user",
+                Name = message.AuthorName,
             };
 
             foreach (AIContent content in message.Contents)
@@ -595,6 +596,7 @@ private void AddOutputMessagesTags(ChatResponse response, Activity? activity)
     private sealed class OtelMessage
     {
         public string? Role { get; set; }
+        public string? Name { get; set; }
         public List<object> Parts { get; set; } = [];
         public string? FinishReason { get; set; }
     }

src/Libraries/Microsoft.Extensions.AI/ChatCompletion/OpenTelemetryChatClient.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using System.Net;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.ServiceDiscovery.Internal;
@@ -34,4 +35,52 @@ public static ServiceEndpoint Create(EndPoint endPoint, IFeatureCollection? feat
 
         return new ServiceEndpointImpl(endPoint, features);
     }
+
+    /// <summary>
+    /// Tries to convert a specified string representation to its <see cref="ServiceEndpoint"/> equivalent,
+    /// and returns a value that indicates whether the conversion succeeded.
+    /// </summary>
+    /// <param name="value">A string that consists of an IP address or hostname, optionally followed by a colon and port number, or a URI.</param>
+    /// <param name="serviceEndpoint">When this method returns, contains the equivalent <see cref="ServiceEndpoint"/> if the conversion succeeded; otherwise,
+    /// <see langword="null"/>. This parameter is passed uninitialized; any value originally supplied will be overwritten.</param>
+    /// <returns><see langword="true"/> if the string was successfully parsed into a <see cref="ServiceEndpoint"/>; otherwise, <see langword="false"/>.</returns>
+    public static bool TryParse([NotNullWhen(true)] string? value,
+        [NotNullWhen(true)] out ServiceEndpoint? serviceEndpoint)
+    {
+        EndPoint? endPoint = TryParseEndPoint(value);
+
+        if (endPoint != null)
+        {
+            serviceEndpoint = Create(endPoint);
+            return true;
+        }
+        else
+        {
+            serviceEndpoint = null;
+            return false;
+        }
+    }
+
+    private static EndPoint? TryParseEndPoint(string? value)
+    {
+        if (!string.IsNullOrWhiteSpace(value))
+        {
+#pragma warning disable CS8602
+            if (value.IndexOf("://", StringComparison.Ordinal) < 0 && Uri.TryCreate($"fakescheme://{value}", default, out var uri))
+#pragma warning restore CS8602
+            {
+                var port = uri.Port > 0 ? uri.Port : 0;
+                return IPAddress.TryParse(uri.Host, out var ip)
+                    ? new IPEndPoint(ip, port)
+                    : new DnsEndPoint(uri.Host, port);
+            }
+
+            if (Uri.TryCreate(value, default, out uri))
+            {
+                return new UriEndPoint(uri);
+            }
+        }
+
+        return null;
+    }
 }