Fix custom code

Author: ShivangiReja

specification/base/typespec/responses/custom.tsp

@@ -46,4 +46,10 @@ union CodeInterpreterContainerConfigurationType {
 model CodeInterpreterContainerConfiguration {  
   @doc("The type of the output.")  
   type: CodeInterpreterContainerConfigurationType;  
-}
+}
+
+model DeleteResponseResponse {
+    id: string;
+    object: "response";
+    deleted: true;
+};

specification/base/typespec/responses/operations.tsp

@@ -56,11 +56,7 @@ interface Responses {
     @path
     @example("resp_677efb5139a88190b512bc3fef8e535d")
     response_id: string,
-  ): {
-    id: string;
-    object: "response";
-    deleted: true;
-  } | ResponseErrorResponse;
+  ): DeleteResponseResponse | ResponseErrorResponse;
 
   @post
   @route("{response_id}/cancel")

specification/client/responses.client.tsp

@@ -214,6 +214,7 @@ using TypeSpec.HttpClient.CSharp;
 @@dynamicModel(LogProb);
 // custom.tsp models
 @@dynamicModel(ResponseErrorResponse);
+@@dynamicModel(DeleteResponseResponse);
 @@dynamicModel(ReasoningItemSummaryPart);
 @@dynamicModel(ReasoningItemSummaryTextPart);
 @@dynamicModel(CodeInterpreterToolOutput);

src/Custom/Chat/ChatClient.cs

