Merge rel10

src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesChatClient.cs

@@ -466,6 +466,19 @@
                     yield return CreateUpdate(GetImageGenerationResult(streamingImageGenUpdate, options));
                     break;
 
+                case StreamingResponseImageGenerationCallInProgressUpdate imageGenInProgress:
+                    yield return CreateUpdate(new ImageGenerationToolCallContent
+                    {
+                        ImageId = imageGenInProgress.ItemId,
+                        RawRepresentation = imageGenInProgress,
+
+                    });
+                    goto default;
+
+                case StreamingResponseImageGenerationCallPartialImageUpdate streamingImageGenUpdate:
+                    yield return CreateUpdate(GetImageGenerationResult(streamingImageGenUpdate, options));
+                    break;
+
                 default:
                     yield return CreateUpdate();
                     break;
@@ -1295,13 +1308,26 @@
         var imageGenTool = options?.Tools.OfType<ImageGenerationTool>().FirstOrDefault();
         var outputType = imageGenTool?.OutputFileFormat?.ToString() ?? "png";
 
+        var bytes = update.PartialImageBytes;
+
+        if (bytes is null || bytes.Length == 0)
+        {
+            // workaround https://github.com/openai/openai-dotnet/issues/809
+            if (update.Patch.TryGetJson("$.partial_image_b64"u8, out var jsonBytes))
+            {
+                Utf8JsonReader reader = new(jsonBytes.Span);
+                _ = reader.Read();
+                bytes = BinaryData.FromBytes(reader.GetBytesFromBase64());
+            }
+        }
+
         return new ImageGenerationToolResultContent
         {
             ImageId = update.ItemId,
             RawRepresentation = update,
             Outputs = new List<AIContent>
             {
-                new DataContent(update.PartialImageBytes, $"image/{outputType}")
+                new DataContent(bytes, $"image/{outputType}")
                 {
                     AdditionalProperties = new()
                     {

src/Libraries/Microsoft.Extensions.DataIngestion.MarkItDown/MarkItDownMcpReader.cs

@@ -43,23 +43,21 @@ public override async Task<IngestionDocument> ReadAsync(FileInfo source, string
             throw new FileNotFoundException("The specified file does not exist.", source.FullName);
         }
 
-        // Read file content and create DataContent
+        // Read file content as base64 data URI
 #if NET
-        ReadOnlyMemory<byte> fileBytes = await File.ReadAllBytesAsync(source.FullName, cancellationToken).ConfigureAwait(false);
+        byte[] fileBytes = await File.ReadAllBytesAsync(source.FullName, cancellationToken).ConfigureAwait(false);
 #else
-        ReadOnlyMemory<byte> fileBytes;
+        byte[] fileBytes;
         using (FileStream fs = new(source.FullName, FileMode.Open, FileAccess.Read, FileShare.Read, 1, FileOptions.Asynchronous))
         {
-            using MemoryStream ms = new((int)Math.Min(int.MaxValue, fs.Length));
+            using MemoryStream ms = new();
             await fs.CopyToAsync(ms).ConfigureAwait(false);
-            fileBytes = ms.GetBuffer().AsMemory(0, (int)ms.Length);
+            fileBytes = ms.ToArray();
         }
 #endif
-        DataContent dataContent = new(
-            fileBytes,
-            string.IsNullOrEmpty(mediaType) ? "application/octet-stream" : mediaType!);
+        string dataUri = CreateDataUri(fileBytes, mediaType);
 
-        string markdown = await ConvertToMarkdownAsync(dataContent, cancellationToken).ConfigureAwait(false);
+        string markdown = await ConvertToMarkdownAsync(dataUri, cancellationToken).ConfigureAwait(false);
 
         return MarkdownParser.Parse(markdown, identifier);
     }
@@ -70,23 +68,31 @@ public override async Task<IngestionDocument> ReadAsync(Stream source, string id
         _ = Throw.IfNull(source);
         _ = Throw.IfNullOrEmpty(identifier);
 
-        // Read stream content and create DataContent
-        using MemoryStream ms = source.CanSeek ? new((int)Math.Min(int.MaxValue, source.Length)) : new();
+        // Read stream content as base64 data URI
+        using MemoryStream ms = new();
 #if NET
         await source.CopyToAsync(ms, cancellationToken).ConfigureAwait(false);
 #else
         await source.CopyToAsync(ms).ConfigureAwait(false);
 #endif
-        DataContent dataContent = new(
-            ms.GetBuffer().AsMemory(0, (int)ms.Length),
-            string.IsNullOrEmpty(mediaType) ? "application/octet-stream" : mediaType);
+        byte[] fileBytes = ms.ToArray();
+        string dataUri = CreateDataUri(fileBytes, mediaType);
 
-        string markdown = await ConvertToMarkdownAsync(dataContent, cancellationToken).ConfigureAwait(false);
+        string markdown = await ConvertToMarkdownAsync(dataUri, cancellationToken).ConfigureAwait(false);
 
         return MarkdownParser.Parse(markdown, identifier);
     }
 
-    private async Task<string> ConvertToMarkdownAsync(DataContent dataContent, CancellationToken cancellationToken)
+#pragma warning disable S3995 // URI return values should not be strings
+    private static string CreateDataUri(byte[] fileBytes, string? mediaType)
+#pragma warning restore S3995 // URI return values should not be strings
+    {
+        string base64Content = Convert.ToBase64String(fileBytes);
+        string mimeType = string.IsNullOrEmpty(mediaType) ? "application/octet-stream" : mediaType!;
+        return $"data:{mimeType};base64,{base64Content}";
+    }
+
+    private async Task<string> ConvertToMarkdownAsync(string dataUri, CancellationToken cancellationToken)
     {
         // Create HTTP client transport for MCP
         HttpClientTransport transport = new(new HttpClientTransportOptions
@@ -104,7 +110,7 @@ private async Task<string> ConvertToMarkdownAsync(DataContent dataContent, Cance
                 // Build parameters for convert_to_markdown tool
                 Dictionary<string, object?> parameters = new()
                 {
-                    ["uri"] = dataContent.Uri
+                    ["uri"] = dataUri
                 };
 
                 // Call the convert_to_markdown tool

src/Libraries/Microsoft.Extensions.DataIngestion/Utils/Batching.cs

@@ -3,7 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+#if NET10_0_OR_GREATER
 using System.Linq;
+#endif
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
@@ -67,4 +69,40 @@ internal static async IAsyncEnumerable<IngestionChunk<string>> ProcessAsync<TMet
             }
         }
     }
+
+#if !NET10_0_OR_GREATER
+#pragma warning disable VSTHRD200 // Use "Async" suffix for async methods
+    private static IAsyncEnumerable<TSource[]> Chunk<TSource>(this IAsyncEnumerable<TSource> source, int count)
+#pragma warning restore VSTHRD200 // Use "Async" suffix for async methods
+    {
+        _ = Throw.IfNull(source);
+        _ = Throw.IfLessThanOrEqual(count, 0);
+
+        return CoreAsync(source, count);
+
+        static async IAsyncEnumerable<TSource[]> CoreAsync(IAsyncEnumerable<TSource> source, int count,
+            [EnumeratorCancellation] CancellationToken cancellationToken = default)
+        {
+            var buffer = new TSource[count];
+            int index = 0;
+
+            await foreach (var item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
+            {
+                buffer[index++] = item;
+
+                if (index == count)
+                {
+                    index = 0;
+                    yield return buffer;
+                }
+            }
+
+            if (index > 0)
+            {
+                Array.Resize(ref buffer, index);
+                yield return buffer;
+            }
+        }
+    }
+#endif
 }

src/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates/src/WebApiAgent/WebApiAgent-CSharp/.template.config/ide.host.json

@@ -10,7 +10,7 @@
     },
     {
       "id": "ChatModel",
-      "isVisible": true
+      "isVisible": false
     },
     {
       "id": "UseManagedIdentity",

src/ProjectTemplates/Microsoft.Agents.AI.ProjectTemplates/src/WebApiAgent/WebApiAgent-CSharp/.template.config/template.json

@@ -38,15 +38,15 @@
       "choices": [
         {
           "choice": "net10.0",
-          "description": "Target net10.0"
+          "description": ".NET 10"
         },
         {
           "choice": "net9.0",
-          "description": "Target net9.0"
+          "description": ".NET 9"
         },
         {
           "choice": "net8.0",
-          "description": "Target net8.0"
+          "description": ".NET 8"
         }
       ],
       "replaces": "net10.0",

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/ChatWithCustomData-CSharp.Web.csproj.in

@@ -40,7 +40,7 @@
     <PackageReference Include="Microsoft.ML.Tokenizers.Data.Cl100kBase" Version="${TemplatePackageVersion_MicrosoftMLTokenizers}" />
     <PackageReference Include="Microsoft.ML.Tokenizers.Data.O200kBase" Version="${TemplatePackageVersion_MicrosoftMLTokenizers}" />
 <!--#if (IsNET9) -->
-    <PackageReference Include="System.Linq.AsyncEnumerable" Version="${TemplatePackageVersion_SystemLinqAsyncEnumerable}" />
+    <PackageReference Include="System.Linq.Async" Version="${TemplatePackageVersion_SystemLinqAsync}" />
 <!--#endif -->
 <!--#if (IsAzureAISearch && IsAspire)
     <PackageReference Include="Aspire.Azure.Search.Documents" Version="${TemplatePackageVersion_Aspire}" />