Merge branch 'main' of https://github.com/openai/openai-dotnet into Shreja_AudioSpecUpdate

Author: ShivangiReja

.config/dotnet-tools.json

@@ -10,7 +10,7 @@
       "rollForward": false
     },
     "azure.sdk.tools.testproxy": {
-      "version": "1.0.0-dev.20250922.2",
+      "version": "1.0.0-dev.20251209.1",
       "commands": [
         "test-proxy"
       ],

Directory.Packages.props

@@ -31,7 +31,7 @@
     <PackageVersion Include="Moq" Version="[4.18.2]" />
 
     <!-- Development Feed Packages -->
-    <PackageVersion Include="Microsoft.ClientModel.TestFramework" Version="1.0.0-alpha.20250919.1" />
+    <PackageVersion Include="Microsoft.ClientModel.TestFramework" Version="1.0.0-alpha.20260121.1" />
   </ItemGroup>
 
   <!-- Generator-Only Dependencies -->

api/OpenAI.net8.0.cs

@@ -5621,6 +5621,8 @@ public class McpToolCallApprovalPolicy : IJsonModel<McpToolCallApprovalPolicy>,
         public ref JsonPatch Patch { get; }
         protected virtual McpToolCallApprovalPolicy JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
+        public static implicit operator McpToolCallApprovalPolicy(CustomMcpToolCallApprovalPolicy customPolicy);
+        public static implicit operator McpToolCallApprovalPolicy(GlobalMcpToolCallApprovalPolicy globalPolicy);
         protected virtual McpToolCallApprovalPolicy PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
         protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
     }
@@ -5801,6 +5803,7 @@ public class ResponseContentPart : IJsonModel<ResponseContentPart>, IPersistable
         public string InputFilename { get; }
         public ResponseImageDetailLevel? InputImageDetailLevel { get; }
         public string InputImageFileId { get; }
+        public string InputImageUrl { get; }
         public ResponseContentPartKind Kind { get; }
         public IReadOnlyList<ResponseMessageAnnotation> OutputTextAnnotations { get; }
         [Serialization.JsonIgnore]

api/OpenAI.netstandard2.0.cs

@@ -4922,6 +4922,8 @@ public class McpToolCallApprovalPolicy : IJsonModel<McpToolCallApprovalPolicy>,
         public ref JsonPatch Patch { get; }
         protected virtual McpToolCallApprovalPolicy JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options);
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options);
+        public static implicit operator McpToolCallApprovalPolicy(CustomMcpToolCallApprovalPolicy customPolicy);
+        public static implicit operator McpToolCallApprovalPolicy(GlobalMcpToolCallApprovalPolicy globalPolicy);
         protected virtual McpToolCallApprovalPolicy PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options);
         protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options);
     }
@@ -5083,6 +5085,7 @@ public class ResponseContentPart : IJsonModel<ResponseContentPart>, IPersistable
         public string InputFilename { get; }
         public ResponseImageDetailLevel? InputImageDetailLevel { get; }
         public string InputImageFileId { get; }
+        public string InputImageUrl { get; }
         public ResponseContentPartKind Kind { get; }
         public IReadOnlyList<ResponseMessageAnnotation> OutputTextAnnotations { get; }
         [Serialization.JsonIgnore]

examples/Responses/Example05_RemoteMcp.cs

@@ -25,7 +25,7 @@ public void Example05_RemoteMcp()
                 new McpTool(serverLabel: "dmcp", serverUri: new Uri("https://dmcp-server.deno.dev/sse"))
                 {
                     ServerDescription = "A Dungeons and Dragons MCP server to assist with dice rolling.",
-                    ToolCallApprovalPolicy = new McpToolCallApprovalPolicy(GlobalMcpToolCallApprovalPolicy.NeverRequireApproval)
+                    ToolCallApprovalPolicy = GlobalMcpToolCallApprovalPolicy.NeverRequireApproval // An implicit conversion is used here for convenience.
                 }
             }
         };

examples/Responses/Example05_RemoteMcpAsync.cs

@@ -26,7 +26,7 @@ public async Task Example05_RemoteMcpAsync()
                 new McpTool(serverLabel: "dmcp", serverUri: new Uri("https://dmcp-server.deno.dev/sse"))
                 {
                     ServerDescription = "A Dungeons and Dragons MCP server to assist with dice rolling.",
-                    ToolCallApprovalPolicy = new McpToolCallApprovalPolicy(GlobalMcpToolCallApprovalPolicy.NeverRequireApproval)
+                    ToolCallApprovalPolicy = GlobalMcpToolCallApprovalPolicy.NeverRequireApproval // An implicit conversion is used here for convenience.
                 }
             }
         };

nuget.config

@@ -8,7 +8,6 @@
   </packageSources>
   <packageSourceMapping>
     <packageSource key="azure-sdk-dev-feed">