@@ -23,7 +23,7 @@ public partial class ChatClient
 {
     private readonly string _model;
     private readonly OpenTelemetrySource _telemetry;
-    private static readonly InternalChatCompletionStreamOptions s_includeUsageStreamOptions = new(includeUsage: true, additionalBinaryDataProperties: null);
+    private static readonly InternalChatCompletionStreamOptions s_includeUsageStreamOptions = new(includeUsage: true, patch: default);
 
     // CUSTOM: Added as a convenience.
     /// <summary> Initializes a new instance of <see cref="ChatClient"/>. </summary>

src/Custom/Chat/ChatFunctionChoice.Serialization.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
+using System.Text;
 using System.Text.Json;
 
 namespace OpenAI.Chat;
@@ -13,6 +14,14 @@ void IJsonModel<ChatFunctionChoice>.Write(Utf8JsonWriter writer, ModelReaderWrit
 
     internal static void SerializeChatFunctionChoice(ChatFunctionChoice instance, Utf8JsonWriter writer, ModelReaderWriterOptions options)
     {
+#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
+        if (instance.Patch.Contains("$"u8))
+        {
+            writer.WriteRawValue(instance.Patch.GetJson("$"u8));
+            return;
+        }
+#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
+
         if (instance._isPlainString)
         {
             writer.WriteStringValue(instance._string);
@@ -22,12 +31,14 @@ internal static void SerializeChatFunctionChoice(ChatFunctionChoice instance, Ut
             writer.WriteStartObject();
             writer.WritePropertyName("name"u8);
             writer.WriteStringValue(instance._function.Name);
-            writer.WriteSerializedAdditionalRawData(instance._additionalBinaryDataProperties, options);
+#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
+            instance.Patch.WriteTo(writer);
+#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
             writer.WriteEndObject();
         }
     }
 
-    internal static ChatFunctionChoice DeserializeChatFunctionChoice(JsonElement element, ModelReaderWriterOptions options = null)
+    internal static ChatFunctionChoice DeserializeChatFunctionChoice(JsonElement element, BinaryData data, ModelReaderWriterOptions options = null)
     {
         options ??= ModelSerializationExtensions.WireOptions;
 
@@ -42,8 +53,9 @@ internal static ChatFunctionChoice DeserializeChatFunctionChoice(JsonElement ele
         else
         {
             string name = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
+            JsonPatch patch = new JsonPatch(data is null ? ReadOnlyMemory<byte>.Empty : data.ToMemory());
+#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("name"u8))
@@ -53,11 +65,10 @@ internal static ChatFunctionChoice DeserializeChatFunctionChoice(JsonElement ele
                 }
                 if (true)
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    patch.Set([.. "$."u8, .. Encoding.UTF8.GetBytes(property.Name)], property.Value.GetUtf8Bytes());
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ChatFunctionChoice(name, serializedAdditionalRawData);
+            return new ChatFunctionChoice(name, patch);
         }
     }
 }

src/Custom/Chat/ChatFunctionChoice.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ClientModel.Primitives;
 using System.Collections.Generic;
 
 namespace OpenAI.Chat;
@@ -35,16 +36,18 @@ internal ChatFunctionChoice(string predefinedFunctionChoice)
     // CUSTOM: Added the function name parameter to the constructor that takes additional data to handle the object representation.
     /// <summary> Initializes a new instance of <see cref="ChatFunctionChoice"/>. </summary>
     /// <param name="functionName"> The function name. </param>
-    /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-    internal ChatFunctionChoice(string functionName, IDictionary<string, BinaryData> serializedAdditionalRawData)
+    /// <param name="patch"> Keeps track of any properties unknown to the library. </param>
+#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
+    internal ChatFunctionChoice(string functionName, in JsonPatch patch)
     {
         Argument.AssertNotNull(functionName, nameof(functionName));
 
         _function = new(functionName);
         _isPlainString = false;
 
-        _additionalBinaryDataProperties = serializedAdditionalRawData;
+        _patch = patch;
     }
+#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
 
     /// <summary>
     /// Creates an instance of <see cref="ChatFunctionChoice"/> that specifies the model must call a specific function,
@@ -56,7 +59,7 @@ public static ChatFunctionChoice CreateNamedChoice(string functionName)
     {
         Argument.AssertNotNull(functionName, nameof(functionName));
 
-        return new(functionName, serializedAdditionalRawData: null);
+        return new(functionName, patch: default);
     }
 
     /// <summary>

src/Custom/Chat/ChatMessageContent.Serialization.cs

@@ -42,7 +42,7 @@ internal static ChatMessageContent DeserializeChatMessageContent(JsonElement ele
             List<ChatMessageContentPart> parts = [];
             foreach (JsonElement contentPartElement in element.EnumerateArray())
             {
-                parts.Add(ChatMessageContentPart.DeserializeChatMessageContentPart(contentPartElement, options));
+                parts.Add(ChatMessageContentPart.DeserializeChatMessageContentPart(contentPartElement, contentPartElement.GetUtf8Bytes(), options));
             }
             return new(parts);
         }

src/Custom/Chat/ChatMessageContentPart.Serialization.cs

@@ -2,6 +2,7 @@
 using System;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
+using System.Text;
 using System.Text.Json;
 
 namespace OpenAI.Chat;
@@ -14,6 +15,14 @@ void IJsonModel<ChatMessageContentPart>.Write(Utf8JsonWriter writer, ModelReader
 
     internal static void WriteCoreContentPart(ChatMessageContentPart instance, Utf8JsonWriter writer, ModelReaderWriterOptions options)
     {
+#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
+        if (instance.Patch.Contains("$"u8))
+        {
+            writer.WriteRawValue(instance.Patch.GetJson("$"u8));
+            return;
+        }
+#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
+
         writer.WriteStartObject();
         writer.WritePropertyName("type"u8);
         writer.WriteStringValue(instance._kind.ToSerialString());
@@ -43,11 +52,13 @@ internal static void WriteCoreContentPart(ChatMessageContentPart instance, Utf8J
             writer.WritePropertyName("file"u8);
             writer.WriteObjectValue(instance._fileFile, options);
         }
-        writer.WriteSerializedAdditionalRawData(instance._additionalBinaryDataProperties, options);
+#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
+        instance.Patch.WriteTo(writer);
+#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
         writer.WriteEndObject();
     }
 
-    internal static ChatMessageContentPart DeserializeChatMessageContentPart(JsonElement element, ModelReaderWriterOptions options = null)
+    internal static ChatMessageContentPart DeserializeChatMessageContentPart(JsonElement element, BinaryData data, ModelReaderWriterOptions options = null)
     {
         options ??= ModelSerializationExtensions.WireOptions;
 
@@ -62,8 +73,9 @@ internal static ChatMessageContentPart DeserializeChatMessageContentPart(JsonEle
         InternalChatCompletionRequestMessageContentPartImageImageUrl imageUri = default;
         InternalChatCompletionRequestMessageContentPartAudioInputAudio inputAudio = default;
         InternalChatCompletionRequestMessageContentPartFileFile fileFile = default;
-        IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-        Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
+        JsonPatch patch = new JsonPatch(data is null ? ReadOnlyMemory<byte>.Empty : data.ToMemory());
+#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
         foreach (var property in element.EnumerateObject())
         {
             if (property.NameEquals("type"u8))
@@ -78,7 +90,7 @@ internal static ChatMessageContentPart DeserializeChatMessageContentPart(JsonEle
             }
             if (property.NameEquals("image_url"u8))
             {
-                imageUri = InternalChatCompletionRequestMessageContentPartImageImageUrl.DeserializeInternalChatCompletionRequestMessageContentPartImageImageUrl(property.Value, options);
+                imageUri = InternalChatCompletionRequestMessageContentPartImageImageUrl.DeserializeInternalChatCompletionRequestMessageContentPartImageImageUrl(property.Value, property.Value.GetUtf8Bytes(), options);
                 continue;
             }
             if (property.NameEquals("refusal"u8))
@@ -89,21 +101,20 @@ internal static ChatMessageContentPart DeserializeChatMessageContentPart(JsonEle
             if (property.NameEquals("input_audio"u8))
             {
                 inputAudio = InternalChatCompletionRequestMessageContentPartAudioInputAudio
-                    .DeserializeInternalChatCompletionRequestMessageContentPartAudioInputAudio(property.Value, options);
+                    .DeserializeInternalChatCompletionRequestMessageContentPartAudioInputAudio(property.Value, property.Value.GetUtf8Bytes(), options);
                 continue;
             }
             if (property.NameEquals("file"u8))
             {
                 fileFile = InternalChatCompletionRequestMessageContentPartFileFile
-                    .DeserializeInternalChatCompletionRequestMessageContentPartFileFile(property.Value, options);
+                    .DeserializeInternalChatCompletionRequestMessageContentPartFileFile(property.Value, property.Value.GetUtf8Bytes(), options);
                 continue;
             }
             if (true)
             {
-                rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                patch.Set([.. "$."u8, .. Encoding.UTF8.GetBytes(property.Name)], property.Value.GetUtf8Bytes());
             }
         }
-        serializedAdditionalRawData = rawDataDictionary;
-        return new ChatMessageContentPart(kind, text, imageUri, refusal, inputAudio, fileFile, serializedAdditionalRawData);
+        return new ChatMessageContentPart(kind, text, imageUri, refusal, inputAudio, fileFile, patch);
     }
 }

src/Custom/Chat/ChatMessageContentPart.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
@@ -42,23 +43,25 @@ internal ChatMessageContentPart()
     }
 
     // CUSTOM: Added to support deserialization.
+#pragma warning disable SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
     internal ChatMessageContentPart(
         ChatMessageContentPartKind kind,
         string text = default,
         InternalChatCompletionRequestMessageContentPartImageImageUrl imageUri = default,
         string refusal = default,
         InternalChatCompletionRequestMessageContentPartAudioInputAudio inputAudio = default,
         InternalChatCompletionRequestMessageContentPartFileFile fileFile = default,
-        IDictionary<string, BinaryData> serializedAdditionalRawData = default)
+        in JsonPatch patch = default)
     {
         _kind = kind;
         _text = text;
         _imageUri = imageUri;
         _refusal = refusal;
         _inputAudio = inputAudio;
         _fileFile = fileFile;
-        _additionalBinaryDataProperties = serializedAdditionalRawData;
+        _patch = patch;
     }
+#pragma warning restore SCME0001 // Type is for evaluation purposes only and is subject to change or removal in future updates.
 
     /// <summary> The kind of content part. </summary>
     public ChatMessageContentPartKind Kind => _kind;

src/Custom/Chat/ChatResponseFormat.cs

@@ -99,7 +99,7 @@ public static ChatResponseFormat CreateJsonSchemaFormat(string jsonSchemaFormatN
             jsonSchemaFormatName,
             schema: jsonSchema,
             jsonSchemaIsStrict,
-            additionalBinaryDataProperties: null);
+            patch: default);
 
         return new InternalDotNetChatResponseFormatJsonSchema(internalSchema);
     }