Azure OpenAI: 2.5.0-beta.1 release (Azure#52890)

* initial compiling draft; some test failures to fix but mostly functional

* assistants fixes and a few test updates

* preparation updates

Author: trrwilson

eng/Packages.Data.props

@@ -203,7 +203,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.AI.OpenAI'))">
-    <PackageReference Update="OpenAI" Version="2.3.0" />
+    <PackageReference Update="OpenAI" Version="2.5.0" />
   </ItemGroup>
 
   <ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.Developer.Playwright'))">

sdk/openai/Azure.AI.OpenAI/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History
 
+## 2.5.0-beta.1 (2025-10-03)
+
+This update restores compatibility with the latest `2.5.0` release of `OpenAI` and enables access to the latest features. For details, please see [the full OpenAI 2.5.0 release notes](https://github.com/openai/openai-dotnet/blob/main/CHANGELOG.md#250-2025-09-23).
+
+### Features Added
+
+- A substantial number of new features are carried forward from the `OpenAI` library. Please see [the full OpenAI 2.5.0 release notes](https://github.com/openai/openai-dotnet/blob/main/CHANGELOG.md#250-2025-09-23) for details.
+
 ## 2.3.0-beta.2 (2025-08-21)
 
 ### Features Added

sdk/openai/Azure.AI.OpenAI/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "net",
   "TagPrefix": "net/openai/Azure.AI.OpenAI",
-  "Tag": "net/openai/Azure.AI.OpenAI_7f3c805663"
+  "Tag": "net/openai/Azure.AI.OpenAI_a192ea056f"
 }

sdk/openai/Azure.AI.OpenAI/src/Azure.AI.OpenAI.csproj

@@ -40,8 +40,8 @@
     </When>
     <Otherwise>
       <PropertyGroup>
-        <VersionPrefix>2.3.0</VersionPrefix>
-        <VersionSuffix>beta.2</VersionSuffix>
+        <VersionPrefix>2.5.0</VersionPrefix>
+        <VersionSuffix>beta.1</VersionSuffix>
       </PropertyGroup>
     </Otherwise>
   </Choose>

sdk/openai/Azure.AI.OpenAI/src/Custom/Assistants/AzureAssistantClient.Protocol.cs

@@ -3,6 +3,7 @@
 
 #if !AZURE_OPENAI_GA
 
+using System.ClientModel;
 using System.ClientModel.Primitives;
 
 namespace Azure.AI.OpenAI.Assistants;
@@ -31,6 +32,30 @@ internal AzureAssistantClient(ClientPipeline pipeline, Uri endpoint, AzureOpenAI
 
     protected AzureAssistantClient()
     { }
+
+    public override async Task<ClientResult<ThreadRun>> GetRunAsync(string threadId, string runId, CancellationToken cancellationToken = default)
+    {
+        ClientResult protocolResult = await GetRunAsync(threadId, runId, cancellationToken.ToRequestOptions()).ConfigureAwait(false);
+        return ClientResult.FromValue(ModelReaderWriter.Read<ThreadRun>(protocolResult.GetRawResponse().Content, ModelReaderWriterOptions.Json, OpenAIContext.Default), protocolResult.GetRawResponse());
+    }
+
+    public override ClientResult<ThreadRun> GetRun(string threadId, string runId, CancellationToken cancellationToken = default)
+    {
+        ClientResult protocolResult = GetRun(threadId, runId, cancellationToken.ToRequestOptions());
+        return ClientResult.FromValue(ModelReaderWriter.Read<ThreadRun>(protocolResult.GetRawResponse().Content, ModelReaderWriterOptions.Json, OpenAIContext.Default), protocolResult.GetRawResponse());
+    }
+
+    public override async Task<ClientResult<RunStep>> GetRunStepAsync(string threadId, string runId, string stepId, CancellationToken cancellationToken = default)
+    {
+        ClientResult protocolResult = await GetRunStepAsync(threadId, runId, stepId, cancellationToken.ToRequestOptions()).ConfigureAwait(false);
+        return ClientResult.FromValue(ModelReaderWriter.Read<RunStep>(protocolResult.GetRawResponse().Content, ModelReaderWriterOptions.Json, OpenAIContext.Default), protocolResult.GetRawResponse());
+    }
+
+    public override ClientResult<RunStep> GetRunStep(string threadId, string runId, string stepId, CancellationToken cancellationToken = default)
+    {
+        ClientResult protocolResult = GetRunStep(threadId, runId, stepId, cancellationToken.ToRequestOptions());
+        return ClientResult.FromValue(ModelReaderWriter.Read<RunStep>(protocolResult.GetRawResponse().Content, ModelReaderWriterOptions.Json, OpenAIContext.Default), protocolResult.GetRawResponse());
+    }
 }
 
-#endif
+#endif

sdk/openai/Azure.AI.OpenAI/src/Custom/Assistants/AzureAssistantClient.cs

@@ -61,7 +61,7 @@ internal partial class AzureOpenAIFile : OpenAIFile
     /// <param name="azureStatus"></param>
     /// <exception cref="ArgumentNullException"> <paramref name="id"/>, <paramref name="filename"/> or <paramref name="purpose"/> is null. </exception>
     internal AzureOpenAIFile(string id, long? bytes, DateTimeOffset createdAt, string filename, string purpose, AzureOpenAIFileStatus azureStatus)
-        : base(id, createdAt, filename, purpose.ToFilePurpose(), bytes, azureStatus.ToFileStatus())
+        : base(id, bytes, createdAt, filename, purpose.ToFilePurpose(), azureStatus.ToFileStatus())
     {
         _object = "file";
         _purpose = purpose;
@@ -80,7 +80,7 @@ internal AzureOpenAIFile(string id, long? bytes, DateTimeOffset createdAt, strin
     /// <param name="expiresAt"></param>
     /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
     internal AzureOpenAIFile(string id, long? bytes, DateTimeOffset createdAt, DateTimeOffset? expiresAt, string filename, string @object, string purpose, string statusDetails, AzureOpenAIFileStatus azureStatus, IDictionary<string, BinaryData> additionalBinaryDataProperties)
-        : base(id, createdAt, expiresAt, filename, purpose.ToFilePurpose(), @object, bytes, azureStatus.ToFileStatus(), statusDetails, additionalBinaryDataProperties)
+        : base(id, bytes, createdAt, expiresAt, filename, @object, purpose.ToFilePurpose(), azureStatus.ToFileStatus(), statusDetails, additionalBinaryDataProperties)
     {
         _object = @object;
         _purpose = purpose;

sdk/openai/Azure.AI.OpenAI/src/Custom/Files/AzureOpenAIFile.cs

@@ -53,12 +53,10 @@ internal override AsyncCollectionResult GetJobsAsync(string afterJobId, int? pag
     {
         return new AzureAsyncCollectionResult<FineTuningJob, FineTuningCollectionPageToken>(
             Pipeline,
-            options,
             continuation => GetJobsPipelineMessage(continuation?.After, pageSize, options),
             page => FineTuningCollectionPageToken.FromResponse(page, pageSize),
             page => GetJobsFromResponse(page.GetRawResponse()),
-            options?.CancellationToken ?? default
-            );
+            options?.CancellationToken ?? default);
     }
 
     private IEnumerable<FineTuningJob> GetJobsFromResponse(PipelineResponse response)
@@ -116,4 +114,4 @@ private static bool TryGetLastId(ClientResult previous, out string lastId)
     }
 }
 
-#endif
+#endif

sdk/openai/Azure.AI.OpenAI/src/Custom/FineTuning/AzureFineTuningClient.Protocol.cs

@@ -37,15 +37,15 @@ public override ClientResult CancelAndUpdate(CancellationToken cancellationToken
     {
         using PipelineMessage message = CancelPipelineMessage(JobId, cancellationToken.ToRequestOptions());
         PipelineResponse response = _pipeline.ProcessMessage(message, cancellationToken.ToRequestOptions());
-        CopyLocalParameters(response, InternalFineTuningJob.FromClientResult(ClientResult.FromResponse(response)));
+        CopyLocalParameters(response, ModelReaderWriter.Read<InternalFineTuningJob>(response.Content, ModelReaderWriterOptions.Json, OpenAIContext.Default)!);
         return ClientResult.FromResponse(response);
     }
 
     public override async Task<ClientResult> CancelAndUpdateAsync(CancellationToken cancellationToken = default)
     {
         using PipelineMessage message = CancelPipelineMessage(JobId, cancellationToken.ToRequestOptions());
         PipelineResponse response = await _pipeline.ProcessMessageAsync(message, cancellationToken.ToRequestOptions()).ConfigureAwait(false);
-        CopyLocalParameters(response, InternalFineTuningJob.FromClientResult(ClientResult.FromResponse(response)));
+        CopyLocalParameters(response, ModelReaderWriter.Read<InternalFineTuningJob>(response.Content, ModelReaderWriterOptions.Json, OpenAIContext.Default)!);
         return ClientResult.FromResponse(response);
     }
 }

sdk/openai/Azure.AI.OpenAI/src/Custom/FineTuning/AzureFineTuningJob.cs

@@ -16,7 +16,6 @@ namespace Azure.AI.OpenAI.Utility;
 internal class AzureAsyncCollectionResult<TItem, TContinuation> : AsyncCollectionResult<TItem> where TContinuation : ContinuationToken
 {
     private readonly ClientPipeline _pipeline;
-    private readonly RequestOptions _options;
     private readonly Func<TContinuation?, PipelineMessage> _createRequest;
     private readonly Func<ClientResult, TContinuation?> _getContinuationToken;
     private readonly Func<ClientResult, IEnumerable<TItem>> _getValues;
@@ -26,7 +25,6 @@ internal class AzureAsyncCollectionResult<TItem, TContinuation> : AsyncCollectio
     /// Creates a new instance.
     /// </summary>
     /// <param name="pipeline">The client pipeline to use to send requests.</param>
-    /// <param name="options">The request options to use.</param>
     /// <param name="createRequest">The function used to create the request to get a page of results. The continuation token
     /// may be set to null to get the first page. After that it will be set to a value used to get the next page of results.</param>
     /// <param name="getContinuationToken">The function used to create a continuation token from a page of results.</param>
@@ -35,14 +33,12 @@ internal class AzureAsyncCollectionResult<TItem, TContinuation> : AsyncCollectio
     /// <exception cref="ArgumentNullException">If any of the required arguments are null.</exception>
     public AzureAsyncCollectionResult(
         ClientPipeline pipeline,
-        RequestOptions options,
         Func<TContinuation?, PipelineMessage> createRequest,
         Func<ClientResult, TContinuation?> getContinuationToken,
         Func<ClientResult, IEnumerable<TItem>> getValues,
         CancellationToken cancellation)
     {
         _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline));
-        _options = options ?? new();
         _getContinuationToken = getContinuationToken ?? throw new ArgumentNullException(nameof(_getContinuationToken));
         _createRequest = createRequest ?? throw new ArgumentNullException(nameof(_createRequest));
         _getValues = getValues ?? throw new ArgumentNullException(nameof(_getContinuationToken));
@@ -78,7 +74,7 @@ protected override IAsyncEnumerable<TItem> GetValuesFromPageAsync(ClientResult p
     protected virtual async Task<ClientResult> SendRequestAsync(TContinuation? continuationToken)
     {
         using PipelineMessage message = _createRequest(continuationToken);
-        PipelineResponse response = await _pipeline.ProcessMessageAsync(message, _options).ConfigureAwait(false);
+        PipelineResponse response = await _pipeline.ProcessMessageAsync(message, _cancellation.ToRequestOptions()).ConfigureAwait(false);
         return ClientResult.FromResponse(response);
     }
 }