.Net: Update Microsoft.Extensions.AI to 9.4.0-preview (#11491)

rogerbarreto · web-flow · commit de7ef3d97b22 · 2025-04-10T16:35:50.000Z
### Motivation and Context

Upgrade for latest version of MEAI 9.4.0
diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props
@@ -65,7 +65,7 @@
     <PackageVersion Include="MSTest.TestFramework" Version="3.8.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Npgsql" Version="8.0.6" />
-    <PackageVersion Include="OllamaSharp" Version="5.1.7" />
+    <PackageVersion Include="OllamaSharp" Version="5.1.12" />
     <PackageVersion Include="OpenAI" Version="[2.2.0-beta.4]" />
     <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
@@ -91,10 +91,10 @@
     <PackageVersion Include="Microsoft.DeepDev.TokenizerLib" Version="1.3.3" />
     <PackageVersion Include="SharpToken" Version="2.0.3" />
     <!-- Microsoft.Extensions.* -->
-    <PackageVersion Include="Microsoft.Extensions.AI" Version="9.3.0-preview.1.25161.3" />
-    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25161.3" />
-    <PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="9.3.0-preview.1.25161.3" />
-    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.3.0-preview.1.25161.3" />
+    <PackageVersion Include="Microsoft.Extensions.AI" Version="9.4.0-preview.1.25207.5" />
+    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.4.0-preview.1.25207.5" />
+    <PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="9.4.0-preview.1.25207.5" />
+    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.4.0-preview.1.25207.5" />
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
diff --git a/dotnet/samples/Concepts/ChatCompletion/AzureAIInference_ChatCompletion.cs b/dotnet/samples/Concepts/ChatCompletion/AzureAIInference_ChatCompletion.cs
@@ -25,7 +25,7 @@ public async Task ServicePromptAsync()
         var chatService = new ChatCompletionsClient(
                 endpoint: new Uri(TestConfiguration.AzureAIInference.Endpoint),
                 credential: new Azure.AzureKeyCredential(TestConfiguration.AzureAIInference.ApiKey))
-            .AsChatClient(TestConfiguration.AzureAIInference.ChatModelId)
+            .AsIChatClient(TestConfiguration.AzureAIInference.ChatModelId)
             .AsChatCompletionService();
 
         Console.WriteLine("Chat content:");
diff --git a/dotnet/samples/Concepts/ChatCompletion/AzureAIInference_ChatCompletionStreaming.cs b/dotnet/samples/Concepts/ChatCompletion/AzureAIInference_ChatCompletionStreaming.cs
@@ -26,7 +26,7 @@ public Task StreamChatAsync()
         var chatService = new ChatCompletionsClient(
                 endpoint: new Uri(TestConfiguration.AzureAIInference.Endpoint),
                 credential: new Azure.AzureKeyCredential(TestConfiguration.AzureAIInference.ApiKey!))
-            .AsChatClient(TestConfiguration.AzureAIInference.ChatModelId)
+            .AsIChatClient(TestConfiguration.AzureAIInference.ChatModelId)
             .AsChatCompletionService();
 
         return this.StartStreamingChatAsync(chatService);
@@ -76,7 +76,7 @@ public async Task StreamTextFromChatAsync()
         var chatService = new ChatCompletionsClient(
                 endpoint: new Uri(TestConfiguration.AzureAIInference.Endpoint),
                 credential: new Azure.AzureKeyCredential(TestConfiguration.AzureAIInference.ApiKey!))
-            .AsChatClient(TestConfiguration.AzureAIInference.ChatModelId)
+            .AsIChatClient(TestConfiguration.AzureAIInference.ChatModelId)
             .AsChatCompletionService();
 
         // Create chat history with initial system and user messages
diff --git a/dotnet/samples/Concepts/ChatCompletion/HybridCompletion_Fallback.cs b/dotnet/samples/Concepts/ChatCompletion/HybridCompletion_Fallback.cs
@@ -104,7 +104,7 @@ private static IChatClient CreateUnavailableOpenAIChatClient()
             )
         };
 
