.Net Kernel Contents Graduation

dotnet/samples/Concepts/Agents/Legacy_AgentCharts.cs

@@ -71,10 +71,9 @@ async Task InvokeAgentAsync(IAgentThread thread, string imageName, string questi
                     var path = Path.Combine(Environment.CurrentDirectory, filename);
                     Console.WriteLine($"# {message.Role}: {message.Content}");
                     Console.WriteLine($"# {message.Role}: {path}");
-                    var content = fileService.GetFileContent(message.Content);
+                    var content = await fileService.GetFileContentAsync(message.Content);
                     await using var outputStream = File.OpenWrite(filename);
-                    await using var inputStream = await content.GetStreamAsync();
-                    await inputStream.CopyToAsync(outputStream);
+                    await outputStream.WriteAsync(content.Data!.Value);
                     Process.Start(
                         new ProcessStartInfo
                         {

dotnet/samples/Concepts/Agents/Legacy_AgentTools.cs

@@ -83,7 +83,7 @@ public async Task RunRetrievalToolAsync()
         var fileService = kernel.GetRequiredService<OpenAIFileService>();
         var result =
             await fileService.UploadContentAsync(
-                new BinaryContent(() => Task.FromResult(EmbeddedResource.ReadStream("travelinfo.txt")!)),
+                new BinaryContent(await EmbeddedResource.ReadAllAsync("travelinfo.txt")!, "text/plain"),
                 new OpenAIFileUploadExecutionSettings("travelinfo.txt", OpenAIFilePurpose.Assistants));
 
         var fileId = result.Id;

dotnet/samples/Concepts/Agents/OpenAIAssistant_MultipleContents.cs

@@ -0,0 +1,146 @@
+// Copyright (c) Microsoft. All rights reserved.
+using Azure.AI.OpenAI.Assistants;
+using Microsoft.SemanticKernel;
+using Microsoft.SemanticKernel.Agents;
+using Microsoft.SemanticKernel.Agents.OpenAI;
+using Microsoft.SemanticKernel.ChatCompletion;
+using Microsoft.SemanticKernel.Connectors.OpenAI;
+using Resources;
+
+namespace Agents;
+
+/// <summary>
+/// Demonstrate using retrieval on <see cref="OpenAIAssistantAgent"/> .
+/// </summary>
+public class OpenAIAssistant_MultipleContents(ITestOutputHelper output) : BaseTest(output)
+{
+    /// <summary>
+    /// Retrieval tool not supported on Azure OpenAI.
+    /// </summary>
+    protected override bool ForceOpenAI => true;
+
+    [Fact]
+    public async Task RunAsync()
+    {
+        OpenAIFileService fileService = new(TestConfiguration.OpenAI.ApiKey);
+
+        BinaryContent[] files = [
+            // Audio is not supported by Assistant API
+            // new AudioContent(await EmbeddedResource.ReadAllAsync("test_audio.wav")!, mimeType:"audio/wav", innerContent: "test_audio.wav"),
+            new ImageContent(await EmbeddedResource.ReadAllAsync("sample_image.jpg")!, mimeType: "image/jpeg") { InnerContent = "sample_image.jpg" },
+            new ImageContent(await EmbeddedResource.ReadAllAsync("test_image.jpg")!, mimeType: "image/jpeg") { InnerContent = "test_image.jpg" },
+            new BinaryContent(data: await EmbeddedResource.ReadAllAsync("travelinfo.txt"), mimeType: "text/plain")
+            {
+                InnerContent = "travelinfo.txt"
+            }
+        ];
+
+        var fileIds = new List<string>();
+        foreach (var file in files)
+        {
+            try
+            {
+                var uploadFile = await fileService.UploadContentAsync(file,
+                        new OpenAIFileUploadExecutionSettings(file.InnerContent!.ToString()!, Microsoft.SemanticKernel.Connectors.OpenAI.OpenAIFilePurpose.Assistants));
+
+                fileIds.Add(uploadFile.Id);
+            }
+            catch (HttpOperationException hex)
+            {
+                Console.WriteLine(hex.ResponseContent);
+                Assert.Fail($"Failed to upload file: {hex.Message}");
+            }
+        }
+
+        // Define the agent
+        OpenAIAssistantAgent agent =
+            await OpenAIAssistantAgent.CreateAsync(
+                kernel: new(),
+                config: new(this.ApiKey, this.Endpoint),
+                new()
+                {
+                    EnableRetrieval = true, // Enable retrieval
+                    ModelId = this.Model,
+                    // FileIds = fileIds  Currently Assistant API only supports text files, no images or audio.
+                    FileIds = [fileIds.Last()]
+                });
+
+        // Create a chat for agent interaction.
+        var chat = new AgentGroupChat();
+
+        // Respond to user input
+        try
+        {
+            await InvokeAgentAsync("Where did sam go?");
+            await InvokeAgentAsync("When does the flight leave Seattle?");
+            await InvokeAgentAsync("What is the hotel contact info at the destination?");
+        }
+        finally
+        {
+            await agent.DeleteAsync();
+        }
+
+        // Local function to invoke agent and display the conversation messages.
+        async Task InvokeAgentAsync(string input)
+        {
+            chat.AddChatMessage(new ChatMessageContent(AuthorRole.User, input));
+
+            Console.WriteLine($"# {AuthorRole.User}: '{input}'");
+
+            await foreach (var content in chat.InvokeAsync(agent))
+            {
+                Console.WriteLine($"# {content.Role} - {content.AuthorName ?? "*"}: '{content.Content}'");
+            }
+        }
+    }
+
+    [Fact]
+    public async Task SendingAndRetrievingFilesAsync()
+    {
+        var openAIClient = new AssistantsClient(TestConfiguration.OpenAI.ApiKey);
+        OpenAIFileService fileService = new(TestConfiguration.OpenAI.ApiKey);
+
+        BinaryContent[] files = [
+            new AudioContent(await EmbeddedResource.ReadAllAsync("test_audio.wav")!, mimeType: "audio/wav") { InnerContent = "test_audio.wav" },
+            new ImageContent(await EmbeddedResource.ReadAllAsync("sample_image.jpg")!, mimeType: "image/jpeg") { InnerContent = "sample_image.jpg" },
+            new ImageContent(await EmbeddedResource.ReadAllAsync("test_image.jpg")!, mimeType: "image/jpeg") { InnerContent = "test_image.jpg" },
+            new BinaryContent(data: await EmbeddedResource.ReadAllAsync("travelinfo.txt"), mimeType: "text/plain") { InnerContent = "travelinfo.txt" }
+        ];
+
+        var fileIds = new Dictionary<string, BinaryContent>();
+        foreach (var file in files)
+        {
+            var result = await openAIClient.UploadFileAsync(new BinaryData(file.Data), Azure.AI.OpenAI.Assistants.OpenAIFilePurpose.FineTune);
+            fileIds.Add(result.Value.Id, file);
+        }
+
+        foreach (var file in (await openAIClient.GetFilesAsync(Azure.AI.OpenAI.Assistants.OpenAIFilePurpose.FineTune)).Value)
+        {
+            if (!fileIds.ContainsKey(file.Id))
+            {
+                continue;
+            }
+
+            var data = (await openAIClient.GetFileContentAsync(file.Id)).Value;
+
+            var mimeType = fileIds[file.Id].MimeType;
+            var fileName = fileIds[file.Id].InnerContent!.ToString();
+            var metadata = new Dictionary<string, object?> { ["id"] = file.Id };
+            var uri = new Uri($"https://api.openai.com/v1/files/{file.Id}/content");
+            var content = mimeType switch
+            {
+                "image/jpeg" => new ImageContent(data, mimeType) { Uri = uri, InnerContent = fileName, Metadata = metadata },
+                "audio/wav" => new AudioContent(data, mimeType) { Uri = uri, InnerContent = fileName, Metadata = metadata },
+                _ => new BinaryContent(data, mimeType) { Uri = uri, InnerContent = fileName, Metadata = metadata }
+            };
+
+            Console.WriteLine($"File: {fileName} - {mimeType}");
+
+            // Images tostring are different from the graduated contents for retrocompatibility
+            Console.WriteLine(content.ToString());
+
+            // Delete the test file remotely
+            await openAIClient.DeleteFileAsync(file.Id);
+        }
+    }
+}

dotnet/samples/Concepts/Agents/OpenAIAssistant_Retrieval.cs

@@ -24,12 +24,9 @@ public async Task RunAsync()
         OpenAIFileService fileService = new(TestConfiguration.OpenAI.ApiKey);
 
         OpenAIFileReference uploadFile =
-            await fileService.UploadContentAsync(
-                new BinaryContent(() => Task.FromResult(EmbeddedResource.ReadStream("travelinfo.txt")!)),
+            await fileService.UploadContentAsync(new BinaryContent(await EmbeddedResource.ReadAllAsync("travelinfo.txt")!, "text/plain"),
                 new OpenAIFileUploadExecutionSettings("travelinfo.txt", OpenAIFilePurpose.Assistants));
 
-        Console.WriteLine(this.ApiKey);
-
         // Define the agent
         OpenAIAssistantAgent agent =
             await OpenAIAssistantAgent.CreateAsync(

dotnet/samples/Concepts/AudioToText/OpenAI_AudioToText.cs

@@ -42,7 +42,7 @@ public async Task AudioToTextAsync()
         // Read audio content from a file
         await using var audioFileStream = EmbeddedResource.ReadStream(AudioFilename);
         var audioFileBinaryData = await BinaryData.FromStreamAsync(audioFileStream!);
-        AudioContent audioContent = new(audioFileBinaryData);
+        AudioContent audioContent = new(audioFileBinaryData, mimeType: null);
 
         // Convert audio to text
         var textContent = await audioToTextService.GetTextContentAsync(audioContent, executionSettings);

dotnet/samples/Concepts/ChatCompletion/ChatHistorySerialization.cs

@@ -17,7 +17,7 @@ public class ChatHistorySerialization(ITestOutputHelper output) : BaseTest(outpu
     /// with <see cref="ChatMessageContent"/> having SK various content types as items.
     /// </summary>
     [Fact]
-    public void SerializeChatHistoryWithSKContentTypes()
+    public async Task SerializeChatHistoryWithSKContentTypesAsync()
     {
         int[] data = [1, 2, 3];
 
@@ -27,10 +27,8 @@ public void SerializeChatHistoryWithSKContentTypes()
             [
                 new TextContent("Discuss the potential long-term consequences for the Earth's ecosystem as well."),
                 new ImageContent(new Uri("https://fake-random-test-host:123")),
-                new BinaryContent(new BinaryData(data)),
-#pragma warning disable SKEXP0001
-                new AudioContent(new BinaryData(data))
-#pragma warning restore SKEXP0001
+                new BinaryContent(new BinaryData(data), "application/octet-stream"),
+                new AudioContent(new BinaryData(data), "application/octet-stream")
             ]
         };
 
@@ -49,7 +47,7 @@ public void SerializeChatHistoryWithSKContentTypes()
 
         Console.WriteLine($"Image content: {(deserializedMessage.Items![1]! as ImageContent)!.Uri}");
 
-        Console.WriteLine($"Binary content: {Encoding.UTF8.GetString((deserializedMessage.Items![2]! as BinaryContent)!.Content!.Value.Span)}");
+        Console.WriteLine($"Binary content: {Encoding.UTF8.GetString((deserializedMessage.Items![2]! as BinaryContent)!.Data!.Value.Span)}");
 
         Console.WriteLine($"Audio content: {Encoding.UTF8.GetString((deserializedMessage.Items![3]! as AudioContent)!.Data!.Value.Span)}");
 

dotnet/samples/Concepts/ChatCompletion/Google_GeminiVision.cs

@@ -41,7 +41,7 @@ public async Task GoogleAIAsync()
             new TextContent("What’s in this image?"),
             // Google AI Gemini API requires the image to be in base64 format, doesn't support URI
             // You have to always provide the mimeType for the image
-            new ImageContent(bytes) { MimeType = "image/jpeg" },
+            new ImageContent(bytes, "image/jpeg"),
         ]);
 
         var reply = await chatCompletionService.GetChatMessageContentAsync(chatHistory);
@@ -109,7 +109,7 @@ public async Task VertexAIAsync()
             new TextContent("What’s in this image?"),
             // Vertex AI Gemini API supports both base64 and URI format
             // You have to always provide the mimeType for the image
-            new ImageContent(bytes) { MimeType = "image/jpeg" },
+            new ImageContent(bytes, "image/jpeg"),
             // The Cloud Storage URI of the image to include in the prompt.
             // The bucket that stores the file must be in the same Google Cloud project that's sending the request.
             // new ImageContent(new Uri("gs://generativeai-downloads/images/scones.jpg"),

dotnet/samples/Concepts/ImageToText/HuggingFace_ImageToText.cs

@@ -35,10 +35,7 @@ public async Task ImageToTextAsync()
 
         // Read image content from a file
         ReadOnlyMemory<byte> imageData = await EmbeddedResource.ReadAllAsync(ImageFilePath);
-        ImageContent imageContent = new(new BinaryData(imageData))
-        {
-            MimeType = "image/jpeg"
-        };
+        ImageContent imageContent = new(new BinaryData(imageData), "image/jpeg");
 
         // Convert image to text
         var textContent = await imageToText.GetTextContentAsync(imageContent, executionSettings);

dotnet/samples/Demos/HuggingFaceImageToText/FormMain.cs

@@ -143,10 +143,7 @@ private void UpdateImageDescription(string description)
     /// <param name="pictureBox">The target <see cref="PictureBox"/>.</param>
     /// <returns>Returns a <see cref="ImageContent"/>.</returns>
     private static ImageContent CreateImageContentFromPictureBox(PictureBox pictureBox)
-        => new(ConvertImageToReadOnlyMemory(pictureBox))
-        {
-            MimeType = GetMimeType(pictureBox.Tag?.ToString()!)
-        };
+        => new(ConvertImageToReadOnlyMemory(pictureBox), GetMimeType(pictureBox.Tag?.ToString()!));
 
     /// <summary>
     /// Gets the image binary array from a <see cref="PictureBox"/>.

dotnet/src/Connectors/Connectors.Google.UnitTests/Core/Gemini/GeminiRequestTests.cs

@@ -177,7 +177,7 @@ public void FromChatHistoryImageAsImageContentItReturnsGeminiRequestWithChatHist
         chatHistory.AddUserMessage(contentItems:
             [new ImageContent(new Uri("https://example-image.com/")) { MimeType = "image/png" }]);
         chatHistory.AddUserMessage(contentItems:
-            [new ImageContent(imageAsBytes) { MimeType = "image/png" }]);
+            [new ImageContent(imageAsBytes, "image/png")]);
         var executionSettings = new GeminiPromptExecutionSettings();
 
         // Act

dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/ClientCore.cs

@@ -339,15 +339,19 @@ internal async Task<IReadOnlyList<TextContent>> GetTextContentFromAudioAsync(
         PromptExecutionSettings? executionSettings,
         CancellationToken cancellationToken)
     {
-        Verify.NotNull(content.Data);
+        var audioData = content.Data!.Value;
+        if (audioData.IsEmpty)
+        {
+            throw new ArgumentException("Audio data cannot be empty", nameof(content));
+        }
 
         OpenAIAudioToTextExecutionSettings? audioExecutionSettings = OpenAIAudioToTextExecutionSettings.FromExecutionSettings(executionSettings);
 
         Verify.ValidFilename(audioExecutionSettings?.Filename);
 
         var audioOptions = new AudioTranscriptionOptions
         {
-            AudioData = BinaryData.FromBytes(content.Data.Value),
+            AudioData = BinaryData.FromBytes(audioData),
             DeploymentName = this.DeploymentOrModelName,
             Filename = audioExecutionSettings.Filename,
             Language = audioExecutionSettings.Language,
@@ -1237,13 +1241,13 @@ private static List<ChatRequestMessage> GetRequestMessages(ChatMessageContent me
 
                 if (resultContent.Result is Exception ex)
                 {
-                    toolMessages.Add(new ChatRequestToolMessage($"Error: Exception while invoking function. {ex.Message}", resultContent.Id));
+                    toolMessages.Add(new ChatRequestToolMessage($"Error: Exception while invoking function. {ex.Message}", resultContent.CallId));
                     continue;
                 }
 
                 var stringResult = ProcessFunctionResult(resultContent.Result ?? string.Empty, toolCallBehavior);
 
-                toolMessages.Add(new ChatRequestToolMessage(stringResult ?? string.Empty, resultContent.Id));
+                toolMessages.Add(new ChatRequestToolMessage(stringResult ?? string.Empty, resultContent.CallId));
             }
 
             if (toolMessages is not null)

dotnet/src/Connectors/Connectors.OpenAI/CompatibilitySuppressions.xml

@@ -22,6 +22,13 @@
     <Right>lib/netstandard2.0/Microsoft.SemanticKernel.Connectors.OpenAI.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Microsoft.SemanticKernel.Connectors.OpenAI.OpenAIFileService.GetFileContent(System.String,System.Threading.CancellationToken)</Target>
+    <Left>lib/netstandard2.0/Microsoft.SemanticKernel.Connectors.OpenAI.dll</Left>
+    <Right>lib/netstandard2.0/Microsoft.SemanticKernel.Connectors.OpenAI.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Microsoft.SemanticKernel.Connectors.OpenAI.OpenAIMemoryBuilderExtensions.WithAzureOpenAITextEmbeddingGeneration(Microsoft.SemanticKernel.Memory.MemoryBuilder,System.String,System.String,Azure.Core.TokenCredential,System.String,System.Net.Http.HttpClient)</Target>

dotnet/src/Connectors/Connectors.OpenAI/Connectors.OpenAI.csproj

@@ -8,6 +8,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);NU5104;SKEXP0001,SKEXP0010</NoWarn>
     <EnablePackageValidation>true</EnablePackageValidation>
+    <ApiCompatGenerateSuppressionFile>true</ApiCompatGenerateSuppressionFile>
   </PropertyGroup>
 
   <!-- IMPORT NUGET PACKAGE SHARED PROPERTIES -->

dotnet/src/Connectors/Connectors.OpenAI/Files/OpenAIFileService.cs

@@ -109,11 +109,22 @@ public async Task DeleteFileAsync(string id, CancellationToken cancellationToken
     /// <remarks>
     /// Files uploaded with <see cref="OpenAIFilePurpose.Assistants"/> do not support content retrieval.
     /// </remarks>
-    public BinaryContent GetFileContent(string id, CancellationToken cancellationToken = default)
+    public async Task<BinaryContent> GetFileContentAsync(string id, CancellationToken cancellationToken = default)
     {
         Verify.NotNull(id, nameof(id));
+        var (stream, mimetype) = await this.StreamGetRequestAsync($"{this._serviceUri}/{id}/content", cancellationToken).ConfigureAwait(false);
 
-        return new BinaryContent(() => this.StreamGetRequestAsync($"{this._serviceUri}/{id}/content", cancellationToken));
+        using (stream)
+        {
+            using var memoryStream = new MemoryStream();
+#if NETSTANDARD2_0
+            const int DefaultCopyBufferSize = 81920;
+            await stream.CopyToAsync(memoryStream, DefaultCopyBufferSize, cancellationToken).ConfigureAwait(false);
+#else
+            await stream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);
+#endif
+            return new BinaryContent(memoryStream.ToArray(), mimetype);
+        }
     }
 
     /// <summary>
@@ -156,8 +167,7 @@ public async Task<OpenAIFileReference> UploadContentAsync(BinaryContent fileCont
 
         using var formData = new MultipartFormDataContent();
         using var contentPurpose = new StringContent(this.ConvertPurpose(settings.Purpose));
-        using var contentStream = await fileContent.GetStreamAsync().ConfigureAwait(false);
-        using var contentFile = new StreamContent(contentStream);
+        using var contentFile = new ByteArrayContent(fileContent.Data!.Value.ToArray());
         formData.Add(contentPurpose, "purpose");
         formData.Add(contentFile, "file", settings.FileName);
 
@@ -191,17 +201,18 @@ private async Task<TModel> ExecuteGetRequestAsync<TModel>(string url, Cancellati
             };
     }
 
-    private async Task<Stream> StreamGetRequestAsync(string url, CancellationToken cancellationToken)
+    private async Task<(Stream Stream, string? MimeType)> StreamGetRequestAsync(string url, CancellationToken cancellationToken)
     {
         using var request = HttpRequest.CreateGetRequest(this.PrepareUrl(url));
         this.AddRequestHeaders(request);
         var response = await this._httpClient.SendWithSuccessCheckAsync(request, cancellationToken).ConfigureAwait(false);
         try
         {
             return
-                new HttpResponseStream(
+                (new HttpResponseStream(
                     await response.Content.ReadAsStreamAndTranslateExceptionAsync().ConfigureAwait(false),
-                    response);
+                    response),
+                    response.Content.Headers.ContentType?.MediaType);
         }
         catch
         {