.Net: OpenAI V2 & Assistants V2 - GA

.github/_typos.toml

@@ -16,6 +16,7 @@ extend-exclude = [
     "test_code_tokenizer.py",
     "*response.json",
     "test_content.txt",
+    "serializedChatHistoryV1_15_1.json"
 ]
 
 [default.extend-words]

.github/workflows/dotnet-build-and-test.yml

@@ -126,7 +126,7 @@ jobs:
           reports: "./TestResults/Coverage/**/coverage.cobertura.xml"
           targetdir: "./TestResults/Reports"
           reporttypes: "JsonSummary"
-          assemblyfilters: "+Microsoft.SemanticKernel.Abstractions;+Microsoft.SemanticKernel.Core;+Microsoft.SemanticKernel.PromptTemplates.Handlebars;+Microsoft.SemanticKernel.Connectors.OpenAI;+Microsoft.SemanticKernel.Yaml;+Microsoft.SemanticKernel.Agents.Abstractions;+Microsoft.SemanticKernel.Agents.Core;+Microsoft.SemanticKernel.Agents.OpenAI"
+          assemblyfilters: "+Microsoft.SemanticKernel.Abstractions;+Microsoft.SemanticKernel.Core;+Microsoft.SemanticKernel.PromptTemplates.Handlebars;+Microsoft.SemanticKernel.Connectors.OpenAI;+Microsoft.SemanticKernel.Connectors.AzureOpenAI;+Microsoft.SemanticKernel.Yaml;+Microsoft.SemanticKernel.Agents.Abstractions;+Microsoft.SemanticKernel.Agents.Core;+Microsoft.SemanticKernel.Agents.OpenAI"
 
       - name: Check coverage
         shell: pwsh

dotnet/Directory.Build.props

@@ -11,6 +11,11 @@
     <ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- In "main" branch this flag should be always "false". -->
+    <IsReleaseCandidate>false</IsReleaseCandidate>
+  </PropertyGroup>
+
   <PropertyGroup>
     <!-- Disable NuGet packaging by default. Projects can override. -->
     <IsPackable>disable</IsPackable>
@@ -30,4 +35,4 @@
       <_Parameter1>false</_Parameter1>
     </AssemblyAttribute>
   </ItemGroup>
-</Project>
+</Project>

dotnet/Directory.Packages.props

@@ -5,9 +5,10 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
+    <PackageVersion Include="OpenAI" Version="2.0.0-beta.10" />
+    <PackageVersion Include="System.ClientModel" Version="1.1.0-beta.7" />
     <PackageVersion Include="Azure.AI.ContentSafety" Version="1.0.0" />
-    <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
-    <PackageVersion Include="Azure.AI.OpenAI.Assistants" Version="1.0.0-beta.4" />
+    <PackageVersion Include="Azure.AI.OpenAI" Version="2.0.0-beta.4" />
     <PackageVersion Include="Azure.Identity" Version="1.12.0" />
     <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
     <PackageVersion Include="Azure.Search.Documents" Version="11.6.0" />

dotnet/SK-dotnet.sln