-      <package pattern="System.ClientModel" />
       <package pattern="Microsoft.ClientModel.TestFramework" />
       <package pattern="Azure.Sdk.Tools.*" />
     </packageSource>

src/Custom/Chat/ChatClient.cs

@@ -152,12 +152,12 @@ internal async Task<ClientResult<ChatCompletion>> CompleteChatAsync(IEnumerable<
         }
 
         options ??= new();
-        CreateChatCompletionOptions(messages, ref options);
-        using OpenTelemetryScope scope = _telemetry.StartChatScope(options);
+        var clonedOptions = CreateChatCompletionOptions(messages, options);
+        using OpenTelemetryScope scope = _telemetry.StartChatScope(clonedOptions);
 
         try
         {
-            using BinaryContent content = options.ToBinaryContent();
+            using BinaryContent content = clonedOptions.ToBinaryContent();
 
             ClientResult result = await CompleteChatAsync(content, requestOptions).ConfigureAwait(false);
             ChatCompletion chatCompletion = (ChatCompletion)result;
@@ -182,12 +182,12 @@ public virtual ClientResult<ChatCompletion> CompleteChat(IEnumerable<ChatMessage
         Argument.AssertNotNullOrEmpty(messages, nameof(messages));
 
         options ??= new();
-        CreateChatCompletionOptions(messages, ref options);
-        using OpenTelemetryScope scope = _telemetry.StartChatScope(options);
+        var clonedOptions = CreateChatCompletionOptions(messages, options);
+        using OpenTelemetryScope scope = _telemetry.StartChatScope(clonedOptions);
 
         try
         {
-            using BinaryContent content = options.ToBinaryContent();
+            using BinaryContent content = clonedOptions.ToBinaryContent();
             ClientResult result = CompleteChat(content, cancellationToken.ToRequestOptions());
             ChatCompletion chatCompletion = (ChatCompletion)result;
 
@@ -243,9 +243,9 @@ internal AsyncCollectionResult<StreamingChatCompletionUpdate> CompleteChatStream
         }
 
         options ??= new();
-        CreateChatCompletionOptions(messages, ref options, stream: true);
+        var clonedOptions = CreateChatCompletionOptions(messages, options, stream: true);
 
-        using BinaryContent content = options.ToBinaryContent();
+        using BinaryContent content = clonedOptions.ToBinaryContent();
         return new AsyncSseUpdateCollection<StreamingChatCompletionUpdate>(
             async () => await CompleteChatAsync(content, requestOptions).ConfigureAwait(false),
             StreamingChatCompletionUpdate.DeserializeStreamingChatCompletionUpdate,
@@ -270,9 +270,9 @@ public virtual CollectionResult<StreamingChatCompletionUpdate> CompleteChatStrea
         Argument.AssertNotNull(messages, nameof(messages));
 
         options ??= new();
-        CreateChatCompletionOptions(messages, ref options, stream: true);
+        var clonedOptions = CreateChatCompletionOptions(messages, options, stream: true);
 
-        using BinaryContent content = options.ToBinaryContent();
+        using BinaryContent content = clonedOptions.ToBinaryContent();
         return new SseUpdateCollection<StreamingChatCompletionUpdate>(
             () => CompleteChat(content, cancellationToken.ToRequestOptions(streaming: true)),
             StreamingChatCompletionUpdate.DeserializeStreamingChatCompletionUpdate,
@@ -381,19 +381,24 @@ public virtual ClientResult<ChatCompletionDeletionResult> DeleteChatCompletion(s
         return ClientResult.FromValue((ChatCompletionDeletionResult)result, result.GetRawResponse());
     }
 
-    private void CreateChatCompletionOptions(IEnumerable<ChatMessage> messages, ref ChatCompletionOptions options, bool stream = false)
+    private ChatCompletionOptions CreateChatCompletionOptions(IEnumerable<ChatMessage> messages, ChatCompletionOptions options, bool stream = false)
     {
-        options.Messages = messages.ToList();
-        options.Model = _model;
+        var clonedOptions = options.Clone();
+        foreach (var message in messages)
+        {
+            clonedOptions.Messages.Add(message);
+        }
+        clonedOptions.Model ??= _model;
         if (stream)
         {
-            options.Stream = true;
-            options.StreamOptions = s_includeUsageStreamOptions;
+            clonedOptions.Stream = true;
+            clonedOptions.StreamOptions = s_includeUsageStreamOptions;
         }
         else
         {
-            options.Stream = null;
-            options.StreamOptions = null;
+            clonedOptions.Stream = null;
+            clonedOptions.StreamOptions = null;
         }
+        return clonedOptions;
     }
 }

src/Custom/Chat/ChatCompletionOptions.cs

@@ -3,6 +3,8 @@
 using System.ClientModel;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Threading;
 
 namespace OpenAI.Chat;
 
@@ -213,4 +215,44 @@ public ChatResponseModalities ResponseModalities
     public ChatOutputPrediction OutputPrediction { get; set; }
 
     internal BinaryContent ToBinaryContent() => BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+
+    internal ChatCompletionOptions Clone()
+    {
+        // Copy the values of the properties to a new instance of ChatCompletionOptions. For collection properties, create a new list and add the items from the original list.
+        var clone = new ChatCompletionOptions();
+        clone.Model = Model;
+        clone.N = N;
+        clone.Stream = Stream;
+        clone.StreamOptions = StreamOptions;
+        clone.IncludeLogProbabilities = IncludeLogProbabilities;
+        clone.TopLogProbabilityCount = TopLogProbabilityCount;
+        foreach (var s in StopSequences) clone.StopSequences.Add(s);
+        foreach (var l in LogitBiases) clone.LogitBiases[l.Key] = l.Value;
+        clone.ToolChoice = ToolChoice;
+        clone.FunctionChoice = FunctionChoice;
+        clone.AllowParallelToolCalls = AllowParallelToolCalls;
+        clone.EndUserId = EndUserId;
+        clone._deprecatedMaxTokens = _deprecatedMaxTokens;
+        clone.MaxOutputTokenCount = MaxOutputTokenCount;
+        foreach (var f in Functions) clone.Functions.Add(f);
+        foreach (var m in Metadata) clone.Metadata[m.Key] = m.Value;
+        clone.StoredOutputEnabled = StoredOutputEnabled;
+        clone.ReasoningEffortLevel = ReasoningEffortLevel;
+        clone.InternalModalities = _internalModalities?.ToList();
+        clone.ResponseModalities = _responseModalities;
+        clone.ResponseFormat = ResponseFormat;
+        clone.AudioOptions = AudioOptions;
+        clone.OutputPrediction = OutputPrediction;
+        clone.Messages = Messages?.Select(m => m).ToList();
+        foreach (var t in Tools) clone.Tools.Add(t);
+        clone.Temperature = Temperature;
+        clone.TopP = TopP;
+        clone.SafetyIdentifier = SafetyIdentifier;
+        clone.ServiceTier = ServiceTier;
+        clone.FrequencyPenalty = FrequencyPenalty;
+        clone.PresencePenalty = PresencePenalty;
+        clone.WebSearchOptions = WebSearchOptions;
+        clone.Seed = Seed;
+        return clone;
+    }
 }

src/Custom/Responses/CreateResponseOptions.cs

@@ -122,10 +122,46 @@ public CreateResponseOptions(IEnumerable<ResponseItem> inputItems, string model
     [CodeGenMember("User")]
     public string EndUserId { get; set; }
 
-    internal CreateResponseOptions GetClone()
+    internal CreateResponseOptions Clone()
     {
-        CreateResponseOptions copiedOptions = (CreateResponseOptions)this.MemberwiseClone();
-        copiedOptions.Patch = _patch;
-        return copiedOptions;
+        var clone = new CreateResponseOptions();
+        foreach (var kvp in Metadata ?? Enumerable.Empty<KeyValuePair<string, string>>())
+        {
+            clone.Metadata[kvp.Key] = kvp.Value;
+        }
+        clone.Temperature = Temperature;
+        clone.TopLogProbabilityCount = TopLogProbabilityCount;
+        clone.TopP = TopP;
+        clone.EndUserId = EndUserId;
+        clone.SafetyIdentifier = SafetyIdentifier;
+        clone.ServiceTier = ServiceTier;
+        clone.PreviousResponseId = PreviousResponseId;
+        clone.Model = Model;
+        clone.ReasoningOptions = ReasoningOptions;
+        clone.BackgroundModeEnabled = BackgroundModeEnabled;
+        clone.MaxOutputTokenCount = MaxOutputTokenCount;
+        clone.MaxToolCallCount = MaxToolCallCount;
+        clone.Instructions = Instructions;
+        clone.TextOptions = TextOptions;
+        foreach (var tool in Tools)
+        {
+            clone.Tools.Add(tool);
+        }
+        clone.ToolChoice = ToolChoice;
+        clone.TruncationMode = TruncationMode;
+        foreach (var item in InputItems)
+        {
+            clone.InputItems.Add(item);
+        }
+        foreach (var item in IncludedProperties)
+        {
+            clone.IncludedProperties.Add(item);
+        }
+        clone.ParallelToolCallsEnabled = ParallelToolCallsEnabled;
+        clone.StoredOutputEnabled = StoredOutputEnabled;
+        clone.StreamingEnabled = StreamingEnabled;
+        clone.ConversationOptions = ConversationOptions;
+
+        return clone;
     }
 }