-        IChatClient openAiClient = new AzureOpenAIClient(new Uri(TestConfiguration.AzureOpenAI.Endpoint), new AzureCliCredential(), options).AsChatClient(TestConfiguration.AzureOpenAI.ChatDeploymentName);
+        IChatClient openAiClient = new AzureOpenAIClient(new Uri(TestConfiguration.AzureOpenAI.Endpoint), new AzureCliCredential(), options).GetChatClient(TestConfiguration.AzureOpenAI.ChatDeploymentName).AsIChatClient();
 
         return new ChatClientBuilder(openAiClient)
             .UseFunctionInvocation()
@@ -113,7 +113,7 @@ private static IChatClient CreateUnavailableOpenAIChatClient()
 
     private static IChatClient CreateAzureOpenAIChatClient()
     {
-        IChatClient chatClient = new AzureOpenAIClient(new Uri(TestConfiguration.AzureOpenAI.Endpoint), new AzureCliCredential()).AsChatClient(TestConfiguration.AzureOpenAI.ChatDeploymentName);
+        IChatClient chatClient = new AzureOpenAIClient(new Uri(TestConfiguration.AzureOpenAI.Endpoint), new AzureCliCredential()).GetChatClient(TestConfiguration.AzureOpenAI.ChatDeploymentName).AsIChatClient();
 
         return new ChatClientBuilder(chatClient)
             .UseFunctionInvocation()
diff --git a/dotnet/src/Connectors/Connectors.AzureAIInference.UnitTests/Extensions/AzureAIInferenceServiceCollectionExtensionsTests.cs b/dotnet/src/Connectors/Connectors.AzureAIInference.UnitTests/Extensions/AzureAIInferenceServiceCollectionExtensionsTests.cs
@@ -3,7 +3,6 @@
 using System;
 using Azure;
 using Azure.AI.Inference;
-using Microsoft.Extensions.AI;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.SemanticKernel;
 using Microsoft.SemanticKernel.ChatCompletion;
@@ -18,13 +17,11 @@ public sealed class AzureAIInferenceServiceCollectionExtensionsTests
     [Theory]
     [InlineData(InitializationType.ApiKey)]
     [InlineData(InitializationType.ClientInline)]
-    [InlineData(InitializationType.ChatClientInline)]
     [InlineData(InitializationType.ClientInServiceProvider)]
     public void ItCanAddChatCompletionService(InitializationType type)
     {
         // Arrange
         var client = new ChatCompletionsClient(this._endpoint, new AzureKeyCredential("key"));
-        using var chatClient = new AzureAIInferenceChatClient(client, "model-id");
         var builder = Kernel.CreateBuilder();
 
         builder.Services.AddSingleton(client);
@@ -34,7 +31,6 @@ public void ItCanAddChatCompletionService(InitializationType type)
         {
             InitializationType.ApiKey => builder.Services.AddAzureAIInferenceChatCompletion("modelId", "api-key", this._endpoint),
             InitializationType.ClientInline => builder.Services.AddAzureAIInferenceChatCompletion("modelId", client),
-            InitializationType.ChatClientInline => builder.Services.AddAzureAIInferenceChatCompletion(chatClient),
             InitializationType.ClientInServiceProvider => builder.Services.AddAzureAIInferenceChatCompletion("modelId", chatClient: null),
             _ => builder.Services
         };
diff --git a/dotnet/src/Connectors/Connectors.AzureAIInference/Extensions/AzureAIInferenceServiceCollectionExtensions.cs b/dotnet/src/Connectors/Connectors.AzureAIInference/Extensions/AzureAIInferenceServiceCollectionExtensions.cs
@@ -50,7 +50,7 @@ public static IServiceCollection AddAzureAIInferenceChatCompletion(
             var loggerFactory = serviceProvider.GetService<ILoggerFactory>();
 
             var builder = new Azure.AI.Inference.ChatCompletionsClient(endpoint, new Azure.AzureKeyCredential(apiKey ?? SingleSpace), options)
-                .AsChatClient(modelId)
+                .AsIChatClient(modelId)
                 .AsBuilder()
                 .UseFunctionInvocation(loggerFactory, f => f.MaximumIterationsPerRequest = MaxInflightAutoInvokes);
 
@@ -96,7 +96,7 @@ public static IServiceCollection AddAzureAIInferenceChatCompletion(
             var loggerFactory = serviceProvider.GetService<ILoggerFactory>();
 
             var builder = new Azure.AI.Inference.ChatCompletionsClient(endpoint, credential, options)
-                .AsChatClient(modelId)
+                .AsIChatClient(modelId)
                 .AsBuilder()
                 .UseFunctionInvocation(loggerFactory, f => f.MaximumIterationsPerRequest = MaxInflightAutoInvokes);
 
@@ -131,39 +131,7 @@ public static IServiceCollection AddAzureAIInferenceChatCompletion(this IService
             var loggerFactory = serviceProvider.GetService<ILoggerFactory>();
 
             var builder = chatClient
-                .AsChatClient(modelId)
-                .AsBuilder()
-                .UseFunctionInvocation(loggerFactory, f => f.MaximumIterationsPerRequest = MaxInflightAutoInvokes);
-
-            if (loggerFactory is not null)
-            {
-                builder.UseLogging(loggerFactory);
-            }
-
-            return builder.Build(serviceProvider).AsChatCompletionService(serviceProvider);
-        });
-    }
-
-    /// <summary>
-    /// Adds an Azure AI Inference <see cref="IChatCompletionService"/> to the <see cref="IServiceCollection"/>.
-    /// </summary>
-    /// <param name="services">The <see cref="IServiceCollection"/> instance to augment.</param>
-    /// <param name="chatClient"><see cref="AzureAIInferenceChatClient"/> to use for the service. If null, one must be available in the service provider when this service is resolved.</param>
-    /// <param name="serviceId">A local identifier for the given AI service</param>
-    /// <returns>The same instance as <paramref name="services"/>.</returns>
-    public static IServiceCollection AddAzureAIInferenceChatCompletion(this IServiceCollection services,
-        AzureAIInferenceChatClient? chatClient = null,
-        string? serviceId = null)
-    {
-        Verify.NotNull(services);
-
-        return services.AddKeyedSingleton<IChatCompletionService>(serviceId, (serviceProvider, _) =>
-        {
-            chatClient ??= serviceProvider.GetRequiredService<AzureAIInferenceChatClient>();
-
-            var loggerFactory = serviceProvider.GetService<ILoggerFactory>();
-
-            var builder = chatClient
+                .AsIChatClient(modelId)
                 .AsBuilder()
                 .UseFunctionInvocation(loggerFactory, f => f.MaximumIterationsPerRequest = MaxInflightAutoInvokes);
 
diff --git a/dotnet/src/Connectors/Connectors.AzureAIInference/Services/AzureAIInferenceChatCompletionService.cs b/dotnet/src/Connectors/Connectors.AzureAIInference/Services/AzureAIInferenceChatCompletionService.cs
@@ -41,7 +41,7 @@ public AzureAIInferenceChatCompletionService(
         this._core = new ChatClientCore(modelId, apiKey, endpoint, httpClient);
 
         var builder = this._core.Client
-            .AsChatClient(modelId)
+            .AsIChatClient(modelId)
             .AsBuilder()
             .UseFunctionInvocation(loggerFactory, f => f.MaximumIterationsPerRequest = MaxInflightAutoInvokes);
 
@@ -71,7 +71,7 @@ public AzureAIInferenceChatCompletionService(
         this._core = new ChatClientCore(modelId, credential, endpoint, httpClient);
 
         var builder = this._core.Client
-            .AsChatClient(modelId)
+            .AsIChatClient(modelId)
             .AsBuilder()
             .UseFunctionInvocation(loggerFactory, f => f.MaximumIterationsPerRequest = MaxInflightAutoInvokes);
 
@@ -99,7 +99,7 @@ public AzureAIInferenceChatCompletionService(
         this._core = new ChatClientCore(modelId, chatClient);
 
         var builder = chatClient
-            .AsChatClient(modelId)
+            .AsIChatClient(modelId)
             .AsBuilder()
             .UseFunctionInvocation(loggerFactory, f => f.MaximumIterationsPerRequest = MaxInflightAutoInvokes);
 
diff --git a/dotnet/src/InternalUtilities/src/Schema/KernelJsonSchemaBuilder.cs b/dotnet/src/InternalUtilities/src/Schema/KernelJsonSchemaBuilder.cs
@@ -49,7 +49,9 @@ public static KernelJsonSchema Build(
         AIJsonSchemaCreateOptions? configuration = null)
     {
         configuration ??= s_schemaOptions;
-        JsonElement schemaDocument = AIJsonUtilities.CreateJsonSchema(type, description, serializerOptions: options, inferenceOptions: configuration);
+        // To be compatible with the previous behavior of MEAI 9.3.0 (when description is empty, should not be included in the schema)
+        string? schemaDescription = string.IsNullOrEmpty(description) ? null : description;
+        JsonElement schemaDocument = AIJsonUtilities.CreateJsonSchema(type, schemaDescription, serializerOptions: options, inferenceOptions: configuration);
         switch (schemaDocument.ValueKind)
         {
             case JsonValueKind.False:
diff --git a/dotnet/src/SemanticKernel.Abstractions/AI/ChatCompletion/AIFunctionKernelFunction.cs b/dotnet/src/SemanticKernel.Abstractions/AI/ChatCompletion/AIFunctionKernelFunction.cs
@@ -48,14 +48,14 @@ public override KernelFunction Clone(string pluginName)
     protected override async ValueTask<FunctionResult> InvokeCoreAsync(
         Kernel kernel, KernelArguments arguments, CancellationToken cancellationToken)
     {
-        object? result = await this._aiFunction.InvokeAsync(arguments, cancellationToken).ConfigureAwait(false);
+        object? result = await this._aiFunction.InvokeAsync(new(arguments), cancellationToken).ConfigureAwait(false);
         return new FunctionResult(this, result);
     }
 
     protected override async IAsyncEnumerable<TResult> InvokeStreamingCoreAsync<TResult>(
         Kernel kernel, KernelArguments arguments, [EnumeratorCancellation] CancellationToken cancellationToken)
     {
-        object? result = await this._aiFunction.InvokeAsync(arguments, cancellationToken).ConfigureAwait(false);
+        object? result = await this._aiFunction.InvokeAsync(new(arguments), cancellationToken).ConfigureAwait(false);
         yield return (TResult)result!;
     }
 
@@ -65,7 +65,6 @@ private static IReadOnlyList<KernelParameterMetadata> MapParameterMetadata(AIFun
         {
             return Array.Empty<KernelParameterMetadata>();
         }
-
         HashSet<string>? requiredParameters = GetRequiredParameterNames(aiFunction.JsonSchema);
 
         List<KernelParameterMetadata> kernelParams = [];
diff --git a/dotnet/src/SemanticKernel.Abstractions/AI/ChatCompletion/ChatClientChatCompletionService.cs b/dotnet/src/SemanticKernel.Abstractions/AI/ChatCompletion/ChatClientChatCompletionService.cs
@@ -39,9 +39,9 @@ public ChatClientChatCompletionService(IChatClient chatClient, IServiceProvider?
         {
             attrs[AIServiceExtensions.EndpointKey] = metadata.ProviderUri.ToString();
         }
-        if (metadata?.ModelId is not null)
+        if (metadata?.DefaultModelId is not null)
         {
-            attrs[AIServiceExtensions.ModelIdKey] = metadata.ModelId;
+            attrs[AIServiceExtensions.ModelIdKey] = metadata.DefaultModelId;
         }
     }
 
diff --git a/dotnet/src/SemanticKernel.Abstractions/AI/Embeddings/EmbeddingGenerationServiceExtensions.cs b/dotnet/src/SemanticKernel.Abstractions/AI/Embeddings/EmbeddingGenerationServiceExtensions.cs
@@ -177,9 +177,9 @@ public EmbeddingGeneratorEmbeddingGenerationService(
             {
                 attrs[AIServiceExtensions.EndpointKey] = metadata.ProviderUri.ToString();
             }
-            if (metadata?.ModelId is not null)
+            if (metadata?.DefaultModelId is not null)
             {
-                attrs[AIServiceExtensions.ModelIdKey] = metadata.ModelId;
+                attrs[AIServiceExtensions.ModelIdKey] = metadata.DefaultModelId;
             }
         }
 
diff --git a/dotnet/src/SemanticKernel.Abstractions/Functions/KernelFunction.cs b/dotnet/src/SemanticKernel.Abstractions/Functions/KernelFunction.cs
@@ -548,8 +548,7 @@ public KernelAIFunction(KernelFunction kernelFunction, Kernel? kernel)
         public override string Description => this._kernelFunction.Description;
         public override JsonSerializerOptions JsonSerializerOptions => this._kernelFunction.JsonSerializerOptions ?? base.JsonSerializerOptions;
 
-        protected override async Task<object?> InvokeCoreAsync(
-            IEnumerable<KeyValuePair<string, object?>> arguments, CancellationToken cancellationToken)
+        protected override async ValueTask<object?> InvokeCoreAsync(AIFunctionArguments? arguments = null, CancellationToken cancellationToken = default)
         {
             Verify.NotNull(arguments);
 
diff --git a/dotnet/src/SemanticKernel.UnitTests/AI/ChatCompletion/AIFunctionKernelFunctionTests.cs b/dotnet/src/SemanticKernel.UnitTests/AI/ChatCompletion/AIFunctionKernelFunctionTests.cs
@@ -14,7 +14,8 @@ public class AIFunctionKernelFunctionTests
     public void ShouldAssignIsRequiredParameterMetadataPropertyCorrectly()
     {
         // Arrange and Act
-        AIFunction aiFunction = AIFunctionFactory.Create((string p1, int? p2 = null) => p1);
+        AIFunction aiFunction = AIFunctionFactory.Create((string p1, int? p2 = null) => p1,
+            new AIFunctionFactoryOptions { JsonSchemaCreateOptions = new AIJsonSchemaCreateOptions { RequireAllProperties = false } });
 
         AIFunctionKernelFunction sut = new(aiFunction);
 
diff --git a/dotnet/src/SemanticKernel.UnitTests/AI/ServiceConversionExtensionsTests.cs b/dotnet/src/SemanticKernel.UnitTests/AI/ServiceConversionExtensionsTests.cs
@@ -43,7 +43,7 @@ public void AsEmbeddingGeneratorMetadataReturnsExpectedData()
         Assert.NotNull(generator);
         var metadata = Assert.IsType<EmbeddingGeneratorMetadata>(generator.GetService(typeof(EmbeddingGeneratorMetadata)));
         Assert.Equal(nameof(TestEmbeddingGenerationService), metadata.ProviderName);
-        Assert.Equal("examplemodel", metadata.ModelId);
+        Assert.Equal("examplemodel", metadata.DefaultModelId);
         Assert.Equal("https://example.com/", metadata.ProviderUri?.ToString());
     }
 
@@ -77,7 +77,7 @@ public void AsChatClientMetadataReturnsExpectedData()
         Assert.NotNull(client);
         var metadata = Assert.IsType<ChatClientMetadata>(client.GetService(typeof(ChatClientMetadata)));
         Assert.Equal(nameof(TestChatCompletionService), metadata.ProviderName);
-        Assert.Equal("examplemodel", metadata.ModelId);
+        Assert.Equal("examplemodel", metadata.DefaultModelId);
         Assert.Equal("https://example.com/", metadata.ProviderUri?.ToString());
     }
 
@@ -349,9 +349,9 @@ .. KernelPluginFactory.CreateFromFunctions("NiftyPlugin",
     private sealed class NopAIFunction(string name) : AIFunction
     {
         public override string Name => name;
-        protected override Task<object?> InvokeCoreAsync(IEnumerable<KeyValuePair<string, object?>> arguments, CancellationToken cancellationToken)
+        protected override ValueTask<object?> InvokeCoreAsync(AIFunctionArguments? arguments = null, CancellationToken cancellationToken = default)
         {
-            return Task.FromResult<object?>(null);
+            return ValueTask.FromResult<object?>(null);
         }
     }
 
diff --git a/dotnet/src/SemanticKernel.UnitTests/Functions/AIFunctionExtensionsTests.cs b/dotnet/src/SemanticKernel.UnitTests/Functions/AIFunctionExtensionsTests.cs
@@ -1,6 +1,5 @@
 ﻿// Copyright (c) Microsoft. All rights reserved.
 
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.AI;
@@ -28,9 +27,9 @@ private sealed class TestAIFunction(string name) : AIFunction
     {
         public override string Name => name;
 
-        protected override Task<object?> InvokeCoreAsync(IEnumerable<KeyValuePair<string, object?>> arguments, CancellationToken cancellationToken)
+        protected override ValueTask<object?> InvokeCoreAsync(AIFunctionArguments? arguments = null, CancellationToken cancellationToken = default)
         {
-            return Task.FromResult<object?>(null);
+            return ValueTask.FromResult<object?>(null);
         }
     }
 }
diff --git a/dotnet/src/SemanticKernel.UnitTests/Functions/KernelFunctionFromMethodTests1.cs b/dotnet/src/SemanticKernel.UnitTests/Functions/KernelFunctionFromMethodTests1.cs
@@ -910,7 +910,7 @@ public async Task ItSupportsJsonElementArgumentsImplicitConversionAsync()
         functionName: "Test");
 
         await function.InvokeAsync(this._kernel, arguments);
-        await function.AsAIFunction().InvokeAsync(arguments);
+        await function.AsAIFunction().InvokeAsync(new(arguments));
     }
 
     [Fact]
@@ -940,7 +940,7 @@ public async Task ItSupportsStringJsonElementArgumentsImplicitConversionAsync()
         functionName: "Test");
 
         await function.InvokeAsync(this._kernel, arguments);
-        await function.AsAIFunction().InvokeAsync(arguments);
+        await function.AsAIFunction().InvokeAsync(new(arguments));
     }
 
     [Fact]
diff --git a/dotnet/src/SemanticKernel.UnitTests/Functions/KernelPluginTests.cs b/dotnet/src/SemanticKernel.UnitTests/Functions/KernelPluginTests.cs
@@ -225,12 +225,12 @@ public async Task ItCanProduceAIFunctionsThatInvokeKernelFunctions(bool withKern
         using CancellationTokenSource cts = new();
 
         JsonElement return1 = Assert.IsType<JsonElement>(await funcs[0].InvokeAsync(
-            [KeyValuePair.Create("arg1", (object?)"value1")],
+            new(new Dictionary<string, object?>([KeyValuePair.Create("arg1", (object?)"value1")])),
             cts.Token));
         Assert.Equal("Return1", return1.ToString());
 
         JsonElement return2 = Assert.IsType<JsonElement>(await funcs[1].InvokeAsync(
-            [KeyValuePair.Create("arg2", (object?)42), KeyValuePair.Create("arg3", (object?)84.0)],
+            new(new Dictionary<string, object?>([KeyValuePair.Create("arg2", (object?)42), KeyValuePair.Create("arg3", (object?)84.0)])),
             cts.Token));
         Assert.Equal("Return2", return2.ToString());
 

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ private static IChatClient CreateUnavailableOpenAIChatClient()`
`104`	`104`	`)`
`105`	`105`	`};`
`106`	`106`
`107`		`- IChatClient openAiClient = new AzureOpenAIClient(new Uri(TestConfiguration.AzureOpenAI.Endpoint), new AzureCliCredential(), options).AsChatClient(TestConfiguration.AzureOpenAI.ChatDeploymentName);`
	`107`	`+ IChatClient openAiClient = new AzureOpenAIClient(new Uri(TestConfiguration.AzureOpenAI.Endpoint), new AzureCliCredential(), options).GetChatClient(TestConfiguration.AzureOpenAI.ChatDeploymentName).AsIChatClient();`
`108`	`108`
`109`	`109`	`return new ChatClientBuilder(openAiClient)`
`110`	`110`	`.UseFunctionInvocation()`
`@@ -113,7 +113,7 @@ private static IChatClient CreateUnavailableOpenAIChatClient()`
`113`	`113`
`114`	`114`	`private static IChatClient CreateAzureOpenAIChatClient()`
`115`	`115`	`{`
`116`		`- IChatClient chatClient = new AzureOpenAIClient(new Uri(TestConfiguration.AzureOpenAI.Endpoint), new AzureCliCredential()).AsChatClient(TestConfiguration.AzureOpenAI.ChatDeploymentName);`
	`116`	`+ IChatClient chatClient = new AzureOpenAIClient(new Uri(TestConfiguration.AzureOpenAI.Endpoint), new AzureCliCredential()).GetChatClient(TestConfiguration.AzureOpenAI.ChatDeploymentName).AsIChatClient();`
`117`	`117`
`118`	`118`	`return new ChatClientBuilder(chatClient)`
`119`	`119`	`.UseFunctionInvocation()`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,9 @@ public static KernelJsonSchema Build(`
`49`	`49`	`AIJsonSchemaCreateOptions? configuration = null)`
`50`	`50`	`{`
`51`	`51`	`configuration ??= s_schemaOptions;`
`52`		`- JsonElement schemaDocument = AIJsonUtilities.CreateJsonSchema(type, description, serializerOptions: options, inferenceOptions: configuration);`
	`52`	`+ // To be compatible with the previous behavior of MEAI 9.3.0 (when description is empty, should not be included in the schema)`
	`53`	`+ string? schemaDescription = string.IsNullOrEmpty(description) ? null : description;`
	`54`	`+ JsonElement schemaDocument = AIJsonUtilities.CreateJsonSchema(type, schemaDescription, serializerOptions: options, inferenceOptions: configuration);`
`53`	`55`	`switch (schemaDocument.ValueKind)`
`54`	`56`	`{`
`55`	`57`	`case JsonValueKind.False:`
Original file line number	Diff line number	Diff line change
`@@ -48,14 +48,14 @@ public override KernelFunction Clone(string pluginName)`
`48`	`48`	`protected override async ValueTask<FunctionResult> InvokeCoreAsync(`
`49`	`49`	`Kernel kernel, KernelArguments arguments, CancellationToken cancellationToken)`
`50`	`50`	`{`
`51`		`- object? result = await this._aiFunction.InvokeAsync(arguments, cancellationToken).ConfigureAwait(false);`
	`51`	`+ object? result = await this._aiFunction.InvokeAsync(new(arguments), cancellationToken).ConfigureAwait(false);`
`52`	`52`	`return new FunctionResult(this, result);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`protected override async IAsyncEnumerable<TResult> InvokeStreamingCoreAsync<TResult>(`
`56`	`56`	`Kernel kernel, KernelArguments arguments, [EnumeratorCancellation] CancellationToken cancellationToken)`
`57`	`57`	`{`
`58`		`- object? result = await this._aiFunction.InvokeAsync(arguments, cancellationToken).ConfigureAwait(false);`
	`58`	`+ object? result = await this._aiFunction.InvokeAsync(new(arguments), cancellationToken).ConfigureAwait(false);`
`59`	`59`	`yield return (TResult)result!;`
`60`	`60`	`}`
`61`	`61`
`@@ -65,7 +65,6 @@ private static IReadOnlyList<KernelParameterMetadata> MapParameterMetadata(AIFun`
`65`	`65`	`{`
`66`	`66`	`return Array.Empty<KernelParameterMetadata>();`
`67`	`67`	`}`
`68`		`-`
`69`	`68`	`HashSet<string>? requiredParameters = GetRequiredParameterNames(aiFunction.JsonSchema);`
`70`	`69`
`71`	`70`	`List<KernelParameterMetadata> kernelParams = [];`
Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,9 @@ public ChatClientChatCompletionService(IChatClient chatClient, IServiceProvider?`
`39`	`39`	`{`
`40`	`40`	`attrs[AIServiceExtensions.EndpointKey] = metadata.ProviderUri.ToString();`
`41`	`41`	`}`
`42`		`- if (metadata?.ModelId is not null)`
	`42`	`+ if (metadata?.DefaultModelId is not null)`
`43`	`43`	`{`
`44`		`- attrs[AIServiceExtensions.ModelIdKey] = metadata.ModelId;`
	`44`	`+ attrs[AIServiceExtensions.ModelIdKey] = metadata.DefaultModelId;`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`