@@ -326,6 +326,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIModelRouter", "samples\De
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Connectors.AzureCosmosDBNoSQL.UnitTests", "src\Connectors\Connectors.AzureCosmosDBNoSQL.UnitTests\Connectors.AzureCosmosDBNoSQL.UnitTests.csproj", "{385A8FE5-87E2-4458-AE09-35E10BD2E67F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Connectors.OpenAI.UnitTests", "src\Connectors\Connectors.OpenAI.UnitTests\Connectors.OpenAI.UnitTests.csproj", "{36DDC119-C030-407E-AC51-A877E9E0F660}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Connectors.AzureOpenAI", "src\Connectors\Connectors.AzureOpenAI\Connectors.AzureOpenAI.csproj", "{7AAD7388-307D-41FB-B80A-EF9E3A4E31F0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Connectors.AzureOpenAI.UnitTests", "src\Connectors\Connectors.AzureOpenAI.UnitTests\Connectors.AzureOpenAI.UnitTests.csproj", "{8CF06B22-50F3-4F71-A002-622DB49DF0F5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -819,6 +825,24 @@ Global
 		{385A8FE5-87E2-4458-AE09-35E10BD2E67F}.Publish|Any CPU.Build.0 = Debug|Any CPU
 		{385A8FE5-87E2-4458-AE09-35E10BD2E67F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{385A8FE5-87E2-4458-AE09-35E10BD2E67F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36DDC119-C030-407E-AC51-A877E9E0F660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36DDC119-C030-407E-AC51-A877E9E0F660}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36DDC119-C030-407E-AC51-A877E9E0F660}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
+		{36DDC119-C030-407E-AC51-A877E9E0F660}.Publish|Any CPU.Build.0 = Debug|Any CPU
+		{36DDC119-C030-407E-AC51-A877E9E0F660}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36DDC119-C030-407E-AC51-A877E9E0F660}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AAD7388-307D-41FB-B80A-EF9E3A4E31F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AAD7388-307D-41FB-B80A-EF9E3A4E31F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AAD7388-307D-41FB-B80A-EF9E3A4E31F0}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
+		{7AAD7388-307D-41FB-B80A-EF9E3A4E31F0}.Publish|Any CPU.Build.0 = Publish|Any CPU
+		{7AAD7388-307D-41FB-B80A-EF9E3A4E31F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AAD7388-307D-41FB-B80A-EF9E3A4E31F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CF06B22-50F3-4F71-A002-622DB49DF0F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CF06B22-50F3-4F71-A002-622DB49DF0F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CF06B22-50F3-4F71-A002-622DB49DF0F5}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CF06B22-50F3-4F71-A002-622DB49DF0F5}.Publish|Any CPU.Build.0 = Debug|Any CPU
+		{8CF06B22-50F3-4F71-A002-622DB49DF0F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CF06B22-50F3-4F71-A002-622DB49DF0F5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -931,6 +955,9 @@ Global
 		{2918478E-BC86-4D53-9D01-9C318F80C14F} = {0247C2C9-86C3-45BA-8873-28B0948EDC0C}
 		{E06818E3-00A5-41AC-97ED-9491070CDEA1} = {5D4C0700-BBB5-418F-A7B2-F392B9A18263}
 		{385A8FE5-87E2-4458-AE09-35E10BD2E67F} = {0247C2C9-86C3-45BA-8873-28B0948EDC0C}
+		{36DDC119-C030-407E-AC51-A877E9E0F660} = {1B4CBDE0-10C2-4E7D-9CD0-FE7586C96ED1}
+		{7AAD7388-307D-41FB-B80A-EF9E3A4E31F0} = {1B4CBDE0-10C2-4E7D-9CD0-FE7586C96ED1}
+		{8CF06B22-50F3-4F71-A002-622DB49DF0F5} = {1B4CBDE0-10C2-4E7D-9CD0-FE7586C96ED1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBDC56A3-86AD-4323-AA0F-201E59123B83}

dotnet/docs/OPENAI-CONNECTOR-MIGRATION.md

@@ -0,0 +1,196 @@
+# OpenAI Connector Migration Guide
+
+This manual prepares you for the migration of your OpenAI Connector to the new OpenAI Connector. The new OpenAI Connector is a complete rewrite of the existing OpenAI Connector and is designed to be more efficient, reliable, and scalable. This manual will guide you through the migration process and help you understand the changes that have been made to the OpenAI Connector.
+
+## 1. Package Setup when Using Azure
+
+If you are working with Azure and or OpenAI public APIs, you will need to change the package from `Microsoft.SemanticKernel.Connectors.OpenAI` to `Microsoft.SemanticKernel.Connectors.AzureOpenAI`,
+
+> [!IMPORTANT]
+> The `Microsoft.SemanticKernel.Connectors.AzureOpenAI` package depends on the `Microsoft.SemanticKernel.Connectors.OpenAI` package so there's no need to add both to your project when using `OpenAI` related types.
+
+```diff
+- // Before
+- using Microsoft.SemanticKernel.Connectors.OpenAI;
++ After
++ using Microsoft.SemanticKernel.Connectors.AzureOpenAI;
+```
+
+### 1.1 AzureOpenAIClient
+
+When using Azure with OpenAI, before where you were using `OpenAIClient` you will need to update your code to use the new `AzureOpenAIClient` type.
+
+### 1.2 Services
+
+All services below now belong to the `Microsoft.SemanticKernel.Connectors.AzureOpenAI` namespace.
+
+- `AzureOpenAIAudioToTextService`
+- `AzureOpenAIChatCompletionService`
+- `AzureOpenAITextEmbeddingGenerationService`
+- `AzureOpenAITextToAudioService`
+- `AzureOpenAITextToImageService`
+
+## 2. Text Generation Deprecated
+
+The latest `OpenAI` SDK does not support text generation modality, when migrating to their underlying SDK we had to drop the support and removed `TextGeneration` specific services but the existing `ChatCompletion` ones still supports (implements `ITextGenerationService`).
+
+If you were using any of the `OpenAITextGenerationService` or `AzureOpenAITextGenerationService` you will need to update your code to target a chat completion model instead, using `OpenAIChatCompletionService` or `AzureOpenAIChatCompletionService` instead.
+
+> [!NOTE]
+> OpenAI and AzureOpenAI `ChatCompletion` services also implement the `ITextGenerationService` interface and that may not require any changes to your code if you were targeting the `ITextGenerationService` interface.
+
+tags:
+`OpenAITextGenerationService`,`AzureOpenAITextGenerationService`,
+`AddOpenAITextGeneration`,`AddAzureOpenAITextGeneration`
+
+## 3. ChatCompletion Multiple Choices Deprecated
+
+The latest `OpenAI` SDK does not support multiple choices, when migrating to their underlying SDK we had to drop the support and removed `ResultsPerPrompt` also from the `OpenAIPromptExecutionSettings`.
+
+tags: `ResultsPerPrompt`,`results_per_prompt`
+
+## 4. OpenAI File Service Deprecation
+
+The `OpenAIFileService` was deprecated in the latest version of the OpenAI Connector. We strongly recommend to update your code to use the new `OpenAIClient.GetFileClient()` for file management operations.
+
+## 5. SemanticKernel MetaPackage
+
+To be retro compatible with the new OpenAI and AzureOpenAI Connectors, our `Microsoft.SemanticKernel` meta package changed its dependency to use the new `Microsoft.SemanticKernel.Connectors.AzureOpenAI` package that depends on the `Microsoft.SemanticKernel.Connectors.OpenAI` package. This way if you are using the metapackage, no change is needed to get access to `Azure` related types.
+
+## 6. Contents
+
+### 6.1 OpenAIChatMessageContent
+
+- The `Tools` property type has changed from `IReadOnlyList<ChatCompletionsToolCall>` to `IReadOnlyList<ChatToolCall>`.
+
+- Inner content type has changed from `ChatCompletionsFunctionToolCall` to `ChatToolCall`.
+
+- Metadata type `FunctionToolCalls` has changed from `IEnumerable<ChatCompletionsFunctionToolCall>` to `IEnumerable<ChatToolCall>`.
+
+### 6.2 OpenAIStreamingChatMessageContent
+
+- The `FinishReason` property type has changed from `CompletionsFinishReason` to `FinishReason`.
+- The `ToolCallUpdate` property has been renamed to `ToolCallUpdates` and its type has changed from `StreamingToolCallUpdate?` to `IReadOnlyList<StreamingToolCallUpdate>?`.
+- The `AuthorName` property is not initialized because it's not provided by the underlying library anymore.
+
+## 6.3 Metrics for AzureOpenAI Connector
+
+The meter `s_meter = new("Microsoft.SemanticKernel.Connectors.OpenAI");` and the relevant counters still have old names that contain "openai" in them, such as:
+
+- `semantic_kernel.connectors.openai.tokens.prompt`
+- `semantic_kernel.connectors.openai.tokens.completion`
+- `semantic_kernel.connectors.openai.tokens.total`
+
+## 7. Using Azure with your data (Data Sources)
+
+With the new `AzureOpenAIClient`, you can now specify your datasource thru the options and that requires a small change in your code to the new type.
+
+Before
+
+```csharp
+var promptExecutionSettings = new OpenAIPromptExecutionSettings
+{
+    AzureChatExtensionsOptions = new AzureChatExtensionsOptions
+    {
+        Extensions = [ new AzureSearchChatExtensionConfiguration
+        {
+            SearchEndpoint = new Uri(TestConfiguration.AzureAISearch.Endpoint),
+            Authentication = new OnYourDataApiKeyAuthenticationOptions(TestConfiguration.AzureAISearch.ApiKey),
+            IndexName = TestConfiguration.AzureAISearch.IndexName
+        }]
+    };
+};
+```
+
+After
+
+```csharp
+var promptExecutionSettings = new AzureOpenAIPromptExecutionSettings
+{
+    AzureChatDataSource = new AzureSearchChatDataSource
+    {
+         Endpoint = new Uri(TestConfiguration.AzureAISearch.Endpoint),
+         Authentication = DataSourceAuthentication.FromApiKey(TestConfiguration.AzureAISearch.ApiKey),
+         IndexName = TestConfiguration.AzureAISearch.IndexName
+    }
+};
+```
+
+## 8. Breaking glass scenarios
+
+Breaking glass scenarios are scenarios where you may need to update your code to use the new OpenAI Connector. Below are some of the breaking changes that you may need to be aware of.
+
+#### 8.1 KernelContent Metadata
+
+Some of the keys in the content metadata dictionary have changed, you will need to update your code to when using the previous key names.
+
+- `Created` -> `CreatedAt`
+
+#### 8.2 Prompt Filter Results
+
+The `PromptFilterResults` metadata type has changed from `IReadOnlyList<ContentFilterResultsForPrompt>` to `ContentFilterResultForPrompt`.
+
+#### 8.3 Content Filter Results
+
+The `ContentFilterResultsForPrompt` type has changed from `ContentFilterResultsForChoice` to `ContentFilterResultForResponse`.
+
+#### 8.4 Finish Reason
+
+The FinishReason metadata string value has changed from `stop` to `Stop`
+
+#### 8.5 Tool Calls
+
+The ToolCalls metadata string value has changed from `tool_calls` to `ToolCalls`
+
+#### 8.6 LogProbs / Log Probability Info
+
+The `LogProbabilityInfo` type has changed from `ChatChoiceLogProbabilityInfo` to `IReadOnlyList<ChatTokenLogProbabilityInfo>`.
+
+#### 8.7 Finish Details, Index, and Enhancements
+
+All of above have been removed.
+
+#### 8.8 Token Usage
+
+The Token usage naming convention from `OpenAI` changed from `Completion`, `Prompt` tokens to `Output` and `Input` respectively. You will need to update your code to use the new naming.
+
+The type also changed from `CompletionsUsage` to `ChatTokenUsage`.
+
+[Example of Token Usage Metadata Changes](https://github.com/microsoft/semantic-kernel/pull/7151/files#diff-a323107b9f8dc8559a83e50080c6e34551ddf6d9d770197a473f249589e8fb47)
+
+```diff
+- Before
+- var usage = FunctionResult.Metadata?["Usage"] as CompletionsUsage;
+- var completionTokesn = usage?.CompletionTokens ?? 0;
+- var promptTokens = usage?.PromptTokens ?? 0;
+
++ After
++ var usage = FunctionResult.Metadata?["Usage"] as ChatTokenUsage;
++ var promptTokens = usage?.InputTokens ?? 0;
++ var completionTokens = completionTokens: usage?.OutputTokens ?? 0;
+
+totalTokens: usage?.TotalTokens ?? 0;
+```
+
+#### 8.9 OpenAIClient
+
+The `OpenAIClient` type previously was a Azure specific namespace type but now it is an `OpenAI` SDK namespace type, you will need to update your code to use the new `OpenAIClient` type.
+
+When using Azure, you will need to update your code to use the new `AzureOpenAIClient` type.
+
+#### 8.10 Pipeline Configuration
+
+The new `OpenAI` SDK uses a different pipeline configuration, and has a dependency on `System.ClientModel` package. You will need to update your code to use the new `HttpClientPipelineTransport` transport configuration where before you were using `HttpClientTransport` from `Azure.Core.Pipeline`.
+
+[Example of Pipeline Configuration](https://github.com/microsoft/semantic-kernel/pull/7151/files#diff-fab02d9a75bf43cb57f71dddc920c3f72882acf83fb125d8cad963a643d26eb3)
+
+```diff
+var clientOptions = new OpenAIClientOptions
+{
+-    // Before: From Azure.Core.Pipeline
+-    Transport = new HttpClientTransport(httpClient),
+
++    // After: From OpenAI SDK -> System.ClientModel
++    Transport = new HttpClientPipelineTransport(httpClient),
+};
+```

dotnet/nuget/nuget-package.props

@@ -1,16 +1,15 @@
 <Project>
   <PropertyGroup>
     <!-- Central version prefix - applies to all nuget packages. -->
-    <VersionPrefix>1.17.2</VersionPrefix>
-
+    <VersionPrefix>1.18.2</VersionPrefix>
     <PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
     <PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)</PackageVersion>
 
     <Configurations>Debug;Release;Publish</Configurations>
     <IsPackable>true</IsPackable>
 
     <!-- Package validation. Baseline Version should be lower or equal to current version. -->
-    <PackageValidationBaselineVersion>1.17.2</PackageValidationBaselineVersion>
+    <PackageValidationBaselineVersion>1.18.0-rc</PackageValidationBaselineVersion>
     <!-- Validate assembly attributes only for Publish builds -->
     <NoWarn Condition="'$(Configuration)' != 'Publish'">$(NoWarn);CP0003</NoWarn>
     <!-- Do not validate reference assemblies -->

dotnet/samples/Concepts/Agents/ChatCompletion_FunctionTermination.cs

@@ -12,7 +12,7 @@ namespace Agents;
 /// Demonstrate usage of <see cref="IAutoFunctionInvocationFilter"/> for both direction invocation
 /// of <see cref="ChatCompletionAgent"/> and via <see cref="AgentChat"/>.
 /// </summary>
-public class ChatCompletion_FunctionTermination(ITestOutputHelper output) : BaseTest(output)
+public class ChatCompletion_FunctionTermination(ITestOutputHelper output) : BaseAgentsTest(output)
 {
     [Fact]
     public async Task UseAutoFunctionInvocationFilterWithAgentInvocationAsync()
@@ -44,25 +44,25 @@ public async Task UseAutoFunctionInvocationFilterWithAgentInvocationAsync()
         Console.WriteLine("================================");
         foreach (ChatMessageContent message in chat)
         {
-            this.WriteContent(message);
+            this.WriteAgentChatMessage(message);
         }
 
         // Local function to invoke agent and display the conversation messages.
         async Task InvokeAgentAsync(string input)
         {
-            ChatMessageContent userContent = new(AuthorRole.User, input);
-            chat.Add(userContent);
-            this.WriteContent(userContent);
+            ChatMessageContent message = new(AuthorRole.User, input);
+            chat.Add(message);
+            this.WriteAgentChatMessage(message);
 
-            await foreach (ChatMessageContent content in agent.InvokeAsync(chat))
+            await foreach (ChatMessageContent response in agent.InvokeAsync(chat))
             {
                 // Do not add a message implicitly added to the history.
-                if (!content.Items.Any(i => i is FunctionCallContent || i is FunctionResultContent))
+                if (!response.Items.Any(i => i is FunctionCallContent || i is FunctionResultContent))
                 {
-                    chat.Add(content);
+                    chat.Add(response);
                 }
 
-                this.WriteContent(content);
+                this.WriteAgentChatMessage(response);
             }
         }
     }
@@ -98,28 +98,23 @@ public async Task UseAutoFunctionInvocationFilterWithAgentChatAsync()
         ChatMessageContent[] history = await chat.GetChatMessagesAsync().ToArrayAsync();
         for (int index = history.Length; index > 0; --index)
         {
-            this.WriteContent(history[index - 1]);
+            this.WriteAgentChatMessage(history[index - 1]);
         }
 
         // Local function to invoke agent and display the conversation messages.
         async Task InvokeAgentAsync(string input)
         {
-            ChatMessageContent userContent = new(AuthorRole.User, input);
-            chat.AddChatMessage(userContent);
-            this.WriteContent(userContent);
+            ChatMessageContent message = new(AuthorRole.User, input);
+            chat.AddChatMessage(message);
+            this.WriteAgentChatMessage(message);
 
-            await foreach (ChatMessageContent content in chat.InvokeAsync(agent))
+            await foreach (ChatMessageContent response in chat.InvokeAsync(agent))
             {
-                this.WriteContent(content);
+                this.WriteAgentChatMessage(response);
             }
         }
     }
 
-    private void WriteContent(ChatMessageContent content)
-    {
-        Console.WriteLine($"[{content.Items.LastOrDefault()?.GetType().Name ?? "(empty)"}] {content.Role} : '{content.Content}'");
-    }
-
     private Kernel CreateKernelWithFilter()
     {
         IKernelBuilder builder = Kernel.CreateBuilder();