diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ApiResponseFormat.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ApiResponseFormat.cs
new file mode 100644
index 000000000000..b2bd551420ac
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ApiResponseFormat.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Possible API response formats. </summary>
+    public readonly partial struct ApiResponseFormat : IEquatable<ApiResponseFormat>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ApiResponseFormat"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ApiResponseFormat(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string TextValue = "text";
+        private const string JsonObjectValue = "json_object";
+
+        /// <summary> `text` format should be used for requests involving any sort of ToolCall. </summary>
+        public static ApiResponseFormat Text { get; } = new ApiResponseFormat(TextValue);
+        /// <summary> Using `json_object` format will limit the usage of ToolCall to only functions. </summary>
+        public static ApiResponseFormat JsonObject { get; } = new ApiResponseFormat(JsonObjectValue);
+        /// <summary> Determines if two <see cref="ApiResponseFormat"/> values are the same. </summary>
+        public static bool operator ==(ApiResponseFormat left, ApiResponseFormat right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ApiResponseFormat"/> values are not the same. </summary>
+        public static bool operator !=(ApiResponseFormat left, ApiResponseFormat right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ApiResponseFormat"/>. </summary>
+        public static implicit operator ApiResponseFormat(string value) => new ApiResponseFormat(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ApiResponseFormat other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ApiResponseFormat other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/Assistant.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/Assistant.Serialization.cs
index 7f7c124b0054..de33b338f1ec 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/Assistant.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/Assistant.Serialization.cs
@@ -68,13 +68,52 @@ void IJsonModel<Assistant>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions
                 writer.WriteObjectValue(item, options);
             }
             writer.WriteEndArray();
-            writer.WritePropertyName("file_ids"u8);
-            writer.WriteStartArray();
-            foreach (var item in FileIds)
+            if (ToolResources != null)
             {
-                writer.WriteStringValue(item);
+                writer.WritePropertyName("tool_resources"u8);
+                writer.WriteObjectValue(ToolResources, options);
+            }
+            else
+            {
+                writer.WriteNull("tool_resources");
+            }
+            if (Temperature != null)
+            {
+                writer.WritePropertyName("temperature"u8);
+                writer.WriteNumberValue(Temperature.Value);
+            }
+            else
+            {
+                writer.WriteNull("temperature");
+            }
+            if (TopP != null)
+            {
+                writer.WritePropertyName("top_p"u8);
+                writer.WriteNumberValue(TopP.Value);
+            }
+            else
+            {
+                writer.WriteNull("top_p");
+            }
+            if (Optional.IsDefined(ResponseFormat))
+            {
+                if (ResponseFormat != null)
+                {
+                    writer.WritePropertyName("response_format"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(ResponseFormat);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(ResponseFormat))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+                else
+                {
+                    writer.WriteNull("response_format");
+                }
             }
-            writer.WriteEndArray();
             if (Metadata != null && Optional.IsCollectionDefined(Metadata))
             {
                 writer.WritePropertyName("metadata"u8);
@@ -136,7 +175,10 @@ internal static Assistant DeserializeAssistant(JsonElement element, ModelReaderW
             string model = default;
             string instructions = default;
             IReadOnlyList<ToolDefinition> tools = default;
-            IReadOnlyList<string> fileIds = default;
+            ToolResources toolResources = default;
+            float? temperature = default;
+            float? topP = default;
+            BinaryData responseFormat = default;
             IReadOnlyDictionary<string, string> metadata = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -202,14 +244,44 @@ internal static Assistant DeserializeAssistant(JsonElement element, ModelReaderW
                     tools = array;
                     continue;
                 }
-                if (property.NameEquals("file_ids"u8))
+                if (property.NameEquals("tool_resources"u8))
                 {
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    if (property.Value.ValueKind == JsonValueKind.Null)
                     {
-                        array.Add(item.GetString());
+                        toolResources = null;
+                        continue;
+                    }
+                    toolResources = ToolResources.DeserializeToolResources(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("temperature"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        temperature = null;
+                        continue;
+                    }
+                    temperature = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("top_p"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        topP = null;
+                        continue;
+                    }
+                    topP = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("response_format"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        responseFormat = null;
+                        continue;
                     }
-                    fileIds = array;
+                    responseFormat = BinaryData.FromString(property.Value.GetRawText());
                     continue;
                 }
                 if (property.NameEquals("metadata"u8))
@@ -242,7 +314,10 @@ internal static Assistant DeserializeAssistant(JsonElement element, ModelReaderW
                 model,
                 instructions,
                 tools,
-                fileIds,
+                toolResources,
+                temperature,
+                topP,
+                responseFormat,
                 metadata,
                 serializedAdditionalRawData);
         }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/Assistant.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/Assistant.cs
index 34402e5480d9..09b938b95c0e 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/Assistant.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/Assistant.cs
@@ -56,17 +56,29 @@ public partial class Assistant
         /// <param name="tools">
         /// The collection of tools enabled for the assistant.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
+        /// </param>
+        /// <param name="toolResources">
+        /// A set of resources that are used by the assistant's tools. The resources are specific to the type of tool. For example, the `code_interpreter`
+        /// tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.
+        /// </param>
+        /// <param name="temperature">
+        /// What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random,
+        /// while lower values like 0.2 will make it more focused and deterministic.
+        /// </param>
+        /// <param name="topP">
+        /// An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass.
+        /// So 0.1 means only the tokens comprising the top 10% probability mass are considered.
+        ///
+        /// We generally recommend altering this or temperature but not both.
         /// </param>
-        /// <param name="fileIds"> A list of attached file IDs, ordered by creation date in ascending order. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="id"/>, <paramref name="model"/>, <paramref name="tools"/> or <paramref name="fileIds"/> is null. </exception>
-        internal Assistant(string id, DateTimeOffset createdAt, string name, string description, string model, string instructions, IEnumerable<ToolDefinition> tools, IEnumerable<string> fileIds, IReadOnlyDictionary<string, string> metadata)
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/>, <paramref name="model"/> or <paramref name="tools"/> is null. </exception>
+        internal Assistant(string id, DateTimeOffset createdAt, string name, string description, string model, string instructions, IEnumerable<ToolDefinition> tools, ToolResources toolResources, float? temperature, float? topP, IReadOnlyDictionary<string, string> metadata)
         {
             Argument.AssertNotNull(id, nameof(id));
             Argument.AssertNotNull(model, nameof(model));
             Argument.AssertNotNull(tools, nameof(tools));
-            Argument.AssertNotNull(fileIds, nameof(fileIds));
 
             Id = id;
             CreatedAt = createdAt;
@@ -75,7 +87,9 @@ internal Assistant(string id, DateTimeOffset createdAt, string name, string desc
             Model = model;
             Instructions = instructions;
             Tools = tools.ToList();
-            FileIds = fileIds.ToList();
+            ToolResources = toolResources;
+            Temperature = temperature;
+            TopP = topP;
             Metadata = metadata;
         }
 
@@ -90,12 +104,26 @@ internal Assistant(string id, DateTimeOffset createdAt, string name, string desc
         /// <param name="tools">
         /// The collection of tools enabled for the assistant.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
+        /// </param>
+        /// <param name="toolResources">
+        /// A set of resources that are used by the assistant's tools. The resources are specific to the type of tool. For example, the `code_interpreter`
+        /// tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.
+        /// </param>
+        /// <param name="temperature">
+        /// What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random,
+        /// while lower values like 0.2 will make it more focused and deterministic.
+        /// </param>
+        /// <param name="topP">
+        /// An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass.
+        /// So 0.1 means only the tokens comprising the top 10% probability mass are considered.
+        ///
+        /// We generally recommend altering this or temperature but not both.
         /// </param>
-        /// <param name="fileIds"> A list of attached file IDs, ordered by creation date in ascending order. </param>
+        /// <param name="responseFormat"> The response format of the tool calls used by this assistant. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal Assistant(string id, string @object, DateTimeOffset createdAt, string name, string description, string model, string instructions, IReadOnlyList<ToolDefinition> tools, IReadOnlyList<string> fileIds, IReadOnlyDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal Assistant(string id, string @object, DateTimeOffset createdAt, string name, string description, string model, string instructions, IReadOnlyList<ToolDefinition> tools, ToolResources toolResources, float? temperature, float? topP, BinaryData responseFormat, IReadOnlyDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Id = id;
             Object = @object;
@@ -105,7 +133,10 @@ internal Assistant(string id, string @object, DateTimeOffset createdAt, string n
             Model = model;
             Instructions = instructions;
             Tools = tools;
-            FileIds = fileIds;
+            ToolResources = toolResources;
+            Temperature = temperature;
+            TopP = topP;
+            ResponseFormat = responseFormat;
             Metadata = metadata;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
@@ -131,11 +162,71 @@ internal Assistant()
         /// <summary>
         /// The collection of tools enabled for the assistant.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
         /// </summary>
         public IReadOnlyList<ToolDefinition> Tools { get; }
-        /// <summary> A list of attached file IDs, ordered by creation date in ascending order. </summary>
-        public IReadOnlyList<string> FileIds { get; }
+        /// <summary>
+        /// A set of resources that are used by the assistant's tools. The resources are specific to the type of tool. For example, the `code_interpreter`
+        /// tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.
+        /// </summary>
+        public ToolResources ToolResources { get; }
+        /// <summary>
+        /// What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random,
+        /// while lower values like 0.2 will make it more focused and deterministic.
+        /// </summary>
+        public float? Temperature { get; }
+        /// <summary>
+        /// An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass.
+        /// So 0.1 means only the tokens comprising the top 10% probability mass are considered.
+        ///
+        /// We generally recommend altering this or temperature but not both.
+        /// </summary>
+        public float? TopP { get; }
+        /// <summary>
+        /// The response format of the tool calls used by this assistant.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="string"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiResponseFormatMode"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiResponseFormat"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData ResponseFormat { get; }
         /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
         public IReadOnlyDictionary<string, string> Metadata { get; }
     }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantCreationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantCreationOptions.Serialization.cs
index 28455a04d327..c906e565aced 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantCreationOptions.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantCreationOptions.Serialization.cs
@@ -74,15 +74,60 @@ void IJsonModel<AssistantCreationOptions>.Write(Utf8JsonWriter writer, ModelRead
                 }
                 writer.WriteEndArray();
             }
-            if (Optional.IsCollectionDefined(FileIds))
+            if (Optional.IsDefined(ToolResources))
             {
-                writer.WritePropertyName("file_ids"u8);
-                writer.WriteStartArray();
-                foreach (var item in FileIds)
+                if (ToolResources != null)
                 {
-                    writer.WriteStringValue(item);
+                    writer.WritePropertyName("tool_resources"u8);
+                    writer.WriteObjectValue(ToolResources, options);
+                }
+                else
+                {
+                    writer.WriteNull("tool_resources");
+                }
+            }
+            if (Optional.IsDefined(Temperature))
+            {
+                if (Temperature != null)
+                {
+                    writer.WritePropertyName("temperature"u8);
+                    writer.WriteNumberValue(Temperature.Value);
+                }
+                else
+                {
+                    writer.WriteNull("temperature");
+                }
+            }
+            if (Optional.IsDefined(TopP))
+            {
+                if (TopP != null)
+                {
+                    writer.WritePropertyName("top_p"u8);
+                    writer.WriteNumberValue(TopP.Value);
+                }
+                else
+                {
+                    writer.WriteNull("top_p");
+                }
+            }
+            if (Optional.IsDefined(ResponseFormat))
+            {
+                if (ResponseFormat != null)
+                {
+                    writer.WritePropertyName("response_format"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(ResponseFormat);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(ResponseFormat))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+                else
+                {
+                    writer.WriteNull("response_format");
                 }
-                writer.WriteEndArray();
             }
             if (Optional.IsCollectionDefined(Metadata))
             {
@@ -145,7 +190,10 @@ internal static AssistantCreationOptions DeserializeAssistantCreationOptions(Jso
             string description = default;
             string instructions = default;
             IList<ToolDefinition> tools = default;
-            IList<string> fileIds = default;
+            CreateToolResourcesOptions toolResources = default;
+            float? temperature = default;
+            float? topP = default;
+            BinaryData responseFormat = default;
             IDictionary<string, string> metadata = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -200,18 +248,44 @@ internal static AssistantCreationOptions DeserializeAssistantCreationOptions(Jso
                     tools = array;
                     continue;
                 }
-                if (property.NameEquals("file_ids"u8))
+                if (property.NameEquals("tool_resources"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
+                        toolResources = null;
                         continue;
                     }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    toolResources = CreateToolResourcesOptions.DeserializeCreateToolResourcesOptions(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("temperature"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        temperature = null;
+                        continue;
+                    }
+                    temperature = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("top_p"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
                     {
-                        array.Add(item.GetString());
+                        topP = null;
+                        continue;
+                    }
+                    topP = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("response_format"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        responseFormat = null;
+                        continue;
                     }
-                    fileIds = array;
+                    responseFormat = BinaryData.FromString(property.Value.GetRawText());
                     continue;
                 }
                 if (property.NameEquals("metadata"u8))
@@ -240,7 +314,10 @@ internal static AssistantCreationOptions DeserializeAssistantCreationOptions(Jso
                 description,
                 instructions,
                 tools ?? new ChangeTrackingList<ToolDefinition>(),
-                fileIds ?? new ChangeTrackingList<string>(),
+                toolResources,
+                temperature,
+                topP,
+                responseFormat,
                 metadata ?? new ChangeTrackingDictionary<string, string>(),
                 serializedAdditionalRawData);
         }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantCreationOptions.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantCreationOptions.cs
index 34372f563399..87275c6b0976 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantCreationOptions.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantCreationOptions.cs
@@ -54,7 +54,6 @@ public AssistantCreationOptions(string model)
 
             Model = model;
             Tools = new ChangeTrackingList<ToolDefinition>();
-            FileIds = new ChangeTrackingList<string>();
             Metadata = new ChangeTrackingDictionary<string, string>();
         }
 
@@ -66,19 +65,36 @@ public AssistantCreationOptions(string model)
         /// <param name="tools">
         /// The collection of tools to enable for the new assistant.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
         /// </param>
-        /// <param name="fileIds"> A list of previously uploaded file IDs to attach to the assistant. </param>
+        /// <param name="toolResources">
+        /// A set of resources that are used by the assistant's tools. The resources are specific to the type of tool. For example, the `code_interpreter`
+        /// tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.
+        /// </param>
+        /// <param name="temperature">
+        /// What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random,
+        /// while lower values like 0.2 will make it more focused and deterministic.
+        /// </param>
+        /// <param name="topP">
+        /// An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass.
+        /// So 0.1 means only the tokens comprising the top 10% probability mass are considered.
+        ///
+        /// We generally recommend altering this or temperature but not both.
+        /// </param>
+        /// <param name="responseFormat"> The response format of the tool calls used by this assistant. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AssistantCreationOptions(string model, string name, string description, string instructions, IList<ToolDefinition> tools, IList<string> fileIds, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal AssistantCreationOptions(string model, string name, string description, string instructions, IList<ToolDefinition> tools, CreateToolResourcesOptions toolResources, float? temperature, float? topP, BinaryData responseFormat, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Model = model;
             Name = name;
             Description = description;
             Instructions = instructions;
             Tools = tools;
-            FileIds = fileIds;
+            ToolResources = toolResources;
+            Temperature = temperature;
+            TopP = topP;
+            ResponseFormat = responseFormat;
             Metadata = metadata;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
@@ -99,11 +115,71 @@ internal AssistantCreationOptions()
         /// <summary>
         /// The collection of tools to enable for the new assistant.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
         /// </summary>
         public IList<ToolDefinition> Tools { get; }
-        /// <summary> A list of previously uploaded file IDs to attach to the assistant. </summary>
-        public IList<string> FileIds { get; }
+        /// <summary>
+        /// A set of resources that are used by the assistant's tools. The resources are specific to the type of tool. For example, the `code_interpreter`
+        /// tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.
+        /// </summary>
+        public CreateToolResourcesOptions ToolResources { get; set; }
+        /// <summary>
+        /// What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random,
+        /// while lower values like 0.2 will make it more focused and deterministic.
+        /// </summary>
+        public float? Temperature { get; set; }
+        /// <summary>
+        /// An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass.
+        /// So 0.1 means only the tokens comprising the top 10% probability mass are considered.
+        ///
+        /// We generally recommend altering this or temperature but not both.
+        /// </summary>
+        public float? TopP { get; set; }
+        /// <summary>
+        /// The response format of the tool calls used by this assistant.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="string"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiResponseFormatMode"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiResponseFormat"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData ResponseFormat { get; set; }
         /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
         public IDictionary<string, string> Metadata { get; set; }
     }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantStreamEvent.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantStreamEvent.cs
new file mode 100644
index 000000000000..3c35b2590d78
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantStreamEvent.cs
@@ -0,0 +1,134 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary>
+    /// Each event in a server-sent events stream has an `event` and `data` property:
+    ///
+    /// ```
+    /// event: thread.created
+    /// data: {"id": "thread_123", "object": "thread", ...}
+    /// ```
+    ///
+    /// We emit events whenever a new object is created, transitions to a new state, or is being
+    /// streamed in parts (deltas). For example, we emit `thread.run.created` when a new run
+    /// is created, `thread.run.completed` when a run completes, and so on. When an Assistant chooses
+    /// to create a message during a run, we emit a `thread.message.created event`, a
+    /// `thread.message.in_progress` event, many `thread.message.delta` events, and finally a
+    /// `thread.message.completed` event.
+    ///
+    /// We may add additional events over time, so we recommend handling unknown events gracefully
+    /// in your code.
+    /// </summary>
+    public readonly partial struct AssistantStreamEvent : IEquatable<AssistantStreamEvent>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="AssistantStreamEvent"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public AssistantStreamEvent(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ThreadCreatedValue = "thread.created";
+        private const string ThreadRunCreatedValue = "thread.run.created";
+        private const string ThreadRunQueuedValue = "thread.run.queued";
+        private const string ThreadRunInProgressValue = "thread.run.in_progress";
+        private const string ThreadRunRequiresActionValue = "thread.run.requires_action";
+        private const string ThreadRunCompletedValue = "thread.run.completed";
+        private const string ThreadRunFailedValue = "thread.run.failed";
+        private const string ThreadRunCancellingValue = "thread.run.cancelling";
+        private const string ThreadRunCancelledValue = "thread.run.cancelled";
+        private const string ThreadRunExpiredValue = "thread.run.expired";
+        private const string ThreadRunStepCreatedValue = "thread.run.step.created";
+        private const string ThreadRunStepInProgressValue = "thread.run.step.in_progress";
+        private const string ThreadRunStepDeltaValue = "thread.run.step.delta";
+        private const string ThreadRunStepCompletedValue = "thread.run.step.completed";
+        private const string ThreadRunStepFailedValue = "thread.run.step.failed";
+        private const string ThreadRunStepCancelledValue = "thread.run.step.cancelled";
+        private const string ThreadRunStepExpiredValue = "thread.run.step.expired";
+        private const string ThreadMessageCreatedValue = "thread.message.created";
+        private const string ThreadMessageInProgressValue = "thread.message.in_progress";
+        private const string ThreadMessageDeltaValue = "thread.message.delta";
+        private const string ThreadMessageCompletedValue = "thread.message.completed";
+        private const string ThreadMessageIncompleteValue = "thread.message.incomplete";
+        private const string ErrorValue = "error";
+        private const string DoneValue = "done";
+
+        /// <summary> Event sent when a new thread is created. The data of this event is of type AssistantThread. </summary>
+        public static AssistantStreamEvent ThreadCreated { get; } = new AssistantStreamEvent(ThreadCreatedValue);
+        /// <summary> Event sent when a new run is created. The data of this event is of type ThreadRun. </summary>
+        public static AssistantStreamEvent ThreadRunCreated { get; } = new AssistantStreamEvent(ThreadRunCreatedValue);
+        /// <summary> Event sent when a run moves to `queued` status. The data of this event is of type ThreadRun. </summary>
+        public static AssistantStreamEvent ThreadRunQueued { get; } = new AssistantStreamEvent(ThreadRunQueuedValue);
+        /// <summary> Event sent when a run moves to `in_progress` status. The data of this event is of type ThreadRun. </summary>
+        public static AssistantStreamEvent ThreadRunInProgress { get; } = new AssistantStreamEvent(ThreadRunInProgressValue);
+        /// <summary> Event sent when a run moves to `requires_action` status. The data of this event is of type ThreadRun. </summary>
+        public static AssistantStreamEvent ThreadRunRequiresAction { get; } = new AssistantStreamEvent(ThreadRunRequiresActionValue);
+        /// <summary> Event sent when a run is completed. The data of this event is of type ThreadRun. </summary>
+        public static AssistantStreamEvent ThreadRunCompleted { get; } = new AssistantStreamEvent(ThreadRunCompletedValue);
+        /// <summary> Event sent when a run fails. The data of this event is of type ThreadRun. </summary>
+        public static AssistantStreamEvent ThreadRunFailed { get; } = new AssistantStreamEvent(ThreadRunFailedValue);
+        /// <summary> Event sent when a run moves to `cancelling` status. The data of this event is of type ThreadRun. </summary>
+        public static AssistantStreamEvent ThreadRunCancelling { get; } = new AssistantStreamEvent(ThreadRunCancellingValue);
+        /// <summary> Event sent when a run is cancelled. The data of this event is of type ThreadRun. </summary>
+        public static AssistantStreamEvent ThreadRunCancelled { get; } = new AssistantStreamEvent(ThreadRunCancelledValue);
+        /// <summary> Event sent when a run is expired. The data of this event is of type ThreadRun. </summary>
+        public static AssistantStreamEvent ThreadRunExpired { get; } = new AssistantStreamEvent(ThreadRunExpiredValue);
+        /// <summary> Event sent when a new thread run step is created. The data of this event is of type RunStep. </summary>
+        public static AssistantStreamEvent ThreadRunStepCreated { get; } = new AssistantStreamEvent(ThreadRunStepCreatedValue);
+        /// <summary> Event sent when a run step moves to `in_progress` status. The data of this event is of type RunStep. </summary>
+        public static AssistantStreamEvent ThreadRunStepInProgress { get; } = new AssistantStreamEvent(ThreadRunStepInProgressValue);
+        /// <summary> Event sent when a run stepis being streamed. The data of this event is of type RunStepDeltaChunk. </summary>
+        public static AssistantStreamEvent ThreadRunStepDelta { get; } = new AssistantStreamEvent(ThreadRunStepDeltaValue);
+        /// <summary> Event sent when a run step is completed. The data of this event is of type RunStep. </summary>
+        public static AssistantStreamEvent ThreadRunStepCompleted { get; } = new AssistantStreamEvent(ThreadRunStepCompletedValue);
+        /// <summary> Event sent when a run step fails. The data of this event is of type RunStep. </summary>
+        public static AssistantStreamEvent ThreadRunStepFailed { get; } = new AssistantStreamEvent(ThreadRunStepFailedValue);
+        /// <summary> Event sent when a run step is cancelled. The data of this event is of type RunStep. </summary>
+        public static AssistantStreamEvent ThreadRunStepCancelled { get; } = new AssistantStreamEvent(ThreadRunStepCancelledValue);
+        /// <summary> Event sent when a run step is expired. The data of this event is of type RunStep. </summary>
+        public static AssistantStreamEvent ThreadRunStepExpired { get; } = new AssistantStreamEvent(ThreadRunStepExpiredValue);
+        /// <summary> Event sent when a new message is created. The data of this event is of type ThreadMessage. </summary>
+        public static AssistantStreamEvent ThreadMessageCreated { get; } = new AssistantStreamEvent(ThreadMessageCreatedValue);
+        /// <summary> Event sent when a message moves to `in_progress` status. The data of this event is of type ThreadMessage. </summary>
+        public static AssistantStreamEvent ThreadMessageInProgress { get; } = new AssistantStreamEvent(ThreadMessageInProgressValue);
+        /// <summary> Event sent when a message is being streamed. The data of this event is of type MessageDeltaChunk. </summary>
+        public static AssistantStreamEvent ThreadMessageDelta { get; } = new AssistantStreamEvent(ThreadMessageDeltaValue);
+        /// <summary> Event sent when a message is completed. The data of this event is of type ThreadMessage. </summary>
+        public static AssistantStreamEvent ThreadMessageCompleted { get; } = new AssistantStreamEvent(ThreadMessageCompletedValue);
+        /// <summary> Event sent before a message is completed. The data of this event is of type ThreadMessage. </summary>
+        public static AssistantStreamEvent ThreadMessageIncomplete { get; } = new AssistantStreamEvent(ThreadMessageIncompleteValue);
+        /// <summary> Event sent when an error occurs, such as an internal server error or a timeout. </summary>
+        public static AssistantStreamEvent Error { get; } = new AssistantStreamEvent(ErrorValue);
+        /// <summary> Event sent when the stream is done. </summary>
+        public static AssistantStreamEvent Done { get; } = new AssistantStreamEvent(DoneValue);
+        /// <summary> Determines if two <see cref="AssistantStreamEvent"/> values are the same. </summary>
+        public static bool operator ==(AssistantStreamEvent left, AssistantStreamEvent right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="AssistantStreamEvent"/> values are not the same. </summary>
+        public static bool operator !=(AssistantStreamEvent left, AssistantStreamEvent right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="AssistantStreamEvent"/>. </summary>
+        public static implicit operator AssistantStreamEvent(string value) => new AssistantStreamEvent(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is AssistantStreamEvent other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(AssistantStreamEvent other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThread.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThread.Serialization.cs
index 72793c7f2950..550ab46b2be4 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThread.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThread.Serialization.cs
@@ -32,6 +32,15 @@ void IJsonModel<AssistantThread>.Write(Utf8JsonWriter writer, ModelReaderWriterO
             writer.WriteStringValue(Object);
             writer.WritePropertyName("created_at"u8);
             writer.WriteNumberValue(CreatedAt, "U");
+            if (ToolResources != null)
+            {
+                writer.WritePropertyName("tool_resources"u8);
+                writer.WriteObjectValue(ToolResources, options);
+            }
+            else
+            {
+                writer.WriteNull("tool_resources");
+            }
             if (Metadata != null && Optional.IsCollectionDefined(Metadata))
             {
                 writer.WritePropertyName("metadata"u8);
@@ -88,6 +97,7 @@ internal static AssistantThread DeserializeAssistantThread(JsonElement element,
             string id = default;
             string @object = default;
             DateTimeOffset createdAt = default;
+            ToolResources toolResources = default;
             IReadOnlyDictionary<string, string> metadata = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -108,6 +118,16 @@ internal static AssistantThread DeserializeAssistantThread(JsonElement element,
                     createdAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
                     continue;
                 }
+                if (property.NameEquals("tool_resources"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        toolResources = null;
+                        continue;
+                    }
+                    toolResources = ToolResources.DeserializeToolResources(property.Value, options);
+                    continue;
+                }
                 if (property.NameEquals("metadata"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
@@ -129,7 +149,13 @@ internal static AssistantThread DeserializeAssistantThread(JsonElement element,
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new AssistantThread(id, @object, createdAt, metadata, serializedAdditionalRawData);
+            return new AssistantThread(
+                id,
+                @object,
+                createdAt,
+                toolResources,
+                metadata,
+                serializedAdditionalRawData);
         }
 
         BinaryData IPersistableModel<AssistantThread>.Write(ModelReaderWriterOptions options)
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThread.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThread.cs
index 55fb2ac9a88e..11820b0ed0b6 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThread.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThread.cs
@@ -48,14 +48,20 @@ public partial class AssistantThread
         /// <summary> Initializes a new instance of <see cref="AssistantThread"/>. </summary>
         /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
         /// <param name="createdAt"> The Unix timestamp, in seconds, representing when this object was created. </param>
+        /// <param name="toolResources">
+        /// A set of resources that are made available to the assistant's tools in this thread. The resources are specific to the type
+        /// of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires a list
+        /// of vector store IDs.
+        /// </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
-        internal AssistantThread(string id, DateTimeOffset createdAt, IReadOnlyDictionary<string, string> metadata)
+        internal AssistantThread(string id, DateTimeOffset createdAt, ToolResources toolResources, IReadOnlyDictionary<string, string> metadata)
         {
             Argument.AssertNotNull(id, nameof(id));
 
             Id = id;
             CreatedAt = createdAt;
+            ToolResources = toolResources;
             Metadata = metadata;
         }
 
@@ -63,13 +69,19 @@ internal AssistantThread(string id, DateTimeOffset createdAt, IReadOnlyDictionar
         /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
         /// <param name="object"> The object type, which is always 'thread'. </param>
         /// <param name="createdAt"> The Unix timestamp, in seconds, representing when this object was created. </param>
+        /// <param name="toolResources">
+        /// A set of resources that are made available to the assistant's tools in this thread. The resources are specific to the type
+        /// of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires a list
+        /// of vector store IDs.
+        /// </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AssistantThread(string id, string @object, DateTimeOffset createdAt, IReadOnlyDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal AssistantThread(string id, string @object, DateTimeOffset createdAt, ToolResources toolResources, IReadOnlyDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Id = id;
             Object = @object;
             CreatedAt = createdAt;
+            ToolResources = toolResources;
             Metadata = metadata;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
@@ -84,6 +96,12 @@ internal AssistantThread()
 
         /// <summary> The Unix timestamp, in seconds, representing when this object was created. </summary>
         public DateTimeOffset CreatedAt { get; }
+        /// <summary>
+        /// A set of resources that are made available to the assistant's tools in this thread. The resources are specific to the type
+        /// of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires a list
+        /// of vector store IDs.
+        /// </summary>
+        public ToolResources ToolResources { get; }
         /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
         public IReadOnlyDictionary<string, string> Metadata { get; }
     }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThreadCreationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThreadCreationOptions.Serialization.cs
index ffd998161e30..873de1490d7f 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThreadCreationOptions.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThreadCreationOptions.Serialization.cs
@@ -36,6 +36,18 @@ void IJsonModel<AssistantThreadCreationOptions>.Write(Utf8JsonWriter writer, Mod
                 }
                 writer.WriteEndArray();
             }
+            if (Optional.IsDefined(ToolResources))
+            {
+                if (ToolResources != null)
+                {
+                    writer.WritePropertyName("tool_resources"u8);
+                    writer.WriteObjectValue(ToolResources, options);
+                }
+                else
+                {
+                    writer.WriteNull("tool_resources");
+                }
+            }
             if (Optional.IsCollectionDefined(Metadata))
             {
                 if (Metadata != null)
@@ -92,7 +104,8 @@ internal static AssistantThreadCreationOptions DeserializeAssistantThreadCreatio
             {
                 return null;
             }
-            IList<ThreadInitializationMessage> messages = default;
+            IList<ThreadMessageOptions> messages = default;
+            CreateToolResourcesOptions toolResources = default;
             IDictionary<string, string> metadata = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -104,14 +117,24 @@ internal static AssistantThreadCreationOptions DeserializeAssistantThreadCreatio
                     {
                         continue;
                     }
-                    List<ThreadInitializationMessage> array = new List<ThreadInitializationMessage>();
+                    List<ThreadMessageOptions> array = new List<ThreadMessageOptions>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(ThreadInitializationMessage.DeserializeThreadInitializationMessage(item, options));
+                        array.Add(ThreadMessageOptions.DeserializeThreadMessageOptions(item, options));
                     }
                     messages = array;
                     continue;
                 }
+                if (property.NameEquals("tool_resources"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        toolResources = null;
+                        continue;
+                    }
+                    toolResources = CreateToolResourcesOptions.DeserializeCreateToolResourcesOptions(property.Value, options);
+                    continue;
+                }
                 if (property.NameEquals("metadata"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
@@ -132,7 +155,7 @@ internal static AssistantThreadCreationOptions DeserializeAssistantThreadCreatio
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new AssistantThreadCreationOptions(messages ?? new ChangeTrackingList<ThreadInitializationMessage>(), metadata ?? new ChangeTrackingDictionary<string, string>(), serializedAdditionalRawData);
+            return new AssistantThreadCreationOptions(messages ?? new ChangeTrackingList<ThreadMessageOptions>(), toolResources, metadata ?? new ChangeTrackingDictionary<string, string>(), serializedAdditionalRawData);
         }
 
         BinaryData IPersistableModel<AssistantThreadCreationOptions>.Write(ModelReaderWriterOptions options)
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThreadCreationOptions.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThreadCreationOptions.cs
index 2df216a2c7e8..086af4d9dc8a 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThreadCreationOptions.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantThreadCreationOptions.cs
@@ -48,23 +48,35 @@ public partial class AssistantThreadCreationOptions
         /// <summary> Initializes a new instance of <see cref="AssistantThreadCreationOptions"/>. </summary>
         public AssistantThreadCreationOptions()
         {
-            Messages = new ChangeTrackingList<ThreadInitializationMessage>();
+            Messages = new ChangeTrackingList<ThreadMessageOptions>();
             Metadata = new ChangeTrackingDictionary<string, string>();
         }
 
         /// <summary> Initializes a new instance of <see cref="AssistantThreadCreationOptions"/>. </summary>
         /// <param name="messages"> The initial messages to associate with the new thread. </param>
+        /// <param name="toolResources">
+        /// A set of resources that are made available to the assistant's tools in this thread. The resources are specific to the
+        /// type of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires
+        /// a list of vector store IDs.
+        /// </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AssistantThreadCreationOptions(IList<ThreadInitializationMessage> messages, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal AssistantThreadCreationOptions(IList<ThreadMessageOptions> messages, CreateToolResourcesOptions toolResources, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Messages = messages;
+            ToolResources = toolResources;
             Metadata = metadata;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
         /// <summary> The initial messages to associate with the new thread. </summary>
-        public IList<ThreadInitializationMessage> Messages { get; }
+        public IList<ThreadMessageOptions> Messages { get; }
+        /// <summary>
+        /// A set of resources that are made available to the assistant's tools in this thread. The resources are specific to the
+        /// type of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires
+        /// a list of vector store IDs.
+        /// </summary>
+        public CreateToolResourcesOptions ToolResources { get; set; }
         /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
         public IDictionary<string, string> Metadata { get; set; }
     }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsApiResponseFormat.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsApiResponseFormat.Serialization.cs
new file mode 100644
index 000000000000..c1cc832cf7b1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsApiResponseFormat.Serialization.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class AssistantsApiResponseFormat : IUtf8JsonSerializable, IJsonModel<AssistantsApiResponseFormat>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AssistantsApiResponseFormat>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AssistantsApiResponseFormat>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AssistantsApiResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AssistantsApiResponseFormat)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Type))
+            {
+                writer.WritePropertyName("type"u8);
+                writer.WriteStringValue(Type.Value.ToString());
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AssistantsApiResponseFormat IJsonModel<AssistantsApiResponseFormat>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AssistantsApiResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AssistantsApiResponseFormat)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAssistantsApiResponseFormat(document.RootElement, options);
+        }
+
+        internal static AssistantsApiResponseFormat DeserializeAssistantsApiResponseFormat(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            ApiResponseFormat? type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    type = new ApiResponseFormat(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AssistantsApiResponseFormat(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AssistantsApiResponseFormat>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AssistantsApiResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AssistantsApiResponseFormat)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AssistantsApiResponseFormat IPersistableModel<AssistantsApiResponseFormat>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AssistantsApiResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAssistantsApiResponseFormat(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AssistantsApiResponseFormat)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AssistantsApiResponseFormat>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AssistantsApiResponseFormat FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAssistantsApiResponseFormat(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIChatErrorResponse.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsApiResponseFormat.cs
similarity index 61%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIChatErrorResponse.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsApiResponseFormat.cs
index 767fce2b029e..02f2e275e525 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIChatErrorResponse.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsApiResponseFormat.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -5,10 +8,13 @@
 using System;
 using System.Collections.Generic;
 
-namespace Azure.AI.OpenAI
+namespace Azure.AI.OpenAI.Assistants
 {
-    /// <summary> A structured representation of an error an Azure OpenAI request. </summary>
-    internal partial class AzureOpenAIChatErrorResponse
+    /// <summary>
+    /// An object describing the expected output of the model. If `json_object` only `function` type `tools` are allowed to be passed to the Run.
+    /// If `text` the model can return text or any value needed.
+    /// </summary>
+    public partial class AssistantsApiResponseFormat
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -40,22 +46,23 @@ internal partial class AzureOpenAIChatErrorResponse
         /// </list>
         /// </para>
         /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="AzureOpenAIChatErrorResponse"/>. </summary>
-        internal AzureOpenAIChatErrorResponse()
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AssistantsApiResponseFormat"/>. </summary>
+        public AssistantsApiResponseFormat()
         {
         }
 
-        /// <summary> Initializes a new instance of <see cref="AzureOpenAIChatErrorResponse"/>. </summary>
-        /// <param name="error"></param>
+        /// <summary> Initializes a new instance of <see cref="AssistantsApiResponseFormat"/>. </summary>
+        /// <param name="type"> Must be one of `text` or `json_object`. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AzureOpenAIChatErrorResponse(AzureOpenAIChatError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal AssistantsApiResponseFormat(ApiResponseFormat? type, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
-            Error = error;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
+            Type = type;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Gets the error. </summary>
-        public AzureOpenAIChatError Error { get; }
+        /// <summary> Must be one of `text` or `json_object`. </summary>
+        public ApiResponseFormat? Type { get; set; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsApiResponseFormatMode.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsApiResponseFormatMode.cs
new file mode 100644
index 000000000000..1dac794d9529
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsApiResponseFormatMode.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents the mode in which the model will handle the return format of a tool call. </summary>
+    public readonly partial struct AssistantsApiResponseFormatMode : IEquatable<AssistantsApiResponseFormatMode>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="AssistantsApiResponseFormatMode"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public AssistantsApiResponseFormatMode(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string AutoValue = "auto";
+        private const string NoneValue = "none";
+
+        /// <summary> Default value. Let the model handle the return format. </summary>
+        public static AssistantsApiResponseFormatMode Auto { get; } = new AssistantsApiResponseFormatMode(AutoValue);
+        /// <summary> Setting the value to `none`, will result in a 400 Bad request. </summary>
+        public static AssistantsApiResponseFormatMode None { get; } = new AssistantsApiResponseFormatMode(NoneValue);
+        /// <summary> Determines if two <see cref="AssistantsApiResponseFormatMode"/> values are the same. </summary>
+        public static bool operator ==(AssistantsApiResponseFormatMode left, AssistantsApiResponseFormatMode right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="AssistantsApiResponseFormatMode"/> values are not the same. </summary>
+        public static bool operator !=(AssistantsApiResponseFormatMode left, AssistantsApiResponseFormatMode right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="AssistantsApiResponseFormatMode"/>. </summary>
+        public static implicit operator AssistantsApiResponseFormatMode(string value) => new AssistantsApiResponseFormatMode(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is AssistantsApiResponseFormatMode other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(AssistantsApiResponseFormatMode other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsApiToolChoiceOptionMode.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsApiToolChoiceOptionMode.cs
new file mode 100644
index 000000000000..89f7812a7ae0
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsApiToolChoiceOptionMode.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Specifies how the tool choice will be used. </summary>
+    public readonly partial struct AssistantsApiToolChoiceOptionMode : IEquatable<AssistantsApiToolChoiceOptionMode>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="AssistantsApiToolChoiceOptionMode"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public AssistantsApiToolChoiceOptionMode(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string NoneValue = "none";
+        private const string AutoValue = "auto";
+
+        /// <summary> The model will not call a function and instead generates a message. </summary>
+        public static AssistantsApiToolChoiceOptionMode None { get; } = new AssistantsApiToolChoiceOptionMode(NoneValue);
+        /// <summary> The model can pick between generating a message or calling a function. </summary>
+        public static AssistantsApiToolChoiceOptionMode Auto { get; } = new AssistantsApiToolChoiceOptionMode(AutoValue);
+        /// <summary> Determines if two <see cref="AssistantsApiToolChoiceOptionMode"/> values are the same. </summary>
+        public static bool operator ==(AssistantsApiToolChoiceOptionMode left, AssistantsApiToolChoiceOptionMode right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="AssistantsApiToolChoiceOptionMode"/> values are not the same. </summary>
+        public static bool operator !=(AssistantsApiToolChoiceOptionMode left, AssistantsApiToolChoiceOptionMode right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="AssistantsApiToolChoiceOptionMode"/>. </summary>
+        public static implicit operator AssistantsApiToolChoiceOptionMode(string value) => new AssistantsApiToolChoiceOptionMode(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is AssistantsApiToolChoiceOptionMode other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(AssistantsApiToolChoiceOptionMode other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsClient.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsClient.cs
index c85db38a83b6..996e52afcb6e 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsClient.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsClient.cs
@@ -39,7 +39,7 @@ protected AssistantsClient()
         }
 
         /// <summary> Creates a new assistant. </summary>
-        /// <param name="body"> Body parameter. </param>
+        /// <param name="body"> The request details to use when creating a new assistant. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
         public virtual async Task<Response<Assistant>> CreateAssistantAsync(AssistantCreationOptions body, CancellationToken cancellationToken = default)
@@ -53,7 +53,7 @@ public virtual async Task<Response<Assistant>> CreateAssistantAsync(AssistantCre
         }
 
         /// <summary> Creates a new assistant. </summary>
-        /// <param name="body"> Body parameter. </param>
+        /// <param name="body"> The request details to use when creating a new assistant. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
         public virtual Response<Assistant> CreateAssistant(AssistantCreationOptions body, CancellationToken cancellationToken = default)
@@ -332,7 +332,7 @@ internal virtual Response GetAssistant(string assistantId, RequestContext contex
 
         /// <summary> Modifies an existing assistant. </summary>
         /// <param name="assistantId"> The ID of the assistant to modify. </param>
-        /// <param name="body"> Body parameter. </param>
+        /// <param name="body"> The request details to use when modifying an existing assistant. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> or <paramref name="body"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="assistantId"/> is an empty string, and was expected to be non-empty. </exception>
@@ -349,7 +349,7 @@ public virtual async Task<Response<Assistant>> UpdateAssistantAsync(string assis
 
         /// <summary> Modifies an existing assistant. </summary>
         /// <param name="assistantId"> The ID of the assistant to modify. </param>
-        /// <param name="body"> Body parameter. </param>
+        /// <param name="body"> The request details to use when modifying an existing assistant. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> or <paramref name="body"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="assistantId"/> is an empty string, and was expected to be non-empty. </exception>
@@ -542,42 +542,36 @@ internal virtual Response InternalDeleteAssistant(string assistantId, RequestCon
             }
         }
 
-        /// <summary> Attaches a previously uploaded file to an assistant for use by tools that can read files. </summary>
-        /// <param name="assistantId"> The ID of the assistant to attach the file to. </param>
-        /// <param name="fileId"> The ID of the previously uploaded file to attach. </param>
+        /// <summary> Creates a new thread. Threads contain messages and can be run by assistants. </summary>
+        /// <param name="body"> The details used to create a new assistant thread. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<AssistantFile>> LinkAssistantFileAsync(string assistantId, string fileId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
+        public virtual async Task<Response<AssistantThread>> CreateThreadAsync(AssistantThreadCreationOptions body, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
-            Argument.AssertNotNull(fileId, nameof(fileId));
+            Argument.AssertNotNull(body, nameof(body));
 
-            CreateAssistantFileRequest createAssistantFileRequest = new CreateAssistantFileRequest(fileId, null);
+            using RequestContent content = body.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await LinkAssistantFileAsync(assistantId, createAssistantFileRequest.ToRequestContent(), context).ConfigureAwait(false);
-            return Response.FromValue(AssistantFile.FromResponse(response), response);
+            Response response = await CreateThreadAsync(content, context).ConfigureAwait(false);
+            return Response.FromValue(AssistantThread.FromResponse(response), response);
         }
 
-        /// <summary> Attaches a previously uploaded file to an assistant for use by tools that can read files. </summary>
-        /// <param name="assistantId"> The ID of the assistant to attach the file to. </param>
-        /// <param name="fileId"> The ID of the previously uploaded file to attach. </param>
+        /// <summary> Creates a new thread. Threads contain messages and can be run by assistants. </summary>
+        /// <param name="body"> The details used to create a new assistant thread. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<AssistantFile> LinkAssistantFile(string assistantId, string fileId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
+        public virtual Response<AssistantThread> CreateThread(AssistantThreadCreationOptions body, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
-            Argument.AssertNotNull(fileId, nameof(fileId));
+            Argument.AssertNotNull(body, nameof(body));
 
-            CreateAssistantFileRequest createAssistantFileRequest = new CreateAssistantFileRequest(fileId, null);
+            using RequestContent content = body.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = LinkAssistantFile(assistantId, createAssistantFileRequest.ToRequestContent(), context);
-            return Response.FromValue(AssistantFile.FromResponse(response), response);
+            Response response = CreateThread(content, context);
+            return Response.FromValue(AssistantThread.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Attaches a previously uploaded file to an assistant for use by tools that can read files.
+        /// [Protocol Method] Creates a new thread. Threads contain messages and can be run by assistants.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -586,23 +580,20 @@ public virtual Response<AssistantFile> LinkAssistantFile(string assistantId, str
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="assistantId"> The ID of the assistant to attach the file to. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> LinkAssistantFileAsync(string assistantId, RequestContent content, RequestContext context = null)
+        internal virtual async Task<Response> CreateThreadAsync(RequestContent content, RequestContext context = null)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
             Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.LinkAssistantFile");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateThread");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateLinkAssistantFileRequest(assistantId, content, context);
+                using HttpMessage message = CreateCreateThreadRequest(content, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -613,7 +604,7 @@ internal virtual async Task<Response> LinkAssistantFileAsync(string assistantId,
         }
 
         /// <summary>
-        /// [Protocol Method] Attaches a previously uploaded file to an assistant for use by tools that can read files.
+        /// [Protocol Method] Creates a new thread. Threads contain messages and can be run by assistants.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -622,23 +613,20 @@ internal virtual async Task<Response> LinkAssistantFileAsync(string assistantId,
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="assistantId"> The ID of the assistant to attach the file to. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response LinkAssistantFile(string assistantId, RequestContent content, RequestContext context = null)
+        internal virtual Response CreateThread(RequestContent content, RequestContext context = null)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
             Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.LinkAssistantFile");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateThread");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateLinkAssistantFileRequest(assistantId, content, context);
+                using HttpMessage message = CreateCreateThreadRequest(content, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -648,76 +636,59 @@ internal virtual Response LinkAssistantFile(string assistantId, RequestContent c
             }
         }
 
-        /// <summary> Gets a list of files attached to a specific assistant, as used by tools that can read files. </summary>
-        /// <param name="assistantId"> The ID of the assistant to retrieve the list of attached files for. </param>
-        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
-        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
-        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
-        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <summary> Gets information about an existing thread. </summary>
+        /// <param name="threadId"> The ID of the thread to retrieve information about. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual async Task<Response<InternalOpenAIPageableListOfAssistantFile>> InternalGetAssistantFilesAsync(string assistantId, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<AssistantThread>> GetThreadAsync(string threadId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await InternalGetAssistantFilesAsync(assistantId, limit, order?.ToString(), after, before, context).ConfigureAwait(false);
-            return Response.FromValue(InternalOpenAIPageableListOfAssistantFile.FromResponse(response), response);
+            Response response = await GetThreadAsync(threadId, context).ConfigureAwait(false);
+            return Response.FromValue(AssistantThread.FromResponse(response), response);
         }
 
-        /// <summary> Gets a list of files attached to a specific assistant, as used by tools that can read files. </summary>
-        /// <param name="assistantId"> The ID of the assistant to retrieve the list of attached files for. </param>
-        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
-        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
-        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
-        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <summary> Gets information about an existing thread. </summary>
+        /// <param name="threadId"> The ID of the thread to retrieve information about. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual Response<InternalOpenAIPageableListOfAssistantFile> InternalGetAssistantFiles(string assistantId, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<AssistantThread> GetThread(string threadId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = InternalGetAssistantFiles(assistantId, limit, order?.ToString(), after, before, context);
-            return Response.FromValue(InternalOpenAIPageableListOfAssistantFile.FromResponse(response), response);
+            Response response = GetThread(threadId, context);
+            return Response.FromValue(AssistantThread.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Gets a list of files attached to a specific assistant, as used by tools that can read files.
+        /// [Protocol Method] Gets information about an existing thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
-        /// <item>
-        /// <description>
-        /// Please try the simpler <see cref="InternalGetAssistantFilesAsync(string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
-        /// </description>
-        /// </item>
         /// </list>
         /// </summary>
-        /// <param name="assistantId"> The ID of the assistant to retrieve the list of attached files for. </param>
-        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
-        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
-        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
-        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <param name="threadId"> The ID of the thread to retrieve information about. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> InternalGetAssistantFilesAsync(string assistantId, int? limit, string order, string after, string before, RequestContext context)
+        internal virtual async Task<Response> GetThreadAsync(string threadId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetAssistantFiles");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetThread");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalGetAssistantFilesRequest(assistantId, limit, order, after, before, context);
+                using HttpMessage message = CreateGetThreadRequest(threadId, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -728,39 +699,30 @@ internal virtual async Task<Response> InternalGetAssistantFilesAsync(string assi
         }
 
         /// <summary>
-        /// [Protocol Method] Gets a list of files attached to a specific assistant, as used by tools that can read files.
+        /// [Protocol Method] Gets information about an existing thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
-        /// <item>
-        /// <description>
-        /// Please try the simpler <see cref="InternalGetAssistantFiles(string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
-        /// </description>
-        /// </item>
         /// </list>
         /// </summary>
-        /// <param name="assistantId"> The ID of the assistant to retrieve the list of attached files for. </param>
-        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
-        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
-        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
-        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <param name="threadId"> The ID of the thread to retrieve information about. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response InternalGetAssistantFiles(string assistantId, int? limit, string order, string after, string before, RequestContext context)
+        internal virtual Response GetThread(string threadId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetAssistantFiles");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetThread");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalGetAssistantFilesRequest(assistantId, limit, order, after, before, context);
+                using HttpMessage message = CreateGetThreadRequest(threadId, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -770,40 +732,42 @@ internal virtual Response InternalGetAssistantFiles(string assistantId, int? lim
             }
         }
 
-        /// <summary> Retrieves a file attached to an assistant. </summary>
-        /// <param name="assistantId"> The ID of the assistant associated with the attached file. </param>
-        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <summary> Modifies an existing thread. </summary>
+        /// <param name="threadId"> The ID of the thread to modify. </param>
+        /// <param name="body"> The details used to update an existing assistant thread. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<AssistantFile>> GetAssistantFileAsync(string assistantId, string fileId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<AssistantThread>> UpdateThreadAsync(string threadId, UpdateAssistantThreadOptions body, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNull(body, nameof(body));
 
+            using RequestContent content = body.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await GetAssistantFileAsync(assistantId, fileId, context).ConfigureAwait(false);
-            return Response.FromValue(AssistantFile.FromResponse(response), response);
+            Response response = await UpdateThreadAsync(threadId, content, context).ConfigureAwait(false);
+            return Response.FromValue(AssistantThread.FromResponse(response), response);
         }
 
-        /// <summary> Retrieves a file attached to an assistant. </summary>
-        /// <param name="assistantId"> The ID of the assistant associated with the attached file. </param>
-        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <summary> Modifies an existing thread. </summary>
+        /// <param name="threadId"> The ID of the thread to modify. </param>
+        /// <param name="body"> The details used to update an existing assistant thread. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<AssistantFile> GetAssistantFile(string assistantId, string fileId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<AssistantThread> UpdateThread(string threadId, UpdateAssistantThreadOptions body, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNull(body, nameof(body));
 
+            using RequestContent content = body.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = GetAssistantFile(assistantId, fileId, context);
-            return Response.FromValue(AssistantFile.FromResponse(response), response);
+            Response response = UpdateThread(threadId, content, context);
+            return Response.FromValue(AssistantThread.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Retrieves a file attached to an assistant.
+        /// [Protocol Method] Modifies an existing thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -812,23 +776,23 @@ public virtual Response<AssistantFile> GetAssistantFile(string assistantId, stri
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="assistantId"> The ID of the assistant associated with the attached file. </param>
-        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <param name="threadId"> The ID of the thread to modify. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> GetAssistantFileAsync(string assistantId, string fileId, RequestContext context)
+        internal virtual async Task<Response> UpdateThreadAsync(string threadId, RequestContent content, RequestContext context = null)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetAssistantFile");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UpdateThread");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetAssistantFileRequest(assistantId, fileId, context);
+                using HttpMessage message = CreateUpdateThreadRequest(threadId, content, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -839,7 +803,7 @@ internal virtual async Task<Response> GetAssistantFileAsync(string assistantId,
         }
 
         /// <summary>
-        /// [Protocol Method] Retrieves a file attached to an assistant.
+        /// [Protocol Method] Modifies an existing thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -848,23 +812,23 @@ internal virtual async Task<Response> GetAssistantFileAsync(string assistantId,
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="assistantId"> The ID of the assistant associated with the attached file. </param>
-        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <param name="threadId"> The ID of the thread to modify. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response GetAssistantFile(string assistantId, string fileId, RequestContext context)
+        internal virtual Response UpdateThread(string threadId, RequestContent content, RequestContext context = null)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetAssistantFile");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UpdateThread");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetAssistantFileRequest(assistantId, fileId, context);
+                using HttpMessage message = CreateUpdateThreadRequest(threadId, content, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -874,47 +838,36 @@ internal virtual Response GetAssistantFile(string assistantId, string fileId, Re
             }
         }
 
-        /// <summary>
-        /// Unlinks a previously attached file from an assistant, rendering it unavailable for use by tools that can read
-        /// files.
-        /// </summary>
-        /// <param name="assistantId"> The ID of the assistant from which the specified file should be unlinked. </param>
-        /// <param name="fileId"> The ID of the file to unlink from the specified assistant. </param>
+        /// <summary> Deletes an existing thread. </summary>
+        /// <param name="threadId"> The ID of the thread to delete. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual async Task<Response<InternalAssistantFileDeletionStatus>> InternalUnlinkAssistantFileAsync(string assistantId, string fileId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
+        internal virtual async Task<Response<ThreadDeletionStatus>> InternalDeleteThreadAsync(string threadId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await InternalUnlinkAssistantFileAsync(assistantId, fileId, context).ConfigureAwait(false);
-            return Response.FromValue(InternalAssistantFileDeletionStatus.FromResponse(response), response);
+            Response response = await InternalDeleteThreadAsync(threadId, context).ConfigureAwait(false);
+            return Response.FromValue(ThreadDeletionStatus.FromResponse(response), response);
         }
 
-        /// <summary>
-        /// Unlinks a previously attached file from an assistant, rendering it unavailable for use by tools that can read
-        /// files.
-        /// </summary>
-        /// <param name="assistantId"> The ID of the assistant from which the specified file should be unlinked. </param>
-        /// <param name="fileId"> The ID of the file to unlink from the specified assistant. </param>
+        /// <summary> Deletes an existing thread. </summary>
+        /// <param name="threadId"> The ID of the thread to delete. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual Response<InternalAssistantFileDeletionStatus> InternalUnlinkAssistantFile(string assistantId, string fileId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
+        internal virtual Response<ThreadDeletionStatus> InternalDeleteThread(string threadId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = InternalUnlinkAssistantFile(assistantId, fileId, context);
-            return Response.FromValue(InternalAssistantFileDeletionStatus.FromResponse(response), response);
+            Response response = InternalDeleteThread(threadId, context);
+            return Response.FromValue(ThreadDeletionStatus.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Unlinks a previously attached file from an assistant, rendering it unavailable for use by tools that can read
-        /// files.
+        /// [Protocol Method] Deletes an existing thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -923,28 +876,26 @@ internal virtual Response<InternalAssistantFileDeletionStatus> InternalUnlinkAss
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="InternalUnlinkAssistantFileAsync(string,string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="InternalDeleteThreadAsync(string,CancellationToken)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="assistantId"> The ID of the assistant from which the specified file should be unlinked. </param>
-        /// <param name="fileId"> The ID of the file to unlink from the specified assistant. </param>
+        /// <param name="threadId"> The ID of the thread to delete. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> InternalUnlinkAssistantFileAsync(string assistantId, string fileId, RequestContext context)
+        internal virtual async Task<Response> InternalDeleteThreadAsync(string threadId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalUnlinkAssistantFile");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalDeleteThread");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalUnlinkAssistantFileRequest(assistantId, fileId, context);
+                using HttpMessage message = CreateInternalDeleteThreadRequest(threadId, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -955,8 +906,7 @@ internal virtual async Task<Response> InternalUnlinkAssistantFileAsync(string as
         }
 
         /// <summary>
-        /// [Protocol Method] Unlinks a previously attached file from an assistant, rendering it unavailable for use by tools that can read
-        /// files.
+        /// [Protocol Method] Deletes an existing thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -965,28 +915,26 @@ internal virtual async Task<Response> InternalUnlinkAssistantFileAsync(string as
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="InternalUnlinkAssistantFile(string,string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="InternalDeleteThread(string,CancellationToken)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="assistantId"> The ID of the assistant from which the specified file should be unlinked. </param>
-        /// <param name="fileId"> The ID of the file to unlink from the specified assistant. </param>
+        /// <param name="threadId"> The ID of the thread to delete. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="assistantId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response InternalUnlinkAssistantFile(string assistantId, string fileId, RequestContext context)
+        internal virtual Response InternalDeleteThread(string threadId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(assistantId, nameof(assistantId));
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalUnlinkAssistantFile");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalDeleteThread");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalUnlinkAssistantFileRequest(assistantId, fileId, context);
+                using HttpMessage message = CreateInternalDeleteThreadRequest(threadId, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -996,36 +944,42 @@ internal virtual Response InternalUnlinkAssistantFile(string assistantId, string
             }
         }
 
-        /// <summary> Creates a new thread. Threads contain messages and can be run by assistants. </summary>
-        /// <param name="body"> Body parameter. </param>
+        /// <summary> Creates a new message on a specified thread. </summary>
+        /// <param name="threadId"> The ID of the thread to create the new message on. </param>
+        /// <param name="body"> A single message within an assistant thread, as provided during that thread's creation for its initial state. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual async Task<Response<AssistantThread>> CreateThreadAsync(AssistantThreadCreationOptions body, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<ThreadMessage>> CreateMessageAsync(string threadId, ThreadMessageOptions body, CancellationToken cancellationToken = default)
         {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
             Argument.AssertNotNull(body, nameof(body));
 
             using RequestContent content = body.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await CreateThreadAsync(content, context).ConfigureAwait(false);
-            return Response.FromValue(AssistantThread.FromResponse(response), response);
+            Response response = await CreateMessageAsync(threadId, content, context).ConfigureAwait(false);
+            return Response.FromValue(ThreadMessage.FromResponse(response), response);
         }
 
-        /// <summary> Creates a new thread. Threads contain messages and can be run by assistants. </summary>
-        /// <param name="body"> Body parameter. </param>
+        /// <summary> Creates a new message on a specified thread. </summary>
+        /// <param name="threadId"> The ID of the thread to create the new message on. </param>
+        /// <param name="body"> A single message within an assistant thread, as provided during that thread's creation for its initial state. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual Response<AssistantThread> CreateThread(AssistantThreadCreationOptions body, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<ThreadMessage> CreateMessage(string threadId, ThreadMessageOptions body, CancellationToken cancellationToken = default)
         {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
             Argument.AssertNotNull(body, nameof(body));
 
             using RequestContent content = body.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = CreateThread(content, context);
-            return Response.FromValue(AssistantThread.FromResponse(response), response);
+            Response response = CreateMessage(threadId, content, context);
+            return Response.FromValue(ThreadMessage.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Creates a new thread. Threads contain messages and can be run by assistants.
+        /// [Protocol Method] Creates a new message on a specified thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -1034,20 +988,23 @@ public virtual Response<AssistantThread> CreateThread(AssistantThreadCreationOpt
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="threadId"> The ID of the thread to create the new message on. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> CreateThreadAsync(RequestContent content, RequestContext context = null)
+        internal virtual async Task<Response> CreateMessageAsync(string threadId, RequestContent content, RequestContext context = null)
         {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
             Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateThread");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateMessage");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateCreateThreadRequest(content, context);
+                using HttpMessage message = CreateCreateMessageRequest(threadId, content, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -1058,7 +1015,7 @@ internal virtual async Task<Response> CreateThreadAsync(RequestContent content,
         }
 
         /// <summary>
-        /// [Protocol Method] Creates a new thread. Threads contain messages and can be run by assistants.
+        /// [Protocol Method] Creates a new message on a specified thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -1067,20 +1024,23 @@ internal virtual async Task<Response> CreateThreadAsync(RequestContent content,
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="threadId"> The ID of the thread to create the new message on. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response CreateThread(RequestContent content, RequestContext context = null)
+        internal virtual Response CreateMessage(string threadId, RequestContent content, RequestContext context = null)
         {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
             Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateThread");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateMessage");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateCreateThreadRequest(content, context);
+                using HttpMessage message = CreateCreateMessageRequest(threadId, content, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -1090,59 +1050,79 @@ internal virtual Response CreateThread(RequestContent content, RequestContext co
             }
         }
 
-        /// <summary> Gets information about an existing thread. </summary>
-        /// <param name="threadId"> The ID of the thread to retrieve information about. </param>
+        /// <summary> Gets a list of messages that exist on a thread. </summary>
+        /// <param name="threadId"> The ID of the thread to list messages from. </param>
+        /// <param name="runId"> Filter messages by the run ID that generated them. </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<AssistantThread>> GetThreadAsync(string threadId, CancellationToken cancellationToken = default)
+        internal virtual async Task<Response<InternalOpenAIPageableListOfThreadMessage>> InternalGetMessagesAsync(string threadId, string runId = null, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await GetThreadAsync(threadId, context).ConfigureAwait(false);
-            return Response.FromValue(AssistantThread.FromResponse(response), response);
+            Response response = await InternalGetMessagesAsync(threadId, runId, limit, order?.ToString(), after, before, context).ConfigureAwait(false);
+            return Response.FromValue(InternalOpenAIPageableListOfThreadMessage.FromResponse(response), response);
         }
 
-        /// <summary> Gets information about an existing thread. </summary>
-        /// <param name="threadId"> The ID of the thread to retrieve information about. </param>
+        /// <summary> Gets a list of messages that exist on a thread. </summary>
+        /// <param name="threadId"> The ID of the thread to list messages from. </param>
+        /// <param name="runId"> Filter messages by the run ID that generated them. </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<AssistantThread> GetThread(string threadId, CancellationToken cancellationToken = default)
+        internal virtual Response<InternalOpenAIPageableListOfThreadMessage> InternalGetMessages(string threadId, string runId = null, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = GetThread(threadId, context);
-            return Response.FromValue(AssistantThread.FromResponse(response), response);
+            Response response = InternalGetMessages(threadId, runId, limit, order?.ToString(), after, before, context);
+            return Response.FromValue(InternalOpenAIPageableListOfThreadMessage.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Gets information about an existing thread.
+        /// [Protocol Method] Gets a list of messages that exist on a thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
+        /// <item>
+        /// <description>
+        /// Please try the simpler <see cref="InternalGetMessagesAsync(string,string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// </description>
+        /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to retrieve information about. </param>
+        /// <param name="threadId"> The ID of the thread to list messages from. </param>
+        /// <param name="runId"> Filter messages by the run ID that generated them. </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> GetThreadAsync(string threadId, RequestContext context)
+        internal virtual async Task<Response> InternalGetMessagesAsync(string threadId, string runId, int? limit, string order, string after, string before, RequestContext context)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetThread");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetMessages");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetThreadRequest(threadId, context);
+                using HttpMessage message = CreateInternalGetMessagesRequest(threadId, runId, limit, order, after, before, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -1153,30 +1133,40 @@ internal virtual async Task<Response> GetThreadAsync(string threadId, RequestCon
         }
 
         /// <summary>
-        /// [Protocol Method] Gets information about an existing thread.
+        /// [Protocol Method] Gets a list of messages that exist on a thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
+        /// <item>
+        /// <description>
+        /// Please try the simpler <see cref="InternalGetMessages(string,string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// </description>
+        /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to retrieve information about. </param>
+        /// <param name="threadId"> The ID of the thread to list messages from. </param>
+        /// <param name="runId"> Filter messages by the run ID that generated them. </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response GetThread(string threadId, RequestContext context)
+        internal virtual Response InternalGetMessages(string threadId, string runId, int? limit, string order, string after, string before, RequestContext context)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetThread");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetMessages");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetThreadRequest(threadId, context);
+                using HttpMessage message = CreateInternalGetMessagesRequest(threadId, runId, limit, order, after, before, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -1186,40 +1176,40 @@ internal virtual Response GetThread(string threadId, RequestContext context)
             }
         }
 
-        /// <summary> Modifies an existing thread. </summary>
-        /// <param name="threadId"> The ID of the thread to modify. </param>
-        /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
+        /// <summary> Gets an existing message from an existing thread. </summary>
+        /// <param name="threadId"> The ID of the thread to retrieve the specified message from. </param>
+        /// <param name="messageId"> The ID of the message to retrieve from the specified thread. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<AssistantThread>> UpdateThreadAsync(string threadId, IReadOnlyDictionary<string, string> metadata = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<ThreadMessage>> GetMessageAsync(string threadId, string messageId, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
 
-            UpdateThreadRequest updateThreadRequest = new UpdateThreadRequest(metadata ?? new ChangeTrackingDictionary<string, string>(), null);
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await UpdateThreadAsync(threadId, updateThreadRequest.ToRequestContent(), context).ConfigureAwait(false);
-            return Response.FromValue(AssistantThread.FromResponse(response), response);
+            Response response = await GetMessageAsync(threadId, messageId, context).ConfigureAwait(false);
+            return Response.FromValue(ThreadMessage.FromResponse(response), response);
         }
 
-        /// <summary> Modifies an existing thread. </summary>
-        /// <param name="threadId"> The ID of the thread to modify. </param>
-        /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
+        /// <summary> Gets an existing message from an existing thread. </summary>
+        /// <param name="threadId"> The ID of the thread to retrieve the specified message from. </param>
+        /// <param name="messageId"> The ID of the message to retrieve from the specified thread. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<AssistantThread> UpdateThread(string threadId, IReadOnlyDictionary<string, string> metadata = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<ThreadMessage> GetMessage(string threadId, string messageId, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
 
-            UpdateThreadRequest updateThreadRequest = new UpdateThreadRequest(metadata ?? new ChangeTrackingDictionary<string, string>(), null);
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = UpdateThread(threadId, updateThreadRequest.ToRequestContent(), context);
-            return Response.FromValue(AssistantThread.FromResponse(response), response);
+            Response response = GetMessage(threadId, messageId, context);
+            return Response.FromValue(ThreadMessage.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Modifies an existing thread.
+        /// [Protocol Method] Gets an existing message from an existing thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -1228,23 +1218,23 @@ public virtual Response<AssistantThread> UpdateThread(string threadId, IReadOnly
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to modify. </param>
-        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="threadId"> The ID of the thread to retrieve the specified message from. </param>
+        /// <param name="messageId"> The ID of the message to retrieve from the specified thread. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> UpdateThreadAsync(string threadId, RequestContent content, RequestContext context = null)
+        internal virtual async Task<Response> GetMessageAsync(string threadId, string messageId, RequestContext context)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNull(content, nameof(content));
+            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UpdateThread");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetMessage");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateUpdateThreadRequest(threadId, content, context);
+                using HttpMessage message = CreateGetMessageRequest(threadId, messageId, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -1255,7 +1245,7 @@ internal virtual async Task<Response> UpdateThreadAsync(string threadId, Request
         }
 
         /// <summary>
-        /// [Protocol Method] Modifies an existing thread.
+        /// [Protocol Method] Gets an existing message from an existing thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -1264,23 +1254,23 @@ internal virtual async Task<Response> UpdateThreadAsync(string threadId, Request
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to modify. </param>
-        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="threadId"> The ID of the thread to retrieve the specified message from. </param>
+        /// <param name="messageId"> The ID of the message to retrieve from the specified thread. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response UpdateThread(string threadId, RequestContent content, RequestContext context = null)
+        internal virtual Response GetMessage(string threadId, string messageId, RequestContext context)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNull(content, nameof(content));
+            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UpdateThread");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetMessage");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateUpdateThreadRequest(threadId, content, context);
+                using HttpMessage message = CreateGetMessageRequest(threadId, messageId, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -1290,64 +1280,71 @@ internal virtual Response UpdateThread(string threadId, RequestContent content,
             }
         }
 
-        /// <summary> Deletes an existing thread. </summary>
-        /// <param name="threadId"> The ID of the thread to delete. </param>
+        /// <summary> Modifies an existing message on an existing thread. </summary>
+        /// <param name="threadId"> The ID of the thread containing the specified message to modify. </param>
+        /// <param name="messageId"> The ID of the message to modify on the specified thread. </param>
+        /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual async Task<Response<ThreadDeletionStatus>> InternalDeleteThreadAsync(string threadId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<ThreadMessage>> UpdateMessageAsync(string threadId, string messageId, IReadOnlyDictionary<string, string> metadata = null, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
 
+            UpdateMessageRequest updateMessageRequest = new UpdateMessageRequest(metadata ?? new ChangeTrackingDictionary<string, string>(), null);
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await InternalDeleteThreadAsync(threadId, context).ConfigureAwait(false);
-            return Response.FromValue(ThreadDeletionStatus.FromResponse(response), response);
+            Response response = await UpdateMessageAsync(threadId, messageId, updateMessageRequest.ToRequestContent(), context).ConfigureAwait(false);
+            return Response.FromValue(ThreadMessage.FromResponse(response), response);
         }
 
-        /// <summary> Deletes an existing thread. </summary>
-        /// <param name="threadId"> The ID of the thread to delete. </param>
+        /// <summary> Modifies an existing message on an existing thread. </summary>
+        /// <param name="threadId"> The ID of the thread containing the specified message to modify. </param>
+        /// <param name="messageId"> The ID of the message to modify on the specified thread. </param>
+        /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual Response<ThreadDeletionStatus> InternalDeleteThread(string threadId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<ThreadMessage> UpdateMessage(string threadId, string messageId, IReadOnlyDictionary<string, string> metadata = null, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
 
+            UpdateMessageRequest updateMessageRequest = new UpdateMessageRequest(metadata ?? new ChangeTrackingDictionary<string, string>(), null);
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = InternalDeleteThread(threadId, context);
-            return Response.FromValue(ThreadDeletionStatus.FromResponse(response), response);
+            Response response = UpdateMessage(threadId, messageId, updateMessageRequest.ToRequestContent(), context);
+            return Response.FromValue(ThreadMessage.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Deletes an existing thread.
+        /// [Protocol Method] Modifies an existing message on an existing thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
-        /// <item>
-        /// <description>
-        /// Please try the simpler <see cref="InternalDeleteThreadAsync(string,CancellationToken)"/> convenience overload with strongly typed models first.
-        /// </description>
-        /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to delete. </param>
+        /// <param name="threadId"> The ID of the thread containing the specified message to modify. </param>
+        /// <param name="messageId"> The ID of the message to modify on the specified thread. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="messageId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> InternalDeleteThreadAsync(string threadId, RequestContext context)
+        internal virtual async Task<Response> UpdateMessageAsync(string threadId, string messageId, RequestContent content, RequestContext context = null)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
+            Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalDeleteThread");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UpdateMessage");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalDeleteThreadRequest(threadId, context);
+                using HttpMessage message = CreateUpdateMessageRequest(threadId, messageId, content, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -1358,35 +1355,34 @@ internal virtual async Task<Response> InternalDeleteThreadAsync(string threadId,
         }
 
         /// <summary>
-        /// [Protocol Method] Deletes an existing thread.
+        /// [Protocol Method] Modifies an existing message on an existing thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
-        /// <item>
-        /// <description>
-        /// Please try the simpler <see cref="InternalDeleteThread(string,CancellationToken)"/> convenience overload with strongly typed models first.
-        /// </description>
-        /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to delete. </param>
+        /// <param name="threadId"> The ID of the thread containing the specified message to modify. </param>
+        /// <param name="messageId"> The ID of the message to modify on the specified thread. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="messageId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response InternalDeleteThread(string threadId, RequestContext context)
+        internal virtual Response UpdateMessage(string threadId, string messageId, RequestContent content, RequestContext context = null)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
+            Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalDeleteThread");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UpdateMessage");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalDeleteThreadRequest(threadId, context);
+                using HttpMessage message = CreateUpdateMessageRequest(threadId, messageId, content, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -1396,48 +1392,42 @@ internal virtual Response InternalDeleteThread(string threadId, RequestContext c
             }
         }
 
-        /// <summary> Creates a new message on a specified thread. </summary>
-        /// <param name="threadId"> The ID of the thread to create the new message on. </param>
-        /// <param name="role"> The role to associate with the new message. </param>
-        /// <param name="content"> The textual content for the new message. </param>
-        /// <param name="fileIds"> A list of up to 10 file IDs to associate with the message, as used by tools like 'code_interpreter' or 'retrieval' that can read files. </param>
-        /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
+        /// <summary> Creates a new run for an assistant thread. </summary>
+        /// <param name="threadId"> The ID of the thread to run. </param>
+        /// <param name="body"> The details used when creating a new run of an assistant thread. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="body"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<ThreadMessage>> CreateMessageAsync(string threadId, MessageRole role, string content, IEnumerable<string> fileIds = null, IReadOnlyDictionary<string, string> metadata = null, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<ThreadRun>> CreateRunAsync(string threadId, CreateRunOptions body, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNull(content, nameof(content));
+            Argument.AssertNotNull(body, nameof(body));
 
-            CreateMessageRequest createMessageRequest = new CreateMessageRequest(role, content, fileIds?.ToList() as IReadOnlyList<string> ?? new ChangeTrackingList<string>(), metadata ?? new ChangeTrackingDictionary<string, string>(), null);
+            using RequestContent content = body.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await CreateMessageAsync(threadId, createMessageRequest.ToRequestContent(), context).ConfigureAwait(false);
-            return Response.FromValue(ThreadMessage.FromResponse(response), response);
+            Response response = await CreateRunAsync(threadId, content, context).ConfigureAwait(false);
+            return Response.FromValue(ThreadRun.FromResponse(response), response);
         }
 
-        /// <summary> Creates a new message on a specified thread. </summary>
-        /// <param name="threadId"> The ID of the thread to create the new message on. </param>
-        /// <param name="role"> The role to associate with the new message. </param>
-        /// <param name="content"> The textual content for the new message. </param>
-        /// <param name="fileIds"> A list of up to 10 file IDs to associate with the message, as used by tools like 'code_interpreter' or 'retrieval' that can read files. </param>
-        /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
+        /// <summary> Creates a new run for an assistant thread. </summary>
+        /// <param name="threadId"> The ID of the thread to run. </param>
+        /// <param name="body"> The details used when creating a new run of an assistant thread. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="body"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<ThreadMessage> CreateMessage(string threadId, MessageRole role, string content, IEnumerable<string> fileIds = null, IReadOnlyDictionary<string, string> metadata = null, CancellationToken cancellationToken = default)
+        public virtual Response<ThreadRun> CreateRun(string threadId, CreateRunOptions body, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNull(content, nameof(content));
+            Argument.AssertNotNull(body, nameof(body));
 
-            CreateMessageRequest createMessageRequest = new CreateMessageRequest(role, content, fileIds?.ToList() as IReadOnlyList<string> ?? new ChangeTrackingList<string>(), metadata ?? new ChangeTrackingDictionary<string, string>(), null);
+            using RequestContent content = body.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = CreateMessage(threadId, createMessageRequest.ToRequestContent(), context);
-            return Response.FromValue(ThreadMessage.FromResponse(response), response);
+            Response response = CreateRun(threadId, content, context);
+            return Response.FromValue(ThreadRun.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Creates a new message on a specified thread.
+        /// [Protocol Method] Creates a new run for an assistant thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -1446,23 +1436,23 @@ public virtual Response<ThreadMessage> CreateMessage(string threadId, MessageRol
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to create the new message on. </param>
+        /// <param name="threadId"> The ID of the thread to run. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="content"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> CreateMessageAsync(string threadId, RequestContent content, RequestContext context = null)
+        internal virtual async Task<Response> CreateRunAsync(string threadId, RequestContent content, RequestContext context = null)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
             Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateMessage");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateRun");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateCreateMessageRequest(threadId, content, context);
+                using HttpMessage message = CreateCreateRunRequest(threadId, content, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -1473,7 +1463,7 @@ internal virtual async Task<Response> CreateMessageAsync(string threadId, Reques
         }
 
         /// <summary>
-        /// [Protocol Method] Creates a new message on a specified thread.
+        /// [Protocol Method] Creates a new run for an assistant thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -1482,23 +1472,23 @@ internal virtual async Task<Response> CreateMessageAsync(string threadId, Reques
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to create the new message on. </param>
+        /// <param name="threadId"> The ID of the thread to run. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="content"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response CreateMessage(string threadId, RequestContent content, RequestContext context = null)
+        internal virtual Response CreateRun(string threadId, RequestContent content, RequestContext context = null)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
             Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateMessage");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateRun");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateCreateMessageRequest(threadId, content, context);
+                using HttpMessage message = CreateCreateRunRequest(threadId, content, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -1508,8 +1498,8 @@ internal virtual Response CreateMessage(string threadId, RequestContent content,
             }
         }
 
-        /// <summary> Gets a list of messages that exist on a thread. </summary>
-        /// <param name="threadId"> The ID of the thread to list messages from. </param>
+        /// <summary> Gets a list of runs for a specified thread. </summary>
+        /// <param name="threadId"> The ID of the thread to list runs from. </param>
         /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
         /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
         /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
@@ -1517,17 +1507,17 @@ internal virtual Response CreateMessage(string threadId, RequestContent content,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual async Task<Response<InternalOpenAIPageableListOfThreadMessage>> InternalGetMessagesAsync(string threadId, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
+        internal virtual async Task<Response<InternalOpenAIPageableListOfThreadRun>> InternalGetRunsAsync(string threadId, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await InternalGetMessagesAsync(threadId, limit, order?.ToString(), after, before, context).ConfigureAwait(false);
-            return Response.FromValue(InternalOpenAIPageableListOfThreadMessage.FromResponse(response), response);
+            Response response = await InternalGetRunsAsync(threadId, limit, order?.ToString(), after, before, context).ConfigureAwait(false);
+            return Response.FromValue(InternalOpenAIPageableListOfThreadRun.FromResponse(response), response);
         }
 
-        /// <summary> Gets a list of messages that exist on a thread. </summary>
-        /// <param name="threadId"> The ID of the thread to list messages from. </param>
+        /// <summary> Gets a list of runs for a specified thread. </summary>
+        /// <param name="threadId"> The ID of the thread to list runs from. </param>
         /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
         /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
         /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
@@ -1535,17 +1525,17 @@ internal virtual async Task<Response<InternalOpenAIPageableListOfThreadMessage>>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual Response<InternalOpenAIPageableListOfThreadMessage> InternalGetMessages(string threadId, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
+        internal virtual Response<InternalOpenAIPageableListOfThreadRun> InternalGetRuns(string threadId, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = InternalGetMessages(threadId, limit, order?.ToString(), after, before, context);
-            return Response.FromValue(InternalOpenAIPageableListOfThreadMessage.FromResponse(response), response);
+            Response response = InternalGetRuns(threadId, limit, order?.ToString(), after, before, context);
+            return Response.FromValue(InternalOpenAIPageableListOfThreadRun.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Gets a list of messages that exist on a thread.
+        /// [Protocol Method] Gets a list of runs for a specified thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -1554,12 +1544,12 @@ internal virtual Response<InternalOpenAIPageableListOfThreadMessage> InternalGet
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="InternalGetMessagesAsync(string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="InternalGetRunsAsync(string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to list messages from. </param>
+        /// <param name="threadId"> The ID of the thread to list runs from. </param>
         /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
         /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
         /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
@@ -1569,15 +1559,15 @@ internal virtual Response<InternalOpenAIPageableListOfThreadMessage> InternalGet
         /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> InternalGetMessagesAsync(string threadId, int? limit, string order, string after, string before, RequestContext context)
+        internal virtual async Task<Response> InternalGetRunsAsync(string threadId, int? limit, string order, string after, string before, RequestContext context)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetMessages");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetRuns");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalGetMessagesRequest(threadId, limit, order, after, before, context);
+                using HttpMessage message = CreateInternalGetRunsRequest(threadId, limit, order, after, before, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -1588,7 +1578,7 @@ internal virtual async Task<Response> InternalGetMessagesAsync(string threadId,
         }
 
         /// <summary>
-        /// [Protocol Method] Gets a list of messages that exist on a thread.
+        /// [Protocol Method] Gets a list of runs for a specified thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -1597,12 +1587,12 @@ internal virtual async Task<Response> InternalGetMessagesAsync(string threadId,
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="InternalGetMessages(string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="InternalGetRuns(string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to list messages from. </param>
+        /// <param name="threadId"> The ID of the thread to list runs from. </param>
         /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
         /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
         /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
@@ -1612,15 +1602,15 @@ internal virtual async Task<Response> InternalGetMessagesAsync(string threadId,
         /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response InternalGetMessages(string threadId, int? limit, string order, string after, string before, RequestContext context)
+        internal virtual Response InternalGetRuns(string threadId, int? limit, string order, string after, string before, RequestContext context)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetMessages");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetRuns");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalGetMessagesRequest(threadId, limit, order, after, before, context);
+                using HttpMessage message = CreateInternalGetRunsRequest(threadId, limit, order, after, before, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -1630,40 +1620,40 @@ internal virtual Response InternalGetMessages(string threadId, int? limit, strin
             }
         }
 
-        /// <summary> Gets an existing message from an existing thread. </summary>
-        /// <param name="threadId"> The ID of the thread to retrieve the specified message from. </param>
-        /// <param name="messageId"> The ID of the message to retrieve from the specified thread. </param>
+        /// <summary> Gets an existing run from an existing thread. </summary>
+        /// <param name="threadId"> The ID of the thread to retrieve run information from. </param>
+        /// <param name="runId"> The ID of the thread to retrieve information about. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<ThreadMessage>> GetMessageAsync(string threadId, string messageId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<ThreadRun>> GetRunAsync(string threadId, string runId, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await GetMessageAsync(threadId, messageId, context).ConfigureAwait(false);
-            return Response.FromValue(ThreadMessage.FromResponse(response), response);
+            Response response = await GetRunAsync(threadId, runId, context).ConfigureAwait(false);
+            return Response.FromValue(ThreadRun.FromResponse(response), response);
         }
 
-        /// <summary> Gets an existing message from an existing thread. </summary>
-        /// <param name="threadId"> The ID of the thread to retrieve the specified message from. </param>
-        /// <param name="messageId"> The ID of the message to retrieve from the specified thread. </param>
+        /// <summary> Gets an existing run from an existing thread. </summary>
+        /// <param name="threadId"> The ID of the thread to retrieve run information from. </param>
+        /// <param name="runId"> The ID of the thread to retrieve information about. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<ThreadMessage> GetMessage(string threadId, string messageId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<ThreadRun> GetRun(string threadId, string runId, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = GetMessage(threadId, messageId, context);
-            return Response.FromValue(ThreadMessage.FromResponse(response), response);
+            Response response = GetRun(threadId, runId, context);
+            return Response.FromValue(ThreadRun.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Gets an existing message from an existing thread.
+        /// [Protocol Method] Gets an existing run from an existing thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -1672,23 +1662,23 @@ public virtual Response<ThreadMessage> GetMessage(string threadId, string messag
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to retrieve the specified message from. </param>
-        /// <param name="messageId"> The ID of the message to retrieve from the specified thread. </param>
+        /// <param name="threadId"> The ID of the thread to retrieve run information from. </param>
+        /// <param name="runId"> The ID of the thread to retrieve information about. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> GetMessageAsync(string threadId, string messageId, RequestContext context)
+        internal virtual async Task<Response> GetRunAsync(string threadId, string runId, RequestContext context)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetMessage");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetRun");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetMessageRequest(threadId, messageId, context);
+                using HttpMessage message = CreateGetRunRequest(threadId, runId, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -1699,7 +1689,7 @@ internal virtual async Task<Response> GetMessageAsync(string threadId, string me
         }
 
         /// <summary>
-        /// [Protocol Method] Gets an existing message from an existing thread.
+        /// [Protocol Method] Gets an existing run from an existing thread.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -1708,23 +1698,23 @@ internal virtual async Task<Response> GetMessageAsync(string threadId, string me
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to retrieve the specified message from. </param>
-        /// <param name="messageId"> The ID of the message to retrieve from the specified thread. </param>
+        /// <param name="threadId"> The ID of the thread to retrieve run information from. </param>
+        /// <param name="runId"> The ID of the thread to retrieve information about. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response GetMessage(string threadId, string messageId, RequestContext context)
+        internal virtual Response GetRun(string threadId, string runId, RequestContext context)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetMessage");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetRun");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetMessageRequest(threadId, messageId, context);
+                using HttpMessage message = CreateGetRunRequest(threadId, runId, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -1734,44 +1724,44 @@ internal virtual Response GetMessage(string threadId, string messageId, RequestC
             }
         }
 
-        /// <summary> Modifies an existing message on an existing thread. </summary>
-        /// <param name="threadId"> The ID of the thread containing the specified message to modify. </param>
-        /// <param name="messageId"> The ID of the message to modify on the specified thread. </param>
+        /// <summary> Modifies an existing thread run. </summary>
+        /// <param name="threadId"> The ID of the thread associated with the specified run. </param>
+        /// <param name="runId"> The ID of the run to modify. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<ThreadMessage>> UpdateMessageAsync(string threadId, string messageId, IReadOnlyDictionary<string, string> metadata = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<ThreadRun>> UpdateRunAsync(string threadId, string runId, IReadOnlyDictionary<string, string> metadata = null, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
 
-            UpdateMessageRequest updateMessageRequest = new UpdateMessageRequest(metadata ?? new ChangeTrackingDictionary<string, string>(), null);
+            UpdateRunRequest updateRunRequest = new UpdateRunRequest(metadata ?? new ChangeTrackingDictionary<string, string>(), null);
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await UpdateMessageAsync(threadId, messageId, updateMessageRequest.ToRequestContent(), context).ConfigureAwait(false);
-            return Response.FromValue(ThreadMessage.FromResponse(response), response);
+            Response response = await UpdateRunAsync(threadId, runId, updateRunRequest.ToRequestContent(), context).ConfigureAwait(false);
+            return Response.FromValue(ThreadRun.FromResponse(response), response);
         }
 
-        /// <summary> Modifies an existing message on an existing thread. </summary>
-        /// <param name="threadId"> The ID of the thread containing the specified message to modify. </param>
-        /// <param name="messageId"> The ID of the message to modify on the specified thread. </param>
+        /// <summary> Modifies an existing thread run. </summary>
+        /// <param name="threadId"> The ID of the thread associated with the specified run. </param>
+        /// <param name="runId"> The ID of the run to modify. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<ThreadMessage> UpdateMessage(string threadId, string messageId, IReadOnlyDictionary<string, string> metadata = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<ThreadRun> UpdateRun(string threadId, string runId, IReadOnlyDictionary<string, string> metadata = null, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
 
-            UpdateMessageRequest updateMessageRequest = new UpdateMessageRequest(metadata ?? new ChangeTrackingDictionary<string, string>(), null);
+            UpdateRunRequest updateRunRequest = new UpdateRunRequest(metadata ?? new ChangeTrackingDictionary<string, string>(), null);
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = UpdateMessage(threadId, messageId, updateMessageRequest.ToRequestContent(), context);
-            return Response.FromValue(ThreadMessage.FromResponse(response), response);
+            Response response = UpdateRun(threadId, runId, updateRunRequest.ToRequestContent(), context);
+            return Response.FromValue(ThreadRun.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Modifies an existing message on an existing thread.
+        /// [Protocol Method] Modifies an existing thread run.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -1780,25 +1770,25 @@ public virtual Response<ThreadMessage> UpdateMessage(string threadId, string mes
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread containing the specified message to modify. </param>
-        /// <param name="messageId"> The ID of the message to modify on the specified thread. </param>
+        /// <param name="threadId"> The ID of the thread associated with the specified run. </param>
+        /// <param name="runId"> The ID of the run to modify. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="messageId"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> UpdateMessageAsync(string threadId, string messageId, RequestContent content, RequestContext context = null)
+        internal virtual async Task<Response> UpdateRunAsync(string threadId, string runId, RequestContent content, RequestContext context = null)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
             Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UpdateMessage");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UpdateRun");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateUpdateMessageRequest(threadId, messageId, content, context);
+                using HttpMessage message = CreateUpdateRunRequest(threadId, runId, content, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -1809,7 +1799,7 @@ internal virtual async Task<Response> UpdateMessageAsync(string threadId, string
         }
 
         /// <summary>
-        /// [Protocol Method] Modifies an existing message on an existing thread.
+        /// [Protocol Method] Modifies an existing thread run.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -1818,25 +1808,25 @@ internal virtual async Task<Response> UpdateMessageAsync(string threadId, string
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread containing the specified message to modify. </param>
-        /// <param name="messageId"> The ID of the message to modify on the specified thread. </param>
+        /// <param name="threadId"> The ID of the thread associated with the specified run. </param>
+        /// <param name="runId"> The ID of the run to modify. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="messageId"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response UpdateMessage(string threadId, string messageId, RequestContent content, RequestContext context = null)
+        internal virtual Response UpdateRun(string threadId, string runId, RequestContent content, RequestContext context = null)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
             Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UpdateMessage");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UpdateRun");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateUpdateMessageRequest(threadId, messageId, content, context);
+                using HttpMessage message = CreateUpdateRunRequest(threadId, runId, content, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -1846,82 +1836,812 @@ internal virtual Response UpdateMessage(string threadId, string messageId, Reque
             }
         }
 
-        /// <summary> Gets a list of previously uploaded files associated with a message from a thread. </summary>
-        /// <param name="threadId"> The ID of the thread containing the message to list files from. </param>
-        /// <param name="messageId"> The ID of the message to list files from. </param>
-        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
-        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
-        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
-        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <summary> Submits outputs from tools as requested by tool calls in a run. Runs that need submitted tool outputs will have a status of 'requires_action' with a required_action.type of 'submit_tool_outputs'. </summary>
+        /// <param name="threadId"> The ID of the thread that was run. </param>
+        /// <param name="runId"> The ID of the run that requires tool outputs. </param>
+        /// <param name="toolOutputs"> A list of tools for which the outputs are being submitted. </param>
+        /// <param name="stream"> If `true`, returns a stream of events that happen during the Run as server-sent events, terminating when the Run enters a terminal state with a `data: [DONE]` message. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual async Task<Response<InternalOpenAIPageableListOfMessageFile>> InternalGetMessageFilesAsync(string threadId, string messageId, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="toolOutputs"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<ThreadRun>> SubmitToolOutputsToRunAsync(string threadId, string runId, IEnumerable<ToolOutput> toolOutputs, bool? stream = null, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNull(toolOutputs, nameof(toolOutputs));
 
+            SubmitToolOutputsToRunRequest submitToolOutputsToRunRequest = new SubmitToolOutputsToRunRequest(toolOutputs.ToList(), stream, null);
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await InternalGetMessageFilesAsync(threadId, messageId, limit, order?.ToString(), after, before, context).ConfigureAwait(false);
-            return Response.FromValue(InternalOpenAIPageableListOfMessageFile.FromResponse(response), response);
+            Response response = await SubmitToolOutputsToRunAsync(threadId, runId, submitToolOutputsToRunRequest.ToRequestContent(), context).ConfigureAwait(false);
+            return Response.FromValue(ThreadRun.FromResponse(response), response);
         }
 
-        /// <summary> Gets a list of previously uploaded files associated with a message from a thread. </summary>
-        /// <param name="threadId"> The ID of the thread containing the message to list files from. </param>
-        /// <param name="messageId"> The ID of the message to list files from. </param>
-        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
-        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
-        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
-        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <summary> Submits outputs from tools as requested by tool calls in a run. Runs that need submitted tool outputs will have a status of 'requires_action' with a required_action.type of 'submit_tool_outputs'. </summary>
+        /// <param name="threadId"> The ID of the thread that was run. </param>
+        /// <param name="runId"> The ID of the run that requires tool outputs. </param>
+        /// <param name="toolOutputs"> A list of tools for which the outputs are being submitted. </param>
+        /// <param name="stream"> If `true`, returns a stream of events that happen during the Run as server-sent events, terminating when the Run enters a terminal state with a `data: [DONE]` message. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual Response<InternalOpenAIPageableListOfMessageFile> InternalGetMessageFiles(string threadId, string messageId, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="toolOutputs"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<ThreadRun> SubmitToolOutputsToRun(string threadId, string runId, IEnumerable<ToolOutput> toolOutputs, bool? stream = null, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNull(toolOutputs, nameof(toolOutputs));
 
+            SubmitToolOutputsToRunRequest submitToolOutputsToRunRequest = new SubmitToolOutputsToRunRequest(toolOutputs.ToList(), stream, null);
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = InternalGetMessageFiles(threadId, messageId, limit, order?.ToString(), after, before, context);
-            return Response.FromValue(InternalOpenAIPageableListOfMessageFile.FromResponse(response), response);
+            Response response = SubmitToolOutputsToRun(threadId, runId, submitToolOutputsToRunRequest.ToRequestContent(), context);
+            return Response.FromValue(ThreadRun.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Gets a list of previously uploaded files associated with a message from a thread.
+        /// [Protocol Method] Submits outputs from tools as requested by tool calls in a run. Runs that need submitted tool outputs will have a status of 'requires_action' with a required_action.type of 'submit_tool_outputs'.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="threadId"> The ID of the thread that was run. </param>
+        /// <param name="runId"> The ID of the run that requires tool outputs. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> SubmitToolOutputsToRunAsync(string threadId, string runId, RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.SubmitToolOutputsToRun");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateSubmitToolOutputsToRunRequest(threadId, runId, content, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Submits outputs from tools as requested by tool calls in a run. Runs that need submitted tool outputs will have a status of 'requires_action' with a required_action.type of 'submit_tool_outputs'.
+        /// <list type="bullet">
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="InternalGetMessageFilesAsync(string,string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread containing the message to list files from. </param>
-        /// <param name="messageId"> The ID of the message to list files from. </param>
-        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
-        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
-        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
-        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <param name="threadId"> The ID of the thread that was run. </param>
+        /// <param name="runId"> The ID of the run that requires tool outputs. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> InternalGetMessageFilesAsync(string threadId, string messageId, int? limit, string order, string after, string before, RequestContext context)
+        internal virtual Response SubmitToolOutputsToRun(string threadId, string runId, RequestContent content, RequestContext context = null)
         {
             Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetMessageFiles");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.SubmitToolOutputsToRun");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalGetMessageFilesRequest(threadId, messageId, limit, order, after, before, context);
+                using HttpMessage message = CreateSubmitToolOutputsToRunRequest(threadId, runId, content, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Cancels a run of an in progress thread. </summary>
+        /// <param name="threadId"> The ID of the thread being run. </param>
+        /// <param name="runId"> The ID of the run to cancel. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<ThreadRun>> CancelRunAsync(string threadId, string runId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await CancelRunAsync(threadId, runId, context).ConfigureAwait(false);
+            return Response.FromValue(ThreadRun.FromResponse(response), response);
+        }
+
+        /// <summary> Cancels a run of an in progress thread. </summary>
+        /// <param name="threadId"> The ID of the thread being run. </param>
+        /// <param name="runId"> The ID of the run to cancel. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<ThreadRun> CancelRun(string threadId, string runId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = CancelRun(threadId, runId, context);
+            return Response.FromValue(ThreadRun.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Cancels a run of an in progress thread.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="threadId"> The ID of the thread being run. </param>
+        /// <param name="runId"> The ID of the run to cancel. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> CancelRunAsync(string threadId, string runId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CancelRun");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCancelRunRequest(threadId, runId, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Cancels a run of an in progress thread.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="threadId"> The ID of the thread being run. </param>
+        /// <param name="runId"> The ID of the run to cancel. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response CancelRun(string threadId, string runId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CancelRun");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCancelRunRequest(threadId, runId, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Creates a new assistant thread and immediately starts a run using that new thread. </summary>
+        /// <param name="body"> The details used when creating and immediately running a new assistant thread. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
+        public virtual async Task<Response<ThreadRun>> CreateThreadAndRunAsync(CreateAndRunThreadOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNull(body, nameof(body));
+
+            using RequestContent content = body.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await CreateThreadAndRunAsync(content, context).ConfigureAwait(false);
+            return Response.FromValue(ThreadRun.FromResponse(response), response);
+        }
+
+        /// <summary> Creates a new assistant thread and immediately starts a run using that new thread. </summary>
+        /// <param name="body"> The details used when creating and immediately running a new assistant thread. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
+        public virtual Response<ThreadRun> CreateThreadAndRun(CreateAndRunThreadOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNull(body, nameof(body));
+
+            using RequestContent content = body.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = CreateThreadAndRun(content, context);
+            return Response.FromValue(ThreadRun.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Creates a new assistant thread and immediately starts a run using that new thread.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> CreateThreadAndRunAsync(RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateThreadAndRun");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCreateThreadAndRunRequest(content, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Creates a new assistant thread and immediately starts a run using that new thread.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response CreateThreadAndRun(RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateThreadAndRun");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCreateThreadAndRunRequest(content, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Gets a single run step from a thread run. </summary>
+        /// <param name="threadId"> The ID of the thread that was run. </param>
+        /// <param name="runId"> The ID of the specific run to retrieve the step from. </param>
+        /// <param name="stepId"> The ID of the step to retrieve information about. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<RunStep>> GetRunStepAsync(string threadId, string runId, string stepId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(stepId, nameof(stepId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetRunStepAsync(threadId, runId, stepId, context).ConfigureAwait(false);
+            return Response.FromValue(RunStep.FromResponse(response), response);
+        }
+
+        /// <summary> Gets a single run step from a thread run. </summary>
+        /// <param name="threadId"> The ID of the thread that was run. </param>
+        /// <param name="runId"> The ID of the specific run to retrieve the step from. </param>
+        /// <param name="stepId"> The ID of the step to retrieve information about. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<RunStep> GetRunStep(string threadId, string runId, string stepId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(stepId, nameof(stepId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetRunStep(threadId, runId, stepId, context);
+            return Response.FromValue(RunStep.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets a single run step from a thread run.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="threadId"> The ID of the thread that was run. </param>
+        /// <param name="runId"> The ID of the specific run to retrieve the step from. </param>
+        /// <param name="stepId"> The ID of the step to retrieve information about. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GetRunStepAsync(string threadId, string runId, string stepId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(stepId, nameof(stepId));
+
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetRunStep");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetRunStepRequest(threadId, runId, stepId, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets a single run step from a thread run.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="threadId"> The ID of the thread that was run. </param>
+        /// <param name="runId"> The ID of the specific run to retrieve the step from. </param>
+        /// <param name="stepId"> The ID of the step to retrieve information about. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GetRunStep(string threadId, string runId, string stepId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(stepId, nameof(stepId));
+
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetRunStep");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetRunStepRequest(threadId, runId, stepId, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Gets a list of run steps from a thread run. </summary>
+        /// <param name="threadId"> The ID of the thread that was run. </param>
+        /// <param name="runId"> The ID of the run to list steps from. </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        internal virtual async Task<Response<InternalOpenAIPageableListOfRunStep>> InternalGetRunStepsAsync(string threadId, string runId, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await InternalGetRunStepsAsync(threadId, runId, limit, order?.ToString(), after, before, context).ConfigureAwait(false);
+            return Response.FromValue(InternalOpenAIPageableListOfRunStep.FromResponse(response), response);
+        }
+
+        /// <summary> Gets a list of run steps from a thread run. </summary>
+        /// <param name="threadId"> The ID of the thread that was run. </param>
+        /// <param name="runId"> The ID of the run to list steps from. </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        internal virtual Response<InternalOpenAIPageableListOfRunStep> InternalGetRunSteps(string threadId, string runId, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = InternalGetRunSteps(threadId, runId, limit, order?.ToString(), after, before, context);
+            return Response.FromValue(InternalOpenAIPageableListOfRunStep.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets a list of run steps from a thread run.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// <item>
+        /// <description>
+        /// Please try the simpler <see cref="InternalGetRunStepsAsync(string,string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="threadId"> The ID of the thread that was run. </param>
+        /// <param name="runId"> The ID of the run to list steps from. </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> InternalGetRunStepsAsync(string threadId, string runId, int? limit, string order, string after, string before, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetRunSteps");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateInternalGetRunStepsRequest(threadId, runId, limit, order, after, before, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets a list of run steps from a thread run.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// <item>
+        /// <description>
+        /// Please try the simpler <see cref="InternalGetRunSteps(string,string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="threadId"> The ID of the thread that was run. </param>
+        /// <param name="runId"> The ID of the run to list steps from. </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response InternalGetRunSteps(string threadId, string runId, int? limit, string order, string after, string before, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
+            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetRunSteps");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateInternalGetRunStepsRequest(threadId, runId, limit, order, after, before, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Gets a list of previously uploaded files. </summary>
+        /// <param name="purpose"> A value that, when provided, limits list results to files matching the corresponding purpose. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        internal virtual async Task<Response<InternalFileListResponse>> InternalListFilesAsync(OpenAIFilePurpose? purpose = null, CancellationToken cancellationToken = default)
+        {
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await InternalListFilesAsync(purpose?.ToString(), context).ConfigureAwait(false);
+            return Response.FromValue(InternalFileListResponse.FromResponse(response), response);
+        }
+
+        /// <summary> Gets a list of previously uploaded files. </summary>
+        /// <param name="purpose"> A value that, when provided, limits list results to files matching the corresponding purpose. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        internal virtual Response<InternalFileListResponse> InternalListFiles(OpenAIFilePurpose? purpose = null, CancellationToken cancellationToken = default)
+        {
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = InternalListFiles(purpose?.ToString(), context);
+            return Response.FromValue(InternalFileListResponse.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets a list of previously uploaded files.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// <item>
+        /// <description>
+        /// Please try the simpler <see cref="InternalListFilesAsync(OpenAIFilePurpose?,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="purpose"> A value that, when provided, limits list results to files matching the corresponding purpose. Allowed values: "fine-tune" | "fine-tune-results" | "assistants" | "assistants_output" | "batch" | "batch_output" | "vision". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> InternalListFilesAsync(string purpose, RequestContext context)
+        {
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalListFiles");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateInternalListFilesRequest(purpose, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets a list of previously uploaded files.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// <item>
+        /// <description>
+        /// Please try the simpler <see cref="InternalListFiles(OpenAIFilePurpose?,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="purpose"> A value that, when provided, limits list results to files matching the corresponding purpose. Allowed values: "fine-tune" | "fine-tune-results" | "assistants" | "assistants_output" | "batch" | "batch_output" | "vision". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response InternalListFiles(string purpose, RequestContext context)
+        {
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalListFiles");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateInternalListFilesRequest(purpose, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Uploads a file for use by other operations. </summary>
+        /// <param name="data"> The file data (not filename) to upload. </param>
+        /// <param name="purpose"> The intended purpose of the file. </param>
+        /// <param name="filename"> A filename to associate with the uploaded data. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
+        public virtual async Task<Response<OpenAIFile>> UploadFileAsync(Stream data, OpenAIFilePurpose purpose, string filename = null, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNull(data, nameof(data));
+
+            UploadFileRequest uploadFileRequest = new UploadFileRequest(data, purpose, filename, null);
+            using MultipartFormDataRequestContent content = uploadFileRequest.ToMultipartRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await UploadFileAsync(content, content.ContentType, context).ConfigureAwait(false);
+            return Response.FromValue(OpenAIFile.FromResponse(response), response);
+        }
+
+        /// <summary> Uploads a file for use by other operations. </summary>
+        /// <param name="data"> The file data (not filename) to upload. </param>
+        /// <param name="purpose"> The intended purpose of the file. </param>
+        /// <param name="filename"> A filename to associate with the uploaded data. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
+        public virtual Response<OpenAIFile> UploadFile(Stream data, OpenAIFilePurpose purpose, string filename = null, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNull(data, nameof(data));
+
+            UploadFileRequest uploadFileRequest = new UploadFileRequest(data, purpose, filename, null);
+            using MultipartFormDataRequestContent content = uploadFileRequest.ToMultipartRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = UploadFile(content, content.ContentType, context);
+            return Response.FromValue(OpenAIFile.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Uploads a file for use by other operations.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="contentType"> The 'content-type' header value, always 'multipart/format-data' for this operation. Allowed values: "multipart/form-data". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> UploadFileAsync(RequestContent content, string contentType, RequestContext context = null)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UploadFile");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateUploadFileRequest(content, contentType, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Uploads a file for use by other operations.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="contentType"> The 'content-type' header value, always 'multipart/format-data' for this operation. Allowed values: "multipart/form-data". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response UploadFile(RequestContent content, string contentType, RequestContext context = null)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UploadFile");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateUploadFileRequest(content, contentType, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Delete a previously uploaded file. </summary>
+        /// <param name="fileId"> The ID of the file to delete. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        internal virtual async Task<Response<InternalFileDeletionStatus>> InternalDeleteFileAsync(string fileId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await InternalDeleteFileAsync(fileId, context).ConfigureAwait(false);
+            return Response.FromValue(InternalFileDeletionStatus.FromResponse(response), response);
+        }
+
+        /// <summary> Delete a previously uploaded file. </summary>
+        /// <param name="fileId"> The ID of the file to delete. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        internal virtual Response<InternalFileDeletionStatus> InternalDeleteFile(string fileId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = InternalDeleteFile(fileId, context);
+            return Response.FromValue(InternalFileDeletionStatus.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Delete a previously uploaded file.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// <item>
+        /// <description>
+        /// Please try the simpler <see cref="InternalDeleteFileAsync(string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="fileId"> The ID of the file to delete. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> InternalDeleteFileAsync(string fileId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalDeleteFile");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateInternalDeleteFileRequest(fileId, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -1932,7 +2652,7 @@ internal virtual async Task<Response> InternalGetMessageFilesAsync(string thread
         }
 
         /// <summary>
-        /// [Protocol Method] Gets a list of previously uploaded files associated with a message from a thread.
+        /// [Protocol Method] Delete a previously uploaded file.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -1941,32 +2661,26 @@ internal virtual async Task<Response> InternalGetMessageFilesAsync(string thread
         /// </item>
         /// <item>
         /// <description>
-        /// Please try the simpler <see cref="InternalGetMessageFiles(string,string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// Please try the simpler <see cref="InternalDeleteFile(string,CancellationToken)"/> convenience overload with strongly typed models first.
         /// </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread containing the message to list files from. </param>
-        /// <param name="messageId"> The ID of the message to list files from. </param>
-        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
-        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
-        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
-        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <param name="fileId"> The ID of the file to delete. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="messageId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="messageId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response InternalGetMessageFiles(string threadId, string messageId, int? limit, string order, string after, string before, RequestContext context)
+        internal virtual Response InternalDeleteFile(string fileId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetMessageFiles");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalDeleteFile");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalGetMessageFilesRequest(threadId, messageId, limit, order, after, before, context);
+                using HttpMessage message = CreateInternalDeleteFileRequest(fileId, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -1976,44 +2690,36 @@ internal virtual Response InternalGetMessageFiles(string threadId, string messag
             }
         }
 
-        /// <summary> Gets information about a file attachment to a message within a thread. </summary>
-        /// <param name="threadId"> The ID of the thread containing the message to get information from. </param>
-        /// <param name="messageId"> The ID of the message to get information from. </param>
-        /// <param name="fileId"> The ID of the file to get information about. </param>
+        /// <summary> Returns information about a specific file. Does not retrieve file content. </summary>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="messageId"/> or <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/>, <paramref name="messageId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<MessageFile>> GetMessageFileAsync(string threadId, string messageId, string fileId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<OpenAIFile>> GetFileAsync(string fileId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
             Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await GetMessageFileAsync(threadId, messageId, fileId, context).ConfigureAwait(false);
-            return Response.FromValue(MessageFile.FromResponse(response), response);
+            Response response = await GetFileAsync(fileId, context).ConfigureAwait(false);
+            return Response.FromValue(OpenAIFile.FromResponse(response), response);
         }
 
-        /// <summary> Gets information about a file attachment to a message within a thread. </summary>
-        /// <param name="threadId"> The ID of the thread containing the message to get information from. </param>
-        /// <param name="messageId"> The ID of the message to get information from. </param>
-        /// <param name="fileId"> The ID of the file to get information about. </param>
+        /// <summary> Returns information about a specific file. Does not retrieve file content. </summary>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="messageId"/> or <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/>, <paramref name="messageId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<MessageFile> GetMessageFile(string threadId, string messageId, string fileId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<OpenAIFile> GetFile(string fileId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
             Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = GetMessageFile(threadId, messageId, fileId, context);
-            return Response.FromValue(MessageFile.FromResponse(response), response);
+            Response response = GetFile(fileId, context);
+            return Response.FromValue(OpenAIFile.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Gets information about a file attachment to a message within a thread.
+        /// [Protocol Method] Returns information about a specific file. Does not retrieve file content.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2022,25 +2728,21 @@ public virtual Response<MessageFile> GetMessageFile(string threadId, string mess
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread containing the message to get information from. </param>
-        /// <param name="messageId"> The ID of the message to get information from. </param>
-        /// <param name="fileId"> The ID of the file to get information about. </param>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="messageId"/> or <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/>, <paramref name="messageId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> GetMessageFileAsync(string threadId, string messageId, string fileId, RequestContext context)
+        internal virtual async Task<Response> GetFileAsync(string fileId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
             Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetMessageFile");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetFile");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetMessageFileRequest(threadId, messageId, fileId, context);
+                using HttpMessage message = CreateGetFileRequest(fileId, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -2051,7 +2753,7 @@ internal virtual async Task<Response> GetMessageFileAsync(string threadId, strin
         }
 
         /// <summary>
-        /// [Protocol Method] Gets information about a file attachment to a message within a thread.
+        /// [Protocol Method] Returns information about a specific file. Does not retrieve file content.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2060,25 +2762,21 @@ internal virtual async Task<Response> GetMessageFileAsync(string threadId, strin
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread containing the message to get information from. </param>
-        /// <param name="messageId"> The ID of the message to get information from. </param>
-        /// <param name="fileId"> The ID of the file to get information about. </param>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="messageId"/> or <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/>, <paramref name="messageId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response GetMessageFile(string threadId, string messageId, string fileId, RequestContext context)
+        internal virtual Response GetFile(string fileId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(messageId, nameof(messageId));
             Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetMessageFile");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetFile");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetMessageFileRequest(threadId, messageId, fileId, context);
+                using HttpMessage message = CreateGetFileRequest(fileId, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -2088,42 +2786,36 @@ internal virtual Response GetMessageFile(string threadId, string messageId, stri
             }
         }
 
-        /// <summary> Creates a new run for an assistant thread. </summary>
-        /// <param name="threadId"> The ID of the thread to run. </param>
-        /// <param name="createRunOptions"> The details for the run to create. </param>
+        /// <summary> Returns information about a specific file. Does not retrieve file content. </summary>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="createRunOptions"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<ThreadRun>> CreateRunAsync(string threadId, CreateRunOptions createRunOptions, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<BinaryData>> GetFileContentAsync(string fileId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNull(createRunOptions, nameof(createRunOptions));
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            using RequestContent content = createRunOptions.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await CreateRunAsync(threadId, content, context).ConfigureAwait(false);
-            return Response.FromValue(ThreadRun.FromResponse(response), response);
+            Response response = await GetFileContentAsync(fileId, context).ConfigureAwait(false);
+            return Response.FromValue(response.Content, response);
         }
 
-        /// <summary> Creates a new run for an assistant thread. </summary>
-        /// <param name="threadId"> The ID of the thread to run. </param>
-        /// <param name="createRunOptions"> The details for the run to create. </param>
+        /// <summary> Returns information about a specific file. Does not retrieve file content. </summary>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="createRunOptions"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<ThreadRun> CreateRun(string threadId, CreateRunOptions createRunOptions, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<BinaryData> GetFileContent(string fileId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNull(createRunOptions, nameof(createRunOptions));
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            using RequestContent content = createRunOptions.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = CreateRun(threadId, content, context);
-            return Response.FromValue(ThreadRun.FromResponse(response), response);
+            Response response = GetFileContent(fileId, context);
+            return Response.FromValue(response.Content, response);
         }
 
         /// <summary>
-        /// [Protocol Method] Creates a new run for an assistant thread.
+        /// [Protocol Method] Returns information about a specific file. Does not retrieve file content.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2132,23 +2824,21 @@ public virtual Response<ThreadRun> CreateRun(string threadId, CreateRunOptions c
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to run. </param>
-        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> CreateRunAsync(string threadId, RequestContent content, RequestContext context = null)
+        internal virtual async Task<Response> GetFileContentAsync(string fileId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNull(content, nameof(content));
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateRun");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetFileContent");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateCreateRunRequest(threadId, content, context);
+                using HttpMessage message = CreateGetFileContentRequest(fileId, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -2159,7 +2849,7 @@ internal virtual async Task<Response> CreateRunAsync(string threadId, RequestCon
         }
 
         /// <summary>
-        /// [Protocol Method] Creates a new run for an assistant thread.
+        /// [Protocol Method] Returns information about a specific file. Does not retrieve file content.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2168,23 +2858,21 @@ internal virtual async Task<Response> CreateRunAsync(string threadId, RequestCon
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to run. </param>
-        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response CreateRun(string threadId, RequestContent content, RequestContext context = null)
+        internal virtual Response GetFileContent(string fileId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNull(content, nameof(content));
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateRun");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetFileContent");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateCreateRunRequest(threadId, content, context);
+                using HttpMessage message = CreateGetFileContentRequest(fileId, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -2194,76 +2882,56 @@ internal virtual Response CreateRun(string threadId, RequestContent content, Req
             }
         }
 
-        /// <summary> Gets a list of runs for a specified thread. </summary>
-        /// <param name="threadId"> The ID of the thread to list runs from. </param>
+        /// <summary> Returns a list of vector stores. </summary>
         /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
         /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
         /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
         /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual async Task<Response<InternalOpenAIPageableListOfThreadRun>> InternalGetRunsAsync(string threadId, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<OpenAIPageableListOfVectorStore>> GetVectorStoresAsync(int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await InternalGetRunsAsync(threadId, limit, order?.ToString(), after, before, context).ConfigureAwait(false);
-            return Response.FromValue(InternalOpenAIPageableListOfThreadRun.FromResponse(response), response);
+            Response response = await GetVectorStoresAsync(limit, order?.ToString(), after, before, context).ConfigureAwait(false);
+            return Response.FromValue(OpenAIPageableListOfVectorStore.FromResponse(response), response);
         }
 
-        /// <summary> Gets a list of runs for a specified thread. </summary>
-        /// <param name="threadId"> The ID of the thread to list runs from. </param>
+        /// <summary> Returns a list of vector stores. </summary>
         /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
         /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
         /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
         /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual Response<InternalOpenAIPageableListOfThreadRun> InternalGetRuns(string threadId, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
+        public virtual Response<OpenAIPageableListOfVectorStore> GetVectorStores(int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = InternalGetRuns(threadId, limit, order?.ToString(), after, before, context);
-            return Response.FromValue(InternalOpenAIPageableListOfThreadRun.FromResponse(response), response);
+            Response response = GetVectorStores(limit, order?.ToString(), after, before, context);
+            return Response.FromValue(OpenAIPageableListOfVectorStore.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Gets a list of runs for a specified thread.
+        /// [Protocol Method] Returns a list of vector stores.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
-        /// <item>
-        /// <description>
-        /// Please try the simpler <see cref="InternalGetRunsAsync(string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
-        /// </description>
-        /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to list runs from. </param>
         /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
         /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
         /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
         /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> InternalGetRunsAsync(string threadId, int? limit, string order, string after, string before, RequestContext context)
+        internal virtual async Task<Response> GetVectorStoresAsync(int? limit, string order, string after, string before, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetRuns");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetVectorStores");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalGetRunsRequest(threadId, limit, order, after, before, context);
+                using HttpMessage message = CreateGetVectorStoresRequest(limit, order, after, before, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -2274,39 +2942,29 @@ internal virtual async Task<Response> InternalGetRunsAsync(string threadId, int?
         }
 
         /// <summary>
-        /// [Protocol Method] Gets a list of runs for a specified thread.
+        /// [Protocol Method] Returns a list of vector stores.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
-        /// <item>
-        /// <description>
-        /// Please try the simpler <see cref="InternalGetRuns(string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
-        /// </description>
-        /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to list runs from. </param>
         /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
         /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
         /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
         /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response InternalGetRuns(string threadId, int? limit, string order, string after, string before, RequestContext context)
+        internal virtual Response GetVectorStores(int? limit, string order, string after, string before, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetRuns");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetVectorStores");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalGetRunsRequest(threadId, limit, order, after, before, context);
+                using HttpMessage message = CreateGetVectorStoresRequest(limit, order, after, before, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -2316,40 +2974,36 @@ internal virtual Response InternalGetRuns(string threadId, int? limit, string or
             }
         }
 
-        /// <summary> Gets an existing run from an existing thread. </summary>
-        /// <param name="threadId"> The ID of the thread to retrieve run information from. </param>
-        /// <param name="runId"> The ID of the thread to retrieve information about. </param>
+        /// <summary> Creates a vector store. </summary>
+        /// <param name="body"> Request object for creating a vector store. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<ThreadRun>> GetRunAsync(string threadId, string runId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
+        public virtual async Task<Response<VectorStore>> CreateVectorStoreAsync(VectorStoreOptions body, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNull(body, nameof(body));
 
+            using RequestContent content = body.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await GetRunAsync(threadId, runId, context).ConfigureAwait(false);
-            return Response.FromValue(ThreadRun.FromResponse(response), response);
+            Response response = await CreateVectorStoreAsync(content, context).ConfigureAwait(false);
+            return Response.FromValue(VectorStore.FromResponse(response), response);
         }
 
-        /// <summary> Gets an existing run from an existing thread. </summary>
-        /// <param name="threadId"> The ID of the thread to retrieve run information from. </param>
-        /// <param name="runId"> The ID of the thread to retrieve information about. </param>
+        /// <summary> Creates a vector store. </summary>
+        /// <param name="body"> Request object for creating a vector store. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<ThreadRun> GetRun(string threadId, string runId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
+        public virtual Response<VectorStore> CreateVectorStore(VectorStoreOptions body, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNull(body, nameof(body));
 
+            using RequestContent content = body.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = GetRun(threadId, runId, context);
-            return Response.FromValue(ThreadRun.FromResponse(response), response);
+            Response response = CreateVectorStore(content, context);
+            return Response.FromValue(VectorStore.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Gets an existing run from an existing thread.
+        /// [Protocol Method] Creates a vector store.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2358,23 +3012,20 @@ public virtual Response<ThreadRun> GetRun(string threadId, string runId, Cancell
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to retrieve run information from. </param>
-        /// <param name="runId"> The ID of the thread to retrieve information about. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> GetRunAsync(string threadId, string runId, RequestContext context)
+        internal virtual async Task<Response> CreateVectorStoreAsync(RequestContent content, RequestContext context = null)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetRun");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateVectorStore");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetRunRequest(threadId, runId, context);
+                using HttpMessage message = CreateCreateVectorStoreRequest(content, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -2385,7 +3036,7 @@ internal virtual async Task<Response> GetRunAsync(string threadId, string runId,
         }
 
         /// <summary>
-        /// [Protocol Method] Gets an existing run from an existing thread.
+        /// [Protocol Method] Creates a vector store.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2394,23 +3045,20 @@ internal virtual async Task<Response> GetRunAsync(string threadId, string runId,
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread to retrieve run information from. </param>
-        /// <param name="runId"> The ID of the thread to retrieve information about. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response GetRun(string threadId, string runId, RequestContext context)
+        internal virtual Response CreateVectorStore(RequestContent content, RequestContext context = null)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetRun");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateVectorStore");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetRunRequest(threadId, runId, context);
+                using HttpMessage message = CreateCreateVectorStoreRequest(content, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -2420,44 +3068,36 @@ internal virtual Response GetRun(string threadId, string runId, RequestContext c
             }
         }
 
-        /// <summary> Modifies an existing thread run. </summary>
-        /// <param name="threadId"> The ID of the thread associated with the specified run. </param>
-        /// <param name="runId"> The ID of the run to modify. </param>
-        /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
+        /// <summary> Returns the vector store object matching the specified ID. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store to retrieve. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<ThreadRun>> UpdateRunAsync(string threadId, string runId, IReadOnlyDictionary<string, string> metadata = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<VectorStore>> GetVectorStoreAsync(string vectorStoreId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
 
-            UpdateRunRequest updateRunRequest = new UpdateRunRequest(metadata ?? new ChangeTrackingDictionary<string, string>(), null);
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await UpdateRunAsync(threadId, runId, updateRunRequest.ToRequestContent(), context).ConfigureAwait(false);
-            return Response.FromValue(ThreadRun.FromResponse(response), response);
+            Response response = await GetVectorStoreAsync(vectorStoreId, context).ConfigureAwait(false);
+            return Response.FromValue(VectorStore.FromResponse(response), response);
         }
 
-        /// <summary> Modifies an existing thread run. </summary>
-        /// <param name="threadId"> The ID of the thread associated with the specified run. </param>
-        /// <param name="runId"> The ID of the run to modify. </param>
-        /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
+        /// <summary> Returns the vector store object matching the specified ID. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store to retrieve. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<ThreadRun> UpdateRun(string threadId, string runId, IReadOnlyDictionary<string, string> metadata = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<VectorStore> GetVectorStore(string vectorStoreId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
 
-            UpdateRunRequest updateRunRequest = new UpdateRunRequest(metadata ?? new ChangeTrackingDictionary<string, string>(), null);
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = UpdateRun(threadId, runId, updateRunRequest.ToRequestContent(), context);
-            return Response.FromValue(ThreadRun.FromResponse(response), response);
+            Response response = GetVectorStore(vectorStoreId, context);
+            return Response.FromValue(VectorStore.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Modifies an existing thread run.
+        /// [Protocol Method] Returns the vector store object matching the specified ID.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2466,25 +3106,21 @@ public virtual Response<ThreadRun> UpdateRun(string threadId, string runId, IRea
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread associated with the specified run. </param>
-        /// <param name="runId"> The ID of the run to modify. </param>
-        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store to retrieve. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> UpdateRunAsync(string threadId, string runId, RequestContent content, RequestContext context = null)
+        internal virtual async Task<Response> GetVectorStoreAsync(string vectorStoreId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
-            Argument.AssertNotNull(content, nameof(content));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UpdateRun");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetVectorStore");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateUpdateRunRequest(threadId, runId, content, context);
+                using HttpMessage message = CreateGetVectorStoreRequest(vectorStoreId, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -2495,7 +3131,7 @@ internal virtual async Task<Response> UpdateRunAsync(string threadId, string run
         }
 
         /// <summary>
-        /// [Protocol Method] Modifies an existing thread run.
+        /// [Protocol Method] Returns the vector store object matching the specified ID.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2503,26 +3139,22 @@ internal virtual async Task<Response> UpdateRunAsync(string threadId, string run
         /// </description>
         /// </item>
         /// </list>
-        /// </summary>
-        /// <param name="threadId"> The ID of the thread associated with the specified run. </param>
-        /// <param name="runId"> The ID of the run to modify. </param>
-        /// <param name="content"> The content to send as the body of the request. </param>
+        /// </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store to retrieve. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response UpdateRun(string threadId, string runId, RequestContent content, RequestContext context = null)
+        internal virtual Response GetVectorStore(string vectorStoreId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
-            Argument.AssertNotNull(content, nameof(content));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UpdateRun");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetVectorStore");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateUpdateRunRequest(threadId, runId, content, context);
+                using HttpMessage message = CreateGetVectorStoreRequest(vectorStoreId, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -2532,46 +3164,42 @@ internal virtual Response UpdateRun(string threadId, string runId, RequestConten
             }
         }
 
-        /// <summary> Submits outputs from tools as requested by tool calls in a run. Runs that need submitted tool outputs will have a status of 'requires_action' with a required_action.type of 'submit_tool_outputs'. </summary>
-        /// <param name="threadId"> The ID of the thread that was run. </param>
-        /// <param name="runId"> The ID of the run that requires tool outputs. </param>
-        /// <param name="toolOutputs"> The list of tool outputs requested by tool calls from the specified run. </param>
+        /// <summary> The ID of the vector store to modify. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store to modify. </param>
+        /// <param name="body"> Request object for updating a vector store. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="toolOutputs"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<ThreadRun>> SubmitToolOutputsToRunAsync(string threadId, string runId, IEnumerable<ToolOutput> toolOutputs, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<VectorStore>> ModifyVectorStoreAsync(string vectorStoreId, VectorStoreUpdateOptions body, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
-            Argument.AssertNotNull(toolOutputs, nameof(toolOutputs));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNull(body, nameof(body));
 
-            SubmitToolOutputsToRunRequest submitToolOutputsToRunRequest = new SubmitToolOutputsToRunRequest(toolOutputs.ToList(), null);
+            using RequestContent content = body.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await SubmitToolOutputsToRunAsync(threadId, runId, submitToolOutputsToRunRequest.ToRequestContent(), context).ConfigureAwait(false);
-            return Response.FromValue(ThreadRun.FromResponse(response), response);
+            Response response = await ModifyVectorStoreAsync(vectorStoreId, content, context).ConfigureAwait(false);
+            return Response.FromValue(VectorStore.FromResponse(response), response);
         }
 
-        /// <summary> Submits outputs from tools as requested by tool calls in a run. Runs that need submitted tool outputs will have a status of 'requires_action' with a required_action.type of 'submit_tool_outputs'. </summary>
-        /// <param name="threadId"> The ID of the thread that was run. </param>
-        /// <param name="runId"> The ID of the run that requires tool outputs. </param>
-        /// <param name="toolOutputs"> The list of tool outputs requested by tool calls from the specified run. </param>
+        /// <summary> The ID of the vector store to modify. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store to modify. </param>
+        /// <param name="body"> Request object for updating a vector store. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="toolOutputs"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<ThreadRun> SubmitToolOutputsToRun(string threadId, string runId, IEnumerable<ToolOutput> toolOutputs, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<VectorStore> ModifyVectorStore(string vectorStoreId, VectorStoreUpdateOptions body, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
-            Argument.AssertNotNull(toolOutputs, nameof(toolOutputs));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNull(body, nameof(body));
 
-            SubmitToolOutputsToRunRequest submitToolOutputsToRunRequest = new SubmitToolOutputsToRunRequest(toolOutputs.ToList(), null);
+            using RequestContent content = body.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = SubmitToolOutputsToRun(threadId, runId, submitToolOutputsToRunRequest.ToRequestContent(), context);
-            return Response.FromValue(ThreadRun.FromResponse(response), response);
+            Response response = ModifyVectorStore(vectorStoreId, content, context);
+            return Response.FromValue(VectorStore.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Submits outputs from tools as requested by tool calls in a run. Runs that need submitted tool outputs will have a status of 'requires_action' with a required_action.type of 'submit_tool_outputs'.
+        /// [Protocol Method] The ID of the vector store to modify.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2580,25 +3208,23 @@ public virtual Response<ThreadRun> SubmitToolOutputsToRun(string threadId, strin
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread that was run. </param>
-        /// <param name="runId"> The ID of the run that requires tool outputs. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store to modify. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> SubmitToolOutputsToRunAsync(string threadId, string runId, RequestContent content, RequestContext context = null)
+        internal virtual async Task<Response> ModifyVectorStoreAsync(string vectorStoreId, RequestContent content, RequestContext context = null)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
             Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.SubmitToolOutputsToRun");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.ModifyVectorStore");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateSubmitToolOutputsToRunRequest(threadId, runId, content, context);
+                using HttpMessage message = CreateModifyVectorStoreRequest(vectorStoreId, content, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -2609,7 +3235,7 @@ internal virtual async Task<Response> SubmitToolOutputsToRunAsync(string threadI
         }
 
         /// <summary>
-        /// [Protocol Method] Submits outputs from tools as requested by tool calls in a run. Runs that need submitted tool outputs will have a status of 'requires_action' with a required_action.type of 'submit_tool_outputs'.
+        /// [Protocol Method] The ID of the vector store to modify.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2618,25 +3244,23 @@ internal virtual async Task<Response> SubmitToolOutputsToRunAsync(string threadI
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread that was run. </param>
-        /// <param name="runId"> The ID of the run that requires tool outputs. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store to modify. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response SubmitToolOutputsToRun(string threadId, string runId, RequestContent content, RequestContext context = null)
+        internal virtual Response ModifyVectorStore(string vectorStoreId, RequestContent content, RequestContext context = null)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
             Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.SubmitToolOutputsToRun");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.ModifyVectorStore");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateSubmitToolOutputsToRunRequest(threadId, runId, content, context);
+                using HttpMessage message = CreateModifyVectorStoreRequest(vectorStoreId, content, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -2646,40 +3270,36 @@ internal virtual Response SubmitToolOutputsToRun(string threadId, string runId,
             }
         }
 
-        /// <summary> Cancels a run of an in progress thread. </summary>
-        /// <param name="threadId"> The ID of the thread being run. </param>
-        /// <param name="runId"> The ID of the run to cancel. </param>
+        /// <summary> Deletes the vector store object matching the specified ID. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store to delete. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<ThreadRun>> CancelRunAsync(string threadId, string runId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<VectorStoreDeletionStatus>> DeleteVectorStoreAsync(string vectorStoreId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await CancelRunAsync(threadId, runId, context).ConfigureAwait(false);
-            return Response.FromValue(ThreadRun.FromResponse(response), response);
+            Response response = await DeleteVectorStoreAsync(vectorStoreId, context).ConfigureAwait(false);
+            return Response.FromValue(VectorStoreDeletionStatus.FromResponse(response), response);
         }
 
-        /// <summary> Cancels a run of an in progress thread. </summary>
-        /// <param name="threadId"> The ID of the thread being run. </param>
-        /// <param name="runId"> The ID of the run to cancel. </param>
+        /// <summary> Deletes the vector store object matching the specified ID. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store to delete. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<ThreadRun> CancelRun(string threadId, string runId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<VectorStoreDeletionStatus> DeleteVectorStore(string vectorStoreId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = CancelRun(threadId, runId, context);
-            return Response.FromValue(ThreadRun.FromResponse(response), response);
+            Response response = DeleteVectorStore(vectorStoreId, context);
+            return Response.FromValue(VectorStoreDeletionStatus.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Cancels a run of an in progress thread.
+        /// [Protocol Method] Deletes the vector store object matching the specified ID.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2688,23 +3308,21 @@ public virtual Response<ThreadRun> CancelRun(string threadId, string runId, Canc
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread being run. </param>
-        /// <param name="runId"> The ID of the run to cancel. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store to delete. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> CancelRunAsync(string threadId, string runId, RequestContext context)
+        internal virtual async Task<Response> DeleteVectorStoreAsync(string vectorStoreId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CancelRun");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.DeleteVectorStore");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateCancelRunRequest(threadId, runId, context);
+                using HttpMessage message = CreateDeleteVectorStoreRequest(vectorStoreId, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -2715,7 +3333,7 @@ internal virtual async Task<Response> CancelRunAsync(string threadId, string run
         }
 
         /// <summary>
-        /// [Protocol Method] Cancels a run of an in progress thread.
+        /// [Protocol Method] Deletes the vector store object matching the specified ID.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2724,23 +3342,21 @@ internal virtual async Task<Response> CancelRunAsync(string threadId, string run
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread being run. </param>
-        /// <param name="runId"> The ID of the run to cancel. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store to delete. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response CancelRun(string threadId, string runId, RequestContext context)
+        internal virtual Response DeleteVectorStore(string vectorStoreId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CancelRun");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.DeleteVectorStore");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateCancelRunRequest(threadId, runId, context);
+                using HttpMessage message = CreateDeleteVectorStoreRequest(vectorStoreId, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -2750,36 +3366,46 @@ internal virtual Response CancelRun(string threadId, string runId, RequestContex
             }
         }
 
-        /// <summary> Creates a new assistant thread and immediately starts a run using that new thread. </summary>
-        /// <param name="body"> Body parameter. </param>
+        /// <summary> Returns a list of vector store files. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store that the files belong to. </param>
+        /// <param name="filter"> Filter by file status. </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual async Task<Response<ThreadRun>> CreateThreadAndRunAsync(CreateAndRunThreadOptions body, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<OpenAIPageableListOfVectorStoreFile>> GetVectorStoreFilesAsync(string vectorStoreId, VectorStoreFileStatusFilter? filter = null, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNull(body, nameof(body));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
 
-            using RequestContent content = body.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await CreateThreadAndRunAsync(content, context).ConfigureAwait(false);
-            return Response.FromValue(ThreadRun.FromResponse(response), response);
+            Response response = await GetVectorStoreFilesAsync(vectorStoreId, filter?.ToString(), limit, order?.ToString(), after, before, context).ConfigureAwait(false);
+            return Response.FromValue(OpenAIPageableListOfVectorStoreFile.FromResponse(response), response);
         }
 
-        /// <summary> Creates a new assistant thread and immediately starts a run using that new thread. </summary>
-        /// <param name="body"> Body parameter. </param>
+        /// <summary> Returns a list of vector store files. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store that the files belong to. </param>
+        /// <param name="filter"> Filter by file status. </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        public virtual Response<ThreadRun> CreateThreadAndRun(CreateAndRunThreadOptions body, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<OpenAIPageableListOfVectorStoreFile> GetVectorStoreFiles(string vectorStoreId, VectorStoreFileStatusFilter? filter = null, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNull(body, nameof(body));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
 
-            using RequestContent content = body.ToRequestContent();
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = CreateThreadAndRun(content, context);
-            return Response.FromValue(ThreadRun.FromResponse(response), response);
+            Response response = GetVectorStoreFiles(vectorStoreId, filter?.ToString(), limit, order?.ToString(), after, before, context);
+            return Response.FromValue(OpenAIPageableListOfVectorStoreFile.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Creates a new assistant thread and immediately starts a run using that new thread.
+        /// [Protocol Method] Returns a list of vector store files.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2788,20 +3414,26 @@ public virtual Response<ThreadRun> CreateThreadAndRun(CreateAndRunThreadOptions
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the files belong to. </param>
+        /// <param name="filter"> Filter by file status. Allowed values: "in_progress" | "completed" | "failed" | "cancelled". </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> CreateThreadAndRunAsync(RequestContent content, RequestContext context = null)
+        internal virtual async Task<Response> GetVectorStoreFilesAsync(string vectorStoreId, string filter, int? limit, string order, string after, string before, RequestContext context)
         {
-            Argument.AssertNotNull(content, nameof(content));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateThreadAndRun");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetVectorStoreFiles");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateCreateThreadAndRunRequest(content, context);
+                using HttpMessage message = CreateGetVectorStoreFilesRequest(vectorStoreId, filter, limit, order, after, before, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -2812,7 +3444,7 @@ internal virtual async Task<Response> CreateThreadAndRunAsync(RequestContent con
         }
 
         /// <summary>
-        /// [Protocol Method] Creates a new assistant thread and immediately starts a run using that new thread.
+        /// [Protocol Method] Returns a list of vector store files.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2821,20 +3453,26 @@ internal virtual async Task<Response> CreateThreadAndRunAsync(RequestContent con
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the files belong to. </param>
+        /// <param name="filter"> Filter by file status. Allowed values: "in_progress" | "completed" | "failed" | "cancelled". </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response CreateThreadAndRun(RequestContent content, RequestContext context = null)
+        internal virtual Response GetVectorStoreFiles(string vectorStoreId, string filter, int? limit, string order, string after, string before, RequestContext context)
         {
-            Argument.AssertNotNull(content, nameof(content));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateThreadAndRun");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetVectorStoreFiles");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateCreateThreadAndRunRequest(content, context);
+                using HttpMessage message = CreateGetVectorStoreFilesRequest(vectorStoreId, filter, limit, order, after, before, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -2844,44 +3482,44 @@ internal virtual Response CreateThreadAndRun(RequestContent content, RequestCont
             }
         }
 
-        /// <summary> Gets a single run step from a thread run. </summary>
-        /// <param name="threadId"> The ID of the thread that was run. </param>
-        /// <param name="runId"> The ID of the specific run to retrieve the step from. </param>
-        /// <param name="stepId"> The ID of the step to retrieve information about. </param>
+        /// <summary> Create a vector store file by attaching a file to a vector store. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store for which to create a File. </param>
+        /// <param name="fileId"> A File ID that the vector store should use. Useful for tools like `file_search` that can access files. </param>
+        /// <param name="chunkingStrategy"> The chunking strategy used to chunk the file(s). If not set, will use the auto strategy. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<RunStep>> GetRunStepAsync(string threadId, string runId, string stepId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<VectorStoreFile>> CreateVectorStoreFileAsync(string vectorStoreId, string fileId, VectorStoreChunkingStrategyRequest chunkingStrategy = null, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
-            Argument.AssertNotNullOrEmpty(stepId, nameof(stepId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNull(fileId, nameof(fileId));
 
+            CreateVectorStoreFileRequest createVectorStoreFileRequest = new CreateVectorStoreFileRequest(fileId, chunkingStrategy, null);
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await GetRunStepAsync(threadId, runId, stepId, context).ConfigureAwait(false);
-            return Response.FromValue(RunStep.FromResponse(response), response);
+            Response response = await CreateVectorStoreFileAsync(vectorStoreId, createVectorStoreFileRequest.ToRequestContent(), context).ConfigureAwait(false);
+            return Response.FromValue(VectorStoreFile.FromResponse(response), response);
         }
 
-        /// <summary> Gets a single run step from a thread run. </summary>
-        /// <param name="threadId"> The ID of the thread that was run. </param>
-        /// <param name="runId"> The ID of the specific run to retrieve the step from. </param>
-        /// <param name="stepId"> The ID of the step to retrieve information about. </param>
+        /// <summary> Create a vector store file by attaching a file to a vector store. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store for which to create a File. </param>
+        /// <param name="fileId"> A File ID that the vector store should use. Useful for tools like `file_search` that can access files. </param>
+        /// <param name="chunkingStrategy"> The chunking strategy used to chunk the file(s). If not set, will use the auto strategy. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<RunStep> GetRunStep(string threadId, string runId, string stepId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<VectorStoreFile> CreateVectorStoreFile(string vectorStoreId, string fileId, VectorStoreChunkingStrategyRequest chunkingStrategy = null, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
-            Argument.AssertNotNullOrEmpty(stepId, nameof(stepId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNull(fileId, nameof(fileId));
 
+            CreateVectorStoreFileRequest createVectorStoreFileRequest = new CreateVectorStoreFileRequest(fileId, chunkingStrategy, null);
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = GetRunStep(threadId, runId, stepId, context);
-            return Response.FromValue(RunStep.FromResponse(response), response);
+            Response response = CreateVectorStoreFile(vectorStoreId, createVectorStoreFileRequest.ToRequestContent(), context);
+            return Response.FromValue(VectorStoreFile.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Gets a single run step from a thread run.
+        /// [Protocol Method] Create a vector store file by attaching a file to a vector store.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2890,25 +3528,23 @@ public virtual Response<RunStep> GetRunStep(string threadId, string runId, strin
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread that was run. </param>
-        /// <param name="runId"> The ID of the specific run to retrieve the step from. </param>
-        /// <param name="stepId"> The ID of the step to retrieve information about. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store for which to create a File. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> GetRunStepAsync(string threadId, string runId, string stepId, RequestContext context)
+        internal virtual async Task<Response> CreateVectorStoreFileAsync(string vectorStoreId, RequestContent content, RequestContext context = null)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
-            Argument.AssertNotNullOrEmpty(stepId, nameof(stepId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetRunStep");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateVectorStoreFile");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetRunStepRequest(threadId, runId, stepId, context);
+                using HttpMessage message = CreateCreateVectorStoreFileRequest(vectorStoreId, content, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -2919,7 +3555,7 @@ internal virtual async Task<Response> GetRunStepAsync(string threadId, string ru
         }
 
         /// <summary>
-        /// [Protocol Method] Gets a single run step from a thread run.
+        /// [Protocol Method] Create a vector store file by attaching a file to a vector store.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -2928,25 +3564,23 @@ internal virtual async Task<Response> GetRunStepAsync(string threadId, string ru
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread that was run. </param>
-        /// <param name="runId"> The ID of the specific run to retrieve the step from. </param>
-        /// <param name="stepId"> The ID of the step to retrieve information about. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store for which to create a File. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/>, <paramref name="runId"/> or <paramref name="stepId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response GetRunStep(string threadId, string runId, string stepId, RequestContext context)
+        internal virtual Response CreateVectorStoreFile(string vectorStoreId, RequestContent content, RequestContext context = null)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
-            Argument.AssertNotNullOrEmpty(stepId, nameof(stepId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetRunStep");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateVectorStoreFile");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetRunStepRequest(threadId, runId, stepId, context);
+                using HttpMessage message = CreateCreateVectorStoreFileRequest(vectorStoreId, content, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -2956,82 +3590,65 @@ internal virtual Response GetRunStep(string threadId, string runId, string stepI
             }
         }
 
-        /// <summary> Gets a list of run steps from a thread run. </summary>
-        /// <param name="threadId"> The ID of the thread that was run. </param>
-        /// <param name="runId"> The ID of the run to list steps from. </param>
-        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
-        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
-        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
-        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <summary> Retrieves a vector store file. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file belongs to. </param>
+        /// <param name="fileId"> The ID of the file being retrieved. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual async Task<Response<InternalOpenAIPageableListOfRunStep>> InternalGetRunStepsAsync(string threadId, string runId, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<VectorStoreFile>> GetVectorStoreFileAsync(string vectorStoreId, string fileId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await InternalGetRunStepsAsync(threadId, runId, limit, order?.ToString(), after, before, context).ConfigureAwait(false);
-            return Response.FromValue(InternalOpenAIPageableListOfRunStep.FromResponse(response), response);
+            Response response = await GetVectorStoreFileAsync(vectorStoreId, fileId, context).ConfigureAwait(false);
+            return Response.FromValue(VectorStoreFile.FromResponse(response), response);
         }
 
-        /// <summary> Gets a list of run steps from a thread run. </summary>
-        /// <param name="threadId"> The ID of the thread that was run. </param>
-        /// <param name="runId"> The ID of the run to list steps from. </param>
-        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
-        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
-        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
-        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <summary> Retrieves a vector store file. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file belongs to. </param>
+        /// <param name="fileId"> The ID of the file being retrieved. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual Response<InternalOpenAIPageableListOfRunStep> InternalGetRunSteps(string threadId, string runId, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<VectorStoreFile> GetVectorStoreFile(string vectorStoreId, string fileId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = InternalGetRunSteps(threadId, runId, limit, order?.ToString(), after, before, context);
-            return Response.FromValue(InternalOpenAIPageableListOfRunStep.FromResponse(response), response);
+            Response response = GetVectorStoreFile(vectorStoreId, fileId, context);
+            return Response.FromValue(VectorStoreFile.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Gets a list of run steps from a thread run.
+        /// [Protocol Method] Retrieves a vector store file.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
-        /// <item>
-        /// <description>
-        /// Please try the simpler <see cref="InternalGetRunStepsAsync(string,string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
-        /// </description>
-        /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread that was run. </param>
-        /// <param name="runId"> The ID of the run to list steps from. </param>
-        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
-        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
-        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
-        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file belongs to. </param>
+        /// <param name="fileId"> The ID of the file being retrieved. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> InternalGetRunStepsAsync(string threadId, string runId, int? limit, string order, string after, string before, RequestContext context)
+        internal virtual async Task<Response> GetVectorStoreFileAsync(string vectorStoreId, string fileId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetRunSteps");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetVectorStoreFile");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalGetRunStepsRequest(threadId, runId, limit, order, after, before, context);
+                using HttpMessage message = CreateGetVectorStoreFileRequest(vectorStoreId, fileId, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -3042,41 +3659,32 @@ internal virtual async Task<Response> InternalGetRunStepsAsync(string threadId,
         }
 
         /// <summary>
-        /// [Protocol Method] Gets a list of run steps from a thread run.
+        /// [Protocol Method] Retrieves a vector store file.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
-        /// <item>
-        /// <description>
-        /// Please try the simpler <see cref="InternalGetRunSteps(string,string,int?,ListSortOrder?,string,string,CancellationToken)"/> convenience overload with strongly typed models first.
-        /// </description>
-        /// </item>
         /// </list>
         /// </summary>
-        /// <param name="threadId"> The ID of the thread that was run. </param>
-        /// <param name="runId"> The ID of the run to list steps from. </param>
-        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
-        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
-        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
-        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file belongs to. </param>
+        /// <param name="fileId"> The ID of the file being retrieved. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="threadId"/> or <paramref name="runId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="threadId"/> or <paramref name="runId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response InternalGetRunSteps(string threadId, string runId, int? limit, string order, string after, string before, RequestContext context)
+        internal virtual Response GetVectorStoreFile(string vectorStoreId, string fileId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(threadId, nameof(threadId));
-            Argument.AssertNotNullOrEmpty(runId, nameof(runId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalGetRunSteps");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetVectorStoreFile");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalGetRunStepsRequest(threadId, runId, limit, order, after, before, context);
+                using HttpMessage message = CreateGetVectorStoreFileRequest(vectorStoreId, fileId, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -3086,52 +3694,72 @@ internal virtual Response InternalGetRunSteps(string threadId, string runId, int
             }
         }
 
-        /// <summary> Gets a list of previously uploaded files. </summary>
-        /// <param name="purpose"> A value that, when provided, limits list results to files matching the corresponding purpose. </param>
+        /// <summary>
+        /// Delete a vector store file. This will remove the file from the vector store but the file itself will not be deleted.
+        /// To delete the file, use the delete file endpoint.
+        /// </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file belongs to. </param>
+        /// <param name="fileId"> The ID of the file to delete its relationship to the vector store. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        internal virtual async Task<Response<InternalFileListResponse>> InternalListFilesAsync(OpenAIFilePurpose? purpose = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<VectorStoreFileDeletionStatus>> DeleteVectorStoreFileAsync(string vectorStoreId, string fileId, CancellationToken cancellationToken = default)
         {
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await InternalListFilesAsync(purpose?.ToString(), context).ConfigureAwait(false);
-            return Response.FromValue(InternalFileListResponse.FromResponse(response), response);
+            Response response = await DeleteVectorStoreFileAsync(vectorStoreId, fileId, context).ConfigureAwait(false);
+            return Response.FromValue(VectorStoreFileDeletionStatus.FromResponse(response), response);
         }
 
-        /// <summary> Gets a list of previously uploaded files. </summary>
-        /// <param name="purpose"> A value that, when provided, limits list results to files matching the corresponding purpose. </param>
+        /// <summary>
+        /// Delete a vector store file. This will remove the file from the vector store but the file itself will not be deleted.
+        /// To delete the file, use the delete file endpoint.
+        /// </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file belongs to. </param>
+        /// <param name="fileId"> The ID of the file to delete its relationship to the vector store. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        internal virtual Response<InternalFileListResponse> InternalListFiles(OpenAIFilePurpose? purpose = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<VectorStoreFileDeletionStatus> DeleteVectorStoreFile(string vectorStoreId, string fileId, CancellationToken cancellationToken = default)
         {
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = InternalListFiles(purpose?.ToString(), context);
-            return Response.FromValue(InternalFileListResponse.FromResponse(response), response);
+            Response response = DeleteVectorStoreFile(vectorStoreId, fileId, context);
+            return Response.FromValue(VectorStoreFileDeletionStatus.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Gets a list of previously uploaded files.
+        /// [Protocol Method] Delete a vector store file. This will remove the file from the vector store but the file itself will not be deleted.
+        /// To delete the file, use the delete file endpoint.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
-        /// <item>
-        /// <description>
-        /// Please try the simpler <see cref="InternalListFilesAsync(OpenAIFilePurpose?,CancellationToken)"/> convenience overload with strongly typed models first.
-        /// </description>
-        /// </item>
         /// </list>
         /// </summary>
-        /// <param name="purpose"> A value that, when provided, limits list results to files matching the corresponding purpose. Allowed values: "fine-tune" | "fine-tune-results" | "assistants" | "assistants_output". </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file belongs to. </param>
+        /// <param name="fileId"> The ID of the file to delete its relationship to the vector store. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> InternalListFilesAsync(string purpose, RequestContext context)
+        internal virtual async Task<Response> DeleteVectorStoreFileAsync(string vectorStoreId, string fileId, RequestContext context)
         {
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalListFiles");
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.DeleteVectorStoreFile");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalListFilesRequest(purpose, context);
+                using HttpMessage message = CreateDeleteVectorStoreFileRequest(vectorStoreId, fileId, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -3142,31 +3770,33 @@ internal virtual async Task<Response> InternalListFilesAsync(string purpose, Req
         }
 
         /// <summary>
-        /// [Protocol Method] Gets a list of previously uploaded files.
+        /// [Protocol Method] Delete a vector store file. This will remove the file from the vector store but the file itself will not be deleted.
+        /// To delete the file, use the delete file endpoint.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
-        /// <item>
-        /// <description>
-        /// Please try the simpler <see cref="InternalListFiles(OpenAIFilePurpose?,CancellationToken)"/> convenience overload with strongly typed models first.
-        /// </description>
-        /// </item>
         /// </list>
         /// </summary>
-        /// <param name="purpose"> A value that, when provided, limits list results to files matching the corresponding purpose. Allowed values: "fine-tune" | "fine-tune-results" | "assistants" | "assistants_output". </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file belongs to. </param>
+        /// <param name="fileId"> The ID of the file to delete its relationship to the vector store. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response InternalListFiles(string purpose, RequestContext context)
+        internal virtual Response DeleteVectorStoreFile(string vectorStoreId, string fileId, RequestContext context)
         {
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalListFiles");
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.DeleteVectorStoreFile");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalListFilesRequest(purpose, context);
+                using HttpMessage message = CreateDeleteVectorStoreFileRequest(vectorStoreId, fileId, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -3176,42 +3806,44 @@ internal virtual Response InternalListFiles(string purpose, RequestContext conte
             }
         }
 
-        /// <summary> Uploads a file for use by other operations. </summary>
-        /// <param name="data"> The file data (not filename) to upload. </param>
-        /// <param name="purpose"> The intended purpose of the file. </param>
-        /// <param name="filename"> A filename to associate with the uploaded data. </param>
+        /// <summary> Create a vector store file batch. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store for which to create a File Batch. </param>
+        /// <param name="fileIds"> A list of File IDs that the vector store should use. Useful for tools like `file_search` that can access files. </param>
+        /// <param name="chunkingStrategy"> The chunking strategy used to chunk the file(s). If not set, will use the auto strategy. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
-        public virtual async Task<Response<OpenAIFile>> UploadFileAsync(Stream data, OpenAIFilePurpose purpose, string filename = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="fileIds"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<VectorStoreFileBatch>> CreateVectorStoreFileBatchAsync(string vectorStoreId, IEnumerable<string> fileIds, VectorStoreChunkingStrategyRequest chunkingStrategy = null, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNull(data, nameof(data));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNull(fileIds, nameof(fileIds));
 
-            UploadFileRequest uploadFileRequest = new UploadFileRequest(data, purpose, filename, null);
-            using MultipartFormDataRequestContent content = uploadFileRequest.ToMultipartRequestContent();
+            CreateVectorStoreFileBatchRequest createVectorStoreFileBatchRequest = new CreateVectorStoreFileBatchRequest(fileIds.ToList(), chunkingStrategy, null);
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await UploadFileAsync(content, content.ContentType, context).ConfigureAwait(false);
-            return Response.FromValue(OpenAIFile.FromResponse(response), response);
+            Response response = await CreateVectorStoreFileBatchAsync(vectorStoreId, createVectorStoreFileBatchRequest.ToRequestContent(), context).ConfigureAwait(false);
+            return Response.FromValue(VectorStoreFileBatch.FromResponse(response), response);
         }
 
-        /// <summary> Uploads a file for use by other operations. </summary>
-        /// <param name="data"> The file data (not filename) to upload. </param>
-        /// <param name="purpose"> The intended purpose of the file. </param>
-        /// <param name="filename"> A filename to associate with the uploaded data. </param>
+        /// <summary> Create a vector store file batch. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store for which to create a File Batch. </param>
+        /// <param name="fileIds"> A list of File IDs that the vector store should use. Useful for tools like `file_search` that can access files. </param>
+        /// <param name="chunkingStrategy"> The chunking strategy used to chunk the file(s). If not set, will use the auto strategy. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
-        public virtual Response<OpenAIFile> UploadFile(Stream data, OpenAIFilePurpose purpose, string filename = null, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="fileIds"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<VectorStoreFileBatch> CreateVectorStoreFileBatch(string vectorStoreId, IEnumerable<string> fileIds, VectorStoreChunkingStrategyRequest chunkingStrategy = null, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNull(data, nameof(data));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNull(fileIds, nameof(fileIds));
 
-            UploadFileRequest uploadFileRequest = new UploadFileRequest(data, purpose, filename, null);
-            using MultipartFormDataRequestContent content = uploadFileRequest.ToMultipartRequestContent();
+            CreateVectorStoreFileBatchRequest createVectorStoreFileBatchRequest = new CreateVectorStoreFileBatchRequest(fileIds.ToList(), chunkingStrategy, null);
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = UploadFile(content, content.ContentType, context);
-            return Response.FromValue(OpenAIFile.FromResponse(response), response);
+            Response response = CreateVectorStoreFileBatch(vectorStoreId, createVectorStoreFileBatchRequest.ToRequestContent(), context);
+            return Response.FromValue(VectorStoreFileBatch.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Uploads a file for use by other operations.
+        /// [Protocol Method] Create a vector store file batch.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -3220,21 +3852,23 @@ public virtual Response<OpenAIFile> UploadFile(Stream data, OpenAIFilePurpose pu
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store for which to create a File Batch. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
-        /// <param name="contentType"> The 'content-type' header value, always 'multipart/format-data' for this operation. Allowed values: "multipart/form-data". </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> UploadFileAsync(RequestContent content, string contentType, RequestContext context = null)
+        internal virtual async Task<Response> CreateVectorStoreFileBatchAsync(string vectorStoreId, RequestContent content, RequestContext context = null)
         {
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
             Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UploadFile");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateVectorStoreFileBatch");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateUploadFileRequest(content, contentType, context);
+                using HttpMessage message = CreateCreateVectorStoreFileBatchRequest(vectorStoreId, content, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -3245,7 +3879,7 @@ internal virtual async Task<Response> UploadFileAsync(RequestContent content, st
         }
 
         /// <summary>
-        /// [Protocol Method] Uploads a file for use by other operations.
+        /// [Protocol Method] Create a vector store file batch.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -3254,21 +3888,23 @@ internal virtual async Task<Response> UploadFileAsync(RequestContent content, st
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store for which to create a File Batch. </param>
         /// <param name="content"> The content to send as the body of the request. </param>
-        /// <param name="contentType"> The 'content-type' header value, always 'multipart/format-data' for this operation. Allowed values: "multipart/form-data". </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response UploadFile(RequestContent content, string contentType, RequestContext context = null)
+        internal virtual Response CreateVectorStoreFileBatch(string vectorStoreId, RequestContent content, RequestContext context = null)
         {
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
             Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.UploadFile");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CreateVectorStoreFileBatch");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateUploadFileRequest(content, contentType, context);
+                using HttpMessage message = CreateCreateVectorStoreFileBatchRequest(vectorStoreId, content, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -3278,64 +3914,65 @@ internal virtual Response UploadFile(RequestContent content, string contentType,
             }
         }
 
-        /// <summary> Delete a previously uploaded file. </summary>
-        /// <param name="fileId"> The ID of the file to delete. </param>
+        /// <summary> Retrieve a vector store file batch. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file batch belongs to. </param>
+        /// <param name="batchId"> The ID of the file batch being retrieved. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual async Task<Response<InternalFileDeletionStatus>> InternalDeleteFileAsync(string fileId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<VectorStoreFileBatch>> GetVectorStoreFileBatchAsync(string vectorStoreId, string batchId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await InternalDeleteFileAsync(fileId, context).ConfigureAwait(false);
-            return Response.FromValue(InternalFileDeletionStatus.FromResponse(response), response);
+            Response response = await GetVectorStoreFileBatchAsync(vectorStoreId, batchId, context).ConfigureAwait(false);
+            return Response.FromValue(VectorStoreFileBatch.FromResponse(response), response);
         }
 
-        /// <summary> Delete a previously uploaded file. </summary>
-        /// <param name="fileId"> The ID of the file to delete. </param>
+        /// <summary> Retrieve a vector store file batch. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file batch belongs to. </param>
+        /// <param name="batchId"> The ID of the file batch being retrieved. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        internal virtual Response<InternalFileDeletionStatus> InternalDeleteFile(string fileId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<VectorStoreFileBatch> GetVectorStoreFileBatch(string vectorStoreId, string batchId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = InternalDeleteFile(fileId, context);
-            return Response.FromValue(InternalFileDeletionStatus.FromResponse(response), response);
+            Response response = GetVectorStoreFileBatch(vectorStoreId, batchId, context);
+            return Response.FromValue(VectorStoreFileBatch.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Delete a previously uploaded file.
+        /// [Protocol Method] Retrieve a vector store file batch.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
-        /// <item>
-        /// <description>
-        /// Please try the simpler <see cref="InternalDeleteFileAsync(string,CancellationToken)"/> convenience overload with strongly typed models first.
-        /// </description>
-        /// </item>
         /// </list>
         /// </summary>
-        /// <param name="fileId"> The ID of the file to delete. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file batch belongs to. </param>
+        /// <param name="batchId"> The ID of the file batch being retrieved. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> InternalDeleteFileAsync(string fileId, RequestContext context)
+        internal virtual async Task<Response> GetVectorStoreFileBatchAsync(string vectorStoreId, string batchId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalDeleteFile");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetVectorStoreFileBatch");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalDeleteFileRequest(fileId, context);
+                using HttpMessage message = CreateGetVectorStoreFileBatchRequest(vectorStoreId, batchId, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -3346,35 +3983,32 @@ internal virtual async Task<Response> InternalDeleteFileAsync(string fileId, Req
         }
 
         /// <summary>
-        /// [Protocol Method] Delete a previously uploaded file.
+        /// [Protocol Method] Retrieve a vector store file batch.
         /// <list type="bullet">
         /// <item>
         /// <description>
         /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
         /// </description>
         /// </item>
-        /// <item>
-        /// <description>
-        /// Please try the simpler <see cref="InternalDeleteFile(string,CancellationToken)"/> convenience overload with strongly typed models first.
-        /// </description>
-        /// </item>
         /// </list>
         /// </summary>
-        /// <param name="fileId"> The ID of the file to delete. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file batch belongs to. </param>
+        /// <param name="batchId"> The ID of the file batch being retrieved. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response InternalDeleteFile(string fileId, RequestContext context)
+        internal virtual Response GetVectorStoreFileBatch(string vectorStoreId, string batchId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.InternalDeleteFile");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetVectorStoreFileBatch");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateInternalDeleteFileRequest(fileId, context);
+                using HttpMessage message = CreateGetVectorStoreFileBatchRequest(vectorStoreId, batchId, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -3384,36 +4018,40 @@ internal virtual Response InternalDeleteFile(string fileId, RequestContext conte
             }
         }
 
-        /// <summary> Returns information about a specific file. Does not retrieve file content. </summary>
-        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <summary> Cancel a vector store file batch. This attempts to cancel the processing of files in this batch as soon as possible. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file batch belongs to. </param>
+        /// <param name="batchId"> The ID of the file batch to cancel. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<OpenAIFile>> GetFileAsync(string fileId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<VectorStoreFileBatch>> CancelVectorStoreFileBatchAsync(string vectorStoreId, string batchId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await GetFileAsync(fileId, context).ConfigureAwait(false);
-            return Response.FromValue(OpenAIFile.FromResponse(response), response);
+            Response response = await CancelVectorStoreFileBatchAsync(vectorStoreId, batchId, context).ConfigureAwait(false);
+            return Response.FromValue(VectorStoreFileBatch.FromResponse(response), response);
         }
 
-        /// <summary> Returns information about a specific file. Does not retrieve file content. </summary>
-        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <summary> Cancel a vector store file batch. This attempts to cancel the processing of files in this batch as soon as possible. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file batch belongs to. </param>
+        /// <param name="batchId"> The ID of the file batch to cancel. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<OpenAIFile> GetFile(string fileId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<VectorStoreFileBatch> CancelVectorStoreFileBatch(string vectorStoreId, string batchId, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = GetFile(fileId, context);
-            return Response.FromValue(OpenAIFile.FromResponse(response), response);
+            Response response = CancelVectorStoreFileBatch(vectorStoreId, batchId, context);
+            return Response.FromValue(VectorStoreFileBatch.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Returns information about a specific file. Does not retrieve file content.
+        /// [Protocol Method] Cancel a vector store file batch. This attempts to cancel the processing of files in this batch as soon as possible.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -3422,21 +4060,23 @@ public virtual Response<OpenAIFile> GetFile(string fileId, CancellationToken can
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file batch belongs to. </param>
+        /// <param name="batchId"> The ID of the file batch to cancel. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> GetFileAsync(string fileId, RequestContext context)
+        internal virtual async Task<Response> CancelVectorStoreFileBatchAsync(string vectorStoreId, string batchId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetFile");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CancelVectorStoreFileBatch");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetFileRequest(fileId, context);
+                using HttpMessage message = CreateCancelVectorStoreFileBatchRequest(vectorStoreId, batchId, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -3447,7 +4087,7 @@ internal virtual async Task<Response> GetFileAsync(string fileId, RequestContext
         }
 
         /// <summary>
-        /// [Protocol Method] Returns information about a specific file. Does not retrieve file content.
+        /// [Protocol Method] Cancel a vector store file batch. This attempts to cancel the processing of files in this batch as soon as possible.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -3456,21 +4096,23 @@ internal virtual async Task<Response> GetFileAsync(string fileId, RequestContext
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file batch belongs to. </param>
+        /// <param name="batchId"> The ID of the file batch to cancel. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response GetFile(string fileId, RequestContext context)
+        internal virtual Response CancelVectorStoreFileBatch(string vectorStoreId, string batchId, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetFile");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.CancelVectorStoreFileBatch");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetFileRequest(fileId, context);
+                using HttpMessage message = CreateCancelVectorStoreFileBatchRequest(vectorStoreId, batchId, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -3480,36 +4122,50 @@ internal virtual Response GetFile(string fileId, RequestContext context)
             }
         }
 
-        /// <summary> Returns information about a specific file. Does not retrieve file content. </summary>
-        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <summary> Returns a list of vector store files in a batch. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file batch belongs to. </param>
+        /// <param name="batchId"> The ID of the file batch that the files belong to. </param>
+        /// <param name="filter"> Filter by file status. </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual async Task<Response<BinaryData>> GetFileContentAsync(string fileId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<OpenAIPageableListOfVectorStoreFile>> GetVectorStoreFileBatchFilesAsync(string vectorStoreId, string batchId, VectorStoreFileStatusFilter? filter = null, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = await GetFileContentAsync(fileId, context).ConfigureAwait(false);
-            return Response.FromValue(response.Content, response);
+            Response response = await GetVectorStoreFileBatchFilesAsync(vectorStoreId, batchId, filter?.ToString(), limit, order?.ToString(), after, before, context).ConfigureAwait(false);
+            return Response.FromValue(OpenAIPageableListOfVectorStoreFile.FromResponse(response), response);
         }
 
-        /// <summary> Returns information about a specific file. Does not retrieve file content. </summary>
-        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <summary> Returns a list of vector store files in a batch. </summary>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file batch belongs to. </param>
+        /// <param name="batchId"> The ID of the file batch that the files belong to. </param>
+        /// <param name="filter"> Filter by file status. </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
-        public virtual Response<BinaryData> GetFileContent(string fileId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<OpenAIPageableListOfVectorStoreFile> GetVectorStoreFileBatchFiles(string vectorStoreId, string batchId, VectorStoreFileStatusFilter? filter = null, int? limit = null, ListSortOrder? order = null, string after = null, string before = null, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
 
             RequestContext context = FromCancellationToken(cancellationToken);
-            Response response = GetFileContent(fileId, context);
-            return Response.FromValue(response.Content, response);
+            Response response = GetVectorStoreFileBatchFiles(vectorStoreId, batchId, filter?.ToString(), limit, order?.ToString(), after, before, context);
+            return Response.FromValue(OpenAIPageableListOfVectorStoreFile.FromResponse(response), response);
         }
 
         /// <summary>
-        /// [Protocol Method] Returns information about a specific file. Does not retrieve file content.
+        /// [Protocol Method] Returns a list of vector store files in a batch.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -3518,21 +4174,28 @@ public virtual Response<BinaryData> GetFileContent(string fileId, CancellationTo
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file batch belongs to. </param>
+        /// <param name="batchId"> The ID of the file batch that the files belong to. </param>
+        /// <param name="filter"> Filter by file status. Allowed values: "in_progress" | "completed" | "failed" | "cancelled". </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual async Task<Response> GetFileContentAsync(string fileId, RequestContext context)
+        internal virtual async Task<Response> GetVectorStoreFileBatchFilesAsync(string vectorStoreId, string batchId, string filter, int? limit, string order, string after, string before, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetFileContent");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetVectorStoreFileBatchFiles");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetFileContentRequest(fileId, context);
+                using HttpMessage message = CreateGetVectorStoreFileBatchFilesRequest(vectorStoreId, batchId, filter, limit, order, after, before, context);
                 return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -3543,7 +4206,7 @@ internal virtual async Task<Response> GetFileContentAsync(string fileId, Request
         }
 
         /// <summary>
-        /// [Protocol Method] Returns information about a specific file. Does not retrieve file content.
+        /// [Protocol Method] Returns a list of vector store files in a batch.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -3552,21 +4215,28 @@ internal virtual async Task<Response> GetFileContentAsync(string fileId, Request
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file batch belongs to. </param>
+        /// <param name="batchId"> The ID of the file batch that the files belong to. </param>
+        /// <param name="filter"> Filter by file status. Allowed values: "in_progress" | "completed" | "failed" | "cancelled". </param>
+        /// <param name="limit"> A limit on the number of objects to be returned. Limit can range between 1 and 100, and the default is 20. </param>
+        /// <param name="order"> Sort order by the created_at timestamp of the objects. asc for ascending order and desc for descending order. Allowed values: "asc" | "desc". </param>
+        /// <param name="after"> A cursor for use in pagination. after is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include after=obj_foo in order to fetch the next page of the list. </param>
+        /// <param name="before"> A cursor for use in pagination. before is an object ID that defines your place in the list. For instance, if you make a list request and receive 100 objects, ending with obj_foo, your subsequent call can include before=obj_foo in order to fetch the previous page of the list. </param>
         /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="vectorStoreId"/> or <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        internal virtual Response GetFileContent(string fileId, RequestContext context)
+        internal virtual Response GetVectorStoreFileBatchFiles(string vectorStoreId, string batchId, string filter, int? limit, string order, string after, string before, RequestContext context)
         {
-            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+            Argument.AssertNotNullOrEmpty(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
 
-            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetFileContent");
+            using var scope = ClientDiagnostics.CreateScope("AssistantsClient.GetVectorStoreFileBatchFiles");
             scope.Start();
             try
             {
-                using HttpMessage message = CreateGetFileContentRequest(fileId, context);
+                using HttpMessage message = CreateGetVectorStoreFileBatchFilesRequest(vectorStoreId, batchId, filter, limit, order, after, before, context);
                 return _pipeline.ProcessMessage(message, context);
             }
             catch (Exception e)
@@ -3576,6 +4246,300 @@ internal virtual Response GetFileContent(string fileId, RequestContext context)
             }
         }
 
+        internal HttpMessage CreateInternalGetMessagesRequest(string threadId, string runId, int? limit, string order, string after, string before, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Get;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendPath("/threads/", false);
+            uri.AppendPath(threadId, true);
+            uri.AppendPath("/messages", false);
+            if (runId != null)
+            {
+                uri.AppendQuery("runId", runId, true);
+            }
+            if (limit != null)
+            {
+                uri.AppendQuery("limit", limit.Value, true);
+            }
+            if (order != null)
+            {
+                uri.AppendQuery("order", order, true);
+            }
+            if (after != null)
+            {
+                uri.AppendQuery("after", after, true);
+            }
+            if (before != null)
+            {
+                uri.AppendQuery("before", before, true);
+            }
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateGetVectorStoresRequest(int? limit, string order, string after, string before, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Get;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendPath("/vector_stores", false);
+            if (limit != null)
+            {
+                uri.AppendQuery("limit", limit.Value, true);
+            }
+            if (order != null)
+            {
+                uri.AppendQuery("order", order, true);
+            }
+            if (after != null)
+            {
+                uri.AppendQuery("after", after, true);
+            }
+            if (before != null)
+            {
+                uri.AppendQuery("before", before, true);
+            }
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateCreateVectorStoreRequest(RequestContent content, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendPath("/vector_stores", false);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", "application/json");
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateGetVectorStoreRequest(string vectorStoreId, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Get;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath(vectorStoreId, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateModifyVectorStoreRequest(string vectorStoreId, RequestContent content, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath(vectorStoreId, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", "application/json");
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateDeleteVectorStoreRequest(string vectorStoreId, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Delete;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath(vectorStoreId, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateGetVectorStoreFilesRequest(string vectorStoreId, string filter, int? limit, string order, string after, string before, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Get;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath(vectorStoreId, true);
+            uri.AppendPath("/files", false);
+            if (filter != null)
+            {
+                uri.AppendQuery("filter", filter, true);
+            }
+            if (limit != null)
+            {
+                uri.AppendQuery("limit", limit.Value, true);
+            }
+            if (order != null)
+            {
+                uri.AppendQuery("order", order, true);
+            }
+            if (after != null)
+            {
+                uri.AppendQuery("after", after, true);
+            }
+            if (before != null)
+            {
+                uri.AppendQuery("before", before, true);
+            }
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateCreateVectorStoreFileRequest(string vectorStoreId, RequestContent content, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath(vectorStoreId, true);
+            uri.AppendPath("/files", false);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", "application/json");
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateGetVectorStoreFileRequest(string vectorStoreId, string fileId, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Get;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath(vectorStoreId, true);
+            uri.AppendPath("/files/", false);
+            uri.AppendPath(fileId, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateDeleteVectorStoreFileRequest(string vectorStoreId, string fileId, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Delete;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath(vectorStoreId, true);
+            uri.AppendPath("/files/", false);
+            uri.AppendPath(fileId, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateCreateVectorStoreFileBatchRequest(string vectorStoreId, RequestContent content, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath(vectorStoreId, true);
+            uri.AppendPath("/file_batches", false);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", "application/json");
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateGetVectorStoreFileBatchRequest(string vectorStoreId, string batchId, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Get;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath(vectorStoreId, true);
+            uri.AppendPath("/file_batches/", false);
+            uri.AppendPath(batchId, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateCancelVectorStoreFileBatchRequest(string vectorStoreId, string batchId, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath(vectorStoreId, true);
+            uri.AppendPath("/file_batches/", false);
+            uri.AppendPath(batchId, true);
+            uri.AppendPath("/cancel", false);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateGetVectorStoreFileBatchFilesRequest(string vectorStoreId, string batchId, string filter, int? limit, string order, string after, string before, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Get;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendPath("/vector_stores/", false);
+            uri.AppendPath(vectorStoreId, true);
+            uri.AppendPath("/file_batches/", false);
+            uri.AppendPath(batchId, true);
+            uri.AppendPath("/files", false);
+            if (filter != null)
+            {
+                uri.AppendQuery("filter", filter, true);
+            }
+            if (limit != null)
+            {
+                uri.AppendQuery("limit", limit.Value, true);
+            }
+            if (order != null)
+            {
+                uri.AppendQuery("order", order, true);
+            }
+            if (after != null)
+            {
+                uri.AppendQuery("after", after, true);
+            }
+            if (before != null)
+            {
+                uri.AppendQuery("before", before, true);
+            }
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
         private static RequestContext DefaultRequestContext = new RequestContext();
         internal static RequestContext FromCancellationToken(CancellationToken cancellationToken = default)
         {
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsClientOptions.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsClientOptions.cs
index a847db2052bd..3436987e4b16 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsClientOptions.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsClientOptions.cs
@@ -13,13 +13,19 @@ namespace Azure.AI.OpenAI.Assistants
     /// <summary> Client options for AssistantsClient. </summary>
     public partial class AssistantsClientOptions : ClientOptions
     {
-        private const ServiceVersion LatestVersion = ServiceVersion.V2024_02_15_Preview;
+        private const ServiceVersion LatestVersion = ServiceVersion.V2024_09_01_Preview;
 
         /// <summary> The version of the service to use. </summary>
         public enum ServiceVersion
         {
             /// <summary> Service version "2024-02-15-preview". </summary>
             V2024_02_15_Preview = 1,
+            /// <summary> Service version "2024-05-01-preview". </summary>
+            V2024_05_01_Preview = 2,
+            /// <summary> Service version "2024-07-01-preview". </summary>
+            V2024_07_01_Preview = 3,
+            /// <summary> Service version "2024-09-01-preview". </summary>
+            V2024_09_01_Preview = 4,
         }
 
         internal string Version { get; }
@@ -30,6 +36,9 @@ public AssistantsClientOptions(ServiceVersion version = LatestVersion)
             Version = version switch
             {
                 ServiceVersion.V2024_02_15_Preview => "2024-02-15-preview",
+                ServiceVersion.V2024_05_01_Preview => "2024-05-01-preview",
+                ServiceVersion.V2024_07_01_Preview => "2024-07-01-preview",
+                ServiceVersion.V2024_09_01_Preview => "2024-09-01-preview",
                 _ => throw new NotSupportedException()
             };
         }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsModelFactory.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsModelFactory.cs
index 8b4620e1331e..df72598f8277 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsModelFactory.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsModelFactory.cs
@@ -5,6 +5,7 @@
 
 #nullable disable
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -21,15 +22,28 @@ public static partial class AssistantsModelFactory
         /// <param name="tools">
         /// The collection of tools to enable for the new assistant.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
         /// </param>
-        /// <param name="fileIds"> A list of previously uploaded file IDs to attach to the assistant. </param>
+        /// <param name="toolResources">
+        /// A set of resources that are used by the assistant's tools. The resources are specific to the type of tool. For example, the `code_interpreter`
+        /// tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.
+        /// </param>
+        /// <param name="temperature">
+        /// What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random,
+        /// while lower values like 0.2 will make it more focused and deterministic.
+        /// </param>
+        /// <param name="topP">
+        /// An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass.
+        /// So 0.1 means only the tokens comprising the top 10% probability mass are considered.
+        ///
+        /// We generally recommend altering this or temperature but not both.
+        /// </param>
+        /// <param name="responseFormat"> The response format of the tool calls used by this assistant. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <returns> A new <see cref="Assistants.AssistantCreationOptions"/> instance for mocking. </returns>
-        public static AssistantCreationOptions AssistantCreationOptions(string model = null, string name = null, string description = null, string instructions = null, IEnumerable<ToolDefinition> tools = null, IEnumerable<string> fileIds = null, IDictionary<string, string> metadata = null)
+        public static AssistantCreationOptions AssistantCreationOptions(string model = null, string name = null, string description = null, string instructions = null, IEnumerable<ToolDefinition> tools = null, CreateToolResourcesOptions toolResources = null, float? temperature = null, float? topP = null, BinaryData responseFormat = null, IDictionary<string, string> metadata = null)
         {
             tools ??= new List<ToolDefinition>();
-            fileIds ??= new List<string>();
             metadata ??= new Dictionary<string, string>();
 
             return new AssistantCreationOptions(
@@ -38,37 +52,94 @@ public static AssistantCreationOptions AssistantCreationOptions(string model = n
                 description,
                 instructions,
                 tools?.ToList(),
-                fileIds?.ToList(),
+                toolResources,
+                temperature,
+                topP,
+                responseFormat,
                 metadata,
                 serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Assistants.ThreadInitializationMessage"/>. </summary>
-        /// <param name="role"> The role associated with the assistant thread message. Currently, only 'user' is supported when providing initial messages to a new thread. </param>
-        /// <param name="content"> The textual content of the initial message. Currently, robust input including images and annotated text may only be provided via a separate call to the create message API. </param>
-        /// <param name="fileIds">
-        /// A list of file IDs that the assistant should use. Useful for tools like retrieval and code_interpreter that can
-        /// access files.
+        /// <summary> Initializes a new instance of <see cref="Assistants.CreateFileSearchToolResourceVectorStoreOptions"/>. </summary>
+        /// <param name="fileIds"> A list of file IDs to add to the vector store. There can be a maximum of 10000 files in a vector store. </param>
+        /// <param name="chunkingStrategy">
+        /// The chunking strategy used to chunk the file(s). If not set, will use the `auto` strategy.
+        /// Please note <see cref="VectorStoreChunkingStrategyRequest"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyRequest"/> and <see cref="Assistants.VectorStoreStaticChunkingStrategyRequest"/>.
         /// </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
-        /// <returns> A new <see cref="Assistants.ThreadInitializationMessage"/> instance for mocking. </returns>
-        public static ThreadInitializationMessage ThreadInitializationMessage(MessageRole role = default, string content = null, IEnumerable<string> fileIds = null, IDictionary<string, string> metadata = null)
+        /// <returns> A new <see cref="Assistants.CreateFileSearchToolResourceVectorStoreOptions"/> instance for mocking. </returns>
+        public static CreateFileSearchToolResourceVectorStoreOptions CreateFileSearchToolResourceVectorStoreOptions(IEnumerable<string> fileIds = null, VectorStoreChunkingStrategyRequest chunkingStrategy = null, IDictionary<string, string> metadata = null)
         {
             fileIds ??= new List<string>();
             metadata ??= new Dictionary<string, string>();
 
-            return new ThreadInitializationMessage(role, content, fileIds?.ToList(), metadata, serializedAdditionalRawData: null);
+            return new CreateFileSearchToolResourceVectorStoreOptions(fileIds?.ToList(), chunkingStrategy, metadata, serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Assistants.MessageTextAnnotation"/>. </summary>
-        /// <param name="type"> The object type. </param>
-        /// <param name="text"> The textual content associated with this text annotation item. </param>
-        /// <param name="startIndex"> The first text index associated with this text annotation. </param>
-        /// <param name="endIndex"> The last text index associated with this text annotation. </param>
-        /// <returns> A new <see cref="Assistants.MessageTextAnnotation"/> instance for mocking. </returns>
-        public static MessageTextAnnotation MessageTextAnnotation(string type = null, string text = null, int startIndex = default, int endIndex = default)
+        /// <summary> Initializes a new instance of <see cref="Assistants.VectorStoreStaticChunkingStrategyRequest"/>. </summary>
+        /// <param name="static"> The options for the static chunking strategy. </param>
+        /// <returns> A new <see cref="Assistants.VectorStoreStaticChunkingStrategyRequest"/> instance for mocking. </returns>
+        public static VectorStoreStaticChunkingStrategyRequest VectorStoreStaticChunkingStrategyRequest(VectorStoreStaticChunkingStrategyOptions @static = null)
+        {
+            return new VectorStoreStaticChunkingStrategyRequest(VectorStoreChunkingStrategyRequestType.Static, serializedAdditionalRawData: null, @static);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.ToolResources"/>. </summary>
+        /// <param name="codeInterpreter"> Resources to be used by the `code_interpreter tool` consisting of file IDs. </param>
+        /// <param name="fileSearch"> Resources to be used by the `file_search` tool consisting of vector store IDs. </param>
+        /// <returns> A new <see cref="Assistants.ToolResources"/> instance for mocking. </returns>
+        public static ToolResources ToolResources(CodeInterpreterToolResource codeInterpreter = null, FileSearchToolResource fileSearch = null)
+        {
+            return new ToolResources(codeInterpreter, fileSearch, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.CodeInterpreterToolResource"/>. </summary>
+        /// <param name="fileIds">
+        /// A list of file IDs made available to the `code_interpreter` tool. There can be a maximum of 20 files
+        /// associated with the tool.
+        /// </param>
+        /// <returns> A new <see cref="Assistants.CodeInterpreterToolResource"/> instance for mocking. </returns>
+        public static CodeInterpreterToolResource CodeInterpreterToolResource(IEnumerable<string> fileIds = null)
+        {
+            fileIds ??= new List<string>();
+
+            return new CodeInterpreterToolResource(fileIds?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.FileSearchToolResource"/>. </summary>
+        /// <param name="vectorStoreIds">
+        /// The ID of the vector store attached to this assistant. There can be a maximum of 1 vector
+        /// store attached to the assistant.
+        /// </param>
+        /// <returns> A new <see cref="Assistants.FileSearchToolResource"/> instance for mocking. </returns>
+        public static FileSearchToolResource FileSearchToolResource(IEnumerable<string> vectorStoreIds = null)
+        {
+            vectorStoreIds ??= new List<string>();
+
+            return new FileSearchToolResource(vectorStoreIds?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.ThreadMessageOptions"/>. </summary>
+        /// <param name="role">
+        /// The role of the entity that is creating the message. Allowed values include:
+        /// - `user`: Indicates the message is sent by an actual user and should be used in most cases to represent user-generated messages.
+        /// - `assistant`: Indicates the message is generated by the assistant. Use this value to insert messages from the assistant into
+        /// the conversation.
+        /// </param>
+        /// <param name="content">
+        /// The textual content of the initial message. Currently, robust input including images and annotated text may only be provided via
+        /// a separate call to the create message API.
+        /// </param>
+        /// <param name="attachments"> A list of files attached to the message, and the tools they should be added to. </param>
+        /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
+        /// <returns> A new <see cref="Assistants.ThreadMessageOptions"/> instance for mocking. </returns>
+        public static ThreadMessageOptions ThreadMessageOptions(MessageRole role = default, string content = null, IEnumerable<MessageAttachment> attachments = null, IDictionary<string, string> metadata = null)
         {
-            return new UnknownMessageTextAnnotation(type, text, startIndex, endIndex, serializedAdditionalRawData: null);
+            attachments ??= new List<MessageAttachment>();
+            metadata ??= new Dictionary<string, string>();
+
+            return new ThreadMessageOptions(role, content, attachments?.ToList(), metadata, serializedAdditionalRawData: null);
         }
 
         /// <summary> Initializes a new instance of <see cref="Assistants.CreateRunOptions"/>. </summary>
@@ -79,15 +150,46 @@ public static MessageTextAnnotation MessageTextAnnotation(string type = null, st
         /// Additional instructions to append at the end of the instructions for the run. This is useful for modifying the behavior
         /// on a per-run basis without overriding other instructions.
         /// </param>
+        /// <param name="additionalMessages"> Adds additional messages to the thread before creating the run. </param>
         /// <param name="overrideTools">
         /// The overridden list of enabled tools that the assistant should use to run the thread.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
         /// </param>
+        /// <param name="parallelToolCalls"> Whether to enable parallel function calling during tool use. </param>
+        /// <param name="stream">
+        /// If `true`, returns a stream of events that happen during the Run as server-sent events,
+        /// terminating when the Run enters a terminal state with a `data: [DONE]` message.
+        /// </param>
+        /// <param name="temperature">
+        /// What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output
+        /// more random, while lower values like 0.2 will make it more focused and deterministic.
+        /// </param>
+        /// <param name="topP">
+        /// An alternative to sampling with temperature, called nucleus sampling, where the model
+        /// considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens
+        /// comprising the top 10% probability mass are considered.
+        ///
+        /// We generally recommend altering this or temperature but not both.
+        /// </param>
+        /// <param name="maxPromptTokens">
+        /// The maximum number of prompt tokens that may be used over the course of the run. The run will make a best effort to use only
+        /// the number of prompt tokens specified, across multiple turns of the run. If the run exceeds the number of prompt tokens specified,
+        /// the run will end with status `incomplete`. See `incomplete_details` for more info.
+        /// </param>
+        /// <param name="maxCompletionTokens">
+        /// The maximum number of completion tokens that may be used over the course of the run. The run will make a best effort
+        /// to use only the number of completion tokens specified, across multiple turns of the run. If the run exceeds the number of
+        /// completion tokens specified, the run will end with status `incomplete`. See `incomplete_details` for more info.
+        /// </param>
+        /// <param name="truncationStrategy"> The strategy to use for dropping messages as the context windows moves forward. </param>
+        /// <param name="toolChoice"> Controls whether or not and which tool is called by the model. </param>
+        /// <param name="responseFormat"> Specifies the format that the model must output. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <returns> A new <see cref="Assistants.CreateRunOptions"/> instance for mocking. </returns>
-        public static CreateRunOptions CreateRunOptions(string assistantId = null, string overrideModelName = null, string overrideInstructions = null, string additionalInstructions = null, IEnumerable<ToolDefinition> overrideTools = null, IDictionary<string, string> metadata = null)
+        public static CreateRunOptions CreateRunOptions(string assistantId = null, string overrideModelName = null, string overrideInstructions = null, string additionalInstructions = null, IEnumerable<ThreadMessage> additionalMessages = null, IEnumerable<ToolDefinition> overrideTools = null, bool? parallelToolCalls = null, bool? stream = null, float? temperature = null, float? topP = null, int? maxPromptTokens = null, int? maxCompletionTokens = null, TruncationObject truncationStrategy = null, BinaryData toolChoice = null, BinaryData responseFormat = null, IDictionary<string, string> metadata = null)
         {
+            additionalMessages ??= new List<ThreadMessage>();
             overrideTools ??= new List<ToolDefinition>();
             metadata ??= new Dictionary<string, string>();
 
@@ -96,7 +198,17 @@ public static CreateRunOptions CreateRunOptions(string assistantId = null, strin
                 overrideModelName,
                 overrideInstructions,
                 additionalInstructions,
+                additionalMessages?.ToList(),
                 overrideTools?.ToList(),
+                parallelToolCalls,
+                stream,
+                temperature,
+                topP,
+                maxPromptTokens,
+                maxCompletionTokens,
+                truncationStrategy,
+                toolChoice,
+                responseFormat,
                 metadata,
                 serializedAdditionalRawData: null);
         }
@@ -119,19 +231,59 @@ public static RunError RunError(string code = null, string message = null)
             return new RunError(code, message, serializedAdditionalRawData: null);
         }
 
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunCompletionUsage"/>. </summary>
+        /// <param name="completionTokens"> Number of completion tokens used over the course of the run. </param>
+        /// <param name="promptTokens"> Number of prompt tokens used over the course of the run. </param>
+        /// <param name="totalTokens"> Total number of tokens used (prompt + completion). </param>
+        /// <returns> A new <see cref="Assistants.RunCompletionUsage"/> instance for mocking. </returns>
+        public static RunCompletionUsage RunCompletionUsage(long completionTokens = default, long promptTokens = default, long totalTokens = default)
+        {
+            return new RunCompletionUsage(completionTokens, promptTokens, totalTokens, serializedAdditionalRawData: null);
+        }
+
         /// <summary> Initializes a new instance of <see cref="Assistants.CreateAndRunThreadOptions"/>. </summary>
         /// <param name="assistantId"> The ID of the assistant for which the thread should be created. </param>
-        /// <param name="thread"> The details used to create the new thread. </param>
+        /// <param name="thread"> The details used to create the new thread. If no thread is provided, an empty one will be created. </param>
         /// <param name="overrideModelName"> The overridden model that the assistant should use to run the thread. </param>
         /// <param name="overrideInstructions"> The overridden system instructions the assistant should use to run the thread. </param>
         /// <param name="overrideTools">
         /// The overridden list of enabled tools the assistant should use to run the thread.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
+        /// </param>
+        /// <param name="parallelToolCalls"> Whether to enable parallel function calling during tool use. </param>
+        /// <param name="toolResources"> Override the tools the assistant can use for this run. This is useful for modifying the behavior on a per-run basis. </param>
+        /// <param name="stream">
+        /// If `true`, returns a stream of events that happen during the Run as server-sent events,
+        /// terminating when the Run enters a terminal state with a `data: [DONE]` message.
+        /// </param>
+        /// <param name="temperature">
+        /// What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output
+        /// more random, while lower values like 0.2 will make it more focused and deterministic.
+        /// </param>
+        /// <param name="topP">
+        /// An alternative to sampling with temperature, called nucleus sampling, where the model
+        /// considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens
+        /// comprising the top 10% probability mass are considered.
+        ///
+        /// We generally recommend altering this or temperature but not both.
+        /// </param>
+        /// <param name="maxPromptTokens">
+        /// The maximum number of prompt tokens that may be used over the course of the run. The run will make a best effort to use only
+        /// the number of prompt tokens specified, across multiple turns of the run. If the run exceeds the number of prompt tokens specified,
+        /// the run will end with status `incomplete`. See `incomplete_details` for more info.
         /// </param>
+        /// <param name="maxCompletionTokens">
+        /// The maximum number of completion tokens that may be used over the course of the run. The run will make a best effort to use only
+        /// the number of completion tokens specified, across multiple turns of the run. If the run exceeds the number of completion tokens
+        /// specified, the run will end with status `incomplete`. See `incomplete_details` for more info.
+        /// </param>
+        /// <param name="truncationStrategy"> The strategy to use for dropping messages as the context windows moves forward. </param>
+        /// <param name="toolChoice"> Controls whether or not and which tool is called by the model. </param>
+        /// <param name="responseFormat"> Specifies the format that the model must output. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <returns> A new <see cref="Assistants.CreateAndRunThreadOptions"/> instance for mocking. </returns>
-        public static CreateAndRunThreadOptions CreateAndRunThreadOptions(string assistantId = null, AssistantThreadCreationOptions thread = null, string overrideModelName = null, string overrideInstructions = null, IEnumerable<ToolDefinition> overrideTools = null, IDictionary<string, string> metadata = null)
+        public static CreateAndRunThreadOptions CreateAndRunThreadOptions(string assistantId = null, AssistantThreadCreationOptions thread = null, string overrideModelName = null, string overrideInstructions = null, IEnumerable<ToolDefinition> overrideTools = null, bool? parallelToolCalls = null, UpdateToolResourcesOptions toolResources = null, bool? stream = null, float? temperature = null, float? topP = null, int? maxPromptTokens = null, int? maxCompletionTokens = null, TruncationObject truncationStrategy = null, BinaryData toolChoice = null, BinaryData responseFormat = null, IDictionary<string, string> metadata = null)
         {
             overrideTools ??= new List<ToolDefinition>();
             metadata ??= new Dictionary<string, string>();
@@ -142,6 +294,16 @@ public static CreateAndRunThreadOptions CreateAndRunThreadOptions(string assista
                 overrideModelName,
                 overrideInstructions,
                 overrideTools?.ToList(),
+                parallelToolCalls,
+                toolResources,
+                stream,
+                temperature,
+                topP,
+                maxPromptTokens,
+                maxCompletionTokens,
+                truncationStrategy,
+                toolChoice,
+                responseFormat,
                 metadata,
                 serializedAdditionalRawData: null);
         }
@@ -166,7 +328,7 @@ public static RunStepMessageCreationReference RunStepMessageCreationReference(st
         /// <param name="toolCalls">
         /// A list of tool call details for this run step.
         /// Please note <see cref="Assistants.RunStepToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="Assistants.RunStepCodeInterpreterToolCall"/>, <see cref="Assistants.RunStepFunctionToolCall"/> and <see cref="Assistants.RunStepRetrievalToolCall"/>.
+        /// The available derived classes include <see cref="Assistants.RunStepCodeInterpreterToolCall"/>, <see cref="Assistants.RunStepFileSearchToolCall"/> and <see cref="Assistants.RunStepFunctionToolCall"/>.
         /// </param>
         /// <returns> A new <see cref="Assistants.RunStepToolCallDetails"/> instance for mocking. </returns>
         public static RunStepToolCallDetails RunStepToolCallDetails(IEnumerable<RunStepToolCall> toolCalls = null)
@@ -209,15 +371,15 @@ public static RunStepCodeInterpreterImageReference RunStepCodeInterpreterImageRe
             return new RunStepCodeInterpreterImageReference(fileId, serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepRetrievalToolCall"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepFileSearchToolCall"/>. </summary>
         /// <param name="id"> The ID of the tool call. This ID must be referenced when you submit tool outputs. </param>
-        /// <param name="retrieval"> The key/value pairs produced by the retrieval tool. </param>
-        /// <returns> A new <see cref="Assistants.RunStepRetrievalToolCall"/> instance for mocking. </returns>
-        public static RunStepRetrievalToolCall RunStepRetrievalToolCall(string id = null, IReadOnlyDictionary<string, string> retrieval = null)
+        /// <param name="fileSearch"> Reserved for future use. </param>
+        /// <returns> A new <see cref="Assistants.RunStepFileSearchToolCall"/> instance for mocking. </returns>
+        public static RunStepFileSearchToolCall RunStepFileSearchToolCall(string id = null, IReadOnlyDictionary<string, string> fileSearch = null)
         {
-            retrieval ??= new Dictionary<string, string>();
+            fileSearch ??= new Dictionary<string, string>();
 
-            return new RunStepRetrievalToolCall("retrieval", id, serializedAdditionalRawData: null, retrieval);
+            return new RunStepFileSearchToolCall("file_search", id, serializedAdditionalRawData: null, fileSearch);
         }
 
         /// <summary> Initializes a new instance of <see cref="Assistants.RunStepError"/>. </summary>
@@ -228,5 +390,488 @@ public static RunStepError RunStepError(RunStepErrorCode code = default, string
         {
             return new RunStepError(code, message, serializedAdditionalRawData: null);
         }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepCompletionUsage"/>. </summary>
+        /// <param name="completionTokens"> Number of completion tokens used over the course of the run step. </param>
+        /// <param name="promptTokens"> Number of prompt tokens used over the course of the run step. </param>
+        /// <param name="totalTokens"> Total number of tokens used (prompt + completion). </param>
+        /// <returns> A new <see cref="Assistants.RunStepCompletionUsage"/> instance for mocking. </returns>
+        public static RunStepCompletionUsage RunStepCompletionUsage(long completionTokens = default, long promptTokens = default, long totalTokens = default)
+        {
+            return new RunStepCompletionUsage(completionTokens, promptTokens, totalTokens, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.OpenAIPageableListOfVectorStore"/>. </summary>
+        /// <param name="object"> The object type, which is always list. </param>
+        /// <param name="data"> The requested list of items. </param>
+        /// <param name="firstId"> The first ID represented in this list. </param>
+        /// <param name="lastId"> The last ID represented in this list. </param>
+        /// <param name="hasMore"> A value indicating whether there are additional values available not captured in this list. </param>
+        /// <returns> A new <see cref="Assistants.OpenAIPageableListOfVectorStore"/> instance for mocking. </returns>
+        public static OpenAIPageableListOfVectorStore OpenAIPageableListOfVectorStore(OpenAIPageableListOfVectorStoreObject @object = default, IEnumerable<VectorStore> data = null, string firstId = null, string lastId = null, bool hasMore = default)
+        {
+            data ??= new List<VectorStore>();
+
+            return new OpenAIPageableListOfVectorStore(
+                @object,
+                data?.ToList(),
+                firstId,
+                lastId,
+                hasMore,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.VectorStore"/>. </summary>
+        /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
+        /// <param name="object"> The object type, which is always `vector_store`. </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the vector store was created. </param>
+        /// <param name="name"> The name of the vector store. </param>
+        /// <param name="usageBytes"> The total number of bytes used by the files in the vector store. </param>
+        /// <param name="fileCounts"> Files count grouped by status processed or being processed by this vector store. </param>
+        /// <param name="status"> The status of the vector store, which can be either `expired`, `in_progress`, or `completed`. A status of `completed` indicates that the vector store is ready for use. </param>
+        /// <param name="expiresAfter"> Details on when this vector store expires. </param>
+        /// <param name="expiresAt"> The Unix timestamp (in seconds) for when the vector store will expire. </param>
+        /// <param name="lastActiveAt"> The Unix timestamp (in seconds) for when the vector store was last active. </param>
+        /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
+        /// <returns> A new <see cref="Assistants.VectorStore"/> instance for mocking. </returns>
+        public static VectorStore VectorStore(string id = null, VectorStoreObject @object = default, DateTimeOffset createdAt = default, string name = null, int usageBytes = default, VectorStoreFileCount fileCounts = null, VectorStoreStatus status = default, VectorStoreExpirationPolicy expiresAfter = null, DateTimeOffset? expiresAt = null, DateTimeOffset? lastActiveAt = null, IReadOnlyDictionary<string, string> metadata = null)
+        {
+            metadata ??= new Dictionary<string, string>();
+
+            return new VectorStore(
+                id,
+                @object,
+                createdAt,
+                name,
+                usageBytes,
+                fileCounts,
+                status,
+                expiresAfter,
+                expiresAt,
+                lastActiveAt,
+                metadata,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.VectorStoreFileCount"/>. </summary>
+        /// <param name="inProgress"> The number of files that are currently being processed. </param>
+        /// <param name="completed"> The number of files that have been successfully processed. </param>
+        /// <param name="failed"> The number of files that have failed to process. </param>
+        /// <param name="cancelled"> The number of files that were cancelled. </param>
+        /// <param name="total"> The total number of files. </param>
+        /// <returns> A new <see cref="Assistants.VectorStoreFileCount"/> instance for mocking. </returns>
+        public static VectorStoreFileCount VectorStoreFileCount(int inProgress = default, int completed = default, int failed = default, int cancelled = default, int total = default)
+        {
+            return new VectorStoreFileCount(
+                inProgress,
+                completed,
+                failed,
+                cancelled,
+                total,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.VectorStoreDeletionStatus"/>. </summary>
+        /// <param name="id"> The ID of the resource specified for deletion. </param>
+        /// <param name="deleted"> A value indicating whether deletion was successful. </param>
+        /// <param name="object"> The object type, which is always 'vector_store.deleted'. </param>
+        /// <returns> A new <see cref="Assistants.VectorStoreDeletionStatus"/> instance for mocking. </returns>
+        public static VectorStoreDeletionStatus VectorStoreDeletionStatus(string id = null, bool deleted = default, VectorStoreDeletionStatusObject @object = default)
+        {
+            return new VectorStoreDeletionStatus(id, deleted, @object, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.OpenAIPageableListOfVectorStoreFile"/>. </summary>
+        /// <param name="object"> The object type, which is always list. </param>
+        /// <param name="data"> The requested list of items. </param>
+        /// <param name="firstId"> The first ID represented in this list. </param>
+        /// <param name="lastId"> The last ID represented in this list. </param>
+        /// <param name="hasMore"> A value indicating whether there are additional values available not captured in this list. </param>
+        /// <returns> A new <see cref="Assistants.OpenAIPageableListOfVectorStoreFile"/> instance for mocking. </returns>
+        public static OpenAIPageableListOfVectorStoreFile OpenAIPageableListOfVectorStoreFile(OpenAIPageableListOfVectorStoreFileObject @object = default, IEnumerable<VectorStoreFile> data = null, string firstId = null, string lastId = null, bool hasMore = default)
+        {
+            data ??= new List<VectorStoreFile>();
+
+            return new OpenAIPageableListOfVectorStoreFile(
+                @object,
+                data?.ToList(),
+                firstId,
+                lastId,
+                hasMore,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.VectorStoreFile"/>. </summary>
+        /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
+        /// <param name="object"> The object type, which is always `vector_store.file`. </param>
+        /// <param name="usageBytes">
+        /// The total vector store usage in bytes. Note that this may be different from the original file
+        /// size.
+        /// </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the vector store file was created. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file is attached to. </param>
+        /// <param name="status"> The status of the vector store file, which can be either `in_progress`, `completed`, `cancelled`, or `failed`. The status `completed` indicates that the vector store file is ready for use. </param>
+        /// <param name="lastError"> The last error associated with this vector store file. Will be `null` if there are no errors. </param>
+        /// <param name="chunkingStrategy">
+        /// The strategy used to chunk the file.
+        /// Please note <see cref="VectorStoreChunkingStrategyResponse"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyResponse"/> and <see cref="Assistants.VectorStoreStaticChunkingStrategyResponse"/>.
+        /// </param>
+        /// <returns> A new <see cref="Assistants.VectorStoreFile"/> instance for mocking. </returns>
+        public static VectorStoreFile VectorStoreFile(string id = null, VectorStoreFileObject @object = default, int usageBytes = default, DateTimeOffset createdAt = default, string vectorStoreId = null, VectorStoreFileStatus status = default, VectorStoreFileError lastError = null, VectorStoreChunkingStrategyResponse chunkingStrategy = null)
+        {
+            return new VectorStoreFile(
+                id,
+                @object,
+                usageBytes,
+                createdAt,
+                vectorStoreId,
+                status,
+                lastError,
+                chunkingStrategy,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.VectorStoreFileError"/>. </summary>
+        /// <param name="code"> One of `server_error` or `rate_limit_exceeded`. </param>
+        /// <param name="message"> A human-readable description of the error. </param>
+        /// <returns> A new <see cref="Assistants.VectorStoreFileError"/> instance for mocking. </returns>
+        public static VectorStoreFileError VectorStoreFileError(VectorStoreFileErrorCode code = default, string message = null)
+        {
+            return new VectorStoreFileError(code, message, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.VectorStoreStaticChunkingStrategyResponse"/>. </summary>
+        /// <param name="static"> The options for the static chunking strategy. </param>
+        /// <returns> A new <see cref="Assistants.VectorStoreStaticChunkingStrategyResponse"/> instance for mocking. </returns>
+        public static VectorStoreStaticChunkingStrategyResponse VectorStoreStaticChunkingStrategyResponse(VectorStoreStaticChunkingStrategyOptions @static = null)
+        {
+            return new VectorStoreStaticChunkingStrategyResponse(VectorStoreChunkingStrategyResponseType.Static, serializedAdditionalRawData: null, @static);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.VectorStoreFileDeletionStatus"/>. </summary>
+        /// <param name="id"> The ID of the resource specified for deletion. </param>
+        /// <param name="deleted"> A value indicating whether deletion was successful. </param>
+        /// <param name="object"> The object type, which is always 'vector_store.deleted'. </param>
+        /// <returns> A new <see cref="Assistants.VectorStoreFileDeletionStatus"/> instance for mocking. </returns>
+        public static VectorStoreFileDeletionStatus VectorStoreFileDeletionStatus(string id = null, bool deleted = default, VectorStoreFileDeletionStatusObject @object = default)
+        {
+            return new VectorStoreFileDeletionStatus(id, deleted, @object, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.VectorStoreFileBatch"/>. </summary>
+        /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
+        /// <param name="object"> The object type, which is always `vector_store.file_batch`. </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the vector store files batch was created. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file is attached to. </param>
+        /// <param name="status"> The status of the vector store files batch, which can be either `in_progress`, `completed`, `cancelled` or `failed`. </param>
+        /// <param name="fileCounts"> Files count grouped by status processed or being processed by this vector store. </param>
+        /// <returns> A new <see cref="Assistants.VectorStoreFileBatch"/> instance for mocking. </returns>
+        public static VectorStoreFileBatch VectorStoreFileBatch(string id = null, VectorStoreFileBatchObject @object = default, DateTimeOffset createdAt = default, string vectorStoreId = null, VectorStoreFileBatchStatus status = default, VectorStoreFileCount fileCounts = null)
+        {
+            return new VectorStoreFileBatch(
+                id,
+                @object,
+                createdAt,
+                vectorStoreId,
+                status,
+                fileCounts,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.MessageDeltaChunk"/>. </summary>
+        /// <param name="id"> The identifier of the message, which can be referenced in API endpoints. </param>
+        /// <param name="object"> The object type, which is always `thread.message.delta`. </param>
+        /// <param name="delta"> The delta containing the fields that have changed on the Message. </param>
+        /// <returns> A new <see cref="Assistants.MessageDeltaChunk"/> instance for mocking. </returns>
+        public static MessageDeltaChunk MessageDeltaChunk(string id = null, MessageDeltaChunkObject @object = default, MessageDelta delta = null)
+        {
+            return new MessageDeltaChunk(id, @object, delta, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.MessageDelta"/>. </summary>
+        /// <param name="role"> The entity that produced the message. </param>
+        /// <param name="content">
+        /// The content of the message as an array of text and/or images.
+        /// Please note <see cref="Assistants.MessageDeltaContent"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="Assistants.MessageDeltaImageFileContent"/> and <see cref="Assistants.MessageDeltaTextContentObject"/>.
+        /// </param>
+        /// <returns> A new <see cref="Assistants.MessageDelta"/> instance for mocking. </returns>
+        public static MessageDelta MessageDelta(MessageRole role = default, IEnumerable<MessageDeltaContent> content = null)
+        {
+            content ??= new List<MessageDeltaContent>();
+
+            return new MessageDelta(role, content?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.MessageDeltaContent"/>. </summary>
+        /// <param name="index"> The index of the content part of the message. </param>
+        /// <param name="type"> The type of content for this content part. </param>
+        /// <returns> A new <see cref="Assistants.MessageDeltaContent"/> instance for mocking. </returns>
+        public static MessageDeltaContent MessageDeltaContent(int index = default, string type = null)
+        {
+            return new UnknownMessageDeltaContent(index, type, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.MessageDeltaImageFileContent"/>. </summary>
+        /// <param name="index"> The index of the content part of the message. </param>
+        /// <param name="imageFile"> The image_file data. </param>
+        /// <returns> A new <see cref="Assistants.MessageDeltaImageFileContent"/> instance for mocking. </returns>
+        public static MessageDeltaImageFileContent MessageDeltaImageFileContent(int index = default, MessageDeltaImageFileContentObject imageFile = null)
+        {
+            return new MessageDeltaImageFileContent(index, "image_file", serializedAdditionalRawData: null, imageFile);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.MessageDeltaImageFileContentObject"/>. </summary>
+        /// <param name="fileId"> The file ID of the image in the message content. </param>
+        /// <returns> A new <see cref="Assistants.MessageDeltaImageFileContentObject"/> instance for mocking. </returns>
+        public static MessageDeltaImageFileContentObject MessageDeltaImageFileContentObject(string fileId = null)
+        {
+            return new MessageDeltaImageFileContentObject(fileId, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.MessageDeltaTextContentObject"/>. </summary>
+        /// <param name="index"> The index of the content part of the message. </param>
+        /// <param name="text"> The text content details. </param>
+        /// <returns> A new <see cref="Assistants.MessageDeltaTextContentObject"/> instance for mocking. </returns>
+        public static MessageDeltaTextContentObject MessageDeltaTextContentObject(int index = default, MessageDeltaTextContent text = null)
+        {
+            return new MessageDeltaTextContentObject(index, "text", serializedAdditionalRawData: null, text);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.MessageDeltaTextContent"/>. </summary>
+        /// <param name="value"> The data that makes up the text. </param>
+        /// <param name="annotations">
+        /// Annotations for the text.
+        /// Please note <see cref="Assistants.MessageDeltaTextAnnotation"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="Assistants.MessageDeltaTextFileCitationAnnotationObject"/> and <see cref="Assistants.MessageDeltaTextFilePathAnnotationObject"/>.
+        /// </param>
+        /// <returns> A new <see cref="Assistants.MessageDeltaTextContent"/> instance for mocking. </returns>
+        public static MessageDeltaTextContent MessageDeltaTextContent(string value = null, IEnumerable<MessageDeltaTextAnnotation> annotations = null)
+        {
+            annotations ??= new List<MessageDeltaTextAnnotation>();
+
+            return new MessageDeltaTextContent(value, annotations?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.MessageDeltaTextAnnotation"/>. </summary>
+        /// <param name="index"> The index of the annotation within a text content part. </param>
+        /// <param name="type"> The type of the text content annotation. </param>
+        /// <returns> A new <see cref="Assistants.MessageDeltaTextAnnotation"/> instance for mocking. </returns>
+        public static MessageDeltaTextAnnotation MessageDeltaTextAnnotation(int index = default, string type = null)
+        {
+            return new UnknownMessageDeltaTextAnnotation(index, type, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.MessageDeltaTextFileCitationAnnotationObject"/>. </summary>
+        /// <param name="index"> The index of the annotation within a text content part. </param>
+        /// <param name="fileCitation"> The file citation information. </param>
+        /// <param name="text"> The text in the message content that needs to be replaced. </param>
+        /// <param name="startIndex"> The start index of this annotation in the content text. </param>
+        /// <param name="endIndex"> The end index of this annotation in the content text. </param>
+        /// <returns> A new <see cref="Assistants.MessageDeltaTextFileCitationAnnotationObject"/> instance for mocking. </returns>
+        public static MessageDeltaTextFileCitationAnnotationObject MessageDeltaTextFileCitationAnnotationObject(int index = default, MessageDeltaTextFileCitationAnnotation fileCitation = null, string text = null, int? startIndex = null, int? endIndex = null)
+        {
+            return new MessageDeltaTextFileCitationAnnotationObject(
+                index,
+                "file_citation",
+                serializedAdditionalRawData: null,
+                fileCitation,
+                text,
+                startIndex,
+                endIndex);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.MessageDeltaTextFileCitationAnnotation"/>. </summary>
+        /// <param name="fileId"> The ID of the specific file the citation is from. </param>
+        /// <param name="quote"> The specific quote in the cited file. </param>
+        /// <returns> A new <see cref="Assistants.MessageDeltaTextFileCitationAnnotation"/> instance for mocking. </returns>
+        public static MessageDeltaTextFileCitationAnnotation MessageDeltaTextFileCitationAnnotation(string fileId = null, string quote = null)
+        {
+            return new MessageDeltaTextFileCitationAnnotation(fileId, quote, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.MessageDeltaTextFilePathAnnotationObject"/>. </summary>
+        /// <param name="index"> The index of the annotation within a text content part. </param>
+        /// <param name="filePath"> The file path information. </param>
+        /// <param name="startIndex"> The start index of this annotation in the content text. </param>
+        /// <param name="endIndex"> The end index of this annotation in the content text. </param>
+        /// <param name="text"> The text in the message content that needs to be replaced. </param>
+        /// <returns> A new <see cref="Assistants.MessageDeltaTextFilePathAnnotationObject"/> instance for mocking. </returns>
+        public static MessageDeltaTextFilePathAnnotationObject MessageDeltaTextFilePathAnnotationObject(int index = default, MessageDeltaTextFilePathAnnotation filePath = null, int? startIndex = null, int? endIndex = null, string text = null)
+        {
+            return new MessageDeltaTextFilePathAnnotationObject(
+                index,
+                "file_path",
+                serializedAdditionalRawData: null,
+                filePath,
+                startIndex,
+                endIndex,
+                text);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.MessageDeltaTextFilePathAnnotation"/>. </summary>
+        /// <param name="fileId"> The file ID for the annotation. </param>
+        /// <returns> A new <see cref="Assistants.MessageDeltaTextFilePathAnnotation"/> instance for mocking. </returns>
+        public static MessageDeltaTextFilePathAnnotation MessageDeltaTextFilePathAnnotation(string fileId = null)
+        {
+            return new MessageDeltaTextFilePathAnnotation(fileId, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDeltaChunk"/>. </summary>
+        /// <param name="id"> The identifier of the run step, which can be referenced in API endpoints. </param>
+        /// <param name="object"> The object type, which is always `thread.run.step.delta`. </param>
+        /// <param name="delta"> The delta containing the fields that have changed on the run step. </param>
+        /// <returns> A new <see cref="Assistants.RunStepDeltaChunk"/> instance for mocking. </returns>
+        public static RunStepDeltaChunk RunStepDeltaChunk(string id = null, RunStepDeltaChunkObject @object = default, RunStepDelta delta = null)
+        {
+            return new RunStepDeltaChunk(id, @object, delta, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDelta"/>. </summary>
+        /// <param name="stepDetails">
+        /// The details of the run step.
+        /// Please note <see cref="RunStepDeltaDetail"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="Assistants.RunStepDeltaMessageCreation"/> and <see cref="Assistants.RunStepDeltaToolCallObject"/>.
+        /// </param>
+        /// <returns> A new <see cref="Assistants.RunStepDelta"/> instance for mocking. </returns>
+        public static RunStepDelta RunStepDelta(RunStepDeltaDetail stepDetails = null)
+        {
+            return new RunStepDelta(stepDetails, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDeltaMessageCreation"/>. </summary>
+        /// <param name="messageCreation"> The message creation data. </param>
+        /// <returns> A new <see cref="Assistants.RunStepDeltaMessageCreation"/> instance for mocking. </returns>
+        public static RunStepDeltaMessageCreation RunStepDeltaMessageCreation(RunStepDeltaMessageCreationObject messageCreation = null)
+        {
+            return new RunStepDeltaMessageCreation("message_creation", serializedAdditionalRawData: null, messageCreation);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDeltaMessageCreationObject"/>. </summary>
+        /// <param name="messageId"> The ID of the newly-created message. </param>
+        /// <returns> A new <see cref="Assistants.RunStepDeltaMessageCreationObject"/> instance for mocking. </returns>
+        public static RunStepDeltaMessageCreationObject RunStepDeltaMessageCreationObject(string messageId = null)
+        {
+            return new RunStepDeltaMessageCreationObject(messageId, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDeltaToolCallObject"/>. </summary>
+        /// <param name="toolCalls">
+        /// The collection of tool calls for the tool call detail item.
+        /// Please note <see cref="Assistants.RunStepDeltaToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="Assistants.RunStepDeltaCodeInterpreterToolCall"/>, <see cref="Assistants.RunStepDeltaFileSearchToolCall"/> and <see cref="Assistants.RunStepDeltaFunctionToolCall"/>.
+        /// </param>
+        /// <returns> A new <see cref="Assistants.RunStepDeltaToolCallObject"/> instance for mocking. </returns>
+        public static RunStepDeltaToolCallObject RunStepDeltaToolCallObject(IEnumerable<RunStepDeltaToolCall> toolCalls = null)
+        {
+            toolCalls ??= new List<RunStepDeltaToolCall>();
+
+            return new RunStepDeltaToolCallObject("tool_calls", serializedAdditionalRawData: null, toolCalls?.ToList());
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDeltaToolCall"/>. </summary>
+        /// <param name="index"> The index of the tool call detail in the run step's tool_calls array. </param>
+        /// <param name="id"> The ID of the tool call, used when submitting outputs to the run. </param>
+        /// <param name="type"> The type of the tool call detail item in a streaming run step's details. </param>
+        /// <returns> A new <see cref="Assistants.RunStepDeltaToolCall"/> instance for mocking. </returns>
+        public static RunStepDeltaToolCall RunStepDeltaToolCall(int index = default, string id = null, string type = null)
+        {
+            return new UnknownRunStepDeltaToolCall(index, id, type, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDeltaFunctionToolCall"/>. </summary>
+        /// <param name="index"> The index of the tool call detail in the run step's tool_calls array. </param>
+        /// <param name="id"> The ID of the tool call, used when submitting outputs to the run. </param>
+        /// <param name="function"> The function data for the tool call. </param>
+        /// <returns> A new <see cref="Assistants.RunStepDeltaFunctionToolCall"/> instance for mocking. </returns>
+        public static RunStepDeltaFunctionToolCall RunStepDeltaFunctionToolCall(int index = default, string id = null, RunStepDeltaFunction function = null)
+        {
+            return new RunStepDeltaFunctionToolCall(index, id, "function", serializedAdditionalRawData: null, function);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDeltaFunction"/>. </summary>
+        /// <param name="name"> The name of the function. </param>
+        /// <param name="arguments"> The arguments passed to the function as input. </param>
+        /// <param name="output"> The output of the function, null if outputs have not yet been submitted. </param>
+        /// <returns> A new <see cref="Assistants.RunStepDeltaFunction"/> instance for mocking. </returns>
+        public static RunStepDeltaFunction RunStepDeltaFunction(string name = null, string arguments = null, string output = null)
+        {
+            return new RunStepDeltaFunction(name, arguments, output, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDeltaFileSearchToolCall"/>. </summary>
+        /// <param name="index"> The index of the tool call detail in the run step's tool_calls array. </param>
+        /// <param name="id"> The ID of the tool call, used when submitting outputs to the run. </param>
+        /// <param name="fileSearch"> Reserved for future use. </param>
+        /// <returns> A new <see cref="Assistants.RunStepDeltaFileSearchToolCall"/> instance for mocking. </returns>
+        public static RunStepDeltaFileSearchToolCall RunStepDeltaFileSearchToolCall(int index = default, string id = null, IReadOnlyDictionary<string, string> fileSearch = null)
+        {
+            fileSearch ??= new Dictionary<string, string>();
+
+            return new RunStepDeltaFileSearchToolCall(index, id, "file_search", serializedAdditionalRawData: null, fileSearch);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDeltaCodeInterpreterToolCall"/>. </summary>
+        /// <param name="index"> The index of the tool call detail in the run step's tool_calls array. </param>
+        /// <param name="id"> The ID of the tool call, used when submitting outputs to the run. </param>
+        /// <param name="codeInterpreter"> The Code Interpreter data for the tool call. </param>
+        /// <returns> A new <see cref="Assistants.RunStepDeltaCodeInterpreterToolCall"/> instance for mocking. </returns>
+        public static RunStepDeltaCodeInterpreterToolCall RunStepDeltaCodeInterpreterToolCall(int index = default, string id = null, RunStepDeltaCodeInterpreterDetailItemObject codeInterpreter = null)
+        {
+            return new RunStepDeltaCodeInterpreterToolCall(index, id, "code_interpreter", serializedAdditionalRawData: null, codeInterpreter);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDeltaCodeInterpreterDetailItemObject"/>. </summary>
+        /// <param name="input"> The input into the Code Interpreter tool call. </param>
+        /// <param name="outputs">
+        /// The outputs from the Code Interpreter tool call. Code Interpreter can output one or more
+        /// items, including text (`logs`) or images (`image`). Each of these are represented by a
+        /// different object type.
+        /// Please note <see cref="Assistants.RunStepDeltaCodeInterpreterOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="Assistants.RunStepDeltaCodeInterpreterImageOutput"/> and <see cref="Assistants.RunStepDeltaCodeInterpreterLogOutput"/>.
+        /// </param>
+        /// <returns> A new <see cref="Assistants.RunStepDeltaCodeInterpreterDetailItemObject"/> instance for mocking. </returns>
+        public static RunStepDeltaCodeInterpreterDetailItemObject RunStepDeltaCodeInterpreterDetailItemObject(string input = null, IEnumerable<RunStepDeltaCodeInterpreterOutput> outputs = null)
+        {
+            outputs ??= new List<RunStepDeltaCodeInterpreterOutput>();
+
+            return new RunStepDeltaCodeInterpreterDetailItemObject(input, outputs?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDeltaCodeInterpreterOutput"/>. </summary>
+        /// <param name="index"> The index of the output in the streaming run step tool call's Code Interpreter outputs array. </param>
+        /// <param name="type"> The type of the streaming run step tool call's Code Interpreter output. </param>
+        /// <returns> A new <see cref="Assistants.RunStepDeltaCodeInterpreterOutput"/> instance for mocking. </returns>
+        public static RunStepDeltaCodeInterpreterOutput RunStepDeltaCodeInterpreterOutput(int index = default, string type = null)
+        {
+            return new UnknownRunStepDeltaCodeInterpreterOutput(index, type, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDeltaCodeInterpreterLogOutput"/>. </summary>
+        /// <param name="index"> The index of the output in the streaming run step tool call's Code Interpreter outputs array. </param>
+        /// <param name="logs"> The text output from the Code Interpreter tool call. </param>
+        /// <returns> A new <see cref="Assistants.RunStepDeltaCodeInterpreterLogOutput"/> instance for mocking. </returns>
+        public static RunStepDeltaCodeInterpreterLogOutput RunStepDeltaCodeInterpreterLogOutput(int index = default, string logs = null)
+        {
+            return new RunStepDeltaCodeInterpreterLogOutput(index, "logs", serializedAdditionalRawData: null, logs);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDeltaCodeInterpreterImageOutput"/>. </summary>
+        /// <param name="index"> The index of the output in the streaming run step tool call's Code Interpreter outputs array. </param>
+        /// <param name="image"> The image data for the Code Interpreter tool call output. </param>
+        /// <returns> A new <see cref="Assistants.RunStepDeltaCodeInterpreterImageOutput"/> instance for mocking. </returns>
+        public static RunStepDeltaCodeInterpreterImageOutput RunStepDeltaCodeInterpreterImageOutput(int index = default, RunStepDeltaCodeInterpreterImageOutputObject image = null)
+        {
+            return new RunStepDeltaCodeInterpreterImageOutput(index, "image", serializedAdditionalRawData: null, image);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Assistants.RunStepDeltaCodeInterpreterImageOutputObject"/>. </summary>
+        /// <param name="fileId"> The file ID for the image. </param>
+        /// <returns> A new <see cref="Assistants.RunStepDeltaCodeInterpreterImageOutputObject"/> instance for mocking. </returns>
+        public static RunStepDeltaCodeInterpreterImageOutputObject RunStepDeltaCodeInterpreterImageOutputObject(string fileId = null)
+        {
+            return new RunStepDeltaCodeInterpreterImageOutputObject(fileId, serializedAdditionalRawData: null);
+        }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsNamedToolChoice.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsNamedToolChoice.Serialization.cs
new file mode 100644
index 000000000000..da652aaf0b45
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsNamedToolChoice.Serialization.cs
@@ -0,0 +1,150 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class AssistantsNamedToolChoice : IUtf8JsonSerializable, IJsonModel<AssistantsNamedToolChoice>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AssistantsNamedToolChoice>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AssistantsNamedToolChoice>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AssistantsNamedToolChoice>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AssistantsNamedToolChoice)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (Optional.IsDefined(Function))
+            {
+                writer.WritePropertyName("function"u8);
+                writer.WriteObjectValue(Function, options);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AssistantsNamedToolChoice IJsonModel<AssistantsNamedToolChoice>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AssistantsNamedToolChoice>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AssistantsNamedToolChoice)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAssistantsNamedToolChoice(document.RootElement, options);
+        }
+
+        internal static AssistantsNamedToolChoice DeserializeAssistantsNamedToolChoice(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            AssistantsNamedToolChoiceType type = default;
+            FunctionName function = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = new AssistantsNamedToolChoiceType(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("function"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    function = FunctionName.DeserializeFunctionName(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AssistantsNamedToolChoice(type, function, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AssistantsNamedToolChoice>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AssistantsNamedToolChoice>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AssistantsNamedToolChoice)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AssistantsNamedToolChoice IPersistableModel<AssistantsNamedToolChoice>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AssistantsNamedToolChoice>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAssistantsNamedToolChoice(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AssistantsNamedToolChoice)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AssistantsNamedToolChoice>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AssistantsNamedToolChoice FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAssistantsNamedToolChoice(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsNamedToolChoice.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsNamedToolChoice.cs
new file mode 100644
index 000000000000..b0da555fe4a1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsNamedToolChoice.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Specifies a tool the model should use. Use to force the model to call a specific tool. </summary>
+    public partial class AssistantsNamedToolChoice
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AssistantsNamedToolChoice"/>. </summary>
+        /// <param name="type"> the type of tool. If type is `function`, the function name must be set. </param>
+        public AssistantsNamedToolChoice(AssistantsNamedToolChoiceType type)
+        {
+            Type = type;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AssistantsNamedToolChoice"/>. </summary>
+        /// <param name="type"> the type of tool. If type is `function`, the function name must be set. </param>
+        /// <param name="function"> The name of the function to call. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AssistantsNamedToolChoice(AssistantsNamedToolChoiceType type, FunctionName function, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Type = type;
+            Function = function;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AssistantsNamedToolChoice"/> for deserialization. </summary>
+        internal AssistantsNamedToolChoice()
+        {
+        }
+
+        /// <summary> the type of tool. If type is `function`, the function name must be set. </summary>
+        public AssistantsNamedToolChoiceType Type { get; set; }
+        /// <summary> The name of the function to call. </summary>
+        public FunctionName Function { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsNamedToolChoiceType.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsNamedToolChoiceType.cs
new file mode 100644
index 000000000000..0d049b86843b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantsNamedToolChoiceType.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Available tool types for assistants named tools. </summary>
+    public readonly partial struct AssistantsNamedToolChoiceType : IEquatable<AssistantsNamedToolChoiceType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="AssistantsNamedToolChoiceType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public AssistantsNamedToolChoiceType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string FunctionValue = "function";
+        private const string CodeInterpreterValue = "code_interpreter";
+        private const string FileSearchValue = "file_search";
+
+        /// <summary> Tool type `function`. </summary>
+        public static AssistantsNamedToolChoiceType Function { get; } = new AssistantsNamedToolChoiceType(FunctionValue);
+        /// <summary> Tool type `code_interpreter`. </summary>
+        public static AssistantsNamedToolChoiceType CodeInterpreter { get; } = new AssistantsNamedToolChoiceType(CodeInterpreterValue);
+        /// <summary> Tool type `file_search`. </summary>
+        public static AssistantsNamedToolChoiceType FileSearch { get; } = new AssistantsNamedToolChoiceType(FileSearchValue);
+        /// <summary> Determines if two <see cref="AssistantsNamedToolChoiceType"/> values are the same. </summary>
+        public static bool operator ==(AssistantsNamedToolChoiceType left, AssistantsNamedToolChoiceType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="AssistantsNamedToolChoiceType"/> values are not the same. </summary>
+        public static bool operator !=(AssistantsNamedToolChoiceType left, AssistantsNamedToolChoiceType right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="AssistantsNamedToolChoiceType"/>. </summary>
+        public static implicit operator AssistantsNamedToolChoiceType(string value) => new AssistantsNamedToolChoiceType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is AssistantsNamedToolChoiceType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(AssistantsNamedToolChoiceType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CodeInterpreterToolResource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CodeInterpreterToolResource.Serialization.cs
new file mode 100644
index 000000000000..152d0868305a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CodeInterpreterToolResource.Serialization.cs
@@ -0,0 +1,145 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class CodeInterpreterToolResource : IUtf8JsonSerializable, IJsonModel<CodeInterpreterToolResource>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CodeInterpreterToolResource>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<CodeInterpreterToolResource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CodeInterpreterToolResource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CodeInterpreterToolResource)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("file_ids"u8);
+            writer.WriteStartArray();
+            foreach (var item in FileIds)
+            {
+                writer.WriteStringValue(item);
+            }
+            writer.WriteEndArray();
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        CodeInterpreterToolResource IJsonModel<CodeInterpreterToolResource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CodeInterpreterToolResource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CodeInterpreterToolResource)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeCodeInterpreterToolResource(document.RootElement, options);
+        }
+
+        internal static CodeInterpreterToolResource DeserializeCodeInterpreterToolResource(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IReadOnlyList<string> fileIds = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_ids"u8))
+                {
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    fileIds = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new CodeInterpreterToolResource(fileIds, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<CodeInterpreterToolResource>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CodeInterpreterToolResource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(CodeInterpreterToolResource)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        CodeInterpreterToolResource IPersistableModel<CodeInterpreterToolResource>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CodeInterpreterToolResource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeCodeInterpreterToolResource(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(CodeInterpreterToolResource)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<CodeInterpreterToolResource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static CodeInterpreterToolResource FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeCodeInterpreterToolResource(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CodeInterpreterToolResource.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CodeInterpreterToolResource.cs
new file mode 100644
index 000000000000..a0a185a491bc
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CodeInterpreterToolResource.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> A set of resources that are used by the `code_interpreter` tool. </summary>
+    public partial class CodeInterpreterToolResource
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="CodeInterpreterToolResource"/>. </summary>
+        /// <param name="fileIds">
+        /// A list of file IDs made available to the `code_interpreter` tool. There can be a maximum of 20 files
+        /// associated with the tool.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileIds"/> is null. </exception>
+        internal CodeInterpreterToolResource(IEnumerable<string> fileIds)
+        {
+            Argument.AssertNotNull(fileIds, nameof(fileIds));
+
+            FileIds = fileIds.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CodeInterpreterToolResource"/>. </summary>
+        /// <param name="fileIds">
+        /// A list of file IDs made available to the `code_interpreter` tool. There can be a maximum of 20 files
+        /// associated with the tool.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal CodeInterpreterToolResource(IReadOnlyList<string> fileIds, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            FileIds = fileIds;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CodeInterpreterToolResource"/> for deserialization. </summary>
+        internal CodeInterpreterToolResource()
+        {
+        }
+
+        /// <summary>
+        /// A list of file IDs made available to the `code_interpreter` tool. There can be a maximum of 20 files
+        /// associated with the tool.
+        /// </summary>
+        public IReadOnlyList<string> FileIds { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateAndRunThreadOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateAndRunThreadOptions.Serialization.cs
index e91fb2d48f48..f45781b4b335 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateAndRunThreadOptions.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateAndRunThreadOptions.Serialization.cs
@@ -35,23 +35,164 @@ void IJsonModel<CreateAndRunThreadOptions>.Write(Utf8JsonWriter writer, ModelRea
             }
             if (Optional.IsDefined(OverrideModelName))
             {
-                writer.WritePropertyName("model"u8);
-                writer.WriteStringValue(OverrideModelName);
+                if (OverrideModelName != null)
+                {
+                    writer.WritePropertyName("model"u8);
+                    writer.WriteStringValue(OverrideModelName);
+                }
+                else
+                {
+                    writer.WriteNull("model");
+                }
             }
             if (Optional.IsDefined(OverrideInstructions))
             {
-                writer.WritePropertyName("instructions"u8);
-                writer.WriteStringValue(OverrideInstructions);
+                if (OverrideInstructions != null)
+                {
+                    writer.WritePropertyName("instructions"u8);
+                    writer.WriteStringValue(OverrideInstructions);
+                }
+                else
+                {
+                    writer.WriteNull("instructions");
+                }
             }
             if (Optional.IsCollectionDefined(OverrideTools))
             {
-                writer.WritePropertyName("tools"u8);
-                writer.WriteStartArray();
-                foreach (var item in OverrideTools)
+                if (OverrideTools != null)
+                {
+                    writer.WritePropertyName("tools"u8);
+                    writer.WriteStartArray();
+                    foreach (var item in OverrideTools)
+                    {
+                        writer.WriteObjectValue(item, options);
+                    }
+                    writer.WriteEndArray();
+                }
+                else
+                {
+                    writer.WriteNull("tools");
+                }
+            }
+            if (Optional.IsDefined(ParallelToolCalls))
+            {
+                writer.WritePropertyName("parallel_tool_calls"u8);
+                writer.WriteBooleanValue(ParallelToolCalls.Value);
+            }
+            if (Optional.IsDefined(ToolResources))
+            {
+                if (ToolResources != null)
                 {
-                    writer.WriteObjectValue(item, options);
+                    writer.WritePropertyName("tool_resources"u8);
+                    writer.WriteObjectValue(ToolResources, options);
+                }
+                else
+                {
+                    writer.WriteNull("tool_resources");
+                }
+            }
+            if (Optional.IsDefined(Stream))
+            {
+                writer.WritePropertyName("stream"u8);
+                writer.WriteBooleanValue(Stream.Value);
+            }
+            if (Optional.IsDefined(Temperature))
+            {
+                if (Temperature != null)
+                {
+                    writer.WritePropertyName("temperature"u8);
+                    writer.WriteNumberValue(Temperature.Value);
+                }
+                else
+                {
+                    writer.WriteNull("temperature");
+                }
+            }
+            if (Optional.IsDefined(TopP))
+            {
+                if (TopP != null)
+                {
+                    writer.WritePropertyName("top_p"u8);
+                    writer.WriteNumberValue(TopP.Value);
+                }
+                else
+                {
+                    writer.WriteNull("top_p");
+                }
+            }
+            if (Optional.IsDefined(MaxPromptTokens))
+            {
+                if (MaxPromptTokens != null)
+                {
+                    writer.WritePropertyName("max_prompt_tokens"u8);
+                    writer.WriteNumberValue(MaxPromptTokens.Value);
+                }
+                else
+                {
+                    writer.WriteNull("max_prompt_tokens");
+                }
+            }
+            if (Optional.IsDefined(MaxCompletionTokens))
+            {
+                if (MaxCompletionTokens != null)
+                {
+                    writer.WritePropertyName("max_completion_tokens"u8);
+                    writer.WriteNumberValue(MaxCompletionTokens.Value);
+                }
+                else
+                {
+                    writer.WriteNull("max_completion_tokens");
+                }
+            }
+            if (Optional.IsDefined(TruncationStrategy))
+            {
+                if (TruncationStrategy != null)
+                {
+                    writer.WritePropertyName("truncation_strategy"u8);
+                    writer.WriteObjectValue(TruncationStrategy, options);
+                }
+                else
+                {
+                    writer.WriteNull("truncation_strategy");
+                }
+            }
+            if (Optional.IsDefined(ToolChoice))
+            {
+                if (ToolChoice != null)
+                {
+                    writer.WritePropertyName("tool_choice"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(ToolChoice);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(ToolChoice))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+                else
+                {
+                    writer.WriteNull("tool_choice");
+                }
+            }
+            if (Optional.IsDefined(ResponseFormat))
+            {
+                if (ResponseFormat != null)
+                {
+                    writer.WritePropertyName("response_format"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(ResponseFormat);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(ResponseFormat))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+                else
+                {
+                    writer.WriteNull("response_format");
                 }
-                writer.WriteEndArray();
             }
             if (Optional.IsCollectionDefined(Metadata))
             {
@@ -114,6 +255,16 @@ internal static CreateAndRunThreadOptions DeserializeCreateAndRunThreadOptions(J
             string model = default;
             string instructions = default;
             IList<ToolDefinition> tools = default;
+            bool? parallelToolCalls = default;
+            UpdateToolResourcesOptions toolResources = default;
+            bool? stream = default;
+            float? temperature = default;
+            float? topP = default;
+            int? maxPromptTokens = default;
+            int? maxCompletionTokens = default;
+            TruncationObject truncationStrategy = default;
+            BinaryData toolChoice = default;
+            BinaryData responseFormat = default;
             IDictionary<string, string> metadata = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -135,11 +286,21 @@ internal static CreateAndRunThreadOptions DeserializeCreateAndRunThreadOptions(J
                 }
                 if (property.NameEquals("model"u8))
                 {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        model = null;
+                        continue;
+                    }
                     model = property.Value.GetString();
                     continue;
                 }
                 if (property.NameEquals("instructions"u8))
                 {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        instructions = null;
+                        continue;
+                    }
                     instructions = property.Value.GetString();
                     continue;
                 }
@@ -157,6 +318,104 @@ internal static CreateAndRunThreadOptions DeserializeCreateAndRunThreadOptions(J
                     tools = array;
                     continue;
                 }
+                if (property.NameEquals("parallel_tool_calls"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    parallelToolCalls = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("tool_resources"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        toolResources = null;
+                        continue;
+                    }
+                    toolResources = UpdateToolResourcesOptions.DeserializeUpdateToolResourcesOptions(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("stream"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    stream = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("temperature"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        temperature = null;
+                        continue;
+                    }
+                    temperature = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("top_p"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        topP = null;
+                        continue;
+                    }
+                    topP = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("max_prompt_tokens"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        maxPromptTokens = null;
+                        continue;
+                    }
+                    maxPromptTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("max_completion_tokens"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        maxCompletionTokens = null;
+                        continue;
+                    }
+                    maxCompletionTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("truncation_strategy"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        truncationStrategy = null;
+                        continue;
+                    }
+                    truncationStrategy = TruncationObject.DeserializeTruncationObject(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("tool_choice"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        toolChoice = null;
+                        continue;
+                    }
+                    toolChoice = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
+                if (property.NameEquals("response_format"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        responseFormat = null;
+                        continue;
+                    }
+                    responseFormat = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
                 if (property.NameEquals("metadata"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
@@ -183,6 +442,16 @@ internal static CreateAndRunThreadOptions DeserializeCreateAndRunThreadOptions(J
                 model,
                 instructions,
                 tools ?? new ChangeTrackingList<ToolDefinition>(),
+                parallelToolCalls,
+                toolResources,
+                stream,
+                temperature,
+                topP,
+                maxPromptTokens,
+                maxCompletionTokens,
+                truncationStrategy,
+                toolChoice,
+                responseFormat,
                 metadata ?? new ChangeTrackingDictionary<string, string>(),
                 serializedAdditionalRawData);
         }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateAndRunThreadOptions.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateAndRunThreadOptions.cs
index cf9c983195f7..16f117a439d8 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateAndRunThreadOptions.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateAndRunThreadOptions.cs
@@ -59,23 +59,63 @@ public CreateAndRunThreadOptions(string assistantId)
 
         /// <summary> Initializes a new instance of <see cref="CreateAndRunThreadOptions"/>. </summary>
         /// <param name="assistantId"> The ID of the assistant for which the thread should be created. </param>
-        /// <param name="thread"> The details used to create the new thread. </param>
+        /// <param name="thread"> The details used to create the new thread. If no thread is provided, an empty one will be created. </param>
         /// <param name="overrideModelName"> The overridden model that the assistant should use to run the thread. </param>
         /// <param name="overrideInstructions"> The overridden system instructions the assistant should use to run the thread. </param>
         /// <param name="overrideTools">
         /// The overridden list of enabled tools the assistant should use to run the thread.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
         /// </param>
+        /// <param name="parallelToolCalls"> Whether to enable parallel function calling during tool use. </param>
+        /// <param name="toolResources"> Override the tools the assistant can use for this run. This is useful for modifying the behavior on a per-run basis. </param>
+        /// <param name="stream">
+        /// If `true`, returns a stream of events that happen during the Run as server-sent events,
+        /// terminating when the Run enters a terminal state with a `data: [DONE]` message.
+        /// </param>
+        /// <param name="temperature">
+        /// What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output
+        /// more random, while lower values like 0.2 will make it more focused and deterministic.
+        /// </param>
+        /// <param name="topP">
+        /// An alternative to sampling with temperature, called nucleus sampling, where the model
+        /// considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens
+        /// comprising the top 10% probability mass are considered.
+        ///
+        /// We generally recommend altering this or temperature but not both.
+        /// </param>
+        /// <param name="maxPromptTokens">
+        /// The maximum number of prompt tokens that may be used over the course of the run. The run will make a best effort to use only
+        /// the number of prompt tokens specified, across multiple turns of the run. If the run exceeds the number of prompt tokens specified,
+        /// the run will end with status `incomplete`. See `incomplete_details` for more info.
+        /// </param>
+        /// <param name="maxCompletionTokens">
+        /// The maximum number of completion tokens that may be used over the course of the run. The run will make a best effort to use only
+        /// the number of completion tokens specified, across multiple turns of the run. If the run exceeds the number of completion tokens
+        /// specified, the run will end with status `incomplete`. See `incomplete_details` for more info.
+        /// </param>
+        /// <param name="truncationStrategy"> The strategy to use for dropping messages as the context windows moves forward. </param>
+        /// <param name="toolChoice"> Controls whether or not and which tool is called by the model. </param>
+        /// <param name="responseFormat"> Specifies the format that the model must output. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal CreateAndRunThreadOptions(string assistantId, AssistantThreadCreationOptions thread, string overrideModelName, string overrideInstructions, IList<ToolDefinition> overrideTools, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal CreateAndRunThreadOptions(string assistantId, AssistantThreadCreationOptions thread, string overrideModelName, string overrideInstructions, IList<ToolDefinition> overrideTools, bool? parallelToolCalls, UpdateToolResourcesOptions toolResources, bool? stream, float? temperature, float? topP, int? maxPromptTokens, int? maxCompletionTokens, TruncationObject truncationStrategy, BinaryData toolChoice, BinaryData responseFormat, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             AssistantId = assistantId;
             Thread = thread;
             OverrideModelName = overrideModelName;
             OverrideInstructions = overrideInstructions;
             OverrideTools = overrideTools;
+            ParallelToolCalls = parallelToolCalls;
+            ToolResources = toolResources;
+            Stream = stream;
+            Temperature = temperature;
+            TopP = topP;
+            MaxPromptTokens = maxPromptTokens;
+            MaxCompletionTokens = maxCompletionTokens;
+            TruncationStrategy = truncationStrategy;
+            ToolChoice = toolChoice;
+            ResponseFormat = responseFormat;
             Metadata = metadata;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
@@ -87,7 +127,7 @@ internal CreateAndRunThreadOptions()
 
         /// <summary> The ID of the assistant for which the thread should be created. </summary>
         public string AssistantId { get; }
-        /// <summary> The details used to create the new thread. </summary>
+        /// <summary> The details used to create the new thread. If no thread is provided, an empty one will be created. </summary>
         public AssistantThreadCreationOptions Thread { get; set; }
         /// <summary> The overridden model that the assistant should use to run the thread. </summary>
         public string OverrideModelName { get; set; }
@@ -96,9 +136,135 @@ internal CreateAndRunThreadOptions()
         /// <summary>
         /// The overridden list of enabled tools the assistant should use to run the thread.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
+        /// </summary>
+        public IList<ToolDefinition> OverrideTools { get; set; }
+        /// <summary> Whether to enable parallel function calling during tool use. </summary>
+        public bool? ParallelToolCalls { get; set; }
+        /// <summary> Override the tools the assistant can use for this run. This is useful for modifying the behavior on a per-run basis. </summary>
+        public UpdateToolResourcesOptions ToolResources { get; set; }
+        /// <summary>
+        /// If `true`, returns a stream of events that happen during the Run as server-sent events,
+        /// terminating when the Run enters a terminal state with a `data: [DONE]` message.
+        /// </summary>
+        public bool? Stream { get; set; }
+        /// <summary>
+        /// What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output
+        /// more random, while lower values like 0.2 will make it more focused and deterministic.
+        /// </summary>
+        public float? Temperature { get; set; }
+        /// <summary>
+        /// An alternative to sampling with temperature, called nucleus sampling, where the model
+        /// considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens
+        /// comprising the top 10% probability mass are considered.
+        ///
+        /// We generally recommend altering this or temperature but not both.
+        /// </summary>
+        public float? TopP { get; set; }
+        /// <summary>
+        /// The maximum number of prompt tokens that may be used over the course of the run. The run will make a best effort to use only
+        /// the number of prompt tokens specified, across multiple turns of the run. If the run exceeds the number of prompt tokens specified,
+        /// the run will end with status `incomplete`. See `incomplete_details` for more info.
+        /// </summary>
+        public int? MaxPromptTokens { get; set; }
+        /// <summary>
+        /// The maximum number of completion tokens that may be used over the course of the run. The run will make a best effort to use only
+        /// the number of completion tokens specified, across multiple turns of the run. If the run exceeds the number of completion tokens
+        /// specified, the run will end with status `incomplete`. See `incomplete_details` for more info.
+        /// </summary>
+        public int? MaxCompletionTokens { get; set; }
+        /// <summary> The strategy to use for dropping messages as the context windows moves forward. </summary>
+        public TruncationObject TruncationStrategy { get; set; }
+        /// <summary>
+        /// Controls whether or not and which tool is called by the model.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="string"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiToolChoiceOptionMode"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsNamedToolChoice"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData ToolChoice { get; set; }
+        /// <summary>
+        /// Specifies the format that the model must output.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="string"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiResponseFormatMode"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiResponseFormat"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
         /// </summary>
-        public IList<ToolDefinition> OverrideTools { get; }
+        public BinaryData ResponseFormat { get; set; }
         /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
         public IDictionary<string, string> Metadata { get; set; }
     }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateCodeInterpreterToolResourceOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateCodeInterpreterToolResourceOptions.Serialization.cs
new file mode 100644
index 000000000000..887cb1e943d8
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateCodeInterpreterToolResourceOptions.Serialization.cs
@@ -0,0 +1,152 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class CreateCodeInterpreterToolResourceOptions : IUtf8JsonSerializable, IJsonModel<CreateCodeInterpreterToolResourceOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CreateCodeInterpreterToolResourceOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<CreateCodeInterpreterToolResourceOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateCodeInterpreterToolResourceOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CreateCodeInterpreterToolResourceOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsCollectionDefined(FileIds))
+            {
+                writer.WritePropertyName("file_ids"u8);
+                writer.WriteStartArray();
+                foreach (var item in FileIds)
+                {
+                    writer.WriteStringValue(item);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        CreateCodeInterpreterToolResourceOptions IJsonModel<CreateCodeInterpreterToolResourceOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateCodeInterpreterToolResourceOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CreateCodeInterpreterToolResourceOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeCreateCodeInterpreterToolResourceOptions(document.RootElement, options);
+        }
+
+        internal static CreateCodeInterpreterToolResourceOptions DeserializeCreateCodeInterpreterToolResourceOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IList<string> fileIds = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_ids"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    fileIds = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new CreateCodeInterpreterToolResourceOptions(fileIds ?? new ChangeTrackingList<string>(), serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<CreateCodeInterpreterToolResourceOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateCodeInterpreterToolResourceOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(CreateCodeInterpreterToolResourceOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        CreateCodeInterpreterToolResourceOptions IPersistableModel<CreateCodeInterpreterToolResourceOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateCodeInterpreterToolResourceOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeCreateCodeInterpreterToolResourceOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(CreateCodeInterpreterToolResourceOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<CreateCodeInterpreterToolResourceOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static CreateCodeInterpreterToolResourceOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeCreateCodeInterpreterToolResourceOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateCodeInterpreterToolResourceOptions.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateCodeInterpreterToolResourceOptions.cs
new file mode 100644
index 000000000000..97be44a94098
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateCodeInterpreterToolResourceOptions.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> A set of resources that will be used by the `code_interpreter` tool. Request object. </summary>
+    public partial class CreateCodeInterpreterToolResourceOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="CreateCodeInterpreterToolResourceOptions"/>. </summary>
+        public CreateCodeInterpreterToolResourceOptions()
+        {
+            FileIds = new ChangeTrackingList<string>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CreateCodeInterpreterToolResourceOptions"/>. </summary>
+        /// <param name="fileIds"> A list of file IDs made available to the `code_interpreter` tool. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal CreateCodeInterpreterToolResourceOptions(IList<string> fileIds, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            FileIds = fileIds;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> A list of file IDs made available to the `code_interpreter` tool. </summary>
+        public IList<string> FileIds { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadInitializationMessage.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateFileSearchToolResourceVectorStoreOptions.Serialization.cs
similarity index 60%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadInitializationMessage.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateFileSearchToolResourceVectorStoreOptions.Serialization.cs
index 8ec0eefb2fc4..758a3da794aa 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadInitializationMessage.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateFileSearchToolResourceVectorStoreOptions.Serialization.cs
@@ -13,33 +13,28 @@
 
 namespace Azure.AI.OpenAI.Assistants
 {
-    public partial class ThreadInitializationMessage : IUtf8JsonSerializable, IJsonModel<ThreadInitializationMessage>
+    public partial class CreateFileSearchToolResourceVectorStoreOptions : IUtf8JsonSerializable, IJsonModel<CreateFileSearchToolResourceVectorStoreOptions>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ThreadInitializationMessage>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CreateFileSearchToolResourceVectorStoreOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<ThreadInitializationMessage>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<CreateFileSearchToolResourceVectorStoreOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ThreadInitializationMessage>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<CreateFileSearchToolResourceVectorStoreOptions>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ThreadInitializationMessage)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(CreateFileSearchToolResourceVectorStoreOptions)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            writer.WritePropertyName("role"u8);
-            writer.WriteStringValue(Role.ToString());
-            writer.WritePropertyName("content"u8);
-            writer.WriteStringValue(Content);
-            if (Optional.IsCollectionDefined(FileIds))
+            writer.WritePropertyName("file_ids"u8);
+            writer.WriteStartArray();
+            foreach (var item in FileIds)
             {
-                writer.WritePropertyName("file_ids"u8);
-                writer.WriteStartArray();
-                foreach (var item in FileIds)
-                {
-                    writer.WriteStringValue(item);
-                }
-                writer.WriteEndArray();
+                writer.WriteStringValue(item);
             }
+            writer.WriteEndArray();
+            writer.WritePropertyName("chunking_strategy"u8);
+            writer.WriteObjectValue(ChunkingStrategy, options);
             if (Optional.IsCollectionDefined(Metadata))
             {
                 if (Metadata != null)
@@ -76,19 +71,19 @@ void IJsonModel<ThreadInitializationMessage>.Write(Utf8JsonWriter writer, ModelR
             writer.WriteEndObject();
         }
 
-        ThreadInitializationMessage IJsonModel<ThreadInitializationMessage>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        CreateFileSearchToolResourceVectorStoreOptions IJsonModel<CreateFileSearchToolResourceVectorStoreOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ThreadInitializationMessage>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<CreateFileSearchToolResourceVectorStoreOptions>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ThreadInitializationMessage)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(CreateFileSearchToolResourceVectorStoreOptions)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeThreadInitializationMessage(document.RootElement, options);
+            return DeserializeCreateFileSearchToolResourceVectorStoreOptions(document.RootElement, options);
         }
 
-        internal static ThreadInitializationMessage DeserializeThreadInitializationMessage(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static CreateFileSearchToolResourceVectorStoreOptions DeserializeCreateFileSearchToolResourceVectorStoreOptions(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -96,30 +91,15 @@ internal static ThreadInitializationMessage DeserializeThreadInitializationMessa
             {
                 return null;
             }
-            MessageRole role = default;
-            string content = default;
             IList<string> fileIds = default;
+            VectorStoreChunkingStrategyRequest chunkingStrategy = default;
             IDictionary<string, string> metadata = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
             {
-                if (property.NameEquals("role"u8))
-                {
-                    role = new MessageRole(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("content"u8))
-                {
-                    content = property.Value.GetString();
-                    continue;
-                }
                 if (property.NameEquals("file_ids"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
                     List<string> array = new List<string>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
@@ -128,6 +108,11 @@ internal static ThreadInitializationMessage DeserializeThreadInitializationMessa
                     fileIds = array;
                     continue;
                 }
+                if (property.NameEquals("chunking_strategy"u8))
+                {
+                    chunkingStrategy = VectorStoreChunkingStrategyRequest.DeserializeVectorStoreChunkingStrategyRequest(property.Value, options);
+                    continue;
+                }
                 if (property.NameEquals("metadata"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
@@ -148,46 +133,46 @@ internal static ThreadInitializationMessage DeserializeThreadInitializationMessa
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new ThreadInitializationMessage(role, content, fileIds ?? new ChangeTrackingList<string>(), metadata ?? new ChangeTrackingDictionary<string, string>(), serializedAdditionalRawData);
+            return new CreateFileSearchToolResourceVectorStoreOptions(fileIds, chunkingStrategy, metadata ?? new ChangeTrackingDictionary<string, string>(), serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<ThreadInitializationMessage>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<CreateFileSearchToolResourceVectorStoreOptions>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ThreadInitializationMessage>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<CreateFileSearchToolResourceVectorStoreOptions>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(ThreadInitializationMessage)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(CreateFileSearchToolResourceVectorStoreOptions)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ThreadInitializationMessage IPersistableModel<ThreadInitializationMessage>.Create(BinaryData data, ModelReaderWriterOptions options)
+        CreateFileSearchToolResourceVectorStoreOptions IPersistableModel<CreateFileSearchToolResourceVectorStoreOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ThreadInitializationMessage>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<CreateFileSearchToolResourceVectorStoreOptions>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeThreadInitializationMessage(document.RootElement, options);
+                        return DeserializeCreateFileSearchToolResourceVectorStoreOptions(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(ThreadInitializationMessage)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(CreateFileSearchToolResourceVectorStoreOptions)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ThreadInitializationMessage>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<CreateFileSearchToolResourceVectorStoreOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
         /// <param name="response"> The response to deserialize the model from. </param>
-        internal static ThreadInitializationMessage FromResponse(Response response)
+        internal static CreateFileSearchToolResourceVectorStoreOptions FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeThreadInitializationMessage(document.RootElement);
+            return DeserializeCreateFileSearchToolResourceVectorStoreOptions(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateFileSearchToolResourceVectorStoreOptions.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateFileSearchToolResourceVectorStoreOptions.cs
new file mode 100644
index 000000000000..cac5e291a8a8
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateFileSearchToolResourceVectorStoreOptions.cs
@@ -0,0 +1,100 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> File IDs associated to the vector store to be passed to the helper. </summary>
+    public partial class CreateFileSearchToolResourceVectorStoreOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="CreateFileSearchToolResourceVectorStoreOptions"/>. </summary>
+        /// <param name="fileIds"> A list of file IDs to add to the vector store. There can be a maximum of 10000 files in a vector store. </param>
+        /// <param name="chunkingStrategy">
+        /// The chunking strategy used to chunk the file(s). If not set, will use the `auto` strategy.
+        /// Please note <see cref="VectorStoreChunkingStrategyRequest"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyRequest"/> and <see cref="VectorStoreStaticChunkingStrategyRequest"/>.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileIds"/> or <paramref name="chunkingStrategy"/> is null. </exception>
+        public CreateFileSearchToolResourceVectorStoreOptions(IEnumerable<string> fileIds, VectorStoreChunkingStrategyRequest chunkingStrategy)
+        {
+            Argument.AssertNotNull(fileIds, nameof(fileIds));
+            Argument.AssertNotNull(chunkingStrategy, nameof(chunkingStrategy));
+
+            FileIds = fileIds.ToList();
+            ChunkingStrategy = chunkingStrategy;
+            Metadata = new ChangeTrackingDictionary<string, string>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CreateFileSearchToolResourceVectorStoreOptions"/>. </summary>
+        /// <param name="fileIds"> A list of file IDs to add to the vector store. There can be a maximum of 10000 files in a vector store. </param>
+        /// <param name="chunkingStrategy">
+        /// The chunking strategy used to chunk the file(s). If not set, will use the `auto` strategy.
+        /// Please note <see cref="VectorStoreChunkingStrategyRequest"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyRequest"/> and <see cref="VectorStoreStaticChunkingStrategyRequest"/>.
+        /// </param>
+        /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal CreateFileSearchToolResourceVectorStoreOptions(IList<string> fileIds, VectorStoreChunkingStrategyRequest chunkingStrategy, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            FileIds = fileIds;
+            ChunkingStrategy = chunkingStrategy;
+            Metadata = metadata;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CreateFileSearchToolResourceVectorStoreOptions"/> for deserialization. </summary>
+        internal CreateFileSearchToolResourceVectorStoreOptions()
+        {
+        }
+
+        /// <summary> A list of file IDs to add to the vector store. There can be a maximum of 10000 files in a vector store. </summary>
+        public IList<string> FileIds { get; }
+        /// <summary>
+        /// The chunking strategy used to chunk the file(s). If not set, will use the `auto` strategy.
+        /// Please note <see cref="VectorStoreChunkingStrategyRequest"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyRequest"/> and <see cref="VectorStoreStaticChunkingStrategyRequest"/>.
+        /// </summary>
+        public VectorStoreChunkingStrategyRequest ChunkingStrategy { get; }
+        /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
+        public IDictionary<string, string> Metadata { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateRunOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateRunOptions.Serialization.cs
index 1e4243ff8d01..ee2e77118f4c 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateRunOptions.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateRunOptions.Serialization.cs
@@ -64,6 +64,23 @@ void IJsonModel<CreateRunOptions>.Write(Utf8JsonWriter writer, ModelReaderWriter
                     writer.WriteNull("additional_instructions");
                 }
             }
+            if (Optional.IsCollectionDefined(AdditionalMessages))
+            {
+                if (AdditionalMessages != null)
+                {
+                    writer.WritePropertyName("additional_messages"u8);
+                    writer.WriteStartArray();
+                    foreach (var item in AdditionalMessages)
+                    {
+                        writer.WriteObjectValue(item, options);
+                    }
+                    writer.WriteEndArray();
+                }
+                else
+                {
+                    writer.WriteNull("additional_messages");
+                }
+            }
             if (Optional.IsCollectionDefined(OverrideTools))
             {
                 if (OverrideTools != null)
@@ -81,6 +98,114 @@ void IJsonModel<CreateRunOptions>.Write(Utf8JsonWriter writer, ModelReaderWriter
                     writer.WriteNull("tools");
                 }
             }
+            if (Optional.IsDefined(ParallelToolCalls))
+            {
+                writer.WritePropertyName("parallel_tool_calls"u8);
+                writer.WriteBooleanValue(ParallelToolCalls.Value);
+            }
+            if (Optional.IsDefined(Stream))
+            {
+                writer.WritePropertyName("stream"u8);
+                writer.WriteBooleanValue(Stream.Value);
+            }
+            if (Optional.IsDefined(Temperature))
+            {
+                if (Temperature != null)
+                {
+                    writer.WritePropertyName("temperature"u8);
+                    writer.WriteNumberValue(Temperature.Value);
+                }
+                else
+                {
+                    writer.WriteNull("temperature");
+                }
+            }
+            if (Optional.IsDefined(TopP))
+            {
+                if (TopP != null)
+                {
+                    writer.WritePropertyName("top_p"u8);
+                    writer.WriteNumberValue(TopP.Value);
+                }
+                else
+                {
+                    writer.WriteNull("top_p");
+                }
+            }
+            if (Optional.IsDefined(MaxPromptTokens))
+            {
+                if (MaxPromptTokens != null)
+                {
+                    writer.WritePropertyName("max_prompt_tokens"u8);
+                    writer.WriteNumberValue(MaxPromptTokens.Value);
+                }
+                else
+                {
+                    writer.WriteNull("max_prompt_tokens");
+                }
+            }
+            if (Optional.IsDefined(MaxCompletionTokens))
+            {
+                if (MaxCompletionTokens != null)
+                {
+                    writer.WritePropertyName("max_completion_tokens"u8);
+                    writer.WriteNumberValue(MaxCompletionTokens.Value);
+                }
+                else
+                {
+                    writer.WriteNull("max_completion_tokens");
+                }
+            }
+            if (Optional.IsDefined(TruncationStrategy))
+            {
+                if (TruncationStrategy != null)
+                {
+                    writer.WritePropertyName("truncation_strategy"u8);
+                    writer.WriteObjectValue(TruncationStrategy, options);
+                }
+                else
+                {
+                    writer.WriteNull("truncation_strategy");
+                }
+            }
+            if (Optional.IsDefined(ToolChoice))
+            {
+                if (ToolChoice != null)
+                {
+                    writer.WritePropertyName("tool_choice"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(ToolChoice);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(ToolChoice))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+                else
+                {
+                    writer.WriteNull("tool_choice");
+                }
+            }
+            if (Optional.IsDefined(ResponseFormat))
+            {
+                if (ResponseFormat != null)
+                {
+                    writer.WritePropertyName("response_format"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(ResponseFormat);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(ResponseFormat))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+                else
+                {
+                    writer.WriteNull("response_format");
+                }
+            }
             if (Optional.IsCollectionDefined(Metadata))
             {
                 if (Metadata != null)
@@ -141,7 +266,17 @@ internal static CreateRunOptions DeserializeCreateRunOptions(JsonElement element
             string model = default;
             string instructions = default;
             string additionalInstructions = default;
+            IList<ThreadMessage> additionalMessages = default;
             IList<ToolDefinition> tools = default;
+            bool? parallelToolCalls = default;
+            bool? stream = default;
+            float? temperature = default;
+            float? topP = default;
+            int? maxPromptTokens = default;
+            int? maxCompletionTokens = default;
+            TruncationObject truncationStrategy = default;
+            BinaryData toolChoice = default;
+            BinaryData responseFormat = default;
             IDictionary<string, string> metadata = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -182,6 +317,20 @@ internal static CreateRunOptions DeserializeCreateRunOptions(JsonElement element
                     additionalInstructions = property.Value.GetString();
                     continue;
                 }
+                if (property.NameEquals("additional_messages"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<ThreadMessage> array = new List<ThreadMessage>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(ThreadMessage.DeserializeThreadMessage(item, options));
+                    }
+                    additionalMessages = array;
+                    continue;
+                }
                 if (property.NameEquals("tools"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
@@ -196,6 +345,94 @@ internal static CreateRunOptions DeserializeCreateRunOptions(JsonElement element
                     tools = array;
                     continue;
                 }
+                if (property.NameEquals("parallel_tool_calls"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    parallelToolCalls = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("stream"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    stream = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("temperature"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        temperature = null;
+                        continue;
+                    }
+                    temperature = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("top_p"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        topP = null;
+                        continue;
+                    }
+                    topP = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("max_prompt_tokens"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        maxPromptTokens = null;
+                        continue;
+                    }
+                    maxPromptTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("max_completion_tokens"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        maxCompletionTokens = null;
+                        continue;
+                    }
+                    maxCompletionTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("truncation_strategy"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        truncationStrategy = null;
+                        continue;
+                    }
+                    truncationStrategy = TruncationObject.DeserializeTruncationObject(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("tool_choice"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        toolChoice = null;
+                        continue;
+                    }
+                    toolChoice = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
+                if (property.NameEquals("response_format"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        responseFormat = null;
+                        continue;
+                    }
+                    responseFormat = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
                 if (property.NameEquals("metadata"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
@@ -221,7 +458,17 @@ internal static CreateRunOptions DeserializeCreateRunOptions(JsonElement element
                 model,
                 instructions,
                 additionalInstructions,
+                additionalMessages ?? new ChangeTrackingList<ThreadMessage>(),
                 tools ?? new ChangeTrackingList<ToolDefinition>(),
+                parallelToolCalls,
+                stream,
+                temperature,
+                topP,
+                maxPromptTokens,
+                maxCompletionTokens,
+                truncationStrategy,
+                toolChoice,
+                responseFormat,
                 metadata ?? new ChangeTrackingDictionary<string, string>(),
                 serializedAdditionalRawData);
         }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateRunOptions.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateRunOptions.cs
index 1c307b753523..b8a9e8507c50 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateRunOptions.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateRunOptions.cs
@@ -53,6 +53,7 @@ public CreateRunOptions(string assistantId)
             Argument.AssertNotNull(assistantId, nameof(assistantId));
 
             AssistantId = assistantId;
+            AdditionalMessages = new ChangeTrackingList<ThreadMessage>();
             OverrideTools = new ChangeTrackingList<ToolDefinition>();
             Metadata = new ChangeTrackingDictionary<string, string>();
         }
@@ -65,20 +66,60 @@ public CreateRunOptions(string assistantId)
         /// Additional instructions to append at the end of the instructions for the run. This is useful for modifying the behavior
         /// on a per-run basis without overriding other instructions.
         /// </param>
+        /// <param name="additionalMessages"> Adds additional messages to the thread before creating the run. </param>
         /// <param name="overrideTools">
         /// The overridden list of enabled tools that the assistant should use to run the thread.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
         /// </param>
+        /// <param name="parallelToolCalls"> Whether to enable parallel function calling during tool use. </param>
+        /// <param name="stream">
+        /// If `true`, returns a stream of events that happen during the Run as server-sent events,
+        /// terminating when the Run enters a terminal state with a `data: [DONE]` message.
+        /// </param>
+        /// <param name="temperature">
+        /// What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output
+        /// more random, while lower values like 0.2 will make it more focused and deterministic.
+        /// </param>
+        /// <param name="topP">
+        /// An alternative to sampling with temperature, called nucleus sampling, where the model
+        /// considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens
+        /// comprising the top 10% probability mass are considered.
+        ///
+        /// We generally recommend altering this or temperature but not both.
+        /// </param>
+        /// <param name="maxPromptTokens">
+        /// The maximum number of prompt tokens that may be used over the course of the run. The run will make a best effort to use only
+        /// the number of prompt tokens specified, across multiple turns of the run. If the run exceeds the number of prompt tokens specified,
+        /// the run will end with status `incomplete`. See `incomplete_details` for more info.
+        /// </param>
+        /// <param name="maxCompletionTokens">
+        /// The maximum number of completion tokens that may be used over the course of the run. The run will make a best effort
+        /// to use only the number of completion tokens specified, across multiple turns of the run. If the run exceeds the number of
+        /// completion tokens specified, the run will end with status `incomplete`. See `incomplete_details` for more info.
+        /// </param>
+        /// <param name="truncationStrategy"> The strategy to use for dropping messages as the context windows moves forward. </param>
+        /// <param name="toolChoice"> Controls whether or not and which tool is called by the model. </param>
+        /// <param name="responseFormat"> Specifies the format that the model must output. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal CreateRunOptions(string assistantId, string overrideModelName, string overrideInstructions, string additionalInstructions, IList<ToolDefinition> overrideTools, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal CreateRunOptions(string assistantId, string overrideModelName, string overrideInstructions, string additionalInstructions, IList<ThreadMessage> additionalMessages, IList<ToolDefinition> overrideTools, bool? parallelToolCalls, bool? stream, float? temperature, float? topP, int? maxPromptTokens, int? maxCompletionTokens, TruncationObject truncationStrategy, BinaryData toolChoice, BinaryData responseFormat, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             AssistantId = assistantId;
             OverrideModelName = overrideModelName;
             OverrideInstructions = overrideInstructions;
             AdditionalInstructions = additionalInstructions;
+            AdditionalMessages = additionalMessages;
             OverrideTools = overrideTools;
+            ParallelToolCalls = parallelToolCalls;
+            Stream = stream;
+            Temperature = temperature;
+            TopP = topP;
+            MaxPromptTokens = maxPromptTokens;
+            MaxCompletionTokens = maxCompletionTokens;
+            TruncationStrategy = truncationStrategy;
+            ToolChoice = toolChoice;
+            ResponseFormat = responseFormat;
             Metadata = metadata;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
@@ -99,12 +140,138 @@ internal CreateRunOptions()
         /// on a per-run basis without overriding other instructions.
         /// </summary>
         public string AdditionalInstructions { get; set; }
+        /// <summary> Adds additional messages to the thread before creating the run. </summary>
+        public IList<ThreadMessage> AdditionalMessages { get; set; }
         /// <summary>
         /// The overridden list of enabled tools that the assistant should use to run the thread.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
         /// </summary>
         public IList<ToolDefinition> OverrideTools { get; set; }
+        /// <summary> Whether to enable parallel function calling during tool use. </summary>
+        public bool? ParallelToolCalls { get; set; }
+        /// <summary>
+        /// If `true`, returns a stream of events that happen during the Run as server-sent events,
+        /// terminating when the Run enters a terminal state with a `data: [DONE]` message.
+        /// </summary>
+        public bool? Stream { get; set; }
+        /// <summary>
+        /// What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output
+        /// more random, while lower values like 0.2 will make it more focused and deterministic.
+        /// </summary>
+        public float? Temperature { get; set; }
+        /// <summary>
+        /// An alternative to sampling with temperature, called nucleus sampling, where the model
+        /// considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens
+        /// comprising the top 10% probability mass are considered.
+        ///
+        /// We generally recommend altering this or temperature but not both.
+        /// </summary>
+        public float? TopP { get; set; }
+        /// <summary>
+        /// The maximum number of prompt tokens that may be used over the course of the run. The run will make a best effort to use only
+        /// the number of prompt tokens specified, across multiple turns of the run. If the run exceeds the number of prompt tokens specified,
+        /// the run will end with status `incomplete`. See `incomplete_details` for more info.
+        /// </summary>
+        public int? MaxPromptTokens { get; set; }
+        /// <summary>
+        /// The maximum number of completion tokens that may be used over the course of the run. The run will make a best effort
+        /// to use only the number of completion tokens specified, across multiple turns of the run. If the run exceeds the number of
+        /// completion tokens specified, the run will end with status `incomplete`. See `incomplete_details` for more info.
+        /// </summary>
+        public int? MaxCompletionTokens { get; set; }
+        /// <summary> The strategy to use for dropping messages as the context windows moves forward. </summary>
+        public TruncationObject TruncationStrategy { get; set; }
+        /// <summary>
+        /// Controls whether or not and which tool is called by the model.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="string"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiToolChoiceOptionMode"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsNamedToolChoice"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData ToolChoice { get; set; }
+        /// <summary>
+        /// Specifies the format that the model must output.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="string"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiResponseFormatMode"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiResponseFormat"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData ResponseFormat { get; set; }
         /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
         public IDictionary<string, string> Metadata { get; set; }
     }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateToolResourcesOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateToolResourcesOptions.Serialization.cs
new file mode 100644
index 000000000000..228c9350b244
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateToolResourcesOptions.Serialization.cs
@@ -0,0 +1,164 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class CreateToolResourcesOptions : IUtf8JsonSerializable, IJsonModel<CreateToolResourcesOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CreateToolResourcesOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<CreateToolResourcesOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateToolResourcesOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CreateToolResourcesOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(CodeInterpreter))
+            {
+                writer.WritePropertyName("code_interpreter"u8);
+                writer.WriteObjectValue(CodeInterpreter, options);
+            }
+            if (Optional.IsDefined(FileSearch))
+            {
+                writer.WritePropertyName("file_search"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(FileSearch);
+#else
+                using (JsonDocument document = JsonDocument.Parse(FileSearch))
+                {
+                    JsonSerializer.Serialize(writer, document.RootElement);
+                }
+#endif
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        CreateToolResourcesOptions IJsonModel<CreateToolResourcesOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateToolResourcesOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CreateToolResourcesOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeCreateToolResourcesOptions(document.RootElement, options);
+        }
+
+        internal static CreateToolResourcesOptions DeserializeCreateToolResourcesOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            CreateCodeInterpreterToolResourceOptions codeInterpreter = default;
+            BinaryData fileSearch = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("code_interpreter"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    codeInterpreter = CreateCodeInterpreterToolResourceOptions.DeserializeCreateCodeInterpreterToolResourceOptions(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("file_search"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    fileSearch = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new CreateToolResourcesOptions(codeInterpreter, fileSearch, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<CreateToolResourcesOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateToolResourcesOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(CreateToolResourcesOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        CreateToolResourcesOptions IPersistableModel<CreateToolResourcesOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateToolResourcesOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeCreateToolResourcesOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(CreateToolResourcesOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<CreateToolResourcesOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static CreateToolResourcesOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeCreateToolResourcesOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateToolResourcesOptions.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateToolResourcesOptions.cs
new file mode 100644
index 000000000000..796bdccc21f0
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateToolResourcesOptions.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary>
+    /// Request object. A set of resources that are used by the assistant's tools. The resources are specific to the
+    /// type of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search`
+    /// tool requires a list of vector store IDs.
+    /// </summary>
+    public partial class CreateToolResourcesOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="CreateToolResourcesOptions"/>. </summary>
+        public CreateToolResourcesOptions()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CreateToolResourcesOptions"/>. </summary>
+        /// <param name="codeInterpreter">
+        /// A list of file IDs made available to the `code_interpreter` tool. There can be a maximum of 20 files
+        /// associated with the tool.
+        /// </param>
+        /// <param name="fileSearch"> A list of vector stores or their IDs made available to the `file_search` tool. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal CreateToolResourcesOptions(CreateCodeInterpreterToolResourceOptions codeInterpreter, BinaryData fileSearch, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            CodeInterpreter = codeInterpreter;
+            FileSearch = fileSearch;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary>
+        /// A list of file IDs made available to the `code_interpreter` tool. There can be a maximum of 20 files
+        /// associated with the tool.
+        /// </summary>
+        public CreateCodeInterpreterToolResourceOptions CodeInterpreter { get; set; }
+        /// <summary>
+        /// A list of vector stores or their IDs made available to the `file_search` tool.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="IList{T}"/> where <c>T</c> is of type <see cref="string"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="IList{T}"/> where <c>T</c> is of type <see cref="CreateFileSearchToolResourceVectorStoreOptions"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData FileSearch { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateVectorStoreFileBatchRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateVectorStoreFileBatchRequest.Serialization.cs
new file mode 100644
index 000000000000..0afaf2dea1a2
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateVectorStoreFileBatchRequest.Serialization.cs
@@ -0,0 +1,160 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    internal partial class CreateVectorStoreFileBatchRequest : IUtf8JsonSerializable, IJsonModel<CreateVectorStoreFileBatchRequest>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CreateVectorStoreFileBatchRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<CreateVectorStoreFileBatchRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateVectorStoreFileBatchRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CreateVectorStoreFileBatchRequest)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("file_ids"u8);
+            writer.WriteStartArray();
+            foreach (var item in FileIds)
+            {
+                writer.WriteStringValue(item);
+            }
+            writer.WriteEndArray();
+            if (Optional.IsDefined(ChunkingStrategy))
+            {
+                writer.WritePropertyName("chunking_strategy"u8);
+                writer.WriteObjectValue(ChunkingStrategy, options);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        CreateVectorStoreFileBatchRequest IJsonModel<CreateVectorStoreFileBatchRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateVectorStoreFileBatchRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CreateVectorStoreFileBatchRequest)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeCreateVectorStoreFileBatchRequest(document.RootElement, options);
+        }
+
+        internal static CreateVectorStoreFileBatchRequest DeserializeCreateVectorStoreFileBatchRequest(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IReadOnlyList<string> fileIds = default;
+            VectorStoreChunkingStrategyRequest chunkingStrategy = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_ids"u8))
+                {
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    fileIds = array;
+                    continue;
+                }
+                if (property.NameEquals("chunking_strategy"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    chunkingStrategy = VectorStoreChunkingStrategyRequest.DeserializeVectorStoreChunkingStrategyRequest(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new CreateVectorStoreFileBatchRequest(fileIds, chunkingStrategy, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<CreateVectorStoreFileBatchRequest>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateVectorStoreFileBatchRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(CreateVectorStoreFileBatchRequest)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        CreateVectorStoreFileBatchRequest IPersistableModel<CreateVectorStoreFileBatchRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateVectorStoreFileBatchRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeCreateVectorStoreFileBatchRequest(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(CreateVectorStoreFileBatchRequest)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<CreateVectorStoreFileBatchRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static CreateVectorStoreFileBatchRequest FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeCreateVectorStoreFileBatchRequest(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateVectorStoreFileBatchRequest.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateVectorStoreFileBatchRequest.cs
new file mode 100644
index 000000000000..ae91f3b2fed8
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateVectorStoreFileBatchRequest.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The CreateVectorStoreFileBatchRequest. </summary>
+    internal partial class CreateVectorStoreFileBatchRequest
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="CreateVectorStoreFileBatchRequest"/>. </summary>
+        /// <param name="fileIds"> A list of File IDs that the vector store should use. Useful for tools like `file_search` that can access files. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileIds"/> is null. </exception>
+        internal CreateVectorStoreFileBatchRequest(IEnumerable<string> fileIds)
+        {
+            Argument.AssertNotNull(fileIds, nameof(fileIds));
+
+            FileIds = fileIds.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CreateVectorStoreFileBatchRequest"/>. </summary>
+        /// <param name="fileIds"> A list of File IDs that the vector store should use. Useful for tools like `file_search` that can access files. </param>
+        /// <param name="chunkingStrategy">
+        /// The chunking strategy used to chunk the file(s). If not set, will use the auto strategy.
+        /// Please note <see cref="VectorStoreChunkingStrategyRequest"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyRequest"/> and <see cref="VectorStoreStaticChunkingStrategyRequest"/>.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal CreateVectorStoreFileBatchRequest(IReadOnlyList<string> fileIds, VectorStoreChunkingStrategyRequest chunkingStrategy, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            FileIds = fileIds;
+            ChunkingStrategy = chunkingStrategy;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CreateVectorStoreFileBatchRequest"/> for deserialization. </summary>
+        internal CreateVectorStoreFileBatchRequest()
+        {
+        }
+
+        /// <summary> A list of File IDs that the vector store should use. Useful for tools like `file_search` that can access files. </summary>
+        public IReadOnlyList<string> FileIds { get; }
+        /// <summary>
+        /// The chunking strategy used to chunk the file(s). If not set, will use the auto strategy.
+        /// Please note <see cref="VectorStoreChunkingStrategyRequest"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyRequest"/> and <see cref="VectorStoreStaticChunkingStrategyRequest"/>.
+        /// </summary>
+        public VectorStoreChunkingStrategyRequest ChunkingStrategy { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateVectorStoreFileRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateVectorStoreFileRequest.Serialization.cs
new file mode 100644
index 000000000000..7b1a5bf6ac82
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateVectorStoreFileRequest.Serialization.cs
@@ -0,0 +1,150 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    internal partial class CreateVectorStoreFileRequest : IUtf8JsonSerializable, IJsonModel<CreateVectorStoreFileRequest>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CreateVectorStoreFileRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<CreateVectorStoreFileRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateVectorStoreFileRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CreateVectorStoreFileRequest)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("file_id"u8);
+            writer.WriteStringValue(FileId);
+            if (Optional.IsDefined(ChunkingStrategy))
+            {
+                writer.WritePropertyName("chunking_strategy"u8);
+                writer.WriteObjectValue(ChunkingStrategy, options);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        CreateVectorStoreFileRequest IJsonModel<CreateVectorStoreFileRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateVectorStoreFileRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CreateVectorStoreFileRequest)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeCreateVectorStoreFileRequest(document.RootElement, options);
+        }
+
+        internal static CreateVectorStoreFileRequest DeserializeCreateVectorStoreFileRequest(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string fileId = default;
+            VectorStoreChunkingStrategyRequest chunkingStrategy = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_id"u8))
+                {
+                    fileId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("chunking_strategy"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    chunkingStrategy = VectorStoreChunkingStrategyRequest.DeserializeVectorStoreChunkingStrategyRequest(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new CreateVectorStoreFileRequest(fileId, chunkingStrategy, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<CreateVectorStoreFileRequest>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateVectorStoreFileRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(CreateVectorStoreFileRequest)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        CreateVectorStoreFileRequest IPersistableModel<CreateVectorStoreFileRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateVectorStoreFileRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeCreateVectorStoreFileRequest(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(CreateVectorStoreFileRequest)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<CreateVectorStoreFileRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static CreateVectorStoreFileRequest FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeCreateVectorStoreFileRequest(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateVectorStoreFileRequest.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateVectorStoreFileRequest.cs
new file mode 100644
index 000000000000..fdda0a8891d1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateVectorStoreFileRequest.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The CreateVectorStoreFileRequest. </summary>
+    internal partial class CreateVectorStoreFileRequest
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="CreateVectorStoreFileRequest"/>. </summary>
+        /// <param name="fileId"> A File ID that the vector store should use. Useful for tools like `file_search` that can access files. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        internal CreateVectorStoreFileRequest(string fileId)
+        {
+            Argument.AssertNotNull(fileId, nameof(fileId));
+
+            FileId = fileId;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CreateVectorStoreFileRequest"/>. </summary>
+        /// <param name="fileId"> A File ID that the vector store should use. Useful for tools like `file_search` that can access files. </param>
+        /// <param name="chunkingStrategy">
+        /// The chunking strategy used to chunk the file(s). If not set, will use the auto strategy.
+        /// Please note <see cref="VectorStoreChunkingStrategyRequest"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyRequest"/> and <see cref="VectorStoreStaticChunkingStrategyRequest"/>.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal CreateVectorStoreFileRequest(string fileId, VectorStoreChunkingStrategyRequest chunkingStrategy, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            FileId = fileId;
+            ChunkingStrategy = chunkingStrategy;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CreateVectorStoreFileRequest"/> for deserialization. </summary>
+        internal CreateVectorStoreFileRequest()
+        {
+        }
+
+        /// <summary> A File ID that the vector store should use. Useful for tools like `file_search` that can access files. </summary>
+        public string FileId { get; }
+        /// <summary>
+        /// The chunking strategy used to chunk the file(s). If not set, will use the auto strategy.
+        /// Please note <see cref="VectorStoreChunkingStrategyRequest"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyRequest"/> and <see cref="VectorStoreStaticChunkingStrategyRequest"/>.
+        /// </summary>
+        public VectorStoreChunkingStrategyRequest ChunkingStrategy { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/DoneEvent.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/DoneEvent.cs
new file mode 100644
index 000000000000..d59d8966c668
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/DoneEvent.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Terminal event indicating the successful end of a stream. </summary>
+    public readonly partial struct DoneEvent : IEquatable<DoneEvent>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="DoneEvent"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public DoneEvent(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string DoneValue = "done";
+
+        /// <summary> Event sent when the stream is done. </summary>
+        public static DoneEvent Done { get; } = new DoneEvent(DoneValue);
+        /// <summary> Determines if two <see cref="DoneEvent"/> values are the same. </summary>
+        public static bool operator ==(DoneEvent left, DoneEvent right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="DoneEvent"/> values are not the same. </summary>
+        public static bool operator !=(DoneEvent left, DoneEvent right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="DoneEvent"/>. </summary>
+        public static implicit operator DoneEvent(string value) => new DoneEvent(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is DoneEvent other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(DoneEvent other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ErrorEvent.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ErrorEvent.cs
new file mode 100644
index 000000000000..3a26ca078a2f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ErrorEvent.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Terminal event indicating a server side error while streaming. </summary>
+    public readonly partial struct ErrorEvent : IEquatable<ErrorEvent>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ErrorEvent"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ErrorEvent(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ErrorValue = "error";
+
+        /// <summary> Event sent when an error occurs, such as an internal server error or a timeout. </summary>
+        public static ErrorEvent Error { get; } = new ErrorEvent(ErrorValue);
+        /// <summary> Determines if two <see cref="ErrorEvent"/> values are the same. </summary>
+        public static bool operator ==(ErrorEvent left, ErrorEvent right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ErrorEvent"/> values are not the same. </summary>
+        public static bool operator !=(ErrorEvent left, ErrorEvent right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ErrorEvent"/>. </summary>
+        public static implicit operator ErrorEvent(string value) => new ErrorEvent(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ErrorEvent other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ErrorEvent other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolDefinition.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolDefinition.Serialization.cs
new file mode 100644
index 000000000000..044e4cfb677f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolDefinition.Serialization.cs
@@ -0,0 +1,150 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class FileSearchToolDefinition : IUtf8JsonSerializable, IJsonModel<FileSearchToolDefinition>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<FileSearchToolDefinition>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<FileSearchToolDefinition>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileSearchToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FileSearchToolDefinition)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(FileSearch))
+            {
+                writer.WritePropertyName("file_search"u8);
+                writer.WriteObjectValue(FileSearch, options);
+            }
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        FileSearchToolDefinition IJsonModel<FileSearchToolDefinition>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileSearchToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FileSearchToolDefinition)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeFileSearchToolDefinition(document.RootElement, options);
+        }
+
+        internal static FileSearchToolDefinition DeserializeFileSearchToolDefinition(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            FileSearchToolDefinitionDetails fileSearch = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_search"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    fileSearch = FileSearchToolDefinitionDetails.DeserializeFileSearchToolDefinitionDetails(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new FileSearchToolDefinition(type, serializedAdditionalRawData, fileSearch);
+        }
+
+        BinaryData IPersistableModel<FileSearchToolDefinition>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileSearchToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(FileSearchToolDefinition)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        FileSearchToolDefinition IPersistableModel<FileSearchToolDefinition>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileSearchToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeFileSearchToolDefinition(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(FileSearchToolDefinition)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<FileSearchToolDefinition>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new FileSearchToolDefinition FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeFileSearchToolDefinition(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolDefinition.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolDefinition.cs
new file mode 100644
index 000000000000..e68594b90832
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolDefinition.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The input definition information for a file search tool as used to configure an assistant. </summary>
+    public partial class FileSearchToolDefinition : ToolDefinition
+    {
+        /// <summary> Initializes a new instance of <see cref="FileSearchToolDefinition"/>. </summary>
+        public FileSearchToolDefinition()
+        {
+            Type = "file_search";
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FileSearchToolDefinition"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="fileSearch"> Options overrides for the file search tool. </param>
+        internal FileSearchToolDefinition(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, FileSearchToolDefinitionDetails fileSearch) : base(type, serializedAdditionalRawData)
+        {
+            FileSearch = fileSearch;
+        }
+
+        /// <summary> Options overrides for the file search tool. </summary>
+        public FileSearchToolDefinitionDetails FileSearch { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolDefinitionDetails.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolDefinitionDetails.Serialization.cs
new file mode 100644
index 000000000000..e1f77ecfcfbb
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolDefinitionDetails.Serialization.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class FileSearchToolDefinitionDetails : IUtf8JsonSerializable, IJsonModel<FileSearchToolDefinitionDetails>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<FileSearchToolDefinitionDetails>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<FileSearchToolDefinitionDetails>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileSearchToolDefinitionDetails>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FileSearchToolDefinitionDetails)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(MaxNumResults))
+            {
+                writer.WritePropertyName("max_num_results"u8);
+                writer.WriteNumberValue(MaxNumResults.Value);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        FileSearchToolDefinitionDetails IJsonModel<FileSearchToolDefinitionDetails>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileSearchToolDefinitionDetails>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FileSearchToolDefinitionDetails)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeFileSearchToolDefinitionDetails(document.RootElement, options);
+        }
+
+        internal static FileSearchToolDefinitionDetails DeserializeFileSearchToolDefinitionDetails(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            int? maxNumResults = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("max_num_results"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    maxNumResults = property.Value.GetInt32();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new FileSearchToolDefinitionDetails(maxNumResults, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<FileSearchToolDefinitionDetails>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileSearchToolDefinitionDetails>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(FileSearchToolDefinitionDetails)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        FileSearchToolDefinitionDetails IPersistableModel<FileSearchToolDefinitionDetails>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileSearchToolDefinitionDetails>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeFileSearchToolDefinitionDetails(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(FileSearchToolDefinitionDetails)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<FileSearchToolDefinitionDetails>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static FileSearchToolDefinitionDetails FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeFileSearchToolDefinitionDetails(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolDefinitionDetails.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolDefinitionDetails.cs
new file mode 100644
index 000000000000..019548640805
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolDefinitionDetails.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Options overrides for the file search tool. </summary>
+    public partial class FileSearchToolDefinitionDetails
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="FileSearchToolDefinitionDetails"/>. </summary>
+        public FileSearchToolDefinitionDetails()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FileSearchToolDefinitionDetails"/>. </summary>
+        /// <param name="maxNumResults">
+        /// The maximum number of results the file search tool should output. The default is 20 for gpt-4* models and 5 for gpt-3.5-turbo. This number should be between 1 and 50 inclusive.
+        ///
+        /// Note that the file search tool may output fewer than `max_num_results` results. See the file search tool documentation for more information.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal FileSearchToolDefinitionDetails(int? maxNumResults, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            MaxNumResults = maxNumResults;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary>
+        /// The maximum number of results the file search tool should output. The default is 20 for gpt-4* models and 5 for gpt-3.5-turbo. This number should be between 1 and 50 inclusive.
+        ///
+        /// Note that the file search tool may output fewer than `max_num_results` results. See the file search tool documentation for more information.
+        /// </summary>
+        public int? MaxNumResults { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolResource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolResource.Serialization.cs
new file mode 100644
index 000000000000..eeeba6c1ad6f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolResource.Serialization.cs
@@ -0,0 +1,152 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class FileSearchToolResource : IUtf8JsonSerializable, IJsonModel<FileSearchToolResource>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<FileSearchToolResource>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<FileSearchToolResource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileSearchToolResource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FileSearchToolResource)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsCollectionDefined(VectorStoreIds))
+            {
+                writer.WritePropertyName("vector_store_ids"u8);
+                writer.WriteStartArray();
+                foreach (var item in VectorStoreIds)
+                {
+                    writer.WriteStringValue(item);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        FileSearchToolResource IJsonModel<FileSearchToolResource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileSearchToolResource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FileSearchToolResource)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeFileSearchToolResource(document.RootElement, options);
+        }
+
+        internal static FileSearchToolResource DeserializeFileSearchToolResource(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IReadOnlyList<string> vectorStoreIds = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("vector_store_ids"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    vectorStoreIds = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new FileSearchToolResource(vectorStoreIds ?? new ChangeTrackingList<string>(), serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<FileSearchToolResource>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileSearchToolResource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(FileSearchToolResource)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        FileSearchToolResource IPersistableModel<FileSearchToolResource>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileSearchToolResource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeFileSearchToolResource(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(FileSearchToolResource)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<FileSearchToolResource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static FileSearchToolResource FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeFileSearchToolResource(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolResource.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolResource.cs
new file mode 100644
index 000000000000..94422e677d08
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileSearchToolResource.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> A set of resources that are used by the `file_search` tool. </summary>
+    public partial class FileSearchToolResource
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="FileSearchToolResource"/>. </summary>
+        internal FileSearchToolResource()
+        {
+            VectorStoreIds = new ChangeTrackingList<string>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FileSearchToolResource"/>. </summary>
+        /// <param name="vectorStoreIds">
+        /// The ID of the vector store attached to this assistant. There can be a maximum of 1 vector
+        /// store attached to the assistant.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal FileSearchToolResource(IReadOnlyList<string> vectorStoreIds, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            VectorStoreIds = vectorStoreIds;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary>
+        /// The ID of the vector store attached to this assistant. There can be a maximum of 1 vector
+        /// store attached to the assistant.
+        /// </summary>
+        public IReadOnlyList<string> VectorStoreIds { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileState.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileState.cs
new file mode 100644
index 000000000000..47ce58179d3d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FileState.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The state of the file. </summary>
+    public readonly partial struct FileState : IEquatable<FileState>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="FileState"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public FileState(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string UploadedValue = "uploaded";
+        private const string PendingValue = "pending";
+        private const string RunningValue = "running";
+        private const string ProcessedValue = "processed";
+        private const string ErrorValue = "error";
+        private const string DeletingValue = "deleting";
+        private const string DeletedValue = "deleted";
+
+        /// <summary>
+        /// The file has been uploaded but it's not yet processed. This state is not returned by Azure OpenAI and exposed only for
+        /// compatibility. It can be categorized as an inactive state.
+        /// </summary>
+        public static FileState Uploaded { get; } = new FileState(UploadedValue);
+        /// <summary> The operation was created and is not queued to be processed in the future. It can be categorized as an inactive state. </summary>
+        public static FileState Pending { get; } = new FileState(PendingValue);
+        /// <summary> The operation has started to be processed. It can be categorized as an active state. </summary>
+        public static FileState Running { get; } = new FileState(RunningValue);
+        /// <summary> The operation has successfully processed and is ready for consumption. It can be categorized as a terminal state. </summary>
+        public static FileState Processed { get; } = new FileState(ProcessedValue);
+        /// <summary> The operation has completed processing with a failure and cannot be further consumed. It can be categorized as a terminal state. </summary>
+        public static FileState Error { get; } = new FileState(ErrorValue);
+        /// <summary>
+        /// The entity is in the process to be deleted. This state is not returned by Azure OpenAI and exposed only for compatibility.
+        /// It can be categorized as an active state.
+        /// </summary>
+        public static FileState Deleting { get; } = new FileState(DeletingValue);
+        /// <summary>
+        /// The entity has been deleted but may still be referenced by other entities predating the deletion. It can be categorized as a
+        /// terminal state.
+        /// </summary>
+        public static FileState Deleted { get; } = new FileState(DeletedValue);
+        /// <summary> Determines if two <see cref="FileState"/> values are the same. </summary>
+        public static bool operator ==(FileState left, FileState right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="FileState"/> values are not the same. </summary>
+        public static bool operator !=(FileState left, FileState right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="FileState"/>. </summary>
+        public static implicit operator FileState(string value) => new FileState(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is FileState other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(FileState other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FunctionName.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FunctionName.Serialization.cs
new file mode 100644
index 000000000000..1af0a6d26063
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FunctionName.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class FunctionName : IUtf8JsonSerializable, IJsonModel<FunctionName>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<FunctionName>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<FunctionName>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionName>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FunctionName)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("name"u8);
+            writer.WriteStringValue(Name);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        FunctionName IJsonModel<FunctionName>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionName>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FunctionName)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeFunctionName(document.RootElement, options);
+        }
+
+        internal static FunctionName DeserializeFunctionName(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string name = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("name"u8))
+                {
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new FunctionName(name, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<FunctionName>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionName>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(FunctionName)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        FunctionName IPersistableModel<FunctionName>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionName>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeFunctionName(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(FunctionName)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<FunctionName>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static FunctionName FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeFunctionName(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FunctionName.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FunctionName.cs
new file mode 100644
index 000000000000..70fcf993d4ae
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/FunctionName.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The function name that will be used, if using the `function` tool. </summary>
+    public partial class FunctionName
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="FunctionName"/>. </summary>
+        /// <param name="name"> The name of the function to call. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
+        public FunctionName(string name)
+        {
+            Argument.AssertNotNull(name, nameof(name));
+
+            Name = name;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FunctionName"/>. </summary>
+        /// <param name="name"> The name of the function to call. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal FunctionName(string name, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Name = name;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FunctionName"/> for deserialization. </summary>
+        internal FunctionName()
+        {
+        }
+
+        /// <summary> The name of the function to call. </summary>
+        public string Name { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/IncompleteRunDetails.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/IncompleteRunDetails.cs
new file mode 100644
index 000000000000..373733568f34
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/IncompleteRunDetails.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The reason why the run is incomplete. This will point to which specific token limit was reached over the course of the run. </summary>
+    public readonly partial struct IncompleteRunDetails : IEquatable<IncompleteRunDetails>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="IncompleteRunDetails"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public IncompleteRunDetails(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string MaxCompletionTokensValue = "max_completion_tokens";
+        private const string MaxPromptTokensValue = "max_prompt_tokens";
+
+        /// <summary> Maximum completion tokens exceeded. </summary>
+        public static IncompleteRunDetails MaxCompletionTokens { get; } = new IncompleteRunDetails(MaxCompletionTokensValue);
+        /// <summary> Maximum prompt tokens exceeded. </summary>
+        public static IncompleteRunDetails MaxPromptTokens { get; } = new IncompleteRunDetails(MaxPromptTokensValue);
+        /// <summary> Determines if two <see cref="IncompleteRunDetails"/> values are the same. </summary>
+        public static bool operator ==(IncompleteRunDetails left, IncompleteRunDetails right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="IncompleteRunDetails"/> values are not the same. </summary>
+        public static bool operator !=(IncompleteRunDetails left, IncompleteRunDetails right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="IncompleteRunDetails"/>. </summary>
+        public static implicit operator IncompleteRunDetails(string value) => new IncompleteRunDetails(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is IncompleteRunDetails other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(IncompleteRunDetails other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalAssistantFileDeletionStatusObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalAssistantFileDeletionStatusObject.cs
deleted file mode 100644
index 5c52700f6c0f..000000000000
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalAssistantFileDeletionStatusObject.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.AI.OpenAI.Assistants
-{
-    /// <summary> The InternalAssistantFileDeletionStatus_object. </summary>
-    internal readonly partial struct InternalAssistantFileDeletionStatusObject : IEquatable<InternalAssistantFileDeletionStatusObject>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="InternalAssistantFileDeletionStatusObject"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public InternalAssistantFileDeletionStatusObject(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string AssistantFileDeletedValue = "assistant.file.deleted";
-
-        /// <summary> assistant.file.deleted. </summary>
-        public static InternalAssistantFileDeletionStatusObject AssistantFileDeleted { get; } = new InternalAssistantFileDeletionStatusObject(AssistantFileDeletedValue);
-        /// <summary> Determines if two <see cref="InternalAssistantFileDeletionStatusObject"/> values are the same. </summary>
-        public static bool operator ==(InternalAssistantFileDeletionStatusObject left, InternalAssistantFileDeletionStatusObject right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="InternalAssistantFileDeletionStatusObject"/> values are not the same. </summary>
-        public static bool operator !=(InternalAssistantFileDeletionStatusObject left, InternalAssistantFileDeletionStatusObject right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="InternalAssistantFileDeletionStatusObject"/>. </summary>
-        public static implicit operator InternalAssistantFileDeletionStatusObject(string value) => new InternalAssistantFileDeletionStatusObject(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is InternalAssistantFileDeletionStatusObject other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(InternalAssistantFileDeletionStatusObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageImageFileDetails.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageImageFileDetails.cs
index eb315c465ad1..89cfab2a18a4 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageImageFileDetails.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageImageFileDetails.cs
@@ -48,7 +48,7 @@ internal partial class InternalMessageImageFileDetails
         /// <summary> Initializes a new instance of <see cref="InternalMessageImageFileDetails"/>. </summary>
         /// <param name="internalDetails"> The ID for the file associated with this image. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="internalDetails"/> is null. </exception>
-        internal InternalMessageImageFileDetails(string internalDetails)
+        public InternalMessageImageFileDetails(string internalDetails)
         {
             Argument.AssertNotNull(internalDetails, nameof(internalDetails));
 
@@ -70,6 +70,6 @@ internal InternalMessageImageFileDetails()
         }
 
         /// <summary> The ID for the file associated with this image. </summary>
-        public string InternalDetails { get; }
+        public string InternalDetails { get; set; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextDetails.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextDetails.Serialization.cs
index 29ffc7f46eb7..a181f9527cb5 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextDetails.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextDetails.Serialization.cs
@@ -74,7 +74,7 @@ internal static InternalMessageTextDetails DeserializeInternalMessageTextDetails
                 return null;
             }
             string value = default;
-            IReadOnlyList<MessageTextAnnotation> annotations = default;
+            IList<MessageTextAnnotation> annotations = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextDetails.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextDetails.cs
index 7f6a60a62245..4489c4dd184e 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextDetails.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextDetails.cs
@@ -54,7 +54,7 @@ internal partial class InternalMessageTextDetails
         /// The available derived classes include <see cref="MessageTextFileCitationAnnotation"/> and <see cref="MessageTextFilePathAnnotation"/>.
         /// </param>
         /// <exception cref="ArgumentNullException"> <paramref name="text"/> or <paramref name="annotations"/> is null. </exception>
-        internal InternalMessageTextDetails(string text, IEnumerable<MessageTextAnnotation> annotations)
+        public InternalMessageTextDetails(string text, IEnumerable<MessageTextAnnotation> annotations)
         {
             Argument.AssertNotNull(text, nameof(text));
             Argument.AssertNotNull(annotations, nameof(annotations));
@@ -71,7 +71,7 @@ internal InternalMessageTextDetails(string text, IEnumerable<MessageTextAnnotati
         /// The available derived classes include <see cref="MessageTextFileCitationAnnotation"/> and <see cref="MessageTextFilePathAnnotation"/>.
         /// </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalMessageTextDetails(string text, IReadOnlyList<MessageTextAnnotation> annotations, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal InternalMessageTextDetails(string text, IList<MessageTextAnnotation> annotations, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Text = text;
             Annotations = annotations;
@@ -84,12 +84,12 @@ internal InternalMessageTextDetails()
         }
 
         /// <summary> The text data. </summary>
-        public string Text { get; }
+        public string Text { get; set; }
         /// <summary>
         /// A list of annotations associated with this text.
         /// Please note <see cref="MessageTextAnnotation"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="MessageTextFileCitationAnnotation"/> and <see cref="MessageTextFilePathAnnotation"/>.
         /// </summary>
-        public IReadOnlyList<MessageTextAnnotation> Annotations { get; }
+        public IList<MessageTextAnnotation> Annotations { get; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextFileCitationDetails.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextFileCitationDetails.cs
index 3bbdf07622ce..158100231c04 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextFileCitationDetails.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextFileCitationDetails.cs
@@ -49,7 +49,7 @@ internal partial class InternalMessageTextFileCitationDetails
         /// <param name="fileId"> The ID of the file associated with this citation. </param>
         /// <param name="quote"> The specific quote cited in the associated file. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> or <paramref name="quote"/> is null. </exception>
-        internal InternalMessageTextFileCitationDetails(string fileId, string quote)
+        public InternalMessageTextFileCitationDetails(string fileId, string quote)
         {
             Argument.AssertNotNull(fileId, nameof(fileId));
             Argument.AssertNotNull(quote, nameof(quote));
@@ -75,8 +75,8 @@ internal InternalMessageTextFileCitationDetails()
         }
 
         /// <summary> The ID of the file associated with this citation. </summary>
-        public string FileId { get; }
+        public string FileId { get; set; }
         /// <summary> The specific quote cited in the associated file. </summary>
-        public string Quote { get; }
+        public string Quote { get; set; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextFilePathDetails.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextFilePathDetails.cs
index 4b86d66be5a2..f56d8a2f2cce 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextFilePathDetails.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalMessageTextFilePathDetails.cs
@@ -48,7 +48,7 @@ internal partial class InternalMessageTextFilePathDetails
         /// <summary> Initializes a new instance of <see cref="InternalMessageTextFilePathDetails"/>. </summary>
         /// <param name="fileId"> The ID of the specific file that the citation is from. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
-        internal InternalMessageTextFilePathDetails(string fileId)
+        public InternalMessageTextFilePathDetails(string fileId)
         {
             Argument.AssertNotNull(fileId, nameof(fileId));
 
@@ -70,6 +70,6 @@ internal InternalMessageTextFilePathDetails()
         }
 
         /// <summary> The ID of the specific file that the citation is from. </summary>
-        public string FileId { get; }
+        public string FileId { get; set; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageAttachment.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageAttachment.Serialization.cs
new file mode 100644
index 000000000000..9a30136e04e3
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageAttachment.Serialization.cs
@@ -0,0 +1,172 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class MessageAttachment : IUtf8JsonSerializable, IJsonModel<MessageAttachment>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageAttachment>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageAttachment>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageAttachment>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageAttachment)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("file_id"u8);
+            writer.WriteStringValue(FileId);
+            writer.WritePropertyName("tools"u8);
+            writer.WriteStartArray();
+            foreach (var item in Tools)
+            {
+                if (item == null)
+                {
+                    writer.WriteNullValue();
+                    continue;
+                }
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item);
+#else
+                using (JsonDocument document = JsonDocument.Parse(item))
+                {
+                    JsonSerializer.Serialize(writer, document.RootElement);
+                }
+#endif
+            }
+            writer.WriteEndArray();
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageAttachment IJsonModel<MessageAttachment>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageAttachment>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageAttachment)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageAttachment(document.RootElement, options);
+        }
+
+        internal static MessageAttachment DeserializeMessageAttachment(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string fileId = default;
+            IList<BinaryData> tools = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_id"u8))
+                {
+                    fileId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("tools"u8))
+                {
+                    List<BinaryData> array = new List<BinaryData>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        if (item.ValueKind == JsonValueKind.Null)
+                        {
+                            array.Add(null);
+                        }
+                        else
+                        {
+                            array.Add(BinaryData.FromString(item.GetRawText()));
+                        }
+                    }
+                    tools = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new MessageAttachment(fileId, tools, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<MessageAttachment>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageAttachment>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageAttachment)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageAttachment IPersistableModel<MessageAttachment>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageAttachment>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageAttachment(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageAttachment)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageAttachment>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static MessageAttachment FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMessageAttachment(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageAttachment.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageAttachment.cs
new file mode 100644
index 000000000000..f905e2a52576
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageAttachment.cs
@@ -0,0 +1,120 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> This describes to which tools a file has been attached. </summary>
+    public partial class MessageAttachment
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="MessageAttachment"/>. </summary>
+        /// <param name="fileId"> The ID of the file to attach to the message. </param>
+        /// <param name="tools"> The tools to add to this file. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> or <paramref name="tools"/> is null. </exception>
+        public MessageAttachment(string fileId, IEnumerable<BinaryData> tools)
+        {
+            Argument.AssertNotNull(fileId, nameof(fileId));
+            Argument.AssertNotNull(tools, nameof(tools));
+
+            FileId = fileId;
+            Tools = tools.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageAttachment"/>. </summary>
+        /// <param name="fileId"> The ID of the file to attach to the message. </param>
+        /// <param name="tools"> The tools to add to this file. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal MessageAttachment(string fileId, IList<BinaryData> tools, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            FileId = fileId;
+            Tools = tools;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageAttachment"/> for deserialization. </summary>
+        internal MessageAttachment()
+        {
+        }
+
+        /// <summary> The ID of the file to attach to the message. </summary>
+        public string FileId { get; set; }
+        /// <summary>
+        /// The tools to add to this file.
+        /// <para>
+        /// To assign an object to the element of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="BinaryData"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public IList<BinaryData> Tools { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDelta.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDelta.Serialization.cs
new file mode 100644
index 000000000000..8fbd90a6237b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDelta.Serialization.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class MessageDelta : IUtf8JsonSerializable, IJsonModel<MessageDelta>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageDelta>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageDelta>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDelta>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDelta)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("role"u8);
+            writer.WriteStringValue(Role.ToString());
+            writer.WritePropertyName("content"u8);
+            writer.WriteStartArray();
+            foreach (var item in Content)
+            {
+                writer.WriteObjectValue(item, options);
+            }
+            writer.WriteEndArray();
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageDelta IJsonModel<MessageDelta>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDelta>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDelta)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageDelta(document.RootElement, options);
+        }
+
+        internal static MessageDelta DeserializeMessageDelta(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            MessageRole role = default;
+            IReadOnlyList<MessageDeltaContent> content = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("role"u8))
+                {
+                    role = new MessageRole(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("content"u8))
+                {
+                    List<MessageDeltaContent> array = new List<MessageDeltaContent>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(MessageDeltaContent.DeserializeMessageDeltaContent(item, options));
+                    }
+                    content = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new MessageDelta(role, content, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<MessageDelta>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDelta>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageDelta)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageDelta IPersistableModel<MessageDelta>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDelta>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageDelta(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageDelta)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageDelta>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static MessageDelta FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMessageDelta(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDelta.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDelta.cs
new file mode 100644
index 000000000000..ec114efcb09d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDelta.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents the typed 'delta' payload within a streaming message delta chunk. </summary>
+    public partial class MessageDelta
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="MessageDelta"/>. </summary>
+        /// <param name="role"> The entity that produced the message. </param>
+        /// <param name="content">
+        /// The content of the message as an array of text and/or images.
+        /// Please note <see cref="MessageDeltaContent"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="MessageDeltaImageFileContent"/> and <see cref="MessageDeltaTextContentObject"/>.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        internal MessageDelta(MessageRole role, IEnumerable<MessageDeltaContent> content)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            Role = role;
+            Content = content.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDelta"/>. </summary>
+        /// <param name="role"> The entity that produced the message. </param>
+        /// <param name="content">
+        /// The content of the message as an array of text and/or images.
+        /// Please note <see cref="MessageDeltaContent"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="MessageDeltaImageFileContent"/> and <see cref="MessageDeltaTextContentObject"/>.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal MessageDelta(MessageRole role, IReadOnlyList<MessageDeltaContent> content, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Role = role;
+            Content = content;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDelta"/> for deserialization. </summary>
+        internal MessageDelta()
+        {
+        }
+
+        /// <summary> The entity that produced the message. </summary>
+        public MessageRole Role { get; }
+        /// <summary>
+        /// The content of the message as an array of text and/or images.
+        /// Please note <see cref="MessageDeltaContent"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="MessageDeltaImageFileContent"/> and <see cref="MessageDeltaTextContentObject"/>.
+        /// </summary>
+        public IReadOnlyList<MessageDeltaContent> Content { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageFile.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaChunk.Serialization.cs
similarity index 61%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageFile.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaChunk.Serialization.cs
index c1c5a4d65a5f..0021de85df1f 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageFile.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaChunk.Serialization.cs
@@ -13,27 +13,25 @@
 
 namespace Azure.AI.OpenAI.Assistants
 {
-    public partial class MessageFile : IUtf8JsonSerializable, IJsonModel<MessageFile>
+    public partial class MessageDeltaChunk : IUtf8JsonSerializable, IJsonModel<MessageDeltaChunk>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageFile>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageDeltaChunk>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<MessageFile>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<MessageDeltaChunk>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<MessageFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaChunk>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(MessageFile)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(MessageDeltaChunk)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
             writer.WritePropertyName("id"u8);
             writer.WriteStringValue(Id);
             writer.WritePropertyName("object"u8);
-            writer.WriteStringValue(Object);
-            writer.WritePropertyName("created_at"u8);
-            writer.WriteNumberValue(CreatedAt, "U");
-            writer.WritePropertyName("message_id"u8);
-            writer.WriteStringValue(MessageId);
+            writer.WriteStringValue(Object.ToString());
+            writer.WritePropertyName("delta"u8);
+            writer.WriteObjectValue(Delta, options);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -52,19 +50,19 @@ void IJsonModel<MessageFile>.Write(Utf8JsonWriter writer, ModelReaderWriterOptio
             writer.WriteEndObject();
         }
 
-        MessageFile IJsonModel<MessageFile>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        MessageDeltaChunk IJsonModel<MessageDeltaChunk>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<MessageFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaChunk>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(MessageFile)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(MessageDeltaChunk)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMessageFile(document.RootElement, options);
+            return DeserializeMessageDeltaChunk(document.RootElement, options);
         }
 
-        internal static MessageFile DeserializeMessageFile(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static MessageDeltaChunk DeserializeMessageDeltaChunk(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -73,9 +71,8 @@ internal static MessageFile DeserializeMessageFile(JsonElement element, ModelRea
                 return null;
             }
             string id = default;
-            string @object = default;
-            DateTimeOffset createdAt = default;
-            string messageId = default;
+            MessageDeltaChunkObject @object = default;
+            MessageDelta delta = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -87,17 +84,12 @@ internal static MessageFile DeserializeMessageFile(JsonElement element, ModelRea
                 }
                 if (property.NameEquals("object"u8))
                 {
-                    @object = property.Value.GetString();
+                    @object = new MessageDeltaChunkObject(property.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("created_at"u8))
+                if (property.NameEquals("delta"u8))
                 {
-                    createdAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
-                    continue;
-                }
-                if (property.NameEquals("message_id"u8))
-                {
-                    messageId = property.Value.GetString();
+                    delta = MessageDelta.DeserializeMessageDelta(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
@@ -106,46 +98,46 @@ internal static MessageFile DeserializeMessageFile(JsonElement element, ModelRea
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new MessageFile(id, @object, createdAt, messageId, serializedAdditionalRawData);
+            return new MessageDeltaChunk(id, @object, delta, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<MessageFile>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<MessageDeltaChunk>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<MessageFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaChunk>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(MessageFile)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(MessageDeltaChunk)} does not support writing '{options.Format}' format.");
             }
         }
 
-        MessageFile IPersistableModel<MessageFile>.Create(BinaryData data, ModelReaderWriterOptions options)
+        MessageDeltaChunk IPersistableModel<MessageDeltaChunk>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<MessageFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaChunk>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMessageFile(document.RootElement, options);
+                        return DeserializeMessageDeltaChunk(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(MessageFile)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(MessageDeltaChunk)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<MessageFile>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<MessageDeltaChunk>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
         /// <param name="response"> The response to deserialize the model from. </param>
-        internal static MessageFile FromResponse(Response response)
+        internal static MessageDeltaChunk FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMessageFile(document.RootElement);
+            return DeserializeMessageDeltaChunk(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageFile.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaChunk.cs
similarity index 56%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageFile.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaChunk.cs
index a33691868926..3a8984a1a101 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageFile.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaChunk.cs
@@ -10,8 +10,8 @@
 
 namespace Azure.AI.OpenAI.Assistants
 {
-    /// <summary> Information about a file attached to an assistant thread message. </summary>
-    public partial class MessageFile
+    /// <summary> Represents a message delta i.e. any changed fields on a message during streaming. </summary>
+    public partial class MessageDeltaChunk
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,47 +45,43 @@ public partial class MessageFile
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="MessageFile"/>. </summary>
-        /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
-        /// <param name="createdAt"> The Unix timestamp, in seconds, representing when this object was created. </param>
-        /// <param name="messageId"> The ID of the message that this file is attached to. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="id"/> or <paramref name="messageId"/> is null. </exception>
-        internal MessageFile(string id, DateTimeOffset createdAt, string messageId)
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaChunk"/>. </summary>
+        /// <param name="id"> The identifier of the message, which can be referenced in API endpoints. </param>
+        /// <param name="delta"> The delta containing the fields that have changed on the Message. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> or <paramref name="delta"/> is null. </exception>
+        internal MessageDeltaChunk(string id, MessageDelta delta)
         {
             Argument.AssertNotNull(id, nameof(id));
-            Argument.AssertNotNull(messageId, nameof(messageId));
+            Argument.AssertNotNull(delta, nameof(delta));
 
             Id = id;
-            CreatedAt = createdAt;
-            MessageId = messageId;
+            Delta = delta;
         }
 
-        /// <summary> Initializes a new instance of <see cref="MessageFile"/>. </summary>
-        /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
-        /// <param name="object"> The object type, which is always 'thread.message.file'. </param>
-        /// <param name="createdAt"> The Unix timestamp, in seconds, representing when this object was created. </param>
-        /// <param name="messageId"> The ID of the message that this file is attached to. </param>
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaChunk"/>. </summary>
+        /// <param name="id"> The identifier of the message, which can be referenced in API endpoints. </param>
+        /// <param name="object"> The object type, which is always `thread.message.delta`. </param>
+        /// <param name="delta"> The delta containing the fields that have changed on the Message. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MessageFile(string id, string @object, DateTimeOffset createdAt, string messageId, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal MessageDeltaChunk(string id, MessageDeltaChunkObject @object, MessageDelta delta, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Id = id;
             Object = @object;
-            CreatedAt = createdAt;
-            MessageId = messageId;
+            Delta = delta;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="MessageFile"/> for deserialization. </summary>
-        internal MessageFile()
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaChunk"/> for deserialization. </summary>
+        internal MessageDeltaChunk()
         {
         }
 
-        /// <summary> The identifier, which can be referenced in API endpoints. </summary>
+        /// <summary> The identifier of the message, which can be referenced in API endpoints. </summary>
         public string Id { get; }
+        /// <summary> The object type, which is always `thread.message.delta`. </summary>
+        public MessageDeltaChunkObject Object { get; } = MessageDeltaChunkObject.ThreadMessageDelta;
 
-        /// <summary> The Unix timestamp, in seconds, representing when this object was created. </summary>
-        public DateTimeOffset CreatedAt { get; }
-        /// <summary> The ID of the message that this file is attached to. </summary>
-        public string MessageId { get; }
+        /// <summary> The delta containing the fields that have changed on the Message. </summary>
+        public MessageDelta Delta { get; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaChunkObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaChunkObject.cs
new file mode 100644
index 000000000000..b8b58471b5b6
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaChunkObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The MessageDeltaChunk_object. </summary>
+    public readonly partial struct MessageDeltaChunkObject : IEquatable<MessageDeltaChunkObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaChunkObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public MessageDeltaChunkObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ThreadMessageDeltaValue = "thread.message.delta";
+
+        /// <summary> thread.message.delta. </summary>
+        public static MessageDeltaChunkObject ThreadMessageDelta { get; } = new MessageDeltaChunkObject(ThreadMessageDeltaValue);
+        /// <summary> Determines if two <see cref="MessageDeltaChunkObject"/> values are the same. </summary>
+        public static bool operator ==(MessageDeltaChunkObject left, MessageDeltaChunkObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="MessageDeltaChunkObject"/> values are not the same. </summary>
+        public static bool operator !=(MessageDeltaChunkObject left, MessageDeltaChunkObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="MessageDeltaChunkObject"/>. </summary>
+        public static implicit operator MessageDeltaChunkObject(string value) => new MessageDeltaChunkObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is MessageDeltaChunkObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(MessageDeltaChunkObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaContent.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaContent.Serialization.cs
new file mode 100644
index 000000000000..772c6f38dba4
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaContent.Serialization.cs
@@ -0,0 +1,129 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    [PersistableModelProxy(typeof(UnknownMessageDeltaContent))]
+    public partial class MessageDeltaContent : IUtf8JsonSerializable, IJsonModel<MessageDeltaContent>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageDeltaContent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageDeltaContent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaContent>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaContent)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageDeltaContent IJsonModel<MessageDeltaContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaContent>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaContent)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageDeltaContent(document.RootElement, options);
+        }
+
+        internal static MessageDeltaContent DeserializeMessageDeltaContent(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "image_file": return MessageDeltaImageFileContent.DeserializeMessageDeltaImageFileContent(element, options);
+                    case "text": return MessageDeltaTextContentObject.DeserializeMessageDeltaTextContentObject(element, options);
+                }
+            }
+            return UnknownMessageDeltaContent.DeserializeUnknownMessageDeltaContent(element, options);
+        }
+
+        BinaryData IPersistableModel<MessageDeltaContent>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaContent>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaContent)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageDeltaContent IPersistableModel<MessageDeltaContent>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaContent>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageDeltaContent(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaContent)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageDeltaContent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static MessageDeltaContent FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMessageDeltaContent(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaContent.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaContent.cs
new file mode 100644
index 000000000000..454d8e437f56
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaContent.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary>
+    /// The abstract base representation of a partial streamed message content payload.
+    /// Please note <see cref="MessageDeltaContent"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="MessageDeltaImageFileContent"/> and <see cref="MessageDeltaTextContentObject"/>.
+    /// </summary>
+    public abstract partial class MessageDeltaContent
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaContent"/>. </summary>
+        /// <param name="index"> The index of the content part of the message. </param>
+        protected MessageDeltaContent(int index)
+        {
+            Index = index;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaContent"/>. </summary>
+        /// <param name="index"> The index of the content part of the message. </param>
+        /// <param name="type"> The type of content for this content part. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal MessageDeltaContent(int index, string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Index = index;
+            Type = type;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaContent"/> for deserialization. </summary>
+        internal MessageDeltaContent()
+        {
+        }
+
+        /// <summary> The index of the content part of the message. </summary>
+        public int Index { get; }
+        /// <summary> The type of content for this content part. </summary>
+        internal string Type { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaImageFileContent.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaImageFileContent.Serialization.cs
new file mode 100644
index 000000000000..b5fb1b24e1d1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaImageFileContent.Serialization.cs
@@ -0,0 +1,158 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class MessageDeltaImageFileContent : IUtf8JsonSerializable, IJsonModel<MessageDeltaImageFileContent>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageDeltaImageFileContent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageDeltaImageFileContent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaImageFileContent>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaImageFileContent)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(ImageFile))
+            {
+                writer.WritePropertyName("image_file"u8);
+                writer.WriteObjectValue(ImageFile, options);
+            }
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageDeltaImageFileContent IJsonModel<MessageDeltaImageFileContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaImageFileContent>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaImageFileContent)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageDeltaImageFileContent(document.RootElement, options);
+        }
+
+        internal static MessageDeltaImageFileContent DeserializeMessageDeltaImageFileContent(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            MessageDeltaImageFileContentObject imageFile = default;
+            int index = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("image_file"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    imageFile = MessageDeltaImageFileContentObject.DeserializeMessageDeltaImageFileContentObject(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new MessageDeltaImageFileContent(index, type, serializedAdditionalRawData, imageFile);
+        }
+
+        BinaryData IPersistableModel<MessageDeltaImageFileContent>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaImageFileContent>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaImageFileContent)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageDeltaImageFileContent IPersistableModel<MessageDeltaImageFileContent>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaImageFileContent>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageDeltaImageFileContent(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaImageFileContent)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageDeltaImageFileContent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new MessageDeltaImageFileContent FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMessageDeltaImageFileContent(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaImageFileContent.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaImageFileContent.cs
new file mode 100644
index 000000000000..212421c7c2e7
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaImageFileContent.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents a streamed image file content part within a streaming message delta chunk. </summary>
+    public partial class MessageDeltaImageFileContent : MessageDeltaContent
+    {
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaImageFileContent"/>. </summary>
+        /// <param name="index"> The index of the content part of the message. </param>
+        internal MessageDeltaImageFileContent(int index) : base(index)
+        {
+            Type = "image_file";
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaImageFileContent"/>. </summary>
+        /// <param name="index"> The index of the content part of the message. </param>
+        /// <param name="type"> The type of content for this content part. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="imageFile"> The image_file data. </param>
+        internal MessageDeltaImageFileContent(int index, string type, IDictionary<string, BinaryData> serializedAdditionalRawData, MessageDeltaImageFileContentObject imageFile) : base(index, type, serializedAdditionalRawData)
+        {
+            ImageFile = imageFile;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaImageFileContent"/> for deserialization. </summary>
+        internal MessageDeltaImageFileContent()
+        {
+        }
+
+        /// <summary> The image_file data. </summary>
+        public MessageDeltaImageFileContentObject ImageFile { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaImageFileContentObject.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaImageFileContentObject.Serialization.cs
new file mode 100644
index 000000000000..058851b1fc5e
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaImageFileContentObject.Serialization.cs
@@ -0,0 +1,138 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class MessageDeltaImageFileContentObject : IUtf8JsonSerializable, IJsonModel<MessageDeltaImageFileContentObject>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageDeltaImageFileContentObject>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageDeltaImageFileContentObject>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaImageFileContentObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaImageFileContentObject)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(FileId))
+            {
+                writer.WritePropertyName("file_id"u8);
+                writer.WriteStringValue(FileId);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageDeltaImageFileContentObject IJsonModel<MessageDeltaImageFileContentObject>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaImageFileContentObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaImageFileContentObject)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageDeltaImageFileContentObject(document.RootElement, options);
+        }
+
+        internal static MessageDeltaImageFileContentObject DeserializeMessageDeltaImageFileContentObject(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string fileId = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_id"u8))
+                {
+                    fileId = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new MessageDeltaImageFileContentObject(fileId, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<MessageDeltaImageFileContentObject>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaImageFileContentObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaImageFileContentObject)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageDeltaImageFileContentObject IPersistableModel<MessageDeltaImageFileContentObject>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaImageFileContentObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageDeltaImageFileContentObject(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaImageFileContentObject)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageDeltaImageFileContentObject>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static MessageDeltaImageFileContentObject FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMessageDeltaImageFileContentObject(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaImageFileContentObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaImageFileContentObject.cs
new file mode 100644
index 000000000000..592b0e9cef60
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaImageFileContentObject.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents the 'image_file' payload within streaming image file content. </summary>
+    public partial class MessageDeltaImageFileContentObject
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaImageFileContentObject"/>. </summary>
+        internal MessageDeltaImageFileContentObject()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaImageFileContentObject"/>. </summary>
+        /// <param name="fileId"> The file ID of the image in the message content. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal MessageDeltaImageFileContentObject(string fileId, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            FileId = fileId;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The file ID of the image in the message content. </summary>
+        public string FileId { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextAnnotation.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextAnnotation.Serialization.cs
new file mode 100644
index 000000000000..d8cce0302222
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextAnnotation.Serialization.cs
@@ -0,0 +1,129 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    [PersistableModelProxy(typeof(UnknownMessageDeltaTextAnnotation))]
+    public partial class MessageDeltaTextAnnotation : IUtf8JsonSerializable, IJsonModel<MessageDeltaTextAnnotation>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageDeltaTextAnnotation>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageDeltaTextAnnotation>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextAnnotation)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageDeltaTextAnnotation IJsonModel<MessageDeltaTextAnnotation>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextAnnotation)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageDeltaTextAnnotation(document.RootElement, options);
+        }
+
+        internal static MessageDeltaTextAnnotation DeserializeMessageDeltaTextAnnotation(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "file_citation": return MessageDeltaTextFileCitationAnnotationObject.DeserializeMessageDeltaTextFileCitationAnnotationObject(element, options);
+                    case "file_path": return MessageDeltaTextFilePathAnnotationObject.DeserializeMessageDeltaTextFilePathAnnotationObject(element, options);
+                }
+            }
+            return UnknownMessageDeltaTextAnnotation.DeserializeUnknownMessageDeltaTextAnnotation(element, options);
+        }
+
+        BinaryData IPersistableModel<MessageDeltaTextAnnotation>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextAnnotation)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageDeltaTextAnnotation IPersistableModel<MessageDeltaTextAnnotation>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageDeltaTextAnnotation(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextAnnotation)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageDeltaTextAnnotation>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static MessageDeltaTextAnnotation FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMessageDeltaTextAnnotation(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextAnnotation.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextAnnotation.cs
new file mode 100644
index 000000000000..2171bf6148cb
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextAnnotation.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary>
+    /// The abstract base representation of a streamed text content part's text annotation.
+    /// Please note <see cref="MessageDeltaTextAnnotation"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="MessageDeltaTextFileCitationAnnotationObject"/> and <see cref="MessageDeltaTextFilePathAnnotationObject"/>.
+    /// </summary>
+    public abstract partial class MessageDeltaTextAnnotation
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextAnnotation"/>. </summary>
+        /// <param name="index"> The index of the annotation within a text content part. </param>
+        protected MessageDeltaTextAnnotation(int index)
+        {
+            Index = index;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextAnnotation"/>. </summary>
+        /// <param name="index"> The index of the annotation within a text content part. </param>
+        /// <param name="type"> The type of the text content annotation. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal MessageDeltaTextAnnotation(int index, string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Index = index;
+            Type = type;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextAnnotation"/> for deserialization. </summary>
+        internal MessageDeltaTextAnnotation()
+        {
+        }
+
+        /// <summary> The index of the annotation within a text content part. </summary>
+        public int Index { get; }
+        /// <summary> The type of the text content annotation. </summary>
+        internal string Type { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextContent.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextContent.Serialization.cs
new file mode 100644
index 000000000000..49e3cab4ca65
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextContent.Serialization.cs
@@ -0,0 +1,163 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class MessageDeltaTextContent : IUtf8JsonSerializable, IJsonModel<MessageDeltaTextContent>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageDeltaTextContent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageDeltaTextContent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextContent>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextContent)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Value))
+            {
+                writer.WritePropertyName("value"u8);
+                writer.WriteStringValue(Value);
+            }
+            if (Optional.IsCollectionDefined(Annotations))
+            {
+                writer.WritePropertyName("annotations"u8);
+                writer.WriteStartArray();
+                foreach (var item in Annotations)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageDeltaTextContent IJsonModel<MessageDeltaTextContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextContent>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextContent)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageDeltaTextContent(document.RootElement, options);
+        }
+
+        internal static MessageDeltaTextContent DeserializeMessageDeltaTextContent(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string value = default;
+            IReadOnlyList<MessageDeltaTextAnnotation> annotations = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("value"u8))
+                {
+                    value = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("annotations"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<MessageDeltaTextAnnotation> array = new List<MessageDeltaTextAnnotation>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(MessageDeltaTextAnnotation.DeserializeMessageDeltaTextAnnotation(item, options));
+                    }
+                    annotations = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new MessageDeltaTextContent(value, annotations ?? new ChangeTrackingList<MessageDeltaTextAnnotation>(), serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<MessageDeltaTextContent>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextContent>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextContent)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageDeltaTextContent IPersistableModel<MessageDeltaTextContent>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextContent>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageDeltaTextContent(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextContent)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageDeltaTextContent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static MessageDeltaTextContent FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMessageDeltaTextContent(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextContent.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextContent.cs
new file mode 100644
index 000000000000..15c4cac2d7ca
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextContent.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents the data of a streamed text content part within a streaming message delta chunk. </summary>
+    public partial class MessageDeltaTextContent
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextContent"/>. </summary>
+        internal MessageDeltaTextContent()
+        {
+            Annotations = new ChangeTrackingList<MessageDeltaTextAnnotation>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextContent"/>. </summary>
+        /// <param name="value"> The data that makes up the text. </param>
+        /// <param name="annotations">
+        /// Annotations for the text.
+        /// Please note <see cref="MessageDeltaTextAnnotation"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="MessageDeltaTextFileCitationAnnotationObject"/> and <see cref="MessageDeltaTextFilePathAnnotationObject"/>.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal MessageDeltaTextContent(string value, IReadOnlyList<MessageDeltaTextAnnotation> annotations, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Value = value;
+            Annotations = annotations;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The data that makes up the text. </summary>
+        public string Value { get; }
+        /// <summary>
+        /// Annotations for the text.
+        /// Please note <see cref="MessageDeltaTextAnnotation"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="MessageDeltaTextFileCitationAnnotationObject"/> and <see cref="MessageDeltaTextFilePathAnnotationObject"/>.
+        /// </summary>
+        public IReadOnlyList<MessageDeltaTextAnnotation> Annotations { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextContentObject.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextContentObject.Serialization.cs
new file mode 100644
index 000000000000..7261ccd92cb4
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextContentObject.Serialization.cs
@@ -0,0 +1,158 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class MessageDeltaTextContentObject : IUtf8JsonSerializable, IJsonModel<MessageDeltaTextContentObject>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageDeltaTextContentObject>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageDeltaTextContentObject>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextContentObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextContentObject)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Text))
+            {
+                writer.WritePropertyName("text"u8);
+                writer.WriteObjectValue(Text, options);
+            }
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageDeltaTextContentObject IJsonModel<MessageDeltaTextContentObject>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextContentObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextContentObject)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageDeltaTextContentObject(document.RootElement, options);
+        }
+
+        internal static MessageDeltaTextContentObject DeserializeMessageDeltaTextContentObject(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            MessageDeltaTextContent text = default;
+            int index = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("text"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    text = MessageDeltaTextContent.DeserializeMessageDeltaTextContent(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new MessageDeltaTextContentObject(index, type, serializedAdditionalRawData, text);
+        }
+
+        BinaryData IPersistableModel<MessageDeltaTextContentObject>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextContentObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextContentObject)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageDeltaTextContentObject IPersistableModel<MessageDeltaTextContentObject>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextContentObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageDeltaTextContentObject(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextContentObject)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageDeltaTextContentObject>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new MessageDeltaTextContentObject FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMessageDeltaTextContentObject(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextContentObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextContentObject.cs
new file mode 100644
index 000000000000..54247431988a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextContentObject.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents a streamed text content part within a streaming message delta chunk. </summary>
+    public partial class MessageDeltaTextContentObject : MessageDeltaContent
+    {
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextContentObject"/>. </summary>
+        /// <param name="index"> The index of the content part of the message. </param>
+        internal MessageDeltaTextContentObject(int index) : base(index)
+        {
+            Type = "text";
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextContentObject"/>. </summary>
+        /// <param name="index"> The index of the content part of the message. </param>
+        /// <param name="type"> The type of content for this content part. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="text"> The text content details. </param>
+        internal MessageDeltaTextContentObject(int index, string type, IDictionary<string, BinaryData> serializedAdditionalRawData, MessageDeltaTextContent text) : base(index, type, serializedAdditionalRawData)
+        {
+            Text = text;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextContentObject"/> for deserialization. </summary>
+        internal MessageDeltaTextContentObject()
+        {
+        }
+
+        /// <summary> The text content details. </summary>
+        public MessageDeltaTextContent Text { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFileCitationAnnotation.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFileCitationAnnotation.Serialization.cs
new file mode 100644
index 000000000000..155551a551c7
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFileCitationAnnotation.Serialization.cs
@@ -0,0 +1,149 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class MessageDeltaTextFileCitationAnnotation : IUtf8JsonSerializable, IJsonModel<MessageDeltaTextFileCitationAnnotation>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageDeltaTextFileCitationAnnotation>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageDeltaTextFileCitationAnnotation>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFileCitationAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextFileCitationAnnotation)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(FileId))
+            {
+                writer.WritePropertyName("file_id"u8);
+                writer.WriteStringValue(FileId);
+            }
+            if (Optional.IsDefined(Quote))
+            {
+                writer.WritePropertyName("quote"u8);
+                writer.WriteStringValue(Quote);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageDeltaTextFileCitationAnnotation IJsonModel<MessageDeltaTextFileCitationAnnotation>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFileCitationAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextFileCitationAnnotation)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageDeltaTextFileCitationAnnotation(document.RootElement, options);
+        }
+
+        internal static MessageDeltaTextFileCitationAnnotation DeserializeMessageDeltaTextFileCitationAnnotation(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string fileId = default;
+            string quote = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_id"u8))
+                {
+                    fileId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("quote"u8))
+                {
+                    quote = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new MessageDeltaTextFileCitationAnnotation(fileId, quote, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<MessageDeltaTextFileCitationAnnotation>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFileCitationAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextFileCitationAnnotation)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageDeltaTextFileCitationAnnotation IPersistableModel<MessageDeltaTextFileCitationAnnotation>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFileCitationAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageDeltaTextFileCitationAnnotation(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextFileCitationAnnotation)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageDeltaTextFileCitationAnnotation>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static MessageDeltaTextFileCitationAnnotation FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMessageDeltaTextFileCitationAnnotation(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFileCitationAnnotation.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFileCitationAnnotation.cs
new file mode 100644
index 000000000000..6f2fd703c231
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFileCitationAnnotation.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents the data of a streamed file citation as applied to a streaming text content part. </summary>
+    public partial class MessageDeltaTextFileCitationAnnotation
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextFileCitationAnnotation"/>. </summary>
+        internal MessageDeltaTextFileCitationAnnotation()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextFileCitationAnnotation"/>. </summary>
+        /// <param name="fileId"> The ID of the specific file the citation is from. </param>
+        /// <param name="quote"> The specific quote in the cited file. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal MessageDeltaTextFileCitationAnnotation(string fileId, string quote, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            FileId = fileId;
+            Quote = quote;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The ID of the specific file the citation is from. </summary>
+        public string FileId { get; }
+        /// <summary> The specific quote in the cited file. </summary>
+        public string Quote { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFileCitationAnnotationObject.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFileCitationAnnotationObject.Serialization.cs
new file mode 100644
index 000000000000..9fde82d67e2e
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFileCitationAnnotationObject.Serialization.cs
@@ -0,0 +1,206 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class MessageDeltaTextFileCitationAnnotationObject : IUtf8JsonSerializable, IJsonModel<MessageDeltaTextFileCitationAnnotationObject>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageDeltaTextFileCitationAnnotationObject>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageDeltaTextFileCitationAnnotationObject>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFileCitationAnnotationObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextFileCitationAnnotationObject)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(FileCitation))
+            {
+                writer.WritePropertyName("file_citation"u8);
+                writer.WriteObjectValue(FileCitation, options);
+            }
+            if (Optional.IsDefined(Text))
+            {
+                writer.WritePropertyName("text"u8);
+                writer.WriteStringValue(Text);
+            }
+            if (Optional.IsDefined(StartIndex))
+            {
+                writer.WritePropertyName("start_index"u8);
+                writer.WriteNumberValue(StartIndex.Value);
+            }
+            if (Optional.IsDefined(EndIndex))
+            {
+                writer.WritePropertyName("end_index"u8);
+                writer.WriteNumberValue(EndIndex.Value);
+            }
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageDeltaTextFileCitationAnnotationObject IJsonModel<MessageDeltaTextFileCitationAnnotationObject>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFileCitationAnnotationObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextFileCitationAnnotationObject)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageDeltaTextFileCitationAnnotationObject(document.RootElement, options);
+        }
+
+        internal static MessageDeltaTextFileCitationAnnotationObject DeserializeMessageDeltaTextFileCitationAnnotationObject(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            MessageDeltaTextFileCitationAnnotation fileCitation = default;
+            string text = default;
+            int? startIndex = default;
+            int? endIndex = default;
+            int index = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_citation"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    fileCitation = MessageDeltaTextFileCitationAnnotation.DeserializeMessageDeltaTextFileCitationAnnotation(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("text"u8))
+                {
+                    text = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("start_index"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    startIndex = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("end_index"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    endIndex = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new MessageDeltaTextFileCitationAnnotationObject(
+                index,
+                type,
+                serializedAdditionalRawData,
+                fileCitation,
+                text,
+                startIndex,
+                endIndex);
+        }
+
+        BinaryData IPersistableModel<MessageDeltaTextFileCitationAnnotationObject>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFileCitationAnnotationObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextFileCitationAnnotationObject)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageDeltaTextFileCitationAnnotationObject IPersistableModel<MessageDeltaTextFileCitationAnnotationObject>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFileCitationAnnotationObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageDeltaTextFileCitationAnnotationObject(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextFileCitationAnnotationObject)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageDeltaTextFileCitationAnnotationObject>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new MessageDeltaTextFileCitationAnnotationObject FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMessageDeltaTextFileCitationAnnotationObject(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFileCitationAnnotationObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFileCitationAnnotationObject.cs
new file mode 100644
index 000000000000..1a67dafe8dfa
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFileCitationAnnotationObject.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents a streamed file citation applied to a streaming text content part. </summary>
+    public partial class MessageDeltaTextFileCitationAnnotationObject : MessageDeltaTextAnnotation
+    {
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextFileCitationAnnotationObject"/>. </summary>
+        /// <param name="index"> The index of the annotation within a text content part. </param>
+        internal MessageDeltaTextFileCitationAnnotationObject(int index) : base(index)
+        {
+            Type = "file_citation";
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextFileCitationAnnotationObject"/>. </summary>
+        /// <param name="index"> The index of the annotation within a text content part. </param>
+        /// <param name="type"> The type of the text content annotation. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="fileCitation"> The file citation information. </param>
+        /// <param name="text"> The text in the message content that needs to be replaced. </param>
+        /// <param name="startIndex"> The start index of this annotation in the content text. </param>
+        /// <param name="endIndex"> The end index of this annotation in the content text. </param>
+        internal MessageDeltaTextFileCitationAnnotationObject(int index, string type, IDictionary<string, BinaryData> serializedAdditionalRawData, MessageDeltaTextFileCitationAnnotation fileCitation, string text, int? startIndex, int? endIndex) : base(index, type, serializedAdditionalRawData)
+        {
+            FileCitation = fileCitation;
+            Text = text;
+            StartIndex = startIndex;
+            EndIndex = endIndex;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextFileCitationAnnotationObject"/> for deserialization. </summary>
+        internal MessageDeltaTextFileCitationAnnotationObject()
+        {
+        }
+
+        /// <summary> The file citation information. </summary>
+        public MessageDeltaTextFileCitationAnnotation FileCitation { get; }
+        /// <summary> The text in the message content that needs to be replaced. </summary>
+        public string Text { get; }
+        /// <summary> The start index of this annotation in the content text. </summary>
+        public int? StartIndex { get; }
+        /// <summary> The end index of this annotation in the content text. </summary>
+        public int? EndIndex { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFilePathAnnotation.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFilePathAnnotation.Serialization.cs
new file mode 100644
index 000000000000..dcbbf8904dde
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFilePathAnnotation.Serialization.cs
@@ -0,0 +1,138 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class MessageDeltaTextFilePathAnnotation : IUtf8JsonSerializable, IJsonModel<MessageDeltaTextFilePathAnnotation>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageDeltaTextFilePathAnnotation>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageDeltaTextFilePathAnnotation>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFilePathAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextFilePathAnnotation)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(FileId))
+            {
+                writer.WritePropertyName("file_id"u8);
+                writer.WriteStringValue(FileId);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageDeltaTextFilePathAnnotation IJsonModel<MessageDeltaTextFilePathAnnotation>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFilePathAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextFilePathAnnotation)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageDeltaTextFilePathAnnotation(document.RootElement, options);
+        }
+
+        internal static MessageDeltaTextFilePathAnnotation DeserializeMessageDeltaTextFilePathAnnotation(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string fileId = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_id"u8))
+                {
+                    fileId = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new MessageDeltaTextFilePathAnnotation(fileId, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<MessageDeltaTextFilePathAnnotation>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFilePathAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextFilePathAnnotation)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageDeltaTextFilePathAnnotation IPersistableModel<MessageDeltaTextFilePathAnnotation>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFilePathAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageDeltaTextFilePathAnnotation(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextFilePathAnnotation)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageDeltaTextFilePathAnnotation>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static MessageDeltaTextFilePathAnnotation FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMessageDeltaTextFilePathAnnotation(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFilePathAnnotation.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFilePathAnnotation.cs
new file mode 100644
index 000000000000..dbdd8626dc56
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFilePathAnnotation.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents the data of a streamed file path annotation as applied to a streaming text content part. </summary>
+    public partial class MessageDeltaTextFilePathAnnotation
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextFilePathAnnotation"/>. </summary>
+        internal MessageDeltaTextFilePathAnnotation()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextFilePathAnnotation"/>. </summary>
+        /// <param name="fileId"> The file ID for the annotation. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal MessageDeltaTextFilePathAnnotation(string fileId, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            FileId = fileId;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The file ID for the annotation. </summary>
+        public string FileId { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFilePathAnnotationObject.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFilePathAnnotationObject.Serialization.cs
new file mode 100644
index 000000000000..2acabd3d49c5
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFilePathAnnotationObject.Serialization.cs
@@ -0,0 +1,206 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class MessageDeltaTextFilePathAnnotationObject : IUtf8JsonSerializable, IJsonModel<MessageDeltaTextFilePathAnnotationObject>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageDeltaTextFilePathAnnotationObject>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageDeltaTextFilePathAnnotationObject>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFilePathAnnotationObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextFilePathAnnotationObject)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(FilePath))
+            {
+                writer.WritePropertyName("file_path"u8);
+                writer.WriteObjectValue(FilePath, options);
+            }
+            if (Optional.IsDefined(StartIndex))
+            {
+                writer.WritePropertyName("start_index"u8);
+                writer.WriteNumberValue(StartIndex.Value);
+            }
+            if (Optional.IsDefined(EndIndex))
+            {
+                writer.WritePropertyName("end_index"u8);
+                writer.WriteNumberValue(EndIndex.Value);
+            }
+            if (Optional.IsDefined(Text))
+            {
+                writer.WritePropertyName("text"u8);
+                writer.WriteStringValue(Text);
+            }
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageDeltaTextFilePathAnnotationObject IJsonModel<MessageDeltaTextFilePathAnnotationObject>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFilePathAnnotationObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextFilePathAnnotationObject)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageDeltaTextFilePathAnnotationObject(document.RootElement, options);
+        }
+
+        internal static MessageDeltaTextFilePathAnnotationObject DeserializeMessageDeltaTextFilePathAnnotationObject(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            MessageDeltaTextFilePathAnnotation filePath = default;
+            int? startIndex = default;
+            int? endIndex = default;
+            string text = default;
+            int index = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_path"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    filePath = MessageDeltaTextFilePathAnnotation.DeserializeMessageDeltaTextFilePathAnnotation(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("start_index"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    startIndex = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("end_index"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    endIndex = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("text"u8))
+                {
+                    text = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new MessageDeltaTextFilePathAnnotationObject(
+                index,
+                type,
+                serializedAdditionalRawData,
+                filePath,
+                startIndex,
+                endIndex,
+                text);
+        }
+
+        BinaryData IPersistableModel<MessageDeltaTextFilePathAnnotationObject>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFilePathAnnotationObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextFilePathAnnotationObject)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageDeltaTextFilePathAnnotationObject IPersistableModel<MessageDeltaTextFilePathAnnotationObject>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextFilePathAnnotationObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageDeltaTextFilePathAnnotationObject(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextFilePathAnnotationObject)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageDeltaTextFilePathAnnotationObject>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new MessageDeltaTextFilePathAnnotationObject FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMessageDeltaTextFilePathAnnotationObject(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFilePathAnnotationObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFilePathAnnotationObject.cs
new file mode 100644
index 000000000000..85df4f20c57d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageDeltaTextFilePathAnnotationObject.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents a streamed file path annotation applied to a streaming text content part. </summary>
+    public partial class MessageDeltaTextFilePathAnnotationObject : MessageDeltaTextAnnotation
+    {
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextFilePathAnnotationObject"/>. </summary>
+        /// <param name="index"> The index of the annotation within a text content part. </param>
+        internal MessageDeltaTextFilePathAnnotationObject(int index) : base(index)
+        {
+            Type = "file_path";
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextFilePathAnnotationObject"/>. </summary>
+        /// <param name="index"> The index of the annotation within a text content part. </param>
+        /// <param name="type"> The type of the text content annotation. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="filePath"> The file path information. </param>
+        /// <param name="startIndex"> The start index of this annotation in the content text. </param>
+        /// <param name="endIndex"> The end index of this annotation in the content text. </param>
+        /// <param name="text"> The text in the message content that needs to be replaced. </param>
+        internal MessageDeltaTextFilePathAnnotationObject(int index, string type, IDictionary<string, BinaryData> serializedAdditionalRawData, MessageDeltaTextFilePathAnnotation filePath, int? startIndex, int? endIndex, string text) : base(index, type, serializedAdditionalRawData)
+        {
+            FilePath = filePath;
+            StartIndex = startIndex;
+            EndIndex = endIndex;
+            Text = text;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageDeltaTextFilePathAnnotationObject"/> for deserialization. </summary>
+        internal MessageDeltaTextFilePathAnnotationObject()
+        {
+        }
+
+        /// <summary> The file path information. </summary>
+        public MessageDeltaTextFilePathAnnotation FilePath { get; }
+        /// <summary> The start index of this annotation in the content text. </summary>
+        public int? StartIndex { get; }
+        /// <summary> The end index of this annotation in the content text. </summary>
+        public int? EndIndex { get; }
+        /// <summary> The text in the message content that needs to be replaced. </summary>
+        public string Text { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageImageFileContent.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageImageFileContent.cs
index 8997ff05b177..7e252658ea5e 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageImageFileContent.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageImageFileContent.cs
@@ -16,7 +16,7 @@ public partial class MessageImageFileContent : MessageContent
         /// <summary> Initializes a new instance of <see cref="MessageImageFileContent"/>. </summary>
         /// <param name="internalDetails"> The image file for this thread message content item. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="internalDetails"/> is null. </exception>
-        internal MessageImageFileContent(InternalMessageImageFileDetails internalDetails)
+        public MessageImageFileContent(InternalMessageImageFileDetails internalDetails)
         {
             Argument.AssertNotNull(internalDetails, nameof(internalDetails));
 
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageIncompleteDetails.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageIncompleteDetails.Serialization.cs
new file mode 100644
index 000000000000..bee6aeb930a2
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageIncompleteDetails.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class MessageIncompleteDetails : IUtf8JsonSerializable, IJsonModel<MessageIncompleteDetails>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageIncompleteDetails>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageIncompleteDetails>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageIncompleteDetails>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageIncompleteDetails)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("reason"u8);
+            writer.WriteStringValue(Reason.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageIncompleteDetails IJsonModel<MessageIncompleteDetails>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageIncompleteDetails>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageIncompleteDetails)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageIncompleteDetails(document.RootElement, options);
+        }
+
+        internal static MessageIncompleteDetails DeserializeMessageIncompleteDetails(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            MessageIncompleteDetailsReason reason = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("reason"u8))
+                {
+                    reason = new MessageIncompleteDetailsReason(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new MessageIncompleteDetails(reason, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<MessageIncompleteDetails>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageIncompleteDetails>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageIncompleteDetails)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageIncompleteDetails IPersistableModel<MessageIncompleteDetails>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageIncompleteDetails>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageIncompleteDetails(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageIncompleteDetails)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageIncompleteDetails>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static MessageIncompleteDetails FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMessageIncompleteDetails(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageIncompleteDetails.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageIncompleteDetails.cs
new file mode 100644
index 000000000000..335c1009db7f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageIncompleteDetails.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Information providing additional detail about a message entering an incomplete status. </summary>
+    public partial class MessageIncompleteDetails
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="MessageIncompleteDetails"/>. </summary>
+        /// <param name="reason"> The provided reason describing why the message was marked as incomplete. </param>
+        public MessageIncompleteDetails(MessageIncompleteDetailsReason reason)
+        {
+            Reason = reason;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageIncompleteDetails"/>. </summary>
+        /// <param name="reason"> The provided reason describing why the message was marked as incomplete. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal MessageIncompleteDetails(MessageIncompleteDetailsReason reason, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Reason = reason;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MessageIncompleteDetails"/> for deserialization. </summary>
+        internal MessageIncompleteDetails()
+        {
+        }
+
+        /// <summary> The provided reason describing why the message was marked as incomplete. </summary>
+        public MessageIncompleteDetailsReason Reason { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageIncompleteDetailsReason.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageIncompleteDetailsReason.cs
new file mode 100644
index 000000000000..ec0c57835d91
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageIncompleteDetailsReason.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> A set of reasons describing why a message is marked as incomplete. </summary>
+    public readonly partial struct MessageIncompleteDetailsReason : IEquatable<MessageIncompleteDetailsReason>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="MessageIncompleteDetailsReason"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public MessageIncompleteDetailsReason(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ContentFilterValue = "content_filter";
+        private const string MaxTokensValue = "max_tokens";
+        private const string RunCancelledValue = "run_cancelled";
+        private const string RunFailedValue = "run_failed";
+        private const string RunExpiredValue = "run_expired";
+
+        /// <summary> The run generating the message was terminated due to content filter flagging. </summary>
+        public static MessageIncompleteDetailsReason ContentFilter { get; } = new MessageIncompleteDetailsReason(ContentFilterValue);
+        /// <summary> The run generating the message exhausted available tokens before completion. </summary>
+        public static MessageIncompleteDetailsReason MaxTokens { get; } = new MessageIncompleteDetailsReason(MaxTokensValue);
+        /// <summary> The run generating the message was cancelled before completion. </summary>
+        public static MessageIncompleteDetailsReason RunCancelled { get; } = new MessageIncompleteDetailsReason(RunCancelledValue);
+        /// <summary> The run generating the message failed. </summary>
+        public static MessageIncompleteDetailsReason RunFailed { get; } = new MessageIncompleteDetailsReason(RunFailedValue);
+        /// <summary> The run generating the message expired. </summary>
+        public static MessageIncompleteDetailsReason RunExpired { get; } = new MessageIncompleteDetailsReason(RunExpiredValue);
+        /// <summary> Determines if two <see cref="MessageIncompleteDetailsReason"/> values are the same. </summary>
+        public static bool operator ==(MessageIncompleteDetailsReason left, MessageIncompleteDetailsReason right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="MessageIncompleteDetailsReason"/> values are not the same. </summary>
+        public static bool operator !=(MessageIncompleteDetailsReason left, MessageIncompleteDetailsReason right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="MessageIncompleteDetailsReason"/>. </summary>
+        public static implicit operator MessageIncompleteDetailsReason(string value) => new MessageIncompleteDetailsReason(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is MessageIncompleteDetailsReason other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(MessageIncompleteDetailsReason other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageStatus.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageStatus.cs
new file mode 100644
index 000000000000..d63a6bcf8b56
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageStatus.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The possible execution status values for a thread message. </summary>
+    public readonly partial struct MessageStatus : IEquatable<MessageStatus>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="MessageStatus"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public MessageStatus(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string InProgressValue = "in_progress";
+        private const string IncompleteValue = "incomplete";
+        private const string CompletedValue = "completed";
+
+        /// <summary> A run is currently creating this message. </summary>
+        public static MessageStatus InProgress { get; } = new MessageStatus(InProgressValue);
+        /// <summary> This message is incomplete. See incomplete_details for more information. </summary>
+        public static MessageStatus Incomplete { get; } = new MessageStatus(IncompleteValue);
+        /// <summary> This message was successfully completed by a run. </summary>
+        public static MessageStatus Completed { get; } = new MessageStatus(CompletedValue);
+        /// <summary> Determines if two <see cref="MessageStatus"/> values are the same. </summary>
+        public static bool operator ==(MessageStatus left, MessageStatus right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="MessageStatus"/> values are not the same. </summary>
+        public static bool operator !=(MessageStatus left, MessageStatus right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="MessageStatus"/>. </summary>
+        public static implicit operator MessageStatus(string value) => new MessageStatus(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is MessageStatus other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(MessageStatus other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageStreamEvent.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageStreamEvent.cs
new file mode 100644
index 000000000000..13c90b7d0b77
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageStreamEvent.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Message operation related streaming events. </summary>
+    public readonly partial struct MessageStreamEvent : IEquatable<MessageStreamEvent>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="MessageStreamEvent"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public MessageStreamEvent(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ThreadMessageCreatedValue = "thread.message.created";
+        private const string ThreadMessageInProgressValue = "thread.message.in_progress";
+        private const string ThreadMessageDeltaValue = "thread.message.delta";
+        private const string ThreadMessageCompletedValue = "thread.message.completed";
+        private const string ThreadMessageIncompleteValue = "thread.message.incomplete";
+
+        /// <summary> Event sent when a new message is created. The data of this event is of type ThreadMessage. </summary>
+        public static MessageStreamEvent ThreadMessageCreated { get; } = new MessageStreamEvent(ThreadMessageCreatedValue);
+        /// <summary> Event sent when a message moves to `in_progress` status. The data of this event is of type ThreadMessage. </summary>
+        public static MessageStreamEvent ThreadMessageInProgress { get; } = new MessageStreamEvent(ThreadMessageInProgressValue);
+        /// <summary> Event sent when a message is being streamed. The data of this event is of type MessageDeltaChunk. </summary>
+        public static MessageStreamEvent ThreadMessageDelta { get; } = new MessageStreamEvent(ThreadMessageDeltaValue);
+        /// <summary> Event sent when a message is completed. The data of this event is of type ThreadMessage. </summary>
+        public static MessageStreamEvent ThreadMessageCompleted { get; } = new MessageStreamEvent(ThreadMessageCompletedValue);
+        /// <summary> Event sent before a message is completed. The data of this event is of type ThreadMessage. </summary>
+        public static MessageStreamEvent ThreadMessageIncomplete { get; } = new MessageStreamEvent(ThreadMessageIncompleteValue);
+        /// <summary> Determines if two <see cref="MessageStreamEvent"/> values are the same. </summary>
+        public static bool operator ==(MessageStreamEvent left, MessageStreamEvent right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="MessageStreamEvent"/> values are not the same. </summary>
+        public static bool operator !=(MessageStreamEvent left, MessageStreamEvent right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="MessageStreamEvent"/>. </summary>
+        public static implicit operator MessageStreamEvent(string value) => new MessageStreamEvent(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is MessageStreamEvent other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(MessageStreamEvent other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextAnnotation.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextAnnotation.Serialization.cs
index ae962644a772..99920983550d 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextAnnotation.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextAnnotation.Serialization.cs
@@ -30,10 +30,6 @@ void IJsonModel<MessageTextAnnotation>.Write(Utf8JsonWriter writer, ModelReaderW
             writer.WriteStringValue(Type);
             writer.WritePropertyName("text"u8);
             writer.WriteStringValue(Text);
-            writer.WritePropertyName("start_index"u8);
-            writer.WriteNumberValue(StartIndex);
-            writer.WritePropertyName("end_index"u8);
-            writer.WriteNumberValue(EndIndex);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextAnnotation.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextAnnotation.cs
index 082f8fea6a5b..aa8769d7ed21 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextAnnotation.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextAnnotation.cs
@@ -51,30 +51,22 @@ public abstract partial class MessageTextAnnotation
 
         /// <summary> Initializes a new instance of <see cref="MessageTextAnnotation"/>. </summary>
         /// <param name="text"> The textual content associated with this text annotation item. </param>
-        /// <param name="startIndex"> The first text index associated with this text annotation. </param>
-        /// <param name="endIndex"> The last text index associated with this text annotation. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="text"/> is null. </exception>
-        protected MessageTextAnnotation(string text, int startIndex, int endIndex)
+        protected MessageTextAnnotation(string text)
         {
             Argument.AssertNotNull(text, nameof(text));
 
             Text = text;
-            StartIndex = startIndex;
-            EndIndex = endIndex;
         }
 
         /// <summary> Initializes a new instance of <see cref="MessageTextAnnotation"/>. </summary>
         /// <param name="type"> The object type. </param>
         /// <param name="text"> The textual content associated with this text annotation item. </param>
-        /// <param name="startIndex"> The first text index associated with this text annotation. </param>
-        /// <param name="endIndex"> The last text index associated with this text annotation. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MessageTextAnnotation(string type, string text, int startIndex, int endIndex, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal MessageTextAnnotation(string type, string text, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Type = type;
             Text = text;
-            StartIndex = startIndex;
-            EndIndex = endIndex;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
@@ -86,10 +78,6 @@ internal MessageTextAnnotation()
         /// <summary> The object type. </summary>
         internal string Type { get; set; }
         /// <summary> The textual content associated with this text annotation item. </summary>
-        public string Text { get; }
-        /// <summary> The first text index associated with this text annotation. </summary>
-        public int StartIndex { get; }
-        /// <summary> The last text index associated with this text annotation. </summary>
-        public int EndIndex { get; }
+        public string Text { get; set; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextContent.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextContent.cs
index 61d7241bb927..ef579043014c 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextContent.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextContent.cs
@@ -16,7 +16,7 @@ public partial class MessageTextContent : MessageContent
         /// <summary> Initializes a new instance of <see cref="MessageTextContent"/>. </summary>
         /// <param name="internalDetails"> The text and associated annotations for this thread message content item. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="internalDetails"/> is null. </exception>
-        internal MessageTextContent(InternalMessageTextDetails internalDetails)
+        public MessageTextContent(InternalMessageTextDetails internalDetails)
         {
             Argument.AssertNotNull(internalDetails, nameof(internalDetails));
 
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFileCitationAnnotation.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFileCitationAnnotation.Serialization.cs
index 986e6b38dfe0..858b184a6495 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFileCitationAnnotation.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFileCitationAnnotation.Serialization.cs
@@ -28,14 +28,20 @@ void IJsonModel<MessageTextFileCitationAnnotation>.Write(Utf8JsonWriter writer,
             writer.WriteStartObject();
             writer.WritePropertyName("file_citation"u8);
             writer.WriteObjectValue<InternalMessageTextFileCitationDetails>(InternalDetails, options);
+            if (Optional.IsDefined(StartIndex))
+            {
+                writer.WritePropertyName("start_index"u8);
+                writer.WriteNumberValue(StartIndex.Value);
+            }
+            if (Optional.IsDefined(EndIndex))
+            {
+                writer.WritePropertyName("end_index"u8);
+                writer.WriteNumberValue(EndIndex.Value);
+            }
             writer.WritePropertyName("type"u8);
             writer.WriteStringValue(Type);
             writer.WritePropertyName("text"u8);
             writer.WriteStringValue(Text);
-            writer.WritePropertyName("start_index"u8);
-            writer.WriteNumberValue(StartIndex);
-            writer.WritePropertyName("end_index"u8);
-            writer.WriteNumberValue(EndIndex);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -75,10 +81,10 @@ internal static MessageTextFileCitationAnnotation DeserializeMessageTextFileCita
                 return null;
             }
             InternalMessageTextFileCitationDetails fileCitation = default;
+            int? startIndex = default;
+            int? endIndex = default;
             string type = default;
             string text = default;
-            int startIndex = default;
-            int endIndex = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -88,24 +94,32 @@ internal static MessageTextFileCitationAnnotation DeserializeMessageTextFileCita
                     fileCitation = InternalMessageTextFileCitationDetails.DeserializeInternalMessageTextFileCitationDetails(property.Value, options);
                     continue;
                 }
-                if (property.NameEquals("type"u8))
+                if (property.NameEquals("start_index"u8))
                 {
-                    type = property.Value.GetString();
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    startIndex = property.Value.GetInt32();
                     continue;
                 }
-                if (property.NameEquals("text"u8))
+                if (property.NameEquals("end_index"u8))
                 {
-                    text = property.Value.GetString();
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    endIndex = property.Value.GetInt32();
                     continue;
                 }
-                if (property.NameEquals("start_index"u8))
+                if (property.NameEquals("type"u8))
                 {
-                    startIndex = property.Value.GetInt32();
+                    type = property.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("end_index"u8))
+                if (property.NameEquals("text"u8))
                 {
-                    endIndex = property.Value.GetInt32();
+                    text = property.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
@@ -117,10 +131,10 @@ internal static MessageTextFileCitationAnnotation DeserializeMessageTextFileCita
             return new MessageTextFileCitationAnnotation(
                 type,
                 text,
-                startIndex,
-                endIndex,
                 serializedAdditionalRawData,
-                fileCitation);
+                fileCitation,
+                startIndex,
+                endIndex);
         }
 
         BinaryData IPersistableModel<MessageTextFileCitationAnnotation>.Write(ModelReaderWriterOptions options)
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFileCitationAnnotation.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFileCitationAnnotation.cs
index a036ec9b468b..6db943f9c9a3 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFileCitationAnnotation.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFileCitationAnnotation.cs
@@ -10,19 +10,17 @@
 
 namespace Azure.AI.OpenAI.Assistants
 {
-    /// <summary> A citation within the message that points to a specific quote from a specific File associated with the assistant or the message. Generated when the assistant uses the 'retrieval' tool to search files. </summary>
+    /// <summary> A citation within the message that points to a specific quote from a specific File associated with the assistant or the message. Generated when the assistant uses the 'file_search' tool to search files. </summary>
     public partial class MessageTextFileCitationAnnotation : MessageTextAnnotation
     {
         /// <summary> Initializes a new instance of <see cref="MessageTextFileCitationAnnotation"/>. </summary>
         /// <param name="text"> The textual content associated with this text annotation item. </param>
-        /// <param name="startIndex"> The first text index associated with this text annotation. </param>
-        /// <param name="endIndex"> The last text index associated with this text annotation. </param>
         /// <param name="internalDetails">
         /// A citation within the message that points to a specific quote from a specific file.
-        /// Generated when the assistant uses the "retrieval" tool to search files.
+        /// Generated when the assistant uses the "file_search" tool to search files.
         /// </param>
         /// <exception cref="ArgumentNullException"> <paramref name="text"/> or <paramref name="internalDetails"/> is null. </exception>
-        internal MessageTextFileCitationAnnotation(string text, int startIndex, int endIndex, InternalMessageTextFileCitationDetails internalDetails) : base(text, startIndex, endIndex)
+        public MessageTextFileCitationAnnotation(string text, InternalMessageTextFileCitationDetails internalDetails) : base(text)
         {
             Argument.AssertNotNull(text, nameof(text));
             Argument.AssertNotNull(internalDetails, nameof(internalDetails));
@@ -34,21 +32,27 @@ internal MessageTextFileCitationAnnotation(string text, int startIndex, int endI
         /// <summary> Initializes a new instance of <see cref="MessageTextFileCitationAnnotation"/>. </summary>
         /// <param name="type"> The object type. </param>
         /// <param name="text"> The textual content associated with this text annotation item. </param>
-        /// <param name="startIndex"> The first text index associated with this text annotation. </param>
-        /// <param name="endIndex"> The last text index associated with this text annotation. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
         /// <param name="internalDetails">
         /// A citation within the message that points to a specific quote from a specific file.
-        /// Generated when the assistant uses the "retrieval" tool to search files.
+        /// Generated when the assistant uses the "file_search" tool to search files.
         /// </param>
-        internal MessageTextFileCitationAnnotation(string type, string text, int startIndex, int endIndex, IDictionary<string, BinaryData> serializedAdditionalRawData, InternalMessageTextFileCitationDetails internalDetails) : base(type, text, startIndex, endIndex, serializedAdditionalRawData)
+        /// <param name="startIndex"> The first text index associated with this text annotation. </param>
+        /// <param name="endIndex"> The last text index associated with this text annotation. </param>
+        internal MessageTextFileCitationAnnotation(string type, string text, IDictionary<string, BinaryData> serializedAdditionalRawData, InternalMessageTextFileCitationDetails internalDetails, int? startIndex, int? endIndex) : base(type, text, serializedAdditionalRawData)
         {
             InternalDetails = internalDetails;
+            StartIndex = startIndex;
+            EndIndex = endIndex;
         }
 
         /// <summary> Initializes a new instance of <see cref="MessageTextFileCitationAnnotation"/> for deserialization. </summary>
         internal MessageTextFileCitationAnnotation()
         {
         }
+        /// <summary> The first text index associated with this text annotation. </summary>
+        public int? StartIndex { get; set; }
+        /// <summary> The last text index associated with this text annotation. </summary>
+        public int? EndIndex { get; set; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFilePathAnnotation.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFilePathAnnotation.Serialization.cs
index 72659f5a0ea3..1b3342e369e5 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFilePathAnnotation.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFilePathAnnotation.Serialization.cs
@@ -28,14 +28,20 @@ void IJsonModel<MessageTextFilePathAnnotation>.Write(Utf8JsonWriter writer, Mode
             writer.WriteStartObject();
             writer.WritePropertyName("file_path"u8);
             writer.WriteObjectValue<InternalMessageTextFilePathDetails>(InternalDetails, options);
+            if (Optional.IsDefined(StartIndex))
+            {
+                writer.WritePropertyName("start_index"u8);
+                writer.WriteNumberValue(StartIndex.Value);
+            }
+            if (Optional.IsDefined(EndIndex))
+            {
+                writer.WritePropertyName("end_index"u8);
+                writer.WriteNumberValue(EndIndex.Value);
+            }
             writer.WritePropertyName("type"u8);
             writer.WriteStringValue(Type);
             writer.WritePropertyName("text"u8);
             writer.WriteStringValue(Text);
-            writer.WritePropertyName("start_index"u8);
-            writer.WriteNumberValue(StartIndex);
-            writer.WritePropertyName("end_index"u8);
-            writer.WriteNumberValue(EndIndex);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -75,10 +81,10 @@ internal static MessageTextFilePathAnnotation DeserializeMessageTextFilePathAnno
                 return null;
             }
             InternalMessageTextFilePathDetails filePath = default;
+            int? startIndex = default;
+            int? endIndex = default;
             string type = default;
             string text = default;
-            int startIndex = default;
-            int endIndex = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -88,24 +94,32 @@ internal static MessageTextFilePathAnnotation DeserializeMessageTextFilePathAnno
                     filePath = InternalMessageTextFilePathDetails.DeserializeInternalMessageTextFilePathDetails(property.Value, options);
                     continue;
                 }
-                if (property.NameEquals("type"u8))
+                if (property.NameEquals("start_index"u8))
                 {
-                    type = property.Value.GetString();
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    startIndex = property.Value.GetInt32();
                     continue;
                 }
-                if (property.NameEquals("text"u8))
+                if (property.NameEquals("end_index"u8))
                 {
-                    text = property.Value.GetString();
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    endIndex = property.Value.GetInt32();
                     continue;
                 }
-                if (property.NameEquals("start_index"u8))
+                if (property.NameEquals("type"u8))
                 {
-                    startIndex = property.Value.GetInt32();
+                    type = property.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("end_index"u8))
+                if (property.NameEquals("text"u8))
                 {
-                    endIndex = property.Value.GetInt32();
+                    text = property.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
@@ -117,10 +131,10 @@ internal static MessageTextFilePathAnnotation DeserializeMessageTextFilePathAnno
             return new MessageTextFilePathAnnotation(
                 type,
                 text,
-                startIndex,
-                endIndex,
                 serializedAdditionalRawData,
-                filePath);
+                filePath,
+                startIndex,
+                endIndex);
         }
 
         BinaryData IPersistableModel<MessageTextFilePathAnnotation>.Write(ModelReaderWriterOptions options)
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFilePathAnnotation.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFilePathAnnotation.cs
index 787c70831f54..276bb7ded43d 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFilePathAnnotation.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/MessageTextFilePathAnnotation.cs
@@ -15,11 +15,9 @@ public partial class MessageTextFilePathAnnotation : MessageTextAnnotation
     {
         /// <summary> Initializes a new instance of <see cref="MessageTextFilePathAnnotation"/>. </summary>
         /// <param name="text"> The textual content associated with this text annotation item. </param>
-        /// <param name="startIndex"> The first text index associated with this text annotation. </param>
-        /// <param name="endIndex"> The last text index associated with this text annotation. </param>
         /// <param name="internalDetails"> A URL for the file that's generated when the assistant used the code_interpreter tool to generate a file. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="text"/> or <paramref name="internalDetails"/> is null. </exception>
-        internal MessageTextFilePathAnnotation(string text, int startIndex, int endIndex, InternalMessageTextFilePathDetails internalDetails) : base(text, startIndex, endIndex)
+        public MessageTextFilePathAnnotation(string text, InternalMessageTextFilePathDetails internalDetails) : base(text)
         {
             Argument.AssertNotNull(text, nameof(text));
             Argument.AssertNotNull(internalDetails, nameof(internalDetails));
@@ -31,18 +29,24 @@ internal MessageTextFilePathAnnotation(string text, int startIndex, int endIndex
         /// <summary> Initializes a new instance of <see cref="MessageTextFilePathAnnotation"/>. </summary>
         /// <param name="type"> The object type. </param>
         /// <param name="text"> The textual content associated with this text annotation item. </param>
-        /// <param name="startIndex"> The first text index associated with this text annotation. </param>
-        /// <param name="endIndex"> The last text index associated with this text annotation. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
         /// <param name="internalDetails"> A URL for the file that's generated when the assistant used the code_interpreter tool to generate a file. </param>
-        internal MessageTextFilePathAnnotation(string type, string text, int startIndex, int endIndex, IDictionary<string, BinaryData> serializedAdditionalRawData, InternalMessageTextFilePathDetails internalDetails) : base(type, text, startIndex, endIndex, serializedAdditionalRawData)
+        /// <param name="startIndex"> The first text index associated with this text annotation. </param>
+        /// <param name="endIndex"> The last text index associated with this text annotation. </param>
+        internal MessageTextFilePathAnnotation(string type, string text, IDictionary<string, BinaryData> serializedAdditionalRawData, InternalMessageTextFilePathDetails internalDetails, int? startIndex, int? endIndex) : base(type, text, serializedAdditionalRawData)
         {
             InternalDetails = internalDetails;
+            StartIndex = startIndex;
+            EndIndex = endIndex;
         }
 
         /// <summary> Initializes a new instance of <see cref="MessageTextFilePathAnnotation"/> for deserialization. </summary>
         internal MessageTextFilePathAnnotation()
         {
         }
+        /// <summary> The first text index associated with this text annotation. </summary>
+        public int? StartIndex { get; set; }
+        /// <summary> The last text index associated with this text annotation. </summary>
+        public int? EndIndex { get; set; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIFile.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIFile.Serialization.cs
index e553361292ff..eabac96c3ba5 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIFile.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIFile.Serialization.cs
@@ -38,6 +38,16 @@ void IJsonModel<OpenAIFile>.Write(Utf8JsonWriter writer, ModelReaderWriterOption
             writer.WriteNumberValue(CreatedAt, "U");
             writer.WritePropertyName("purpose"u8);
             writer.WriteStringValue(Purpose.ToString());
+            if (Optional.IsDefined(Status))
+            {
+                writer.WritePropertyName("status"u8);
+                writer.WriteStringValue(Status.Value.ToString());
+            }
+            if (Optional.IsDefined(StatusDetails))
+            {
+                writer.WritePropertyName("status_details"u8);
+                writer.WriteStringValue(StatusDetails);
+            }
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -82,6 +92,8 @@ internal static OpenAIFile DeserializeOpenAIFile(JsonElement element, ModelReade
             string filename = default;
             DateTimeOffset createdAt = default;
             OpenAIFilePurpose purpose = default;
+            FileState? status = default;
+            string statusDetails = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -116,6 +128,20 @@ internal static OpenAIFile DeserializeOpenAIFile(JsonElement element, ModelReade
                     purpose = new OpenAIFilePurpose(property.Value.GetString());
                     continue;
                 }
+                if (property.NameEquals("status"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    status = new FileState(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("status_details"u8))
+                {
+                    statusDetails = property.Value.GetString();
+                    continue;
+                }
                 if (options.Format != "W")
                 {
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
@@ -129,6 +155,8 @@ internal static OpenAIFile DeserializeOpenAIFile(JsonElement element, ModelReade
                 filename,
                 createdAt,
                 purpose,
+                status,
+                statusDetails,
                 serializedAdditionalRawData);
         }
 
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIFile.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIFile.cs
index 318f90d4c5a5..29264237fe5a 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIFile.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIFile.cs
@@ -71,8 +71,10 @@ internal OpenAIFile(string id, int size, string filename, DateTimeOffset created
         /// <param name="filename"> The name of the file. </param>
         /// <param name="createdAt"> The Unix timestamp, in seconds, representing when this object was created. </param>
         /// <param name="purpose"> The intended purpose of a file. </param>
+        /// <param name="status"> The state of the file. This field is available in Azure OpenAI only. </param>
+        /// <param name="statusDetails"> The error message with details in case processing of this file failed. This field is available in Azure OpenAI only. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal OpenAIFile(string @object, string id, int size, string filename, DateTimeOffset createdAt, OpenAIFilePurpose purpose, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal OpenAIFile(string @object, string id, int size, string filename, DateTimeOffset createdAt, OpenAIFilePurpose purpose, FileState? status, string statusDetails, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Object = @object;
             Id = id;
@@ -80,6 +82,8 @@ internal OpenAIFile(string @object, string id, int size, string filename, DateTi
             Filename = filename;
             CreatedAt = createdAt;
             Purpose = purpose;
+            Status = status;
+            StatusDetails = statusDetails;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
@@ -98,5 +102,9 @@ internal OpenAIFile()
         public DateTimeOffset CreatedAt { get; }
         /// <summary> The intended purpose of a file. </summary>
         public OpenAIFilePurpose Purpose { get; }
+        /// <summary> The state of the file. This field is available in Azure OpenAI only. </summary>
+        public FileState? Status { get; }
+        /// <summary> The error message with details in case processing of this file failed. This field is available in Azure OpenAI only. </summary>
+        public string StatusDetails { get; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIFilePurpose.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIFilePurpose.cs
index 50d531cac562..e58119d1b591 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIFilePurpose.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIFilePurpose.cs
@@ -26,6 +26,9 @@ public OpenAIFilePurpose(string value)
         private const string FineTuneResultsValue = "fine-tune-results";
         private const string AssistantsValue = "assistants";
         private const string AssistantsOutputValue = "assistants_output";
+        private const string BatchValue = "batch";
+        private const string BatchOutputValue = "batch_output";
+        private const string VisionValue = "vision";
 
         /// <summary> Indicates a file is used for fine tuning input. </summary>
         public static OpenAIFilePurpose FineTune { get; } = new OpenAIFilePurpose(FineTuneValue);
@@ -35,6 +38,12 @@ public OpenAIFilePurpose(string value)
         public static OpenAIFilePurpose Assistants { get; } = new OpenAIFilePurpose(AssistantsValue);
         /// <summary> Indicates a file is used as output by assistants. </summary>
         public static OpenAIFilePurpose AssistantsOutput { get; } = new OpenAIFilePurpose(AssistantsOutputValue);
+        /// <summary> Indicates a file is used as input to . </summary>
+        public static OpenAIFilePurpose Batch { get; } = new OpenAIFilePurpose(BatchValue);
+        /// <summary> Indicates a file is used as output by a vector store batch operation. </summary>
+        public static OpenAIFilePurpose BatchOutput { get; } = new OpenAIFilePurpose(BatchOutputValue);
+        /// <summary> Indicates a file is used as input to a vision operation. </summary>
+        public static OpenAIFilePurpose Vision { get; } = new OpenAIFilePurpose(VisionValue);
         /// <summary> Determines if two <see cref="OpenAIFilePurpose"/> values are the same. </summary>
         public static bool operator ==(OpenAIFilePurpose left, OpenAIFilePurpose right) => left.Equals(right);
         /// <summary> Determines if two <see cref="OpenAIFilePurpose"/> values are not the same. </summary>
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfAssistantFileObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfAssistantFileObject.cs
deleted file mode 100644
index 1a72c0020e88..000000000000
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfAssistantFileObject.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.AI.OpenAI.Assistants
-{
-    /// <summary> The OpenAIPageableListOfAssistantFile_object. </summary>
-    internal readonly partial struct OpenAIPageableListOfAssistantFileObject : IEquatable<OpenAIPageableListOfAssistantFileObject>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="OpenAIPageableListOfAssistantFileObject"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public OpenAIPageableListOfAssistantFileObject(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string ListValue = "list";
-
-        /// <summary> list. </summary>
-        public static OpenAIPageableListOfAssistantFileObject List { get; } = new OpenAIPageableListOfAssistantFileObject(ListValue);
-        /// <summary> Determines if two <see cref="OpenAIPageableListOfAssistantFileObject"/> values are the same. </summary>
-        public static bool operator ==(OpenAIPageableListOfAssistantFileObject left, OpenAIPageableListOfAssistantFileObject right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="OpenAIPageableListOfAssistantFileObject"/> values are not the same. </summary>
-        public static bool operator !=(OpenAIPageableListOfAssistantFileObject left, OpenAIPageableListOfAssistantFileObject right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="OpenAIPageableListOfAssistantFileObject"/>. </summary>
-        public static implicit operator OpenAIPageableListOfAssistantFileObject(string value) => new OpenAIPageableListOfAssistantFileObject(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is OpenAIPageableListOfAssistantFileObject other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(OpenAIPageableListOfAssistantFileObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalOpenAIPageableListOfMessageFile.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStore.Serialization.cs
similarity index 64%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalOpenAIPageableListOfMessageFile.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStore.Serialization.cs
index 0fc4a1b175c0..1103b6e11633 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalOpenAIPageableListOfMessageFile.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStore.Serialization.cs
@@ -13,16 +13,16 @@
 
 namespace Azure.AI.OpenAI.Assistants
 {
-    internal partial class InternalOpenAIPageableListOfMessageFile : IUtf8JsonSerializable, IJsonModel<InternalOpenAIPageableListOfMessageFile>
+    public partial class OpenAIPageableListOfVectorStore : IUtf8JsonSerializable, IJsonModel<OpenAIPageableListOfVectorStore>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<InternalOpenAIPageableListOfMessageFile>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OpenAIPageableListOfVectorStore>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<InternalOpenAIPageableListOfMessageFile>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<OpenAIPageableListOfVectorStore>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalOpenAIPageableListOfMessageFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIPageableListOfVectorStore>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalOpenAIPageableListOfMessageFile)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(OpenAIPageableListOfVectorStore)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
@@ -59,19 +59,19 @@ void IJsonModel<InternalOpenAIPageableListOfMessageFile>.Write(Utf8JsonWriter wr
             writer.WriteEndObject();
         }
 
-        InternalOpenAIPageableListOfMessageFile IJsonModel<InternalOpenAIPageableListOfMessageFile>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        OpenAIPageableListOfVectorStore IJsonModel<OpenAIPageableListOfVectorStore>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalOpenAIPageableListOfMessageFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIPageableListOfVectorStore>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalOpenAIPageableListOfMessageFile)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(OpenAIPageableListOfVectorStore)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalOpenAIPageableListOfMessageFile(document.RootElement, options);
+            return DeserializeOpenAIPageableListOfVectorStore(document.RootElement, options);
         }
 
-        internal static InternalOpenAIPageableListOfMessageFile DeserializeInternalOpenAIPageableListOfMessageFile(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static OpenAIPageableListOfVectorStore DeserializeOpenAIPageableListOfVectorStore(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -79,8 +79,8 @@ internal static InternalOpenAIPageableListOfMessageFile DeserializeInternalOpenA
             {
                 return null;
             }
-            OpenAIPageableListOfMessageFileObject @object = default;
-            IReadOnlyList<MessageFile> data = default;
+            OpenAIPageableListOfVectorStoreObject @object = default;
+            IReadOnlyList<VectorStore> data = default;
             string firstId = default;
             string lastId = default;
             bool hasMore = default;
@@ -90,15 +90,15 @@ internal static InternalOpenAIPageableListOfMessageFile DeserializeInternalOpenA
             {
                 if (property.NameEquals("object"u8))
                 {
-                    @object = new OpenAIPageableListOfMessageFileObject(property.Value.GetString());
+                    @object = new OpenAIPageableListOfVectorStoreObject(property.Value.GetString());
                     continue;
                 }
                 if (property.NameEquals("data"u8))
                 {
-                    List<MessageFile> array = new List<MessageFile>();
+                    List<VectorStore> array = new List<VectorStore>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(MessageFile.DeserializeMessageFile(item, options));
+                        array.Add(VectorStore.DeserializeVectorStore(item, options));
                     }
                     data = array;
                     continue;
@@ -124,7 +124,7 @@ internal static InternalOpenAIPageableListOfMessageFile DeserializeInternalOpenA
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new InternalOpenAIPageableListOfMessageFile(
+            return new OpenAIPageableListOfVectorStore(
                 @object,
                 data,
                 firstId,
@@ -133,43 +133,43 @@ internal static InternalOpenAIPageableListOfMessageFile DeserializeInternalOpenA
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<InternalOpenAIPageableListOfMessageFile>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<OpenAIPageableListOfVectorStore>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalOpenAIPageableListOfMessageFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIPageableListOfVectorStore>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(InternalOpenAIPageableListOfMessageFile)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(OpenAIPageableListOfVectorStore)} does not support writing '{options.Format}' format.");
             }
         }
 
-        InternalOpenAIPageableListOfMessageFile IPersistableModel<InternalOpenAIPageableListOfMessageFile>.Create(BinaryData data, ModelReaderWriterOptions options)
+        OpenAIPageableListOfVectorStore IPersistableModel<OpenAIPageableListOfVectorStore>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalOpenAIPageableListOfMessageFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIPageableListOfVectorStore>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalOpenAIPageableListOfMessageFile(document.RootElement, options);
+                        return DeserializeOpenAIPageableListOfVectorStore(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(InternalOpenAIPageableListOfMessageFile)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(OpenAIPageableListOfVectorStore)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<InternalOpenAIPageableListOfMessageFile>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<OpenAIPageableListOfVectorStore>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
         /// <param name="response"> The response to deserialize the model from. </param>
-        internal static InternalOpenAIPageableListOfMessageFile FromResponse(Response response)
+        internal static OpenAIPageableListOfVectorStore FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalOpenAIPageableListOfMessageFile(document.RootElement);
+            return DeserializeOpenAIPageableListOfVectorStore(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalOpenAIPageableListOfAssistantFile.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStore.cs
similarity index 78%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalOpenAIPageableListOfAssistantFile.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStore.cs
index 7b5f1581bf67..1cfa1fd0b07d 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalOpenAIPageableListOfAssistantFile.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStore.cs
@@ -12,7 +12,7 @@
 namespace Azure.AI.OpenAI.Assistants
 {
     /// <summary> The response data for a requested list of items. </summary>
-    internal partial class InternalOpenAIPageableListOfAssistantFile
+    public partial class OpenAIPageableListOfVectorStore
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -46,13 +46,13 @@ internal partial class InternalOpenAIPageableListOfAssistantFile
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="InternalOpenAIPageableListOfAssistantFile"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="OpenAIPageableListOfVectorStore"/>. </summary>
         /// <param name="data"> The requested list of items. </param>
         /// <param name="firstId"> The first ID represented in this list. </param>
         /// <param name="lastId"> The last ID represented in this list. </param>
         /// <param name="hasMore"> A value indicating whether there are additional values available not captured in this list. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="data"/>, <paramref name="firstId"/> or <paramref name="lastId"/> is null. </exception>
-        internal InternalOpenAIPageableListOfAssistantFile(IEnumerable<AssistantFile> data, string firstId, string lastId, bool hasMore)
+        internal OpenAIPageableListOfVectorStore(IEnumerable<VectorStore> data, string firstId, string lastId, bool hasMore)
         {
             Argument.AssertNotNull(data, nameof(data));
             Argument.AssertNotNull(firstId, nameof(firstId));
@@ -64,14 +64,14 @@ internal InternalOpenAIPageableListOfAssistantFile(IEnumerable<AssistantFile> da
             HasMore = hasMore;
         }
 
-        /// <summary> Initializes a new instance of <see cref="InternalOpenAIPageableListOfAssistantFile"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="OpenAIPageableListOfVectorStore"/>. </summary>
         /// <param name="object"> The object type, which is always list. </param>
         /// <param name="data"> The requested list of items. </param>
         /// <param name="firstId"> The first ID represented in this list. </param>
         /// <param name="lastId"> The last ID represented in this list. </param>
         /// <param name="hasMore"> A value indicating whether there are additional values available not captured in this list. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalOpenAIPageableListOfAssistantFile(OpenAIPageableListOfAssistantFileObject @object, IReadOnlyList<AssistantFile> data, string firstId, string lastId, bool hasMore, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal OpenAIPageableListOfVectorStore(OpenAIPageableListOfVectorStoreObject @object, IReadOnlyList<VectorStore> data, string firstId, string lastId, bool hasMore, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Object = @object;
             Data = data;
@@ -81,16 +81,16 @@ internal InternalOpenAIPageableListOfAssistantFile(OpenAIPageableListOfAssistant
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="InternalOpenAIPageableListOfAssistantFile"/> for deserialization. </summary>
-        internal InternalOpenAIPageableListOfAssistantFile()
+        /// <summary> Initializes a new instance of <see cref="OpenAIPageableListOfVectorStore"/> for deserialization. </summary>
+        internal OpenAIPageableListOfVectorStore()
         {
         }
 
         /// <summary> The object type, which is always list. </summary>
-        public OpenAIPageableListOfAssistantFileObject Object { get; } = OpenAIPageableListOfAssistantFileObject.List;
+        public OpenAIPageableListOfVectorStoreObject Object { get; } = OpenAIPageableListOfVectorStoreObject.List;
 
         /// <summary> The requested list of items. </summary>
-        public IReadOnlyList<AssistantFile> Data { get; }
+        public IReadOnlyList<VectorStore> Data { get; }
         /// <summary> The first ID represented in this list. </summary>
         public string FirstId { get; }
         /// <summary> The last ID represented in this list. </summary>
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalOpenAIPageableListOfAssistantFile.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStoreFile.Serialization.cs
similarity index 63%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalOpenAIPageableListOfAssistantFile.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStoreFile.Serialization.cs
index cd37f4181261..b388e3fa26fb 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalOpenAIPageableListOfAssistantFile.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStoreFile.Serialization.cs
@@ -13,16 +13,16 @@
 
 namespace Azure.AI.OpenAI.Assistants
 {
-    internal partial class InternalOpenAIPageableListOfAssistantFile : IUtf8JsonSerializable, IJsonModel<InternalOpenAIPageableListOfAssistantFile>
+    public partial class OpenAIPageableListOfVectorStoreFile : IUtf8JsonSerializable, IJsonModel<OpenAIPageableListOfVectorStoreFile>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<InternalOpenAIPageableListOfAssistantFile>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OpenAIPageableListOfVectorStoreFile>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<InternalOpenAIPageableListOfAssistantFile>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<OpenAIPageableListOfVectorStoreFile>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalOpenAIPageableListOfAssistantFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIPageableListOfVectorStoreFile>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalOpenAIPageableListOfAssistantFile)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(OpenAIPageableListOfVectorStoreFile)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
@@ -59,19 +59,19 @@ void IJsonModel<InternalOpenAIPageableListOfAssistantFile>.Write(Utf8JsonWriter
             writer.WriteEndObject();
         }
 
-        InternalOpenAIPageableListOfAssistantFile IJsonModel<InternalOpenAIPageableListOfAssistantFile>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        OpenAIPageableListOfVectorStoreFile IJsonModel<OpenAIPageableListOfVectorStoreFile>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalOpenAIPageableListOfAssistantFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIPageableListOfVectorStoreFile>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalOpenAIPageableListOfAssistantFile)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(OpenAIPageableListOfVectorStoreFile)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalOpenAIPageableListOfAssistantFile(document.RootElement, options);
+            return DeserializeOpenAIPageableListOfVectorStoreFile(document.RootElement, options);
         }
 
-        internal static InternalOpenAIPageableListOfAssistantFile DeserializeInternalOpenAIPageableListOfAssistantFile(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static OpenAIPageableListOfVectorStoreFile DeserializeOpenAIPageableListOfVectorStoreFile(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -79,8 +79,8 @@ internal static InternalOpenAIPageableListOfAssistantFile DeserializeInternalOpe
             {
                 return null;
             }
-            OpenAIPageableListOfAssistantFileObject @object = default;
-            IReadOnlyList<AssistantFile> data = default;
+            OpenAIPageableListOfVectorStoreFileObject @object = default;
+            IReadOnlyList<VectorStoreFile> data = default;
             string firstId = default;
             string lastId = default;
             bool hasMore = default;
@@ -90,15 +90,15 @@ internal static InternalOpenAIPageableListOfAssistantFile DeserializeInternalOpe
             {
                 if (property.NameEquals("object"u8))
                 {
-                    @object = new OpenAIPageableListOfAssistantFileObject(property.Value.GetString());
+                    @object = new OpenAIPageableListOfVectorStoreFileObject(property.Value.GetString());
                     continue;
                 }
                 if (property.NameEquals("data"u8))
                 {
-                    List<AssistantFile> array = new List<AssistantFile>();
+                    List<VectorStoreFile> array = new List<VectorStoreFile>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(AssistantFile.DeserializeAssistantFile(item, options));
+                        array.Add(VectorStoreFile.DeserializeVectorStoreFile(item, options));
                     }
                     data = array;
                     continue;
@@ -124,7 +124,7 @@ internal static InternalOpenAIPageableListOfAssistantFile DeserializeInternalOpe
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new InternalOpenAIPageableListOfAssistantFile(
+            return new OpenAIPageableListOfVectorStoreFile(
                 @object,
                 data,
                 firstId,
@@ -133,43 +133,43 @@ internal static InternalOpenAIPageableListOfAssistantFile DeserializeInternalOpe
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<InternalOpenAIPageableListOfAssistantFile>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<OpenAIPageableListOfVectorStoreFile>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalOpenAIPageableListOfAssistantFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIPageableListOfVectorStoreFile>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(InternalOpenAIPageableListOfAssistantFile)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(OpenAIPageableListOfVectorStoreFile)} does not support writing '{options.Format}' format.");
             }
         }
 
-        InternalOpenAIPageableListOfAssistantFile IPersistableModel<InternalOpenAIPageableListOfAssistantFile>.Create(BinaryData data, ModelReaderWriterOptions options)
+        OpenAIPageableListOfVectorStoreFile IPersistableModel<OpenAIPageableListOfVectorStoreFile>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalOpenAIPageableListOfAssistantFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIPageableListOfVectorStoreFile>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalOpenAIPageableListOfAssistantFile(document.RootElement, options);
+                        return DeserializeOpenAIPageableListOfVectorStoreFile(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(InternalOpenAIPageableListOfAssistantFile)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(OpenAIPageableListOfVectorStoreFile)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<InternalOpenAIPageableListOfAssistantFile>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<OpenAIPageableListOfVectorStoreFile>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
         /// <param name="response"> The response to deserialize the model from. </param>
-        internal static InternalOpenAIPageableListOfAssistantFile FromResponse(Response response)
+        internal static OpenAIPageableListOfVectorStoreFile FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalOpenAIPageableListOfAssistantFile(document.RootElement);
+            return DeserializeOpenAIPageableListOfVectorStoreFile(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalOpenAIPageableListOfMessageFile.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStoreFile.cs
similarity index 78%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalOpenAIPageableListOfMessageFile.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStoreFile.cs
index 591f029940a1..8f4e487d59ad 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalOpenAIPageableListOfMessageFile.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStoreFile.cs
@@ -12,7 +12,7 @@
 namespace Azure.AI.OpenAI.Assistants
 {
     /// <summary> The response data for a requested list of items. </summary>
-    internal partial class InternalOpenAIPageableListOfMessageFile
+    public partial class OpenAIPageableListOfVectorStoreFile
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -46,13 +46,13 @@ internal partial class InternalOpenAIPageableListOfMessageFile
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="InternalOpenAIPageableListOfMessageFile"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="OpenAIPageableListOfVectorStoreFile"/>. </summary>
         /// <param name="data"> The requested list of items. </param>
         /// <param name="firstId"> The first ID represented in this list. </param>
         /// <param name="lastId"> The last ID represented in this list. </param>
         /// <param name="hasMore"> A value indicating whether there are additional values available not captured in this list. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="data"/>, <paramref name="firstId"/> or <paramref name="lastId"/> is null. </exception>
-        internal InternalOpenAIPageableListOfMessageFile(IEnumerable<MessageFile> data, string firstId, string lastId, bool hasMore)
+        internal OpenAIPageableListOfVectorStoreFile(IEnumerable<VectorStoreFile> data, string firstId, string lastId, bool hasMore)
         {
             Argument.AssertNotNull(data, nameof(data));
             Argument.AssertNotNull(firstId, nameof(firstId));
@@ -64,14 +64,14 @@ internal InternalOpenAIPageableListOfMessageFile(IEnumerable<MessageFile> data,
             HasMore = hasMore;
         }
 
-        /// <summary> Initializes a new instance of <see cref="InternalOpenAIPageableListOfMessageFile"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="OpenAIPageableListOfVectorStoreFile"/>. </summary>
         /// <param name="object"> The object type, which is always list. </param>
         /// <param name="data"> The requested list of items. </param>
         /// <param name="firstId"> The first ID represented in this list. </param>
         /// <param name="lastId"> The last ID represented in this list. </param>
         /// <param name="hasMore"> A value indicating whether there are additional values available not captured in this list. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalOpenAIPageableListOfMessageFile(OpenAIPageableListOfMessageFileObject @object, IReadOnlyList<MessageFile> data, string firstId, string lastId, bool hasMore, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal OpenAIPageableListOfVectorStoreFile(OpenAIPageableListOfVectorStoreFileObject @object, IReadOnlyList<VectorStoreFile> data, string firstId, string lastId, bool hasMore, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Object = @object;
             Data = data;
@@ -81,16 +81,16 @@ internal InternalOpenAIPageableListOfMessageFile(OpenAIPageableListOfMessageFile
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="InternalOpenAIPageableListOfMessageFile"/> for deserialization. </summary>
-        internal InternalOpenAIPageableListOfMessageFile()
+        /// <summary> Initializes a new instance of <see cref="OpenAIPageableListOfVectorStoreFile"/> for deserialization. </summary>
+        internal OpenAIPageableListOfVectorStoreFile()
         {
         }
 
         /// <summary> The object type, which is always list. </summary>
-        public OpenAIPageableListOfMessageFileObject Object { get; } = OpenAIPageableListOfMessageFileObject.List;
+        public OpenAIPageableListOfVectorStoreFileObject Object { get; } = OpenAIPageableListOfVectorStoreFileObject.List;
 
         /// <summary> The requested list of items. </summary>
-        public IReadOnlyList<MessageFile> Data { get; }
+        public IReadOnlyList<VectorStoreFile> Data { get; }
         /// <summary> The first ID represented in this list. </summary>
         public string FirstId { get; }
         /// <summary> The last ID represented in this list. </summary>
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStoreFileObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStoreFileObject.cs
new file mode 100644
index 000000000000..1c678fe63a61
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStoreFileObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The OpenAIPageableListOfVectorStoreFile_object. </summary>
+    public readonly partial struct OpenAIPageableListOfVectorStoreFileObject : IEquatable<OpenAIPageableListOfVectorStoreFileObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="OpenAIPageableListOfVectorStoreFileObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public OpenAIPageableListOfVectorStoreFileObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ListValue = "list";
+
+        /// <summary> list. </summary>
+        public static OpenAIPageableListOfVectorStoreFileObject List { get; } = new OpenAIPageableListOfVectorStoreFileObject(ListValue);
+        /// <summary> Determines if two <see cref="OpenAIPageableListOfVectorStoreFileObject"/> values are the same. </summary>
+        public static bool operator ==(OpenAIPageableListOfVectorStoreFileObject left, OpenAIPageableListOfVectorStoreFileObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="OpenAIPageableListOfVectorStoreFileObject"/> values are not the same. </summary>
+        public static bool operator !=(OpenAIPageableListOfVectorStoreFileObject left, OpenAIPageableListOfVectorStoreFileObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="OpenAIPageableListOfVectorStoreFileObject"/>. </summary>
+        public static implicit operator OpenAIPageableListOfVectorStoreFileObject(string value) => new OpenAIPageableListOfVectorStoreFileObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is OpenAIPageableListOfVectorStoreFileObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(OpenAIPageableListOfVectorStoreFileObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfMessageFileObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStoreObject.cs
similarity index 55%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfMessageFileObject.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStoreObject.cs
index 9993d3b6fdec..38b2253eef2e 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfMessageFileObject.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/OpenAIPageableListOfVectorStoreObject.cs
@@ -10,14 +10,14 @@
 
 namespace Azure.AI.OpenAI.Assistants
 {
-    /// <summary> The OpenAIPageableListOfMessageFile_object. </summary>
-    internal readonly partial struct OpenAIPageableListOfMessageFileObject : IEquatable<OpenAIPageableListOfMessageFileObject>
+    /// <summary> The OpenAIPageableListOfVectorStore_object. </summary>
+    public readonly partial struct OpenAIPageableListOfVectorStoreObject : IEquatable<OpenAIPageableListOfVectorStoreObject>
     {
         private readonly string _value;
 
-        /// <summary> Initializes a new instance of <see cref="OpenAIPageableListOfMessageFileObject"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="OpenAIPageableListOfVectorStoreObject"/>. </summary>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public OpenAIPageableListOfMessageFileObject(string value)
+        public OpenAIPageableListOfVectorStoreObject(string value)
         {
             _value = value ?? throw new ArgumentNullException(nameof(value));
         }
@@ -25,19 +25,19 @@ public OpenAIPageableListOfMessageFileObject(string value)
         private const string ListValue = "list";
 
         /// <summary> list. </summary>
-        public static OpenAIPageableListOfMessageFileObject List { get; } = new OpenAIPageableListOfMessageFileObject(ListValue);
-        /// <summary> Determines if two <see cref="OpenAIPageableListOfMessageFileObject"/> values are the same. </summary>
-        public static bool operator ==(OpenAIPageableListOfMessageFileObject left, OpenAIPageableListOfMessageFileObject right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="OpenAIPageableListOfMessageFileObject"/> values are not the same. </summary>
-        public static bool operator !=(OpenAIPageableListOfMessageFileObject left, OpenAIPageableListOfMessageFileObject right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="OpenAIPageableListOfMessageFileObject"/>. </summary>
-        public static implicit operator OpenAIPageableListOfMessageFileObject(string value) => new OpenAIPageableListOfMessageFileObject(value);
+        public static OpenAIPageableListOfVectorStoreObject List { get; } = new OpenAIPageableListOfVectorStoreObject(ListValue);
+        /// <summary> Determines if two <see cref="OpenAIPageableListOfVectorStoreObject"/> values are the same. </summary>
+        public static bool operator ==(OpenAIPageableListOfVectorStoreObject left, OpenAIPageableListOfVectorStoreObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="OpenAIPageableListOfVectorStoreObject"/> values are not the same. </summary>
+        public static bool operator !=(OpenAIPageableListOfVectorStoreObject left, OpenAIPageableListOfVectorStoreObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="OpenAIPageableListOfVectorStoreObject"/>. </summary>
+        public static implicit operator OpenAIPageableListOfVectorStoreObject(string value) => new OpenAIPageableListOfVectorStoreObject(value);
 
         /// <inheritdoc />
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is OpenAIPageableListOfMessageFileObject other && Equals(other);
+        public override bool Equals(object obj) => obj is OpenAIPageableListOfVectorStoreObject other && Equals(other);
         /// <inheritdoc />
-        public bool Equals(OpenAIPageableListOfMessageFileObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+        public bool Equals(OpenAIPageableListOfVectorStoreObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
         /// <inheritdoc />
         [EditorBrowsable(EditorBrowsableState.Never)]
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RetrievalToolDefinition.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RetrievalToolDefinition.cs
deleted file mode 100644
index f2f39855b348..000000000000
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RetrievalToolDefinition.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Assistants
-{
-    /// <summary> The input definition information for a retrieval tool as used to configure an assistant. </summary>
-    public partial class RetrievalToolDefinition : ToolDefinition
-    {
-        /// <summary> Initializes a new instance of <see cref="RetrievalToolDefinition"/>. </summary>
-        public RetrievalToolDefinition()
-        {
-            Type = "retrieval";
-        }
-
-        /// <summary> Initializes a new instance of <see cref="RetrievalToolDefinition"/>. </summary>
-        /// <param name="type"> The object type. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal RetrievalToolDefinition(string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
-        {
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunCompletionUsage.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunCompletionUsage.Serialization.cs
new file mode 100644
index 000000000000..c7a00fd70182
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunCompletionUsage.Serialization.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunCompletionUsage : IUtf8JsonSerializable, IJsonModel<RunCompletionUsage>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunCompletionUsage>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunCompletionUsage>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunCompletionUsage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunCompletionUsage)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("completion_tokens"u8);
+            writer.WriteNumberValue(CompletionTokens);
+            writer.WritePropertyName("prompt_tokens"u8);
+            writer.WriteNumberValue(PromptTokens);
+            writer.WritePropertyName("total_tokens"u8);
+            writer.WriteNumberValue(TotalTokens);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunCompletionUsage IJsonModel<RunCompletionUsage>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunCompletionUsage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunCompletionUsage)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunCompletionUsage(document.RootElement, options);
+        }
+
+        internal static RunCompletionUsage DeserializeRunCompletionUsage(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            long completionTokens = default;
+            long promptTokens = default;
+            long totalTokens = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("completion_tokens"u8))
+                {
+                    completionTokens = property.Value.GetInt64();
+                    continue;
+                }
+                if (property.NameEquals("prompt_tokens"u8))
+                {
+                    promptTokens = property.Value.GetInt64();
+                    continue;
+                }
+                if (property.NameEquals("total_tokens"u8))
+                {
+                    totalTokens = property.Value.GetInt64();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunCompletionUsage(completionTokens, promptTokens, totalTokens, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<RunCompletionUsage>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunCompletionUsage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunCompletionUsage)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunCompletionUsage IPersistableModel<RunCompletionUsage>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunCompletionUsage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunCompletionUsage(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunCompletionUsage)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunCompletionUsage>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static RunCompletionUsage FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunCompletionUsage(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunCompletionUsage.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunCompletionUsage.cs
new file mode 100644
index 000000000000..2dfd3c2ee2c8
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunCompletionUsage.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Usage statistics related to the run. This value will be `null` if the run is not in a terminal state (i.e. `in_progress`, `queued`, etc.). </summary>
+    public partial class RunCompletionUsage
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="RunCompletionUsage"/>. </summary>
+        /// <param name="completionTokens"> Number of completion tokens used over the course of the run. </param>
+        /// <param name="promptTokens"> Number of prompt tokens used over the course of the run. </param>
+        /// <param name="totalTokens"> Total number of tokens used (prompt + completion). </param>
+        internal RunCompletionUsage(long completionTokens, long promptTokens, long totalTokens)
+        {
+            CompletionTokens = completionTokens;
+            PromptTokens = promptTokens;
+            TotalTokens = totalTokens;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunCompletionUsage"/>. </summary>
+        /// <param name="completionTokens"> Number of completion tokens used over the course of the run. </param>
+        /// <param name="promptTokens"> Number of prompt tokens used over the course of the run. </param>
+        /// <param name="totalTokens"> Total number of tokens used (prompt + completion). </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal RunCompletionUsage(long completionTokens, long promptTokens, long totalTokens, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            CompletionTokens = completionTokens;
+            PromptTokens = promptTokens;
+            TotalTokens = totalTokens;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunCompletionUsage"/> for deserialization. </summary>
+        internal RunCompletionUsage()
+        {
+        }
+
+        /// <summary> Number of completion tokens used over the course of the run. </summary>
+        public long CompletionTokens { get; }
+        /// <summary> Number of prompt tokens used over the course of the run. </summary>
+        public long PromptTokens { get; }
+        /// <summary> Total number of tokens used (prompt + completion). </summary>
+        public long TotalTokens { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStep.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStep.Serialization.cs
index d1e90dfd8187..a1118659acac 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStep.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStep.Serialization.cs
@@ -89,6 +89,18 @@ void IJsonModel<RunStep>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions o
             {
                 writer.WriteNull("failed_at");
             }
+            if (Optional.IsDefined(Usage))
+            {
+                if (Usage != null)
+                {
+                    writer.WritePropertyName("usage"u8);
+                    writer.WriteObjectValue(Usage, options);
+                }
+                else
+                {
+                    writer.WriteNull("usage");
+                }
+            }
             if (Metadata != null && Optional.IsCollectionDefined(Metadata))
             {
                 writer.WritePropertyName("metadata"u8);
@@ -156,6 +168,7 @@ internal static RunStep DeserializeRunStep(JsonElement element, ModelReaderWrite
             DateTimeOffset? completedAt = default;
             DateTimeOffset? cancelledAt = default;
             DateTimeOffset? failedAt = default;
+            RunStepCompletionUsage usage = default;
             IReadOnlyDictionary<string, string> metadata = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -236,6 +249,16 @@ internal static RunStep DeserializeRunStep(JsonElement element, ModelReaderWrite
                     DeserializeNullableDateTimeOffset(property, ref failedAt);
                     continue;
                 }
+                if (property.NameEquals("usage"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        usage = null;
+                        continue;
+                    }
+                    usage = RunStepCompletionUsage.DeserializeRunStepCompletionUsage(property.Value, options);
+                    continue;
+                }
                 if (property.NameEquals("metadata"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
@@ -272,6 +295,7 @@ internal static RunStep DeserializeRunStep(JsonElement element, ModelReaderWrite
                 completedAt,
                 cancelledAt,
                 failedAt,
+                usage,
                 metadata,
                 serializedAdditionalRawData);
         }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStep.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStep.cs
index 9d8d21d55457..3b622f261eb6 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStep.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStep.cs
@@ -108,9 +108,10 @@ internal RunStep(string id, RunStepType type, string assistantId, string threadI
         /// <param name="completedAt"> The Unix timestamp, in seconds, representing when this completed. </param>
         /// <param name="cancelledAt"> The Unix timestamp, in seconds, representing when this was cancelled. </param>
         /// <param name="failedAt"> The Unix timestamp, in seconds, representing when this failed. </param>
+        /// <param name="usage"> Usage statistics related to the run step. This value will be `null` while the run step's status is `in_progress`. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal RunStep(string id, string @object, RunStepType type, string assistantId, string threadId, string runId, RunStepStatus status, RunStepDetails stepDetails, RunStepError lastError, DateTimeOffset createdAt, DateTimeOffset? expiredAt, DateTimeOffset? completedAt, DateTimeOffset? cancelledAt, DateTimeOffset? failedAt, IReadOnlyDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal RunStep(string id, string @object, RunStepType type, string assistantId, string threadId, string runId, RunStepStatus status, RunStepDetails stepDetails, RunStepError lastError, DateTimeOffset createdAt, DateTimeOffset? expiredAt, DateTimeOffset? completedAt, DateTimeOffset? cancelledAt, DateTimeOffset? failedAt, RunStepCompletionUsage usage, IReadOnlyDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Id = id;
             Object = @object;
@@ -126,6 +127,7 @@ internal RunStep(string id, string @object, RunStepType type, string assistantId
             CompletedAt = completedAt;
             CancelledAt = cancelledAt;
             FailedAt = failedAt;
+            Usage = usage;
             Metadata = metadata;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
@@ -166,6 +168,8 @@ internal RunStep()
         public DateTimeOffset? CancelledAt { get; }
         /// <summary> The Unix timestamp, in seconds, representing when this failed. </summary>
         public DateTimeOffset? FailedAt { get; }
+        /// <summary> Usage statistics related to the run step. This value will be `null` while the run step's status is `in_progress`. </summary>
+        public RunStepCompletionUsage Usage { get; }
         /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
         public IReadOnlyDictionary<string, string> Metadata { get; }
     }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepCompletionUsage.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepCompletionUsage.Serialization.cs
new file mode 100644
index 000000000000..11af2fe4c1ef
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepCompletionUsage.Serialization.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunStepCompletionUsage : IUtf8JsonSerializable, IJsonModel<RunStepCompletionUsage>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepCompletionUsage>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepCompletionUsage>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepCompletionUsage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepCompletionUsage)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("completion_tokens"u8);
+            writer.WriteNumberValue(CompletionTokens);
+            writer.WritePropertyName("prompt_tokens"u8);
+            writer.WriteNumberValue(PromptTokens);
+            writer.WritePropertyName("total_tokens"u8);
+            writer.WriteNumberValue(TotalTokens);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepCompletionUsage IJsonModel<RunStepCompletionUsage>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepCompletionUsage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepCompletionUsage)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepCompletionUsage(document.RootElement, options);
+        }
+
+        internal static RunStepCompletionUsage DeserializeRunStepCompletionUsage(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            long completionTokens = default;
+            long promptTokens = default;
+            long totalTokens = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("completion_tokens"u8))
+                {
+                    completionTokens = property.Value.GetInt64();
+                    continue;
+                }
+                if (property.NameEquals("prompt_tokens"u8))
+                {
+                    promptTokens = property.Value.GetInt64();
+                    continue;
+                }
+                if (property.NameEquals("total_tokens"u8))
+                {
+                    totalTokens = property.Value.GetInt64();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunStepCompletionUsage(completionTokens, promptTokens, totalTokens, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<RunStepCompletionUsage>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepCompletionUsage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepCompletionUsage)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepCompletionUsage IPersistableModel<RunStepCompletionUsage>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepCompletionUsage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepCompletionUsage(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepCompletionUsage)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepCompletionUsage>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static RunStepCompletionUsage FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepCompletionUsage(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepCompletionUsage.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepCompletionUsage.cs
new file mode 100644
index 000000000000..738d57f0df80
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepCompletionUsage.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Usage statistics related to the run step. </summary>
+    public partial class RunStepCompletionUsage
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="RunStepCompletionUsage"/>. </summary>
+        /// <param name="completionTokens"> Number of completion tokens used over the course of the run step. </param>
+        /// <param name="promptTokens"> Number of prompt tokens used over the course of the run step. </param>
+        /// <param name="totalTokens"> Total number of tokens used (prompt + completion). </param>
+        internal RunStepCompletionUsage(long completionTokens, long promptTokens, long totalTokens)
+        {
+            CompletionTokens = completionTokens;
+            PromptTokens = promptTokens;
+            TotalTokens = totalTokens;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepCompletionUsage"/>. </summary>
+        /// <param name="completionTokens"> Number of completion tokens used over the course of the run step. </param>
+        /// <param name="promptTokens"> Number of prompt tokens used over the course of the run step. </param>
+        /// <param name="totalTokens"> Total number of tokens used (prompt + completion). </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal RunStepCompletionUsage(long completionTokens, long promptTokens, long totalTokens, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            CompletionTokens = completionTokens;
+            PromptTokens = promptTokens;
+            TotalTokens = totalTokens;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepCompletionUsage"/> for deserialization. </summary>
+        internal RunStepCompletionUsage()
+        {
+        }
+
+        /// <summary> Number of completion tokens used over the course of the run step. </summary>
+        public long CompletionTokens { get; }
+        /// <summary> Number of prompt tokens used over the course of the run step. </summary>
+        public long PromptTokens { get; }
+        /// <summary> Total number of tokens used (prompt + completion). </summary>
+        public long TotalTokens { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDelta.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDelta.Serialization.cs
new file mode 100644
index 000000000000..aa432bbe3d8d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDelta.Serialization.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunStepDelta : IUtf8JsonSerializable, IJsonModel<RunStepDelta>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDelta>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDelta>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDelta>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDelta)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(StepDetails))
+            {
+                writer.WritePropertyName("step_details"u8);
+                writer.WriteObjectValue(StepDetails, options);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDelta IJsonModel<RunStepDelta>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDelta>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDelta)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDelta(document.RootElement, options);
+        }
+
+        internal static RunStepDelta DeserializeRunStepDelta(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            RunStepDeltaDetail stepDetails = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("step_details"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    stepDetails = RunStepDeltaDetail.DeserializeRunStepDeltaDetail(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunStepDelta(stepDetails, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<RunStepDelta>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDelta>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDelta)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDelta IPersistableModel<RunStepDelta>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDelta>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDelta(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDelta)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDelta>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static RunStepDelta FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDelta(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDelta.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDelta.cs
new file mode 100644
index 000000000000..9b28f292c68b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDelta.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents the delta payload in a streaming run step delta chunk. </summary>
+    public partial class RunStepDelta
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDelta"/>. </summary>
+        internal RunStepDelta()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDelta"/>. </summary>
+        /// <param name="stepDetails">
+        /// The details of the run step.
+        /// Please note <see cref="RunStepDeltaDetail"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="RunStepDeltaMessageCreation"/> and <see cref="RunStepDeltaToolCallObject"/>.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal RunStepDelta(RunStepDeltaDetail stepDetails, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            StepDetails = stepDetails;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary>
+        /// The details of the run step.
+        /// Please note <see cref="RunStepDeltaDetail"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="RunStepDeltaMessageCreation"/> and <see cref="RunStepDeltaToolCallObject"/>.
+        /// </summary>
+        public RunStepDeltaDetail StepDetails { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaChunk.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaChunk.Serialization.cs
new file mode 100644
index 000000000000..2aa656e530bb
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaChunk.Serialization.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunStepDeltaChunk : IUtf8JsonSerializable, IJsonModel<RunStepDeltaChunk>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaChunk>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaChunk>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaChunk>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaChunk)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("object"u8);
+            writer.WriteStringValue(Object.ToString());
+            writer.WritePropertyName("delta"u8);
+            writer.WriteObjectValue(Delta, options);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaChunk IJsonModel<RunStepDeltaChunk>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaChunk>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaChunk)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaChunk(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaChunk DeserializeRunStepDeltaChunk(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string id = default;
+            RunStepDeltaChunkObject @object = default;
+            RunStepDelta delta = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("object"u8))
+                {
+                    @object = new RunStepDeltaChunkObject(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("delta"u8))
+                {
+                    delta = RunStepDelta.DeserializeRunStepDelta(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunStepDeltaChunk(id, @object, delta, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaChunk>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaChunk>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaChunk)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaChunk IPersistableModel<RunStepDeltaChunk>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaChunk>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaChunk(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaChunk)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaChunk>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static RunStepDeltaChunk FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaChunk(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaChunk.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaChunk.cs
new file mode 100644
index 000000000000..b577dd0a9f7d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaChunk.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents a run step delta i.e. any changed fields on a run step during streaming. </summary>
+    public partial class RunStepDeltaChunk
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaChunk"/>. </summary>
+        /// <param name="id"> The identifier of the run step, which can be referenced in API endpoints. </param>
+        /// <param name="delta"> The delta containing the fields that have changed on the run step. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> or <paramref name="delta"/> is null. </exception>
+        internal RunStepDeltaChunk(string id, RunStepDelta delta)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+            Argument.AssertNotNull(delta, nameof(delta));
+
+            Id = id;
+            Delta = delta;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaChunk"/>. </summary>
+        /// <param name="id"> The identifier of the run step, which can be referenced in API endpoints. </param>
+        /// <param name="object"> The object type, which is always `thread.run.step.delta`. </param>
+        /// <param name="delta"> The delta containing the fields that have changed on the run step. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal RunStepDeltaChunk(string id, RunStepDeltaChunkObject @object, RunStepDelta delta, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            Object = @object;
+            Delta = delta;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaChunk"/> for deserialization. </summary>
+        internal RunStepDeltaChunk()
+        {
+        }
+
+        /// <summary> The identifier of the run step, which can be referenced in API endpoints. </summary>
+        public string Id { get; }
+        /// <summary> The object type, which is always `thread.run.step.delta`. </summary>
+        public RunStepDeltaChunkObject Object { get; } = RunStepDeltaChunkObject.ThreadRunStepDelta;
+
+        /// <summary> The delta containing the fields that have changed on the run step. </summary>
+        public RunStepDelta Delta { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaChunkObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaChunkObject.cs
new file mode 100644
index 000000000000..4cadb42a2b35
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaChunkObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The RunStepDeltaChunk_object. </summary>
+    public readonly partial struct RunStepDeltaChunkObject : IEquatable<RunStepDeltaChunkObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaChunkObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public RunStepDeltaChunkObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ThreadRunStepDeltaValue = "thread.run.step.delta";
+
+        /// <summary> thread.run.step.delta. </summary>
+        public static RunStepDeltaChunkObject ThreadRunStepDelta { get; } = new RunStepDeltaChunkObject(ThreadRunStepDeltaValue);
+        /// <summary> Determines if two <see cref="RunStepDeltaChunkObject"/> values are the same. </summary>
+        public static bool operator ==(RunStepDeltaChunkObject left, RunStepDeltaChunkObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="RunStepDeltaChunkObject"/> values are not the same. </summary>
+        public static bool operator !=(RunStepDeltaChunkObject left, RunStepDeltaChunkObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="RunStepDeltaChunkObject"/>. </summary>
+        public static implicit operator RunStepDeltaChunkObject(string value) => new RunStepDeltaChunkObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is RunStepDeltaChunkObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(RunStepDeltaChunkObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterDetailItemObject.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterDetailItemObject.Serialization.cs
new file mode 100644
index 000000000000..5e994dae2f13
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterDetailItemObject.Serialization.cs
@@ -0,0 +1,163 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunStepDeltaCodeInterpreterDetailItemObject : IUtf8JsonSerializable, IJsonModel<RunStepDeltaCodeInterpreterDetailItemObject>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaCodeInterpreterDetailItemObject>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaCodeInterpreterDetailItemObject>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterDetailItemObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterDetailItemObject)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Input))
+            {
+                writer.WritePropertyName("input"u8);
+                writer.WriteStringValue(Input);
+            }
+            if (Optional.IsCollectionDefined(Outputs))
+            {
+                writer.WritePropertyName("outputs"u8);
+                writer.WriteStartArray();
+                foreach (var item in Outputs)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaCodeInterpreterDetailItemObject IJsonModel<RunStepDeltaCodeInterpreterDetailItemObject>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterDetailItemObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterDetailItemObject)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaCodeInterpreterDetailItemObject(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaCodeInterpreterDetailItemObject DeserializeRunStepDeltaCodeInterpreterDetailItemObject(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string input = default;
+            IReadOnlyList<RunStepDeltaCodeInterpreterOutput> outputs = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("input"u8))
+                {
+                    input = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("outputs"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<RunStepDeltaCodeInterpreterOutput> array = new List<RunStepDeltaCodeInterpreterOutput>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(RunStepDeltaCodeInterpreterOutput.DeserializeRunStepDeltaCodeInterpreterOutput(item, options));
+                    }
+                    outputs = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunStepDeltaCodeInterpreterDetailItemObject(input, outputs ?? new ChangeTrackingList<RunStepDeltaCodeInterpreterOutput>(), serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaCodeInterpreterDetailItemObject>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterDetailItemObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterDetailItemObject)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaCodeInterpreterDetailItemObject IPersistableModel<RunStepDeltaCodeInterpreterDetailItemObject>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterDetailItemObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaCodeInterpreterDetailItemObject(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterDetailItemObject)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaCodeInterpreterDetailItemObject>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static RunStepDeltaCodeInterpreterDetailItemObject FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaCodeInterpreterDetailItemObject(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterDetailItemObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterDetailItemObject.cs
new file mode 100644
index 000000000000..d3a655d903d0
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterDetailItemObject.cs
@@ -0,0 +1,82 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents the Code Interpreter tool call data in a streaming run step's tool calls. </summary>
+    public partial class RunStepDeltaCodeInterpreterDetailItemObject
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterDetailItemObject"/>. </summary>
+        internal RunStepDeltaCodeInterpreterDetailItemObject()
+        {
+            Outputs = new ChangeTrackingList<RunStepDeltaCodeInterpreterOutput>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterDetailItemObject"/>. </summary>
+        /// <param name="input"> The input into the Code Interpreter tool call. </param>
+        /// <param name="outputs">
+        /// The outputs from the Code Interpreter tool call. Code Interpreter can output one or more
+        /// items, including text (`logs`) or images (`image`). Each of these are represented by a
+        /// different object type.
+        /// Please note <see cref="RunStepDeltaCodeInterpreterOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="RunStepDeltaCodeInterpreterImageOutput"/> and <see cref="RunStepDeltaCodeInterpreterLogOutput"/>.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal RunStepDeltaCodeInterpreterDetailItemObject(string input, IReadOnlyList<RunStepDeltaCodeInterpreterOutput> outputs, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Input = input;
+            Outputs = outputs;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The input into the Code Interpreter tool call. </summary>
+        public string Input { get; }
+        /// <summary>
+        /// The outputs from the Code Interpreter tool call. Code Interpreter can output one or more
+        /// items, including text (`logs`) or images (`image`). Each of these are represented by a
+        /// different object type.
+        /// Please note <see cref="RunStepDeltaCodeInterpreterOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="RunStepDeltaCodeInterpreterImageOutput"/> and <see cref="RunStepDeltaCodeInterpreterLogOutput"/>.
+        /// </summary>
+        public IReadOnlyList<RunStepDeltaCodeInterpreterOutput> Outputs { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterImageOutput.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterImageOutput.Serialization.cs
new file mode 100644
index 000000000000..d04aca3ea636
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterImageOutput.Serialization.cs
@@ -0,0 +1,158 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunStepDeltaCodeInterpreterImageOutput : IUtf8JsonSerializable, IJsonModel<RunStepDeltaCodeInterpreterImageOutput>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaCodeInterpreterImageOutput>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaCodeInterpreterImageOutput>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterImageOutput>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterImageOutput)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Image))
+            {
+                writer.WritePropertyName("image"u8);
+                writer.WriteObjectValue(Image, options);
+            }
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaCodeInterpreterImageOutput IJsonModel<RunStepDeltaCodeInterpreterImageOutput>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterImageOutput>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterImageOutput)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaCodeInterpreterImageOutput(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaCodeInterpreterImageOutput DeserializeRunStepDeltaCodeInterpreterImageOutput(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            RunStepDeltaCodeInterpreterImageOutputObject image = default;
+            int index = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("image"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    image = RunStepDeltaCodeInterpreterImageOutputObject.DeserializeRunStepDeltaCodeInterpreterImageOutputObject(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunStepDeltaCodeInterpreterImageOutput(index, type, serializedAdditionalRawData, image);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaCodeInterpreterImageOutput>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterImageOutput>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterImageOutput)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaCodeInterpreterImageOutput IPersistableModel<RunStepDeltaCodeInterpreterImageOutput>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterImageOutput>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaCodeInterpreterImageOutput(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterImageOutput)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaCodeInterpreterImageOutput>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new RunStepDeltaCodeInterpreterImageOutput FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaCodeInterpreterImageOutput(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterImageOutput.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterImageOutput.cs
new file mode 100644
index 000000000000..0d80fac4887c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterImageOutput.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents an image output as produced the Code interpreter tool and as represented in a streaming run step's delta tool calls collection. </summary>
+    public partial class RunStepDeltaCodeInterpreterImageOutput : RunStepDeltaCodeInterpreterOutput
+    {
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterImageOutput"/>. </summary>
+        /// <param name="index"> The index of the output in the streaming run step tool call's Code Interpreter outputs array. </param>
+        internal RunStepDeltaCodeInterpreterImageOutput(int index) : base(index)
+        {
+            Type = "image";
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterImageOutput"/>. </summary>
+        /// <param name="index"> The index of the output in the streaming run step tool call's Code Interpreter outputs array. </param>
+        /// <param name="type"> The type of the streaming run step tool call's Code Interpreter output. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="image"> The image data for the Code Interpreter tool call output. </param>
+        internal RunStepDeltaCodeInterpreterImageOutput(int index, string type, IDictionary<string, BinaryData> serializedAdditionalRawData, RunStepDeltaCodeInterpreterImageOutputObject image) : base(index, type, serializedAdditionalRawData)
+        {
+            Image = image;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterImageOutput"/> for deserialization. </summary>
+        internal RunStepDeltaCodeInterpreterImageOutput()
+        {
+        }
+
+        /// <summary> The image data for the Code Interpreter tool call output. </summary>
+        public RunStepDeltaCodeInterpreterImageOutputObject Image { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterImageOutputObject.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterImageOutputObject.Serialization.cs
new file mode 100644
index 000000000000..9322d0b4b1ee
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterImageOutputObject.Serialization.cs
@@ -0,0 +1,138 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunStepDeltaCodeInterpreterImageOutputObject : IUtf8JsonSerializable, IJsonModel<RunStepDeltaCodeInterpreterImageOutputObject>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaCodeInterpreterImageOutputObject>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaCodeInterpreterImageOutputObject>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterImageOutputObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterImageOutputObject)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(FileId))
+            {
+                writer.WritePropertyName("file_id"u8);
+                writer.WriteStringValue(FileId);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaCodeInterpreterImageOutputObject IJsonModel<RunStepDeltaCodeInterpreterImageOutputObject>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterImageOutputObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterImageOutputObject)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaCodeInterpreterImageOutputObject(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaCodeInterpreterImageOutputObject DeserializeRunStepDeltaCodeInterpreterImageOutputObject(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string fileId = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_id"u8))
+                {
+                    fileId = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunStepDeltaCodeInterpreterImageOutputObject(fileId, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaCodeInterpreterImageOutputObject>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterImageOutputObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterImageOutputObject)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaCodeInterpreterImageOutputObject IPersistableModel<RunStepDeltaCodeInterpreterImageOutputObject>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterImageOutputObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaCodeInterpreterImageOutputObject(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterImageOutputObject)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaCodeInterpreterImageOutputObject>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static RunStepDeltaCodeInterpreterImageOutputObject FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaCodeInterpreterImageOutputObject(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/RequestContentFilterResult.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterImageOutputObject.cs
similarity index 62%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/RequestContentFilterResult.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterImageOutputObject.cs
index 74a54e0155bb..35c4bf8d080b 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/RequestContentFilterResult.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterImageOutputObject.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -5,10 +8,10 @@
 using System;
 using System.Collections.Generic;
 
-namespace Azure.AI.OpenAI
+namespace Azure.AI.OpenAI.Assistants
 {
-    /// <summary> A content filter result associated with a single input prompt item into a generative AI system. </summary>
-    public partial class RequestContentFilterResult
+    /// <summary> Represents the data for a streaming run step's Code Interpreter tool call image output. </summary>
+    public partial class RunStepDeltaCodeInterpreterImageOutputObject
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -40,21 +43,23 @@ public partial class RequestContentFilterResult
         /// </list>
         /// </para>
         /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="RequestContentFilterResult"/>. </summary>
-        internal RequestContentFilterResult()
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterImageOutputObject"/>. </summary>
+        internal RunStepDeltaCodeInterpreterImageOutputObject()
         {
         }
 
-        /// <summary> Initializes a new instance of <see cref="RequestContentFilterResult"/>. </summary>
-        /// <param name="promptIndex"> The index of the input prompt associated with the accompanying content filter result categories. </param>
-        /// <param name="internalResults"> The content filter category details for the result. </param>
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterImageOutputObject"/>. </summary>
+        /// <param name="fileId"> The file ID for the image. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal RequestContentFilterResult(int? promptIndex, InternalAzureContentFilterResultForPromptContentFilterResults internalResults, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal RunStepDeltaCodeInterpreterImageOutputObject(string fileId, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
-            PromptIndex = promptIndex;
-            InternalResults = internalResults;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
+            FileId = fileId;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
         }
+
+        /// <summary> The file ID for the image. </summary>
+        public string FileId { get; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterLogOutput.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterLogOutput.Serialization.cs
new file mode 100644
index 000000000000..bb764ac22b70
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterLogOutput.Serialization.cs
@@ -0,0 +1,154 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunStepDeltaCodeInterpreterLogOutput : IUtf8JsonSerializable, IJsonModel<RunStepDeltaCodeInterpreterLogOutput>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaCodeInterpreterLogOutput>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaCodeInterpreterLogOutput>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterLogOutput>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterLogOutput)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Logs))
+            {
+                writer.WritePropertyName("logs"u8);
+                writer.WriteStringValue(Logs);
+            }
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaCodeInterpreterLogOutput IJsonModel<RunStepDeltaCodeInterpreterLogOutput>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterLogOutput>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterLogOutput)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaCodeInterpreterLogOutput(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaCodeInterpreterLogOutput DeserializeRunStepDeltaCodeInterpreterLogOutput(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string logs = default;
+            int index = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("logs"u8))
+                {
+                    logs = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunStepDeltaCodeInterpreterLogOutput(index, type, serializedAdditionalRawData, logs);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaCodeInterpreterLogOutput>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterLogOutput>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterLogOutput)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaCodeInterpreterLogOutput IPersistableModel<RunStepDeltaCodeInterpreterLogOutput>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterLogOutput>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaCodeInterpreterLogOutput(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterLogOutput)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaCodeInterpreterLogOutput>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new RunStepDeltaCodeInterpreterLogOutput FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaCodeInterpreterLogOutput(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterLogOutput.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterLogOutput.cs
new file mode 100644
index 000000000000..96eaa7b38dc3
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterLogOutput.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents a log output as produced by the Code Interpreter tool and as represented in a streaming run step's delta tool calls collection. </summary>
+    public partial class RunStepDeltaCodeInterpreterLogOutput : RunStepDeltaCodeInterpreterOutput
+    {
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterLogOutput"/>. </summary>
+        /// <param name="index"> The index of the output in the streaming run step tool call's Code Interpreter outputs array. </param>
+        internal RunStepDeltaCodeInterpreterLogOutput(int index) : base(index)
+        {
+            Type = "logs";
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterLogOutput"/>. </summary>
+        /// <param name="index"> The index of the output in the streaming run step tool call's Code Interpreter outputs array. </param>
+        /// <param name="type"> The type of the streaming run step tool call's Code Interpreter output. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="logs"> The text output from the Code Interpreter tool call. </param>
+        internal RunStepDeltaCodeInterpreterLogOutput(int index, string type, IDictionary<string, BinaryData> serializedAdditionalRawData, string logs) : base(index, type, serializedAdditionalRawData)
+        {
+            Logs = logs;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterLogOutput"/> for deserialization. </summary>
+        internal RunStepDeltaCodeInterpreterLogOutput()
+        {
+        }
+
+        /// <summary> The text output from the Code Interpreter tool call. </summary>
+        public string Logs { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterOutput.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterOutput.Serialization.cs
new file mode 100644
index 000000000000..6e213cb7d63f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterOutput.Serialization.cs
@@ -0,0 +1,129 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    [PersistableModelProxy(typeof(UnknownRunStepDeltaCodeInterpreterOutput))]
+    public partial class RunStepDeltaCodeInterpreterOutput : IUtf8JsonSerializable, IJsonModel<RunStepDeltaCodeInterpreterOutput>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaCodeInterpreterOutput>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaCodeInterpreterOutput>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterOutput>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterOutput)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaCodeInterpreterOutput IJsonModel<RunStepDeltaCodeInterpreterOutput>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterOutput>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterOutput)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaCodeInterpreterOutput(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaCodeInterpreterOutput DeserializeRunStepDeltaCodeInterpreterOutput(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "image": return RunStepDeltaCodeInterpreterImageOutput.DeserializeRunStepDeltaCodeInterpreterImageOutput(element, options);
+                    case "logs": return RunStepDeltaCodeInterpreterLogOutput.DeserializeRunStepDeltaCodeInterpreterLogOutput(element, options);
+                }
+            }
+            return UnknownRunStepDeltaCodeInterpreterOutput.DeserializeUnknownRunStepDeltaCodeInterpreterOutput(element, options);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaCodeInterpreterOutput>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterOutput>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterOutput)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaCodeInterpreterOutput IPersistableModel<RunStepDeltaCodeInterpreterOutput>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterOutput>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaCodeInterpreterOutput(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterOutput)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaCodeInterpreterOutput>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static RunStepDeltaCodeInterpreterOutput FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaCodeInterpreterOutput(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterOutput.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterOutput.cs
new file mode 100644
index 000000000000..396e993239ce
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterOutput.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary>
+    /// The abstract base representation of a streaming run step tool call's Code Interpreter tool output.
+    /// Please note <see cref="RunStepDeltaCodeInterpreterOutput"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="RunStepDeltaCodeInterpreterImageOutput"/> and <see cref="RunStepDeltaCodeInterpreterLogOutput"/>.
+    /// </summary>
+    public abstract partial class RunStepDeltaCodeInterpreterOutput
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterOutput"/>. </summary>
+        /// <param name="index"> The index of the output in the streaming run step tool call's Code Interpreter outputs array. </param>
+        protected RunStepDeltaCodeInterpreterOutput(int index)
+        {
+            Index = index;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterOutput"/>. </summary>
+        /// <param name="index"> The index of the output in the streaming run step tool call's Code Interpreter outputs array. </param>
+        /// <param name="type"> The type of the streaming run step tool call's Code Interpreter output. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal RunStepDeltaCodeInterpreterOutput(int index, string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Index = index;
+            Type = type;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterOutput"/> for deserialization. </summary>
+        internal RunStepDeltaCodeInterpreterOutput()
+        {
+        }
+
+        /// <summary> The index of the output in the streaming run step tool call's Code Interpreter outputs array. </summary>
+        public int Index { get; }
+        /// <summary> The type of the streaming run step tool call's Code Interpreter output. </summary>
+        internal string Type { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterToolCall.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterToolCall.Serialization.cs
new file mode 100644
index 000000000000..1daa8feffe07
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterToolCall.Serialization.cs
@@ -0,0 +1,166 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunStepDeltaCodeInterpreterToolCall : IUtf8JsonSerializable, IJsonModel<RunStepDeltaCodeInterpreterToolCall>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaCodeInterpreterToolCall>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaCodeInterpreterToolCall>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterToolCall)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(CodeInterpreter))
+            {
+                writer.WritePropertyName("code_interpreter"u8);
+                writer.WriteObjectValue(CodeInterpreter, options);
+            }
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaCodeInterpreterToolCall IJsonModel<RunStepDeltaCodeInterpreterToolCall>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterToolCall)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaCodeInterpreterToolCall(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaCodeInterpreterToolCall DeserializeRunStepDeltaCodeInterpreterToolCall(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            RunStepDeltaCodeInterpreterDetailItemObject codeInterpreter = default;
+            int index = default;
+            string id = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("code_interpreter"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    codeInterpreter = RunStepDeltaCodeInterpreterDetailItemObject.DeserializeRunStepDeltaCodeInterpreterDetailItemObject(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunStepDeltaCodeInterpreterToolCall(index, id, type, serializedAdditionalRawData, codeInterpreter);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaCodeInterpreterToolCall>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterToolCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterToolCall)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaCodeInterpreterToolCall IPersistableModel<RunStepDeltaCodeInterpreterToolCall>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterToolCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaCodeInterpreterToolCall(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterToolCall)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaCodeInterpreterToolCall>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new RunStepDeltaCodeInterpreterToolCall FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaCodeInterpreterToolCall(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterToolCall.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterToolCall.cs
new file mode 100644
index 000000000000..059c30cbca81
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaCodeInterpreterToolCall.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents a Code Interpreter tool call within a streaming run step's tool call details. </summary>
+    public partial class RunStepDeltaCodeInterpreterToolCall : RunStepDeltaToolCall
+    {
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterToolCall"/>. </summary>
+        /// <param name="index"> The index of the tool call detail in the run step's tool_calls array. </param>
+        /// <param name="id"> The ID of the tool call, used when submitting outputs to the run. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
+        internal RunStepDeltaCodeInterpreterToolCall(int index, string id) : base(index, id)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+
+            Type = "code_interpreter";
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterToolCall"/>. </summary>
+        /// <param name="index"> The index of the tool call detail in the run step's tool_calls array. </param>
+        /// <param name="id"> The ID of the tool call, used when submitting outputs to the run. </param>
+        /// <param name="type"> The type of the tool call detail item in a streaming run step's details. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="codeInterpreter"> The Code Interpreter data for the tool call. </param>
+        internal RunStepDeltaCodeInterpreterToolCall(int index, string id, string type, IDictionary<string, BinaryData> serializedAdditionalRawData, RunStepDeltaCodeInterpreterDetailItemObject codeInterpreter) : base(index, id, type, serializedAdditionalRawData)
+        {
+            CodeInterpreter = codeInterpreter;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaCodeInterpreterToolCall"/> for deserialization. </summary>
+        internal RunStepDeltaCodeInterpreterToolCall()
+        {
+        }
+
+        /// <summary> The Code Interpreter data for the tool call. </summary>
+        public RunStepDeltaCodeInterpreterDetailItemObject CodeInterpreter { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaDetail.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaDetail.Serialization.cs
new file mode 100644
index 000000000000..274b792c2227
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaDetail.Serialization.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    [PersistableModelProxy(typeof(UnknownRunStepDeltaDetail))]
+    public partial class RunStepDeltaDetail : IUtf8JsonSerializable, IJsonModel<RunStepDeltaDetail>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaDetail>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaDetail>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaDetail>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaDetail)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaDetail IJsonModel<RunStepDeltaDetail>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaDetail>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaDetail)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaDetail(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaDetail DeserializeRunStepDeltaDetail(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "message_creation": return RunStepDeltaMessageCreation.DeserializeRunStepDeltaMessageCreation(element, options);
+                    case "tool_calls": return RunStepDeltaToolCallObject.DeserializeRunStepDeltaToolCallObject(element, options);
+                }
+            }
+            return UnknownRunStepDeltaDetail.DeserializeUnknownRunStepDeltaDetail(element, options);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaDetail>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaDetail>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaDetail)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaDetail IPersistableModel<RunStepDeltaDetail>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaDetail>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaDetail(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaDetail)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaDetail>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static RunStepDeltaDetail FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaDetail(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceVectorizer.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaDetail.cs
similarity index 55%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceVectorizer.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaDetail.cs
index 474c2459025b..508fac38660c 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceVectorizer.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaDetail.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -5,13 +8,14 @@
 using System;
 using System.Collections.Generic;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI.Assistants
 {
     /// <summary>
-    /// A representation of a data vectorization source usable as an embedding resource with a data source.
-    /// Please note <see cref="DataSourceVectorizer"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
+    /// Represents a single run step detail item in a streaming run step's delta payload.
+    /// Please note <see cref="RunStepDeltaDetail"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="RunStepDeltaMessageCreation"/> and <see cref="RunStepDeltaToolCallObject"/>.
     /// </summary>
-    public abstract partial class DataSourceVectorizer
+    public abstract partial class RunStepDeltaDetail
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -43,22 +47,23 @@ public abstract partial class DataSourceVectorizer
         /// </list>
         /// </para>
         /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="DataSourceVectorizer"/>. </summary>
-        protected DataSourceVectorizer()
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaDetail"/>. </summary>
+        protected RunStepDeltaDetail()
         {
         }
 
-        /// <summary> Initializes a new instance of <see cref="DataSourceVectorizer"/>. </summary>
-        /// <param name="type"> The differentiating identifier for the concrete vectorization source. </param>
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaDetail"/>. </summary>
+        /// <param name="type"> The object type for the run step detail object. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DataSourceVectorizer(string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal RunStepDeltaDetail(string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Type = type;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> The differentiating identifier for the concrete vectorization source. </summary>
+        /// <summary> The object type for the run step detail object. </summary>
         internal string Type { get; set; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFileSearchToolCall.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFileSearchToolCall.Serialization.cs
new file mode 100644
index 000000000000..bfbb55ddae92
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFileSearchToolCall.Serialization.cs
@@ -0,0 +1,177 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunStepDeltaFileSearchToolCall : IUtf8JsonSerializable, IJsonModel<RunStepDeltaFileSearchToolCall>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaFileSearchToolCall>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaFileSearchToolCall>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaFileSearchToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaFileSearchToolCall)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsCollectionDefined(FileSearch))
+            {
+                writer.WritePropertyName("file_search"u8);
+                writer.WriteStartObject();
+                foreach (var item in FileSearch)
+                {
+                    writer.WritePropertyName(item.Key);
+                    writer.WriteStringValue(item.Value);
+                }
+                writer.WriteEndObject();
+            }
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaFileSearchToolCall IJsonModel<RunStepDeltaFileSearchToolCall>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaFileSearchToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaFileSearchToolCall)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaFileSearchToolCall(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaFileSearchToolCall DeserializeRunStepDeltaFileSearchToolCall(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IReadOnlyDictionary<string, string> fileSearch = default;
+            int index = default;
+            string id = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_search"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
+                    foreach (var property0 in property.Value.EnumerateObject())
+                    {
+                        dictionary.Add(property0.Name, property0.Value.GetString());
+                    }
+                    fileSearch = dictionary;
+                    continue;
+                }
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunStepDeltaFileSearchToolCall(index, id, type, serializedAdditionalRawData, fileSearch ?? new ChangeTrackingDictionary<string, string>());
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaFileSearchToolCall>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaFileSearchToolCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaFileSearchToolCall)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaFileSearchToolCall IPersistableModel<RunStepDeltaFileSearchToolCall>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaFileSearchToolCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaFileSearchToolCall(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaFileSearchToolCall)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaFileSearchToolCall>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new RunStepDeltaFileSearchToolCall FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaFileSearchToolCall(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFileSearchToolCall.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFileSearchToolCall.cs
new file mode 100644
index 000000000000..7be515d9cc76
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFileSearchToolCall.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents a file search tool call within a streaming run step's tool call details. </summary>
+    public partial class RunStepDeltaFileSearchToolCall : RunStepDeltaToolCall
+    {
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaFileSearchToolCall"/>. </summary>
+        /// <param name="index"> The index of the tool call detail in the run step's tool_calls array. </param>
+        /// <param name="id"> The ID of the tool call, used when submitting outputs to the run. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
+        internal RunStepDeltaFileSearchToolCall(int index, string id) : base(index, id)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+
+            Type = "file_search";
+            FileSearch = new ChangeTrackingDictionary<string, string>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaFileSearchToolCall"/>. </summary>
+        /// <param name="index"> The index of the tool call detail in the run step's tool_calls array. </param>
+        /// <param name="id"> The ID of the tool call, used when submitting outputs to the run. </param>
+        /// <param name="type"> The type of the tool call detail item in a streaming run step's details. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="fileSearch"> Reserved for future use. </param>
+        internal RunStepDeltaFileSearchToolCall(int index, string id, string type, IDictionary<string, BinaryData> serializedAdditionalRawData, IReadOnlyDictionary<string, string> fileSearch) : base(index, id, type, serializedAdditionalRawData)
+        {
+            FileSearch = fileSearch;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaFileSearchToolCall"/> for deserialization. </summary>
+        internal RunStepDeltaFileSearchToolCall()
+        {
+        }
+
+        /// <summary> Reserved for future use. </summary>
+        public IReadOnlyDictionary<string, string> FileSearch { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFunction.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFunction.Serialization.cs
new file mode 100644
index 000000000000..e1f73cd20f39
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFunction.Serialization.cs
@@ -0,0 +1,172 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunStepDeltaFunction : IUtf8JsonSerializable, IJsonModel<RunStepDeltaFunction>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaFunction>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaFunction>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaFunction>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaFunction)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Name))
+            {
+                writer.WritePropertyName("name"u8);
+                writer.WriteStringValue(Name);
+            }
+            if (Optional.IsDefined(Arguments))
+            {
+                writer.WritePropertyName("arguments"u8);
+                writer.WriteStringValue(Arguments);
+            }
+            if (Optional.IsDefined(Output))
+            {
+                if (Output != null)
+                {
+                    writer.WritePropertyName("output"u8);
+                    writer.WriteStringValue(Output);
+                }
+                else
+                {
+                    writer.WriteNull("output");
+                }
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaFunction IJsonModel<RunStepDeltaFunction>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaFunction>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaFunction)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaFunction(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaFunction DeserializeRunStepDeltaFunction(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string name = default;
+            string arguments = default;
+            string output = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("name"u8))
+                {
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("arguments"u8))
+                {
+                    arguments = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("output"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        output = null;
+                        continue;
+                    }
+                    output = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunStepDeltaFunction(name, arguments, output, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaFunction>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaFunction>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaFunction)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaFunction IPersistableModel<RunStepDeltaFunction>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaFunction>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaFunction(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaFunction)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaFunction>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static RunStepDeltaFunction FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaFunction(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFunction.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFunction.cs
new file mode 100644
index 000000000000..df34c88e6f43
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFunction.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents the function data in a streaming run step delta's function tool call. </summary>
+    public partial class RunStepDeltaFunction
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaFunction"/>. </summary>
+        internal RunStepDeltaFunction()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaFunction"/>. </summary>
+        /// <param name="name"> The name of the function. </param>
+        /// <param name="arguments"> The arguments passed to the function as input. </param>
+        /// <param name="output"> The output of the function, null if outputs have not yet been submitted. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal RunStepDeltaFunction(string name, string arguments, string output, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Name = name;
+            Arguments = arguments;
+            Output = output;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The name of the function. </summary>
+        public string Name { get; }
+        /// <summary> The arguments passed to the function as input. </summary>
+        public string Arguments { get; }
+        /// <summary> The output of the function, null if outputs have not yet been submitted. </summary>
+        public string Output { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFunctionToolCall.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFunctionToolCall.Serialization.cs
new file mode 100644
index 000000000000..43ebba310262
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFunctionToolCall.Serialization.cs
@@ -0,0 +1,166 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunStepDeltaFunctionToolCall : IUtf8JsonSerializable, IJsonModel<RunStepDeltaFunctionToolCall>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaFunctionToolCall>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaFunctionToolCall>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaFunctionToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaFunctionToolCall)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Function))
+            {
+                writer.WritePropertyName("function"u8);
+                writer.WriteObjectValue(Function, options);
+            }
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaFunctionToolCall IJsonModel<RunStepDeltaFunctionToolCall>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaFunctionToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaFunctionToolCall)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaFunctionToolCall(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaFunctionToolCall DeserializeRunStepDeltaFunctionToolCall(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            RunStepDeltaFunction function = default;
+            int index = default;
+            string id = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("function"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    function = RunStepDeltaFunction.DeserializeRunStepDeltaFunction(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunStepDeltaFunctionToolCall(index, id, type, serializedAdditionalRawData, function);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaFunctionToolCall>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaFunctionToolCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaFunctionToolCall)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaFunctionToolCall IPersistableModel<RunStepDeltaFunctionToolCall>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaFunctionToolCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaFunctionToolCall(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaFunctionToolCall)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaFunctionToolCall>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new RunStepDeltaFunctionToolCall FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaFunctionToolCall(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFunctionToolCall.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFunctionToolCall.cs
new file mode 100644
index 000000000000..ce9d9486ef82
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaFunctionToolCall.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents a function tool call within a streaming run step's tool call details. </summary>
+    public partial class RunStepDeltaFunctionToolCall : RunStepDeltaToolCall
+    {
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaFunctionToolCall"/>. </summary>
+        /// <param name="index"> The index of the tool call detail in the run step's tool_calls array. </param>
+        /// <param name="id"> The ID of the tool call, used when submitting outputs to the run. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
+        internal RunStepDeltaFunctionToolCall(int index, string id) : base(index, id)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+
+            Type = "function";
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaFunctionToolCall"/>. </summary>
+        /// <param name="index"> The index of the tool call detail in the run step's tool_calls array. </param>
+        /// <param name="id"> The ID of the tool call, used when submitting outputs to the run. </param>
+        /// <param name="type"> The type of the tool call detail item in a streaming run step's details. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="function"> The function data for the tool call. </param>
+        internal RunStepDeltaFunctionToolCall(int index, string id, string type, IDictionary<string, BinaryData> serializedAdditionalRawData, RunStepDeltaFunction function) : base(index, id, type, serializedAdditionalRawData)
+        {
+            Function = function;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaFunctionToolCall"/> for deserialization. </summary>
+        internal RunStepDeltaFunctionToolCall()
+        {
+        }
+
+        /// <summary> The function data for the tool call. </summary>
+        public RunStepDeltaFunction Function { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaMessageCreation.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaMessageCreation.Serialization.cs
new file mode 100644
index 000000000000..e526f0766540
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaMessageCreation.Serialization.cs
@@ -0,0 +1,150 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunStepDeltaMessageCreation : IUtf8JsonSerializable, IJsonModel<RunStepDeltaMessageCreation>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaMessageCreation>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaMessageCreation>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaMessageCreation>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaMessageCreation)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(MessageCreation))
+            {
+                writer.WritePropertyName("message_creation"u8);
+                writer.WriteObjectValue(MessageCreation, options);
+            }
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaMessageCreation IJsonModel<RunStepDeltaMessageCreation>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaMessageCreation>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaMessageCreation)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaMessageCreation(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaMessageCreation DeserializeRunStepDeltaMessageCreation(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            RunStepDeltaMessageCreationObject messageCreation = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("message_creation"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    messageCreation = RunStepDeltaMessageCreationObject.DeserializeRunStepDeltaMessageCreationObject(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunStepDeltaMessageCreation(type, serializedAdditionalRawData, messageCreation);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaMessageCreation>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaMessageCreation>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaMessageCreation)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaMessageCreation IPersistableModel<RunStepDeltaMessageCreation>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaMessageCreation>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaMessageCreation(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaMessageCreation)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaMessageCreation>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new RunStepDeltaMessageCreation FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaMessageCreation(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaMessageCreation.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaMessageCreation.cs
new file mode 100644
index 000000000000..38f8a808eeac
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaMessageCreation.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents a message creation within a streaming run step delta. </summary>
+    public partial class RunStepDeltaMessageCreation : RunStepDeltaDetail
+    {
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaMessageCreation"/>. </summary>
+        internal RunStepDeltaMessageCreation()
+        {
+            Type = "message_creation";
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaMessageCreation"/>. </summary>
+        /// <param name="type"> The object type for the run step detail object. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="messageCreation"> The message creation data. </param>
+        internal RunStepDeltaMessageCreation(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, RunStepDeltaMessageCreationObject messageCreation) : base(type, serializedAdditionalRawData)
+        {
+            MessageCreation = messageCreation;
+        }
+
+        /// <summary> The message creation data. </summary>
+        public RunStepDeltaMessageCreationObject MessageCreation { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaMessageCreationObject.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaMessageCreationObject.Serialization.cs
new file mode 100644
index 000000000000..58a72a5f6dc7
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaMessageCreationObject.Serialization.cs
@@ -0,0 +1,138 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunStepDeltaMessageCreationObject : IUtf8JsonSerializable, IJsonModel<RunStepDeltaMessageCreationObject>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaMessageCreationObject>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaMessageCreationObject>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaMessageCreationObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaMessageCreationObject)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(MessageId))
+            {
+                writer.WritePropertyName("message_id"u8);
+                writer.WriteStringValue(MessageId);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaMessageCreationObject IJsonModel<RunStepDeltaMessageCreationObject>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaMessageCreationObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaMessageCreationObject)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaMessageCreationObject(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaMessageCreationObject DeserializeRunStepDeltaMessageCreationObject(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string messageId = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("message_id"u8))
+                {
+                    messageId = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunStepDeltaMessageCreationObject(messageId, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaMessageCreationObject>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaMessageCreationObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaMessageCreationObject)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaMessageCreationObject IPersistableModel<RunStepDeltaMessageCreationObject>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaMessageCreationObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaMessageCreationObject(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaMessageCreationObject)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaMessageCreationObject>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static RunStepDeltaMessageCreationObject FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaMessageCreationObject(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaMessageCreationObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaMessageCreationObject.cs
new file mode 100644
index 000000000000..15aaccdbc60c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaMessageCreationObject.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents the data within a streaming run step message creation response object. </summary>
+    public partial class RunStepDeltaMessageCreationObject
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaMessageCreationObject"/>. </summary>
+        internal RunStepDeltaMessageCreationObject()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaMessageCreationObject"/>. </summary>
+        /// <param name="messageId"> The ID of the newly-created message. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal RunStepDeltaMessageCreationObject(string messageId, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            MessageId = messageId;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The ID of the newly-created message. </summary>
+        public string MessageId { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaToolCall.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaToolCall.Serialization.cs
new file mode 100644
index 000000000000..90c180755ad5
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaToolCall.Serialization.cs
@@ -0,0 +1,132 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    [PersistableModelProxy(typeof(UnknownRunStepDeltaToolCall))]
+    public partial class RunStepDeltaToolCall : IUtf8JsonSerializable, IJsonModel<RunStepDeltaToolCall>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaToolCall>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaToolCall>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaToolCall)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaToolCall IJsonModel<RunStepDeltaToolCall>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaToolCall)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaToolCall(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaToolCall DeserializeRunStepDeltaToolCall(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "code_interpreter": return RunStepDeltaCodeInterpreterToolCall.DeserializeRunStepDeltaCodeInterpreterToolCall(element, options);
+                    case "file_search": return RunStepDeltaFileSearchToolCall.DeserializeRunStepDeltaFileSearchToolCall(element, options);
+                    case "function": return RunStepDeltaFunctionToolCall.DeserializeRunStepDeltaFunctionToolCall(element, options);
+                }
+            }
+            return UnknownRunStepDeltaToolCall.DeserializeUnknownRunStepDeltaToolCall(element, options);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaToolCall>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaToolCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaToolCall)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaToolCall IPersistableModel<RunStepDeltaToolCall>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaToolCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaToolCall(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaToolCall)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaToolCall>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static RunStepDeltaToolCall FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaToolCall(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaToolCall.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaToolCall.cs
new file mode 100644
index 000000000000..c056ec5693c5
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaToolCall.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary>
+    /// The abstract base representation of a single tool call within a streaming run step's delta tool call details.
+    /// Please note <see cref="RunStepDeltaToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="RunStepDeltaCodeInterpreterToolCall"/>, <see cref="RunStepDeltaFileSearchToolCall"/> and <see cref="RunStepDeltaFunctionToolCall"/>.
+    /// </summary>
+    public abstract partial class RunStepDeltaToolCall
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaToolCall"/>. </summary>
+        /// <param name="index"> The index of the tool call detail in the run step's tool_calls array. </param>
+        /// <param name="id"> The ID of the tool call, used when submitting outputs to the run. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
+        protected RunStepDeltaToolCall(int index, string id)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+
+            Index = index;
+            Id = id;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaToolCall"/>. </summary>
+        /// <param name="index"> The index of the tool call detail in the run step's tool_calls array. </param>
+        /// <param name="id"> The ID of the tool call, used when submitting outputs to the run. </param>
+        /// <param name="type"> The type of the tool call detail item in a streaming run step's details. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal RunStepDeltaToolCall(int index, string id, string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Index = index;
+            Id = id;
+            Type = type;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaToolCall"/> for deserialization. </summary>
+        internal RunStepDeltaToolCall()
+        {
+        }
+
+        /// <summary> The index of the tool call detail in the run step's tool_calls array. </summary>
+        public int Index { get; }
+        /// <summary> The ID of the tool call, used when submitting outputs to the run. </summary>
+        public string Id { get; }
+        /// <summary> The type of the tool call detail item in a streaming run step's details. </summary>
+        internal string Type { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaToolCallObject.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaToolCallObject.Serialization.cs
new file mode 100644
index 000000000000..19a2a33bf278
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaToolCallObject.Serialization.cs
@@ -0,0 +1,160 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class RunStepDeltaToolCallObject : IUtf8JsonSerializable, IJsonModel<RunStepDeltaToolCallObject>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaToolCallObject>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaToolCallObject>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaToolCallObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaToolCallObject)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsCollectionDefined(ToolCalls))
+            {
+                writer.WritePropertyName("tool_calls"u8);
+                writer.WriteStartArray();
+                foreach (var item in ToolCalls)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaToolCallObject IJsonModel<RunStepDeltaToolCallObject>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaToolCallObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaToolCallObject)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaToolCallObject(document.RootElement, options);
+        }
+
+        internal static RunStepDeltaToolCallObject DeserializeRunStepDeltaToolCallObject(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IReadOnlyList<RunStepDeltaToolCall> toolCalls = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("tool_calls"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<RunStepDeltaToolCall> array = new List<RunStepDeltaToolCall>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(RunStepDeltaToolCall.DeserializeRunStepDeltaToolCall(item, options));
+                    }
+                    toolCalls = array;
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new RunStepDeltaToolCallObject(type, serializedAdditionalRawData, toolCalls ?? new ChangeTrackingList<RunStepDeltaToolCall>());
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaToolCallObject>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaToolCallObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaToolCallObject)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaToolCallObject IPersistableModel<RunStepDeltaToolCallObject>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaToolCallObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaToolCallObject(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaToolCallObject)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaToolCallObject>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new RunStepDeltaToolCallObject FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeRunStepDeltaToolCallObject(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaToolCallObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaToolCallObject.cs
new file mode 100644
index 000000000000..77d87fe333e1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepDeltaToolCallObject.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Represents an invocation of tool calls as part of a streaming run step. </summary>
+    public partial class RunStepDeltaToolCallObject : RunStepDeltaDetail
+    {
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaToolCallObject"/>. </summary>
+        internal RunStepDeltaToolCallObject()
+        {
+            Type = "tool_calls";
+            ToolCalls = new ChangeTrackingList<RunStepDeltaToolCall>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepDeltaToolCallObject"/>. </summary>
+        /// <param name="type"> The object type for the run step detail object. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="toolCalls">
+        /// The collection of tool calls for the tool call detail item.
+        /// Please note <see cref="RunStepDeltaToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="RunStepDeltaCodeInterpreterToolCall"/>, <see cref="RunStepDeltaFileSearchToolCall"/> and <see cref="RunStepDeltaFunctionToolCall"/>.
+        /// </param>
+        internal RunStepDeltaToolCallObject(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, IReadOnlyList<RunStepDeltaToolCall> toolCalls) : base(type, serializedAdditionalRawData)
+        {
+            ToolCalls = toolCalls;
+        }
+
+        /// <summary>
+        /// The collection of tool calls for the tool call detail item.
+        /// Please note <see cref="RunStepDeltaToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="RunStepDeltaCodeInterpreterToolCall"/>, <see cref="RunStepDeltaFileSearchToolCall"/> and <see cref="RunStepDeltaFunctionToolCall"/>.
+        /// </summary>
+        public IReadOnlyList<RunStepDeltaToolCall> ToolCalls { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepRetrievalToolCall.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepFileSearchToolCall.Serialization.cs
similarity index 66%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepRetrievalToolCall.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepFileSearchToolCall.Serialization.cs
index ab165de44e9d..cd7d7b80f371 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepRetrievalToolCall.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepFileSearchToolCall.Serialization.cs
@@ -13,22 +13,22 @@
 
 namespace Azure.AI.OpenAI.Assistants
 {
-    public partial class RunStepRetrievalToolCall : IUtf8JsonSerializable, IJsonModel<RunStepRetrievalToolCall>
+    public partial class RunStepFileSearchToolCall : IUtf8JsonSerializable, IJsonModel<RunStepFileSearchToolCall>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepRetrievalToolCall>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepFileSearchToolCall>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<RunStepRetrievalToolCall>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<RunStepFileSearchToolCall>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<RunStepRetrievalToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepFileSearchToolCall>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(RunStepRetrievalToolCall)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(RunStepFileSearchToolCall)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            writer.WritePropertyName("retrieval"u8);
+            writer.WritePropertyName("file_search"u8);
             writer.WriteStartObject();
-            foreach (var item in Retrieval)
+            foreach (var item in FileSearch)
             {
                 writer.WritePropertyName(item.Key);
                 writer.WriteStringValue(item.Value);
@@ -56,19 +56,19 @@ void IJsonModel<RunStepRetrievalToolCall>.Write(Utf8JsonWriter writer, ModelRead
             writer.WriteEndObject();
         }
 
-        RunStepRetrievalToolCall IJsonModel<RunStepRetrievalToolCall>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        RunStepFileSearchToolCall IJsonModel<RunStepFileSearchToolCall>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<RunStepRetrievalToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepFileSearchToolCall>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(RunStepRetrievalToolCall)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(RunStepFileSearchToolCall)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeRunStepRetrievalToolCall(document.RootElement, options);
+            return DeserializeRunStepFileSearchToolCall(document.RootElement, options);
         }
 
-        internal static RunStepRetrievalToolCall DeserializeRunStepRetrievalToolCall(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static RunStepFileSearchToolCall DeserializeRunStepFileSearchToolCall(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -76,21 +76,21 @@ internal static RunStepRetrievalToolCall DeserializeRunStepRetrievalToolCall(Jso
             {
                 return null;
             }
-            IReadOnlyDictionary<string, string> retrieval = default;
+            IReadOnlyDictionary<string, string> fileSearch = default;
             string type = default;
             string id = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
             {
-                if (property.NameEquals("retrieval"u8))
+                if (property.NameEquals("file_search"u8))
                 {
                     Dictionary<string, string> dictionary = new Dictionary<string, string>();
                     foreach (var property0 in property.Value.EnumerateObject())
                     {
                         dictionary.Add(property0.Name, property0.Value.GetString());
                     }
-                    retrieval = dictionary;
+                    fileSearch = dictionary;
                     continue;
                 }
                 if (property.NameEquals("type"u8))
@@ -109,46 +109,46 @@ internal static RunStepRetrievalToolCall DeserializeRunStepRetrievalToolCall(Jso
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new RunStepRetrievalToolCall(type, id, serializedAdditionalRawData, retrieval);
+            return new RunStepFileSearchToolCall(type, id, serializedAdditionalRawData, fileSearch);
         }
 
-        BinaryData IPersistableModel<RunStepRetrievalToolCall>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<RunStepFileSearchToolCall>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<RunStepRetrievalToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepFileSearchToolCall>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(RunStepRetrievalToolCall)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(RunStepFileSearchToolCall)} does not support writing '{options.Format}' format.");
             }
         }
 
-        RunStepRetrievalToolCall IPersistableModel<RunStepRetrievalToolCall>.Create(BinaryData data, ModelReaderWriterOptions options)
+        RunStepFileSearchToolCall IPersistableModel<RunStepFileSearchToolCall>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<RunStepRetrievalToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepFileSearchToolCall>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeRunStepRetrievalToolCall(document.RootElement, options);
+                        return DeserializeRunStepFileSearchToolCall(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(RunStepRetrievalToolCall)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(RunStepFileSearchToolCall)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<RunStepRetrievalToolCall>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<RunStepFileSearchToolCall>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
         /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new RunStepRetrievalToolCall FromResponse(Response response)
+        internal static new RunStepFileSearchToolCall FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeRunStepRetrievalToolCall(document.RootElement);
+            return DeserializeRunStepFileSearchToolCall(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepFileSearchToolCall.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepFileSearchToolCall.cs
new file mode 100644
index 000000000000..0b3014e92127
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepFileSearchToolCall.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary>
+    /// A record of a call to a file search tool, issued by the model in evaluation of a defined tool, that represents
+    /// executed file search.
+    /// </summary>
+    public partial class RunStepFileSearchToolCall : RunStepToolCall
+    {
+        /// <summary> Initializes a new instance of <see cref="RunStepFileSearchToolCall"/>. </summary>
+        /// <param name="id"> The ID of the tool call. This ID must be referenced when you submit tool outputs. </param>
+        /// <param name="fileSearch"> Reserved for future use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> or <paramref name="fileSearch"/> is null. </exception>
+        internal RunStepFileSearchToolCall(string id, IReadOnlyDictionary<string, string> fileSearch) : base(id)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+            Argument.AssertNotNull(fileSearch, nameof(fileSearch));
+
+            Type = "file_search";
+            FileSearch = fileSearch;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepFileSearchToolCall"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="id"> The ID of the tool call. This ID must be referenced when you submit tool outputs. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="fileSearch"> Reserved for future use. </param>
+        internal RunStepFileSearchToolCall(string type, string id, IDictionary<string, BinaryData> serializedAdditionalRawData, IReadOnlyDictionary<string, string> fileSearch) : base(type, id, serializedAdditionalRawData)
+        {
+            FileSearch = fileSearch;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="RunStepFileSearchToolCall"/> for deserialization. </summary>
+        internal RunStepFileSearchToolCall()
+        {
+        }
+
+        /// <summary> Reserved for future use. </summary>
+        public IReadOnlyDictionary<string, string> FileSearch { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepRetrievalToolCall.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepRetrievalToolCall.cs
deleted file mode 100644
index 5f119347d5f3..000000000000
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepRetrievalToolCall.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Assistants
-{
-    /// <summary>
-    /// A record of a call to a retrieval tool, issued by the model in evaluation of a defined tool, that represents
-    /// executed retrieval actions.
-    /// </summary>
-    public partial class RunStepRetrievalToolCall : RunStepToolCall
-    {
-        /// <summary> Initializes a new instance of <see cref="RunStepRetrievalToolCall"/>. </summary>
-        /// <param name="id"> The ID of the tool call. This ID must be referenced when you submit tool outputs. </param>
-        /// <param name="retrieval"> The key/value pairs produced by the retrieval tool. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="id"/> or <paramref name="retrieval"/> is null. </exception>
-        internal RunStepRetrievalToolCall(string id, IReadOnlyDictionary<string, string> retrieval) : base(id)
-        {
-            Argument.AssertNotNull(id, nameof(id));
-            Argument.AssertNotNull(retrieval, nameof(retrieval));
-
-            Type = "retrieval";
-            Retrieval = retrieval;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="RunStepRetrievalToolCall"/>. </summary>
-        /// <param name="type"> The object type. </param>
-        /// <param name="id"> The ID of the tool call. This ID must be referenced when you submit tool outputs. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="retrieval"> The key/value pairs produced by the retrieval tool. </param>
-        internal RunStepRetrievalToolCall(string type, string id, IDictionary<string, BinaryData> serializedAdditionalRawData, IReadOnlyDictionary<string, string> retrieval) : base(type, id, serializedAdditionalRawData)
-        {
-            Retrieval = retrieval;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="RunStepRetrievalToolCall"/> for deserialization. </summary>
-        internal RunStepRetrievalToolCall()
-        {
-        }
-
-        /// <summary> The key/value pairs produced by the retrieval tool. </summary>
-        public IReadOnlyDictionary<string, string> Retrieval { get; }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepStreamEvent.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepStreamEvent.cs
new file mode 100644
index 000000000000..3949704709ad
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepStreamEvent.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Run step operation related streaming events. </summary>
+    public readonly partial struct RunStepStreamEvent : IEquatable<RunStepStreamEvent>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="RunStepStreamEvent"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public RunStepStreamEvent(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ThreadRunStepCreatedValue = "thread.run.step.created";
+        private const string ThreadRunStepInProgressValue = "thread.run.step.in_progress";
+        private const string ThreadRunStepDeltaValue = "thread.run.step.delta";
+        private const string ThreadRunStepCompletedValue = "thread.run.step.completed";
+        private const string ThreadRunStepFailedValue = "thread.run.step.failed";
+        private const string ThreadRunStepCancelledValue = "thread.run.step.cancelled";
+        private const string ThreadRunStepExpiredValue = "thread.run.step.expired";
+
+        /// <summary> Event sent when a new thread run step is created. The data of this event is of type RunStep. </summary>
+        public static RunStepStreamEvent ThreadRunStepCreated { get; } = new RunStepStreamEvent(ThreadRunStepCreatedValue);
+        /// <summary> Event sent when a run step moves to `in_progress` status. The data of this event is of type RunStep. </summary>
+        public static RunStepStreamEvent ThreadRunStepInProgress { get; } = new RunStepStreamEvent(ThreadRunStepInProgressValue);
+        /// <summary> Event sent when a run stepis being streamed. The data of this event is of type RunStepDeltaChunk. </summary>
+        public static RunStepStreamEvent ThreadRunStepDelta { get; } = new RunStepStreamEvent(ThreadRunStepDeltaValue);
+        /// <summary> Event sent when a run step is completed. The data of this event is of type RunStep. </summary>
+        public static RunStepStreamEvent ThreadRunStepCompleted { get; } = new RunStepStreamEvent(ThreadRunStepCompletedValue);
+        /// <summary> Event sent when a run step fails. The data of this event is of type RunStep. </summary>
+        public static RunStepStreamEvent ThreadRunStepFailed { get; } = new RunStepStreamEvent(ThreadRunStepFailedValue);
+        /// <summary> Event sent when a run step is cancelled. The data of this event is of type RunStep. </summary>
+        public static RunStepStreamEvent ThreadRunStepCancelled { get; } = new RunStepStreamEvent(ThreadRunStepCancelledValue);
+        /// <summary> Event sent when a run step is expired. The data of this event is of type RunStep. </summary>
+        public static RunStepStreamEvent ThreadRunStepExpired { get; } = new RunStepStreamEvent(ThreadRunStepExpiredValue);
+        /// <summary> Determines if two <see cref="RunStepStreamEvent"/> values are the same. </summary>
+        public static bool operator ==(RunStepStreamEvent left, RunStepStreamEvent right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="RunStepStreamEvent"/> values are not the same. </summary>
+        public static bool operator !=(RunStepStreamEvent left, RunStepStreamEvent right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="RunStepStreamEvent"/>. </summary>
+        public static implicit operator RunStepStreamEvent(string value) => new RunStepStreamEvent(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is RunStepStreamEvent other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(RunStepStreamEvent other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepToolCall.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepToolCall.Serialization.cs
index 59c11de06377..b9329fd5c499 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepToolCall.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepToolCall.Serialization.cs
@@ -73,8 +73,8 @@ internal static RunStepToolCall DeserializeRunStepToolCall(JsonElement element,
                 switch (discriminator.GetString())
                 {
                     case "code_interpreter": return RunStepCodeInterpreterToolCall.DeserializeRunStepCodeInterpreterToolCall(element, options);
+                    case "file_search": return RunStepFileSearchToolCall.DeserializeRunStepFileSearchToolCall(element, options);
                     case "function": return RunStepFunctionToolCall.DeserializeRunStepFunctionToolCall(element, options);
-                    case "retrieval": return RunStepRetrievalToolCall.DeserializeRunStepRetrievalToolCall(element, options);
                 }
             }
             return UnknownRunStepToolCall.DeserializeUnknownRunStepToolCall(element, options);
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepToolCall.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepToolCall.cs
index a1f39c74d40e..b458fd4827e9 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepToolCall.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepToolCall.cs
@@ -13,7 +13,7 @@ namespace Azure.AI.OpenAI.Assistants
     /// <summary>
     /// An abstract representation of a detailed tool call as recorded within a run step for an existing run.
     /// Please note <see cref="RunStepToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-    /// The available derived classes include <see cref="RunStepCodeInterpreterToolCall"/>, <see cref="RunStepFunctionToolCall"/> and <see cref="RunStepRetrievalToolCall"/>.
+    /// The available derived classes include <see cref="RunStepCodeInterpreterToolCall"/>, <see cref="RunStepFileSearchToolCall"/> and <see cref="RunStepFunctionToolCall"/>.
     /// </summary>
     public abstract partial class RunStepToolCall
     {
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepToolCallDetails.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepToolCallDetails.cs
index dedd295f4d8a..1d55d40ac096 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepToolCallDetails.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStepToolCallDetails.cs
@@ -18,7 +18,7 @@ public partial class RunStepToolCallDetails : RunStepDetails
         /// <param name="toolCalls">
         /// A list of tool call details for this run step.
         /// Please note <see cref="RunStepToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="RunStepCodeInterpreterToolCall"/>, <see cref="RunStepFunctionToolCall"/> and <see cref="RunStepRetrievalToolCall"/>.
+        /// The available derived classes include <see cref="RunStepCodeInterpreterToolCall"/>, <see cref="RunStepFileSearchToolCall"/> and <see cref="RunStepFunctionToolCall"/>.
         /// </param>
         /// <exception cref="ArgumentNullException"> <paramref name="toolCalls"/> is null. </exception>
         internal RunStepToolCallDetails(IEnumerable<RunStepToolCall> toolCalls)
@@ -35,7 +35,7 @@ internal RunStepToolCallDetails(IEnumerable<RunStepToolCall> toolCalls)
         /// <param name="toolCalls">
         /// A list of tool call details for this run step.
         /// Please note <see cref="RunStepToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="RunStepCodeInterpreterToolCall"/>, <see cref="RunStepFunctionToolCall"/> and <see cref="RunStepRetrievalToolCall"/>.
+        /// The available derived classes include <see cref="RunStepCodeInterpreterToolCall"/>, <see cref="RunStepFileSearchToolCall"/> and <see cref="RunStepFunctionToolCall"/>.
         /// </param>
         internal RunStepToolCallDetails(RunStepType type, IDictionary<string, BinaryData> serializedAdditionalRawData, IReadOnlyList<RunStepToolCall> toolCalls) : base(type, serializedAdditionalRawData)
         {
@@ -50,7 +50,7 @@ internal RunStepToolCallDetails()
         /// <summary>
         /// A list of tool call details for this run step.
         /// Please note <see cref="RunStepToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="RunStepCodeInterpreterToolCall"/>, <see cref="RunStepFunctionToolCall"/> and <see cref="RunStepRetrievalToolCall"/>.
+        /// The available derived classes include <see cref="RunStepCodeInterpreterToolCall"/>, <see cref="RunStepFileSearchToolCall"/> and <see cref="RunStepFunctionToolCall"/>.
         /// </summary>
         public IReadOnlyList<RunStepToolCall> ToolCalls { get; }
     }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStreamEvent.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStreamEvent.cs
new file mode 100644
index 000000000000..d9ce800c9594
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RunStreamEvent.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Run operation related streaming events. </summary>
+    public readonly partial struct RunStreamEvent : IEquatable<RunStreamEvent>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="RunStreamEvent"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public RunStreamEvent(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ThreadRunCreatedValue = "thread.run.created";
+        private const string ThreadRunQueuedValue = "thread.run.queued";
+        private const string ThreadRunInProgressValue = "thread.run.in_progress";
+        private const string ThreadRunRequiresActionValue = "thread.run.requires_action";
+        private const string ThreadRunCompletedValue = "thread.run.completed";
+        private const string ThreadRunFailedValue = "thread.run.failed";
+        private const string ThreadRunCancellingValue = "thread.run.cancelling";
+        private const string ThreadRunCancelledValue = "thread.run.cancelled";
+        private const string ThreadRunExpiredValue = "thread.run.expired";
+
+        /// <summary> Event sent when a new run is created. The data of this event is of type ThreadRun. </summary>
+        public static RunStreamEvent ThreadRunCreated { get; } = new RunStreamEvent(ThreadRunCreatedValue);
+        /// <summary> Event sent when a run moves to `queued` status. The data of this event is of type ThreadRun. </summary>
+        public static RunStreamEvent ThreadRunQueued { get; } = new RunStreamEvent(ThreadRunQueuedValue);
+        /// <summary> Event sent when a run moves to `in_progress` status. The data of this event is of type ThreadRun. </summary>
+        public static RunStreamEvent ThreadRunInProgress { get; } = new RunStreamEvent(ThreadRunInProgressValue);
+        /// <summary> Event sent when a run moves to `requires_action` status. The data of this event is of type ThreadRun. </summary>
+        public static RunStreamEvent ThreadRunRequiresAction { get; } = new RunStreamEvent(ThreadRunRequiresActionValue);
+        /// <summary> Event sent when a run is completed. The data of this event is of type ThreadRun. </summary>
+        public static RunStreamEvent ThreadRunCompleted { get; } = new RunStreamEvent(ThreadRunCompletedValue);
+        /// <summary> Event sent when a run fails. The data of this event is of type ThreadRun. </summary>
+        public static RunStreamEvent ThreadRunFailed { get; } = new RunStreamEvent(ThreadRunFailedValue);
+        /// <summary> Event sent when a run moves to `cancelling` status. The data of this event is of type ThreadRun. </summary>
+        public static RunStreamEvent ThreadRunCancelling { get; } = new RunStreamEvent(ThreadRunCancellingValue);
+        /// <summary> Event sent when a run is cancelled. The data of this event is of type ThreadRun. </summary>
+        public static RunStreamEvent ThreadRunCancelled { get; } = new RunStreamEvent(ThreadRunCancelledValue);
+        /// <summary> Event sent when a run is expired. The data of this event is of type ThreadRun. </summary>
+        public static RunStreamEvent ThreadRunExpired { get; } = new RunStreamEvent(ThreadRunExpiredValue);
+        /// <summary> Determines if two <see cref="RunStreamEvent"/> values are the same. </summary>
+        public static bool operator ==(RunStreamEvent left, RunStreamEvent right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="RunStreamEvent"/> values are not the same. </summary>
+        public static bool operator !=(RunStreamEvent left, RunStreamEvent right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="RunStreamEvent"/>. </summary>
+        public static implicit operator RunStreamEvent(string value) => new RunStreamEvent(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is RunStreamEvent other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(RunStreamEvent other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/SubmitToolOutputsToRunRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/SubmitToolOutputsToRunRequest.Serialization.cs
index 142824a48025..c62ed0007517 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/SubmitToolOutputsToRunRequest.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/SubmitToolOutputsToRunRequest.Serialization.cs
@@ -33,6 +33,18 @@ void IJsonModel<SubmitToolOutputsToRunRequest>.Write(Utf8JsonWriter writer, Mode
                 writer.WriteObjectValue(item, options);
             }
             writer.WriteEndArray();
+            if (Optional.IsDefined(Stream))
+            {
+                if (Stream != null)
+                {
+                    writer.WritePropertyName("stream"u8);
+                    writer.WriteBooleanValue(Stream.Value);
+                }
+                else
+                {
+                    writer.WriteNull("stream");
+                }
+            }
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -72,6 +84,7 @@ internal static SubmitToolOutputsToRunRequest DeserializeSubmitToolOutputsToRunR
                 return null;
             }
             IReadOnlyList<ToolOutput> toolOutputs = default;
+            bool? stream = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -86,13 +99,23 @@ internal static SubmitToolOutputsToRunRequest DeserializeSubmitToolOutputsToRunR
                     toolOutputs = array;
                     continue;
                 }
+                if (property.NameEquals("stream"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        stream = null;
+                        continue;
+                    }
+                    stream = property.Value.GetBoolean();
+                    continue;
+                }
                 if (options.Format != "W")
                 {
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new SubmitToolOutputsToRunRequest(toolOutputs, serializedAdditionalRawData);
+            return new SubmitToolOutputsToRunRequest(toolOutputs, stream, serializedAdditionalRawData);
         }
 
         BinaryData IPersistableModel<SubmitToolOutputsToRunRequest>.Write(ModelReaderWriterOptions options)
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/SubmitToolOutputsToRunRequest.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/SubmitToolOutputsToRunRequest.cs
index 7fc21ab959a6..2971598450d1 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/SubmitToolOutputsToRunRequest.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/SubmitToolOutputsToRunRequest.cs
@@ -47,7 +47,7 @@ internal partial class SubmitToolOutputsToRunRequest
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
         /// <summary> Initializes a new instance of <see cref="SubmitToolOutputsToRunRequest"/>. </summary>
-        /// <param name="toolOutputs"> The list of tool outputs requested by tool calls from the specified run. </param>
+        /// <param name="toolOutputs"> A list of tools for which the outputs are being submitted. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="toolOutputs"/> is null. </exception>
         internal SubmitToolOutputsToRunRequest(IEnumerable<ToolOutput> toolOutputs)
         {
@@ -57,11 +57,13 @@ internal SubmitToolOutputsToRunRequest(IEnumerable<ToolOutput> toolOutputs)
         }
 
         /// <summary> Initializes a new instance of <see cref="SubmitToolOutputsToRunRequest"/>. </summary>
-        /// <param name="toolOutputs"> The list of tool outputs requested by tool calls from the specified run. </param>
+        /// <param name="toolOutputs"> A list of tools for which the outputs are being submitted. </param>
+        /// <param name="stream"> If `true`, returns a stream of events that happen during the Run as server-sent events, terminating when the Run enters a terminal state with a `data: [DONE]` message. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SubmitToolOutputsToRunRequest(IReadOnlyList<ToolOutput> toolOutputs, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal SubmitToolOutputsToRunRequest(IReadOnlyList<ToolOutput> toolOutputs, bool? stream, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             ToolOutputs = toolOutputs;
+            Stream = stream;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
@@ -70,7 +72,9 @@ internal SubmitToolOutputsToRunRequest()
         {
         }
 
-        /// <summary> The list of tool outputs requested by tool calls from the specified run. </summary>
+        /// <summary> A list of tools for which the outputs are being submitted. </summary>
         public IReadOnlyList<ToolOutput> ToolOutputs { get; }
+        /// <summary> If `true`, returns a stream of events that happen during the Run as server-sent events, terminating when the Run enters a terminal state with a `data: [DONE]` message. </summary>
+        public bool? Stream { get; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadMessage.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadMessage.Serialization.cs
index 940a42cf9293..da88c63f2836 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadMessage.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadMessage.Serialization.cs
@@ -34,6 +34,35 @@ void IJsonModel<ThreadMessage>.Write(Utf8JsonWriter writer, ModelReaderWriterOpt
             writer.WriteNumberValue(CreatedAt, "U");
             writer.WritePropertyName("thread_id"u8);
             writer.WriteStringValue(ThreadId);
+            writer.WritePropertyName("status"u8);
+            writer.WriteStringValue(Status.ToString());
+            if (IncompleteDetails != null)
+            {
+                writer.WritePropertyName("incomplete_details"u8);
+                writer.WriteObjectValue(IncompleteDetails, options);
+            }
+            else
+            {
+                writer.WriteNull("incomplete_details");
+            }
+            if (CompletedAt != null)
+            {
+                writer.WritePropertyName("completed_at"u8);
+                writer.WriteNumberValue(CompletedAt.Value, "U");
+            }
+            else
+            {
+                writer.WriteNull("completed_at");
+            }
+            if (IncompleteAt != null)
+            {
+                writer.WritePropertyName("incomplete_at"u8);
+                writer.WriteNumberValue(IncompleteAt.Value, "U");
+            }
+            else
+            {
+                writer.WriteNull("incomplete_at");
+            }
             writer.WritePropertyName("role"u8);
             writer.WriteStringValue(Role.ToString());
             writer.WritePropertyName("content"u8);
@@ -43,23 +72,38 @@ void IJsonModel<ThreadMessage>.Write(Utf8JsonWriter writer, ModelReaderWriterOpt
                 writer.WriteObjectValue(item, options);
             }
             writer.WriteEndArray();
-            if (Optional.IsDefined(AssistantId))
+            if (AssistantId != null)
             {
                 writer.WritePropertyName("assistant_id"u8);
                 writer.WriteStringValue(AssistantId);
             }
-            if (Optional.IsDefined(RunId))
+            else
+            {
+                writer.WriteNull("assistant_id");
+            }
+            if (RunId != null)
             {
                 writer.WritePropertyName("run_id"u8);
                 writer.WriteStringValue(RunId);
             }
-            writer.WritePropertyName("file_ids"u8);
-            writer.WriteStartArray();
-            foreach (var item in FileIds)
+            else
             {
-                writer.WriteStringValue(item);
+                writer.WriteNull("run_id");
+            }
+            if (Attachments != null && Optional.IsCollectionDefined(Attachments))
+            {
+                writer.WritePropertyName("attachments"u8);
+                writer.WriteStartArray();
+                foreach (var item in Attachments)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            else
+            {
+                writer.WriteNull("attachments");
             }
-            writer.WriteEndArray();
             if (Metadata != null && Optional.IsCollectionDefined(Metadata))
             {
                 writer.WritePropertyName("metadata"u8);
@@ -117,12 +161,16 @@ internal static ThreadMessage DeserializeThreadMessage(JsonElement element, Mode
             string @object = default;
             DateTimeOffset createdAt = default;
             string threadId = default;
+            MessageStatus status = default;
+            MessageIncompleteDetails incompleteDetails = default;
+            DateTimeOffset? completedAt = default;
+            DateTimeOffset? incompleteAt = default;
             MessageRole role = default;
-            IReadOnlyList<MessageContent> content = default;
+            IList<MessageContent> content = default;
             string assistantId = default;
             string runId = default;
-            IReadOnlyList<string> fileIds = default;
-            IReadOnlyDictionary<string, string> metadata = default;
+            IList<MessageAttachment> attachments = default;
+            IDictionary<string, string> metadata = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -147,6 +195,41 @@ internal static ThreadMessage DeserializeThreadMessage(JsonElement element, Mode
                     threadId = property.Value.GetString();
                     continue;
                 }
+                if (property.NameEquals("status"u8))
+                {
+                    status = new MessageStatus(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("incomplete_details"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        incompleteDetails = null;
+                        continue;
+                    }
+                    incompleteDetails = MessageIncompleteDetails.DeserializeMessageIncompleteDetails(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("completed_at"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        completedAt = null;
+                        continue;
+                    }
+                    completedAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("incomplete_at"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        incompleteAt = null;
+                        continue;
+                    }
+                    incompleteAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
                 if (property.NameEquals("role"u8))
                 {
                     role = new MessageRole(property.Value.GetString());
@@ -164,22 +247,37 @@ internal static ThreadMessage DeserializeThreadMessage(JsonElement element, Mode
                 }
                 if (property.NameEquals("assistant_id"u8))
                 {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        assistantId = null;
+                        continue;
+                    }
                     assistantId = property.Value.GetString();
                     continue;
                 }
                 if (property.NameEquals("run_id"u8))
                 {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        runId = null;
+                        continue;
+                    }
                     runId = property.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("file_ids"u8))
+                if (property.NameEquals("attachments"u8))
                 {
-                    List<string> array = new List<string>();
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        attachments = new ChangeTrackingList<MessageAttachment>();
+                        continue;
+                    }
+                    List<MessageAttachment> array = new List<MessageAttachment>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(item.GetString());
+                        array.Add(MessageAttachment.DeserializeMessageAttachment(item, options));
                     }
-                    fileIds = array;
+                    attachments = array;
                     continue;
                 }
                 if (property.NameEquals("metadata"u8))
@@ -208,11 +306,15 @@ internal static ThreadMessage DeserializeThreadMessage(JsonElement element, Mode
                 @object,
                 createdAt,
                 threadId,
+                status,
+                incompleteDetails,
+                completedAt,
+                incompleteAt,
                 role,
                 content,
                 assistantId,
                 runId,
-                fileIds,
+                attachments,
                 metadata,
                 serializedAdditionalRawData);
         }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadMessage.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadMessage.cs
index 8bc5a7e7779b..c730b23b4dcf 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadMessage.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadMessage.cs
@@ -50,31 +50,39 @@ public partial class ThreadMessage
         /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
         /// <param name="createdAt"> The Unix timestamp, in seconds, representing when this object was created. </param>
         /// <param name="threadId"> The ID of the thread that this message belongs to. </param>
+        /// <param name="status"> The status of the message. </param>
+        /// <param name="incompleteDetails"> On an incomplete message, details about why the message is incomplete. </param>
+        /// <param name="completedAt"> The Unix timestamp (in seconds) for when the message was completed. </param>
+        /// <param name="incompleteAt"> The Unix timestamp (in seconds) for when the message was marked as incomplete. </param>
         /// <param name="role"> The role associated with the assistant thread message. </param>
         /// <param name="contentItems">
         /// The list of content items associated with the assistant thread message.
         /// Please note <see cref="MessageContent"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="MessageImageFileContent"/> and <see cref="MessageTextContent"/>.
         /// </param>
-        /// <param name="fileIds">
-        /// A list of file IDs that the assistant should use. Useful for tools like retrieval and code_interpreter that can
-        /// access files.
-        /// </param>
+        /// <param name="assistantId"> If applicable, the ID of the assistant that authored this message. </param>
+        /// <param name="runId"> If applicable, the ID of the run associated with the authoring of this message. </param>
+        /// <param name="attachments"> A list of files attached to the message, and the tools they were added to. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="id"/>, <paramref name="threadId"/>, <paramref name="contentItems"/> or <paramref name="fileIds"/> is null. </exception>
-        internal ThreadMessage(string id, DateTimeOffset createdAt, string threadId, MessageRole role, IEnumerable<MessageContent> contentItems, IEnumerable<string> fileIds, IReadOnlyDictionary<string, string> metadata)
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/>, <paramref name="threadId"/> or <paramref name="contentItems"/> is null. </exception>
+        public ThreadMessage(string id, DateTimeOffset createdAt, string threadId, MessageStatus status, MessageIncompleteDetails incompleteDetails, DateTimeOffset? completedAt, DateTimeOffset? incompleteAt, MessageRole role, IEnumerable<MessageContent> contentItems, string assistantId, string runId, IEnumerable<MessageAttachment> attachments, IDictionary<string, string> metadata)
         {
             Argument.AssertNotNull(id, nameof(id));
             Argument.AssertNotNull(threadId, nameof(threadId));
             Argument.AssertNotNull(contentItems, nameof(contentItems));
-            Argument.AssertNotNull(fileIds, nameof(fileIds));
 
             Id = id;
             CreatedAt = createdAt;
             ThreadId = threadId;
+            Status = status;
+            IncompleteDetails = incompleteDetails;
+            CompletedAt = completedAt;
+            IncompleteAt = incompleteAt;
             Role = role;
             ContentItems = contentItems.ToList();
-            FileIds = fileIds.ToList();
+            AssistantId = assistantId;
+            RunId = runId;
+            Attachments = attachments?.ToList();
             Metadata = metadata;
         }
 
@@ -83,6 +91,10 @@ internal ThreadMessage(string id, DateTimeOffset createdAt, string threadId, Mes
         /// <param name="object"> The object type, which is always 'thread.message'. </param>
         /// <param name="createdAt"> The Unix timestamp, in seconds, representing when this object was created. </param>
         /// <param name="threadId"> The ID of the thread that this message belongs to. </param>
+        /// <param name="status"> The status of the message. </param>
+        /// <param name="incompleteDetails"> On an incomplete message, details about why the message is incomplete. </param>
+        /// <param name="completedAt"> The Unix timestamp (in seconds) for when the message was completed. </param>
+        /// <param name="incompleteAt"> The Unix timestamp (in seconds) for when the message was marked as incomplete. </param>
         /// <param name="role"> The role associated with the assistant thread message. </param>
         /// <param name="contentItems">
         /// The list of content items associated with the assistant thread message.
@@ -91,23 +103,24 @@ internal ThreadMessage(string id, DateTimeOffset createdAt, string threadId, Mes
         /// </param>
         /// <param name="assistantId"> If applicable, the ID of the assistant that authored this message. </param>
         /// <param name="runId"> If applicable, the ID of the run associated with the authoring of this message. </param>
-        /// <param name="fileIds">
-        /// A list of file IDs that the assistant should use. Useful for tools like retrieval and code_interpreter that can
-        /// access files.
-        /// </param>
+        /// <param name="attachments"> A list of files attached to the message, and the tools they were added to. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ThreadMessage(string id, string @object, DateTimeOffset createdAt, string threadId, MessageRole role, IReadOnlyList<MessageContent> contentItems, string assistantId, string runId, IReadOnlyList<string> fileIds, IReadOnlyDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal ThreadMessage(string id, string @object, DateTimeOffset createdAt, string threadId, MessageStatus status, MessageIncompleteDetails incompleteDetails, DateTimeOffset? completedAt, DateTimeOffset? incompleteAt, MessageRole role, IList<MessageContent> contentItems, string assistantId, string runId, IList<MessageAttachment> attachments, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Id = id;
             Object = @object;
             CreatedAt = createdAt;
             ThreadId = threadId;
+            Status = status;
+            IncompleteDetails = incompleteDetails;
+            CompletedAt = completedAt;
+            IncompleteAt = incompleteAt;
             Role = role;
             ContentItems = contentItems;
             AssistantId = assistantId;
             RunId = runId;
-            FileIds = fileIds;
+            Attachments = attachments;
             Metadata = metadata;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
@@ -118,30 +131,35 @@ internal ThreadMessage()
         }
 
         /// <summary> The identifier, which can be referenced in API endpoints. </summary>
-        public string Id { get; }
+        public string Id { get; set; }
 
         /// <summary> The Unix timestamp, in seconds, representing when this object was created. </summary>
-        public DateTimeOffset CreatedAt { get; }
+        public DateTimeOffset CreatedAt { get; set; }
         /// <summary> The ID of the thread that this message belongs to. </summary>
-        public string ThreadId { get; }
+        public string ThreadId { get; set; }
+        /// <summary> The status of the message. </summary>
+        public MessageStatus Status { get; set; }
+        /// <summary> On an incomplete message, details about why the message is incomplete. </summary>
+        public MessageIncompleteDetails IncompleteDetails { get; set; }
+        /// <summary> The Unix timestamp (in seconds) for when the message was completed. </summary>
+        public DateTimeOffset? CompletedAt { get; set; }
+        /// <summary> The Unix timestamp (in seconds) for when the message was marked as incomplete. </summary>
+        public DateTimeOffset? IncompleteAt { get; set; }
         /// <summary> The role associated with the assistant thread message. </summary>
-        public MessageRole Role { get; }
+        public MessageRole Role { get; set; }
         /// <summary>
         /// The list of content items associated with the assistant thread message.
         /// Please note <see cref="MessageContent"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
         /// The available derived classes include <see cref="MessageImageFileContent"/> and <see cref="MessageTextContent"/>.
         /// </summary>
-        public IReadOnlyList<MessageContent> ContentItems { get; }
+        public IList<MessageContent> ContentItems { get; }
         /// <summary> If applicable, the ID of the assistant that authored this message. </summary>
-        public string AssistantId { get; }
+        public string AssistantId { get; set; }
         /// <summary> If applicable, the ID of the run associated with the authoring of this message. </summary>
-        public string RunId { get; }
-        /// <summary>
-        /// A list of file IDs that the assistant should use. Useful for tools like retrieval and code_interpreter that can
-        /// access files.
-        /// </summary>
-        public IReadOnlyList<string> FileIds { get; }
+        public string RunId { get; set; }
+        /// <summary> A list of files attached to the message, and the tools they were added to. </summary>
+        public IList<MessageAttachment> Attachments { get; set; }
         /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
-        public IReadOnlyDictionary<string, string> Metadata { get; }
+        public IDictionary<string, string> Metadata { get; set; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateMessageRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadMessageOptions.Serialization.cs
similarity index 69%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateMessageRequest.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadMessageOptions.Serialization.cs
index dd7625e2b011..7d6727044483 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateMessageRequest.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadMessageOptions.Serialization.cs
@@ -13,16 +13,16 @@
 
 namespace Azure.AI.OpenAI.Assistants
 {
-    internal partial class CreateMessageRequest : IUtf8JsonSerializable, IJsonModel<CreateMessageRequest>
+    public partial class ThreadMessageOptions : IUtf8JsonSerializable, IJsonModel<ThreadMessageOptions>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CreateMessageRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ThreadMessageOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<CreateMessageRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<ThreadMessageOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<CreateMessageRequest>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ThreadMessageOptions>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(CreateMessageRequest)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(ThreadMessageOptions)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
@@ -30,15 +30,22 @@ void IJsonModel<CreateMessageRequest>.Write(Utf8JsonWriter writer, ModelReaderWr
             writer.WriteStringValue(Role.ToString());
             writer.WritePropertyName("content"u8);
             writer.WriteStringValue(Content);
-            if (Optional.IsCollectionDefined(FileIds))
+            if (Optional.IsCollectionDefined(Attachments))
             {
-                writer.WritePropertyName("file_ids"u8);
-                writer.WriteStartArray();
-                foreach (var item in FileIds)
+                if (Attachments != null)
                 {
-                    writer.WriteStringValue(item);
+                    writer.WritePropertyName("attachments"u8);
+                    writer.WriteStartArray();
+                    foreach (var item in Attachments)
+                    {
+                        writer.WriteObjectValue(item, options);
+                    }
+                    writer.WriteEndArray();
+                }
+                else
+                {
+                    writer.WriteNull("attachments");
                 }
-                writer.WriteEndArray();
             }
             if (Optional.IsCollectionDefined(Metadata))
             {
@@ -76,19 +83,19 @@ void IJsonModel<CreateMessageRequest>.Write(Utf8JsonWriter writer, ModelReaderWr
             writer.WriteEndObject();
         }
 
-        CreateMessageRequest IJsonModel<CreateMessageRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        ThreadMessageOptions IJsonModel<ThreadMessageOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<CreateMessageRequest>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ThreadMessageOptions>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(CreateMessageRequest)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(ThreadMessageOptions)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeCreateMessageRequest(document.RootElement, options);
+            return DeserializeThreadMessageOptions(document.RootElement, options);
         }
 
-        internal static CreateMessageRequest DeserializeCreateMessageRequest(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static ThreadMessageOptions DeserializeThreadMessageOptions(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -98,8 +105,8 @@ internal static CreateMessageRequest DeserializeCreateMessageRequest(JsonElement
             }
             MessageRole role = default;
             string content = default;
-            IReadOnlyList<string> fileIds = default;
-            IReadOnlyDictionary<string, string> metadata = default;
+            IList<MessageAttachment> attachments = default;
+            IDictionary<string, string> metadata = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -114,18 +121,18 @@ internal static CreateMessageRequest DeserializeCreateMessageRequest(JsonElement
                     content = property.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("file_ids"u8))
+                if (property.NameEquals("attachments"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    List<string> array = new List<string>();
+                    List<MessageAttachment> array = new List<MessageAttachment>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(item.GetString());
+                        array.Add(MessageAttachment.DeserializeMessageAttachment(item, options));
                     }
-                    fileIds = array;
+                    attachments = array;
                     continue;
                 }
                 if (property.NameEquals("metadata"u8))
@@ -148,46 +155,46 @@ internal static CreateMessageRequest DeserializeCreateMessageRequest(JsonElement
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new CreateMessageRequest(role, content, fileIds ?? new ChangeTrackingList<string>(), metadata ?? new ChangeTrackingDictionary<string, string>(), serializedAdditionalRawData);
+            return new ThreadMessageOptions(role, content, attachments ?? new ChangeTrackingList<MessageAttachment>(), metadata ?? new ChangeTrackingDictionary<string, string>(), serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<CreateMessageRequest>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<ThreadMessageOptions>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<CreateMessageRequest>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ThreadMessageOptions>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(CreateMessageRequest)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ThreadMessageOptions)} does not support writing '{options.Format}' format.");
             }
         }
 
-        CreateMessageRequest IPersistableModel<CreateMessageRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
+        ThreadMessageOptions IPersistableModel<ThreadMessageOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<CreateMessageRequest>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ThreadMessageOptions>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeCreateMessageRequest(document.RootElement, options);
+                        return DeserializeThreadMessageOptions(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(CreateMessageRequest)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ThreadMessageOptions)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<CreateMessageRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ThreadMessageOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
         /// <param name="response"> The response to deserialize the model from. </param>
-        internal static CreateMessageRequest FromResponse(Response response)
+        internal static ThreadMessageOptions FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeCreateMessageRequest(document.RootElement);
+            return DeserializeThreadMessageOptions(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadInitializationMessage.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadMessageOptions.cs
similarity index 53%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadInitializationMessage.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadMessageOptions.cs
index 5ce61588505d..6487c1ad7bf4 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadInitializationMessage.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadMessageOptions.cs
@@ -11,7 +11,7 @@
 namespace Azure.AI.OpenAI.Assistants
 {
     /// <summary> A single message within an assistant thread, as provided during that thread's creation for its initial state. </summary>
-    public partial class ThreadInitializationMessage
+    public partial class ThreadMessageOptions
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,52 +45,70 @@ public partial class ThreadInitializationMessage
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="ThreadInitializationMessage"/>. </summary>
-        /// <param name="role"> The role associated with the assistant thread message. Currently, only 'user' is supported when providing initial messages to a new thread. </param>
-        /// <param name="content"> The textual content of the initial message. Currently, robust input including images and annotated text may only be provided via a separate call to the create message API. </param>
+        /// <summary> Initializes a new instance of <see cref="ThreadMessageOptions"/>. </summary>
+        /// <param name="role">
+        /// The role of the entity that is creating the message. Allowed values include:
+        /// - `user`: Indicates the message is sent by an actual user and should be used in most cases to represent user-generated messages.
+        /// - `assistant`: Indicates the message is generated by the assistant. Use this value to insert messages from the assistant into
+        /// the conversation.
+        /// </param>
+        /// <param name="content">
+        /// The textual content of the initial message. Currently, robust input including images and annotated text may only be provided via
+        /// a separate call to the create message API.
+        /// </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        public ThreadInitializationMessage(MessageRole role, string content)
+        public ThreadMessageOptions(MessageRole role, string content)
         {
             Argument.AssertNotNull(content, nameof(content));
 
             Role = role;
             Content = content;
-            FileIds = new ChangeTrackingList<string>();
+            Attachments = new ChangeTrackingList<MessageAttachment>();
             Metadata = new ChangeTrackingDictionary<string, string>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="ThreadInitializationMessage"/>. </summary>
-        /// <param name="role"> The role associated with the assistant thread message. Currently, only 'user' is supported when providing initial messages to a new thread. </param>
-        /// <param name="content"> The textual content of the initial message. Currently, robust input including images and annotated text may only be provided via a separate call to the create message API. </param>
-        /// <param name="fileIds">
-        /// A list of file IDs that the assistant should use. Useful for tools like retrieval and code_interpreter that can
-        /// access files.
+        /// <summary> Initializes a new instance of <see cref="ThreadMessageOptions"/>. </summary>
+        /// <param name="role">
+        /// The role of the entity that is creating the message. Allowed values include:
+        /// - `user`: Indicates the message is sent by an actual user and should be used in most cases to represent user-generated messages.
+        /// - `assistant`: Indicates the message is generated by the assistant. Use this value to insert messages from the assistant into
+        /// the conversation.
         /// </param>
+        /// <param name="content">
+        /// The textual content of the initial message. Currently, robust input including images and annotated text may only be provided via
+        /// a separate call to the create message API.
+        /// </param>
+        /// <param name="attachments"> A list of files attached to the message, and the tools they should be added to. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ThreadInitializationMessage(MessageRole role, string content, IList<string> fileIds, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal ThreadMessageOptions(MessageRole role, string content, IList<MessageAttachment> attachments, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Role = role;
             Content = content;
-            FileIds = fileIds;
+            Attachments = attachments;
             Metadata = metadata;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="ThreadInitializationMessage"/> for deserialization. </summary>
-        internal ThreadInitializationMessage()
+        /// <summary> Initializes a new instance of <see cref="ThreadMessageOptions"/> for deserialization. </summary>
+        internal ThreadMessageOptions()
         {
         }
 
-        /// <summary> The role associated with the assistant thread message. Currently, only 'user' is supported when providing initial messages to a new thread. </summary>
+        /// <summary>
+        /// The role of the entity that is creating the message. Allowed values include:
+        /// - `user`: Indicates the message is sent by an actual user and should be used in most cases to represent user-generated messages.
+        /// - `assistant`: Indicates the message is generated by the assistant. Use this value to insert messages from the assistant into
+        /// the conversation.
+        /// </summary>
         public MessageRole Role { get; }
-        /// <summary> The textual content of the initial message. Currently, robust input including images and annotated text may only be provided via a separate call to the create message API. </summary>
-        public string Content { get; }
         /// <summary>
-        /// A list of file IDs that the assistant should use. Useful for tools like retrieval and code_interpreter that can
-        /// access files.
+        /// The textual content of the initial message. Currently, robust input including images and annotated text may only be provided via
+        /// a separate call to the create message API.
         /// </summary>
-        public IList<string> FileIds { get; }
+        public string Content { get; }
+        /// <summary> A list of files attached to the message, and the tools they should be added to. </summary>
+        public IList<MessageAttachment> Attachments { get; set; }
         /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
         public IDictionary<string, string> Metadata { get; set; }
     }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadRun.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadRun.Serialization.cs
index e8b809e7542c..038592755098 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadRun.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadRun.Serialization.cs
@@ -68,13 +68,6 @@ void IJsonModel<ThreadRun>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions
                 writer.WriteObjectValue(item, options);
             }
             writer.WriteEndArray();
-            writer.WritePropertyName("file_ids"u8);
-            writer.WriteStartArray();
-            foreach (var item in FileIds)
-            {
-                writer.WriteStringValue(item);
-            }
-            writer.WriteEndArray();
             writer.WritePropertyName("created_at"u8);
             writer.WriteNumberValue(CreatedAt, "U");
             if (ExpiresAt != null)
@@ -122,6 +115,109 @@ void IJsonModel<ThreadRun>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions
             {
                 writer.WriteNull("failed_at");
             }
+            if (IncompleteDetails != null)
+            {
+                writer.WritePropertyName("incomplete_details"u8);
+                writer.WriteStringValue(IncompleteDetails.Value.ToString());
+            }
+            else
+            {
+                writer.WriteNull("incomplete_details");
+            }
+            if (Usage != null)
+            {
+                writer.WritePropertyName("usage"u8);
+                writer.WriteObjectValue(Usage, options);
+            }
+            else
+            {
+                writer.WriteNull("usage");
+            }
+            if (Optional.IsDefined(Temperature))
+            {
+                if (Temperature != null)
+                {
+                    writer.WritePropertyName("temperature"u8);
+                    writer.WriteNumberValue(Temperature.Value);
+                }
+                else
+                {
+                    writer.WriteNull("temperature");
+                }
+            }
+            if (Optional.IsDefined(TopP))
+            {
+                if (TopP != null)
+                {
+                    writer.WritePropertyName("top_p"u8);
+                    writer.WriteNumberValue(TopP.Value);
+                }
+                else
+                {
+                    writer.WriteNull("top_p");
+                }
+            }
+            if (MaxPromptTokens != null)
+            {
+                writer.WritePropertyName("max_prompt_tokens"u8);
+                writer.WriteNumberValue(MaxPromptTokens.Value);
+            }
+            else
+            {
+                writer.WriteNull("max_prompt_tokens");
+            }
+            if (MaxCompletionTokens != null)
+            {
+                writer.WritePropertyName("max_completion_tokens"u8);
+                writer.WriteNumberValue(MaxCompletionTokens.Value);
+            }
+            else
+            {
+                writer.WriteNull("max_completion_tokens");
+            }
+            if (TruncationStrategy != null)
+            {
+                writer.WritePropertyName("truncation_strategy"u8);
+                writer.WriteObjectValue(TruncationStrategy, options);
+            }
+            else
+            {
+                writer.WriteNull("truncation_strategy");
+            }
+            if (ToolChoice != null)
+            {
+                writer.WritePropertyName("tool_choice"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(ToolChoice);
+#else
+                using (JsonDocument document = JsonDocument.Parse(ToolChoice))
+                {
+                    JsonSerializer.Serialize(writer, document.RootElement);
+                }
+#endif
+            }
+            else
+            {
+                writer.WriteNull("tool_choice");
+            }
+            writer.WritePropertyName("parallel_tool_calls"u8);
+            writer.WriteBooleanValue(ParallelToolCalls);
+            if (ResponseFormat != null)
+            {
+                writer.WritePropertyName("response_format"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(ResponseFormat);
+#else
+                using (JsonDocument document = JsonDocument.Parse(ResponseFormat))
+                {
+                    JsonSerializer.Serialize(writer, document.RootElement);
+                }
+#endif
+            }
+            else
+            {
+                writer.WriteNull("response_format");
+            }
             if (Metadata != null && Optional.IsCollectionDefined(Metadata))
             {
                 writer.WritePropertyName("metadata"u8);
@@ -185,13 +281,22 @@ internal static ThreadRun DeserializeThreadRun(JsonElement element, ModelReaderW
             string model = default;
             string instructions = default;
             IReadOnlyList<ToolDefinition> tools = default;
-            IReadOnlyList<string> fileIds = default;
             DateTimeOffset createdAt = default;
             DateTimeOffset? expiresAt = default;
             DateTimeOffset? startedAt = default;
             DateTimeOffset? completedAt = default;
             DateTimeOffset? cancelledAt = default;
             DateTimeOffset? failedAt = default;
+            IncompleteRunDetails? incompleteDetails = default;
+            RunCompletionUsage usage = default;
+            float? temperature = default;
+            float? topP = default;
+            int? maxPromptTokens = default;
+            int? maxCompletionTokens = default;
+            TruncationObject truncationStrategy = default;
+            BinaryData toolChoice = default;
+            bool parallelToolCalls = default;
+            BinaryData responseFormat = default;
             IReadOnlyDictionary<string, string> metadata = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -262,16 +367,6 @@ internal static ThreadRun DeserializeThreadRun(JsonElement element, ModelReaderW
                     tools = array;
                     continue;
                 }
-                if (property.NameEquals("file_ids"u8))
-                {
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetString());
-                    }
-                    fileIds = array;
-                    continue;
-                }
                 if (property.NameEquals("created_at"u8))
                 {
                     createdAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
@@ -302,6 +397,101 @@ internal static ThreadRun DeserializeThreadRun(JsonElement element, ModelReaderW
                     DeserializeNullableDateTimeOffset(property, ref failedAt);
                     continue;
                 }
+                if (property.NameEquals("incomplete_details"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        incompleteDetails = null;
+                        continue;
+                    }
+                    incompleteDetails = new IncompleteRunDetails(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("usage"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        usage = null;
+                        continue;
+                    }
+                    usage = RunCompletionUsage.DeserializeRunCompletionUsage(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("temperature"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        temperature = null;
+                        continue;
+                    }
+                    temperature = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("top_p"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        topP = null;
+                        continue;
+                    }
+                    topP = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("max_prompt_tokens"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        maxPromptTokens = null;
+                        continue;
+                    }
+                    maxPromptTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("max_completion_tokens"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        maxCompletionTokens = null;
+                        continue;
+                    }
+                    maxCompletionTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("truncation_strategy"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        truncationStrategy = null;
+                        continue;
+                    }
+                    truncationStrategy = TruncationObject.DeserializeTruncationObject(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("tool_choice"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        toolChoice = null;
+                        continue;
+                    }
+                    toolChoice = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
+                if (property.NameEquals("parallel_tool_calls"u8))
+                {
+                    parallelToolCalls = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("response_format"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        responseFormat = null;
+                        continue;
+                    }
+                    responseFormat = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
                 if (property.NameEquals("metadata"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
@@ -334,13 +524,22 @@ internal static ThreadRun DeserializeThreadRun(JsonElement element, ModelReaderW
                 model,
                 instructions,
                 tools,
-                fileIds,
                 createdAt,
                 expiresAt,
                 startedAt,
                 completedAt,
                 cancelledAt,
                 failedAt,
+                incompleteDetails,
+                usage,
+                temperature,
+                topP,
+                maxPromptTokens,
+                maxCompletionTokens,
+                truncationStrategy,
+                toolChoice,
+                parallelToolCalls,
+                responseFormat,
                 metadata,
                 serializedAdditionalRawData);
         }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadRun.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadRun.cs
index 31c97e45b559..16b96c0084e0 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadRun.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadRun.cs
@@ -57,18 +57,25 @@ public partial class ThreadRun
         /// <param name="tools">
         /// The overridden enabled tools used for this assistant thread run.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
         /// </param>
-        /// <param name="fileIds"> A list of attached file IDs, ordered by creation date in ascending order. </param>
         /// <param name="createdAt"> The Unix timestamp, in seconds, representing when this object was created. </param>
         /// <param name="expiresAt"> The Unix timestamp, in seconds, representing when this item expires. </param>
         /// <param name="startedAt"> The Unix timestamp, in seconds, representing when this item was started. </param>
         /// <param name="completedAt"> The Unix timestamp, in seconds, representing when this completed. </param>
         /// <param name="cancelledAt"> The Unix timestamp, in seconds, representing when this was cancelled. </param>
         /// <param name="failedAt"> The Unix timestamp, in seconds, representing when this failed. </param>
+        /// <param name="incompleteDetails"> Details on why the run is incomplete. Will be `null` if the run is not incomplete. </param>
+        /// <param name="usage"> Usage statistics related to the run. This value will be `null` if the run is not in a terminal state (i.e. `in_progress`, `queued`, etc.). </param>
+        /// <param name="maxPromptTokens"> The maximum number of prompt tokens specified to have been used over the course of the run. </param>
+        /// <param name="maxCompletionTokens"> The maximum number of completion tokens specified to have been used over the course of the run. </param>
+        /// <param name="truncationStrategy"> The strategy to use for dropping messages as the context windows moves forward. </param>
+        /// <param name="toolChoice"> Controls whether or not and which tool is called by the model. </param>
+        /// <param name="parallelToolCalls"> Whether to enable parallel function calling during tool use. </param>
+        /// <param name="responseFormat"> The response format of the tool calls used in this run. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="id"/>, <paramref name="threadId"/>, <paramref name="assistantId"/>, <paramref name="model"/>, <paramref name="instructions"/>, <paramref name="tools"/> or <paramref name="fileIds"/> is null. </exception>
-        internal ThreadRun(string id, string threadId, string assistantId, RunStatus status, RunError lastError, string model, string instructions, IEnumerable<ToolDefinition> tools, IEnumerable<string> fileIds, DateTimeOffset createdAt, DateTimeOffset? expiresAt, DateTimeOffset? startedAt, DateTimeOffset? completedAt, DateTimeOffset? cancelledAt, DateTimeOffset? failedAt, IReadOnlyDictionary<string, string> metadata)
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/>, <paramref name="threadId"/>, <paramref name="assistantId"/>, <paramref name="model"/>, <paramref name="instructions"/> or <paramref name="tools"/> is null. </exception>
+        internal ThreadRun(string id, string threadId, string assistantId, RunStatus status, RunError lastError, string model, string instructions, IEnumerable<ToolDefinition> tools, DateTimeOffset createdAt, DateTimeOffset? expiresAt, DateTimeOffset? startedAt, DateTimeOffset? completedAt, DateTimeOffset? cancelledAt, DateTimeOffset? failedAt, IncompleteRunDetails? incompleteDetails, RunCompletionUsage usage, int? maxPromptTokens, int? maxCompletionTokens, TruncationObject truncationStrategy, BinaryData toolChoice, bool parallelToolCalls, BinaryData responseFormat, IReadOnlyDictionary<string, string> metadata)
         {
             Argument.AssertNotNull(id, nameof(id));
             Argument.AssertNotNull(threadId, nameof(threadId));
@@ -76,7 +83,6 @@ internal ThreadRun(string id, string threadId, string assistantId, RunStatus sta
             Argument.AssertNotNull(model, nameof(model));
             Argument.AssertNotNull(instructions, nameof(instructions));
             Argument.AssertNotNull(tools, nameof(tools));
-            Argument.AssertNotNull(fileIds, nameof(fileIds));
 
             Id = id;
             ThreadId = threadId;
@@ -86,13 +92,20 @@ internal ThreadRun(string id, string threadId, string assistantId, RunStatus sta
             Model = model;
             Instructions = instructions;
             Tools = tools.ToList();
-            FileIds = fileIds.ToList();
             CreatedAt = createdAt;
             ExpiresAt = expiresAt;
             StartedAt = startedAt;
             CompletedAt = completedAt;
             CancelledAt = cancelledAt;
             FailedAt = failedAt;
+            IncompleteDetails = incompleteDetails;
+            Usage = usage;
+            MaxPromptTokens = maxPromptTokens;
+            MaxCompletionTokens = maxCompletionTokens;
+            TruncationStrategy = truncationStrategy;
+            ToolChoice = toolChoice;
+            ParallelToolCalls = parallelToolCalls;
+            ResponseFormat = responseFormat;
             Metadata = metadata;
         }
 
@@ -113,18 +126,27 @@ internal ThreadRun(string id, string threadId, string assistantId, RunStatus sta
         /// <param name="tools">
         /// The overridden enabled tools used for this assistant thread run.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
         /// </param>
-        /// <param name="fileIds"> A list of attached file IDs, ordered by creation date in ascending order. </param>
         /// <param name="createdAt"> The Unix timestamp, in seconds, representing when this object was created. </param>
         /// <param name="expiresAt"> The Unix timestamp, in seconds, representing when this item expires. </param>
         /// <param name="startedAt"> The Unix timestamp, in seconds, representing when this item was started. </param>
         /// <param name="completedAt"> The Unix timestamp, in seconds, representing when this completed. </param>
         /// <param name="cancelledAt"> The Unix timestamp, in seconds, representing when this was cancelled. </param>
         /// <param name="failedAt"> The Unix timestamp, in seconds, representing when this failed. </param>
+        /// <param name="incompleteDetails"> Details on why the run is incomplete. Will be `null` if the run is not incomplete. </param>
+        /// <param name="usage"> Usage statistics related to the run. This value will be `null` if the run is not in a terminal state (i.e. `in_progress`, `queued`, etc.). </param>
+        /// <param name="temperature"> The sampling temperature used for this run. If not set, defaults to 1. </param>
+        /// <param name="topP"> The nucleus sampling value used for this run. If not set, defaults to 1. </param>
+        /// <param name="maxPromptTokens"> The maximum number of prompt tokens specified to have been used over the course of the run. </param>
+        /// <param name="maxCompletionTokens"> The maximum number of completion tokens specified to have been used over the course of the run. </param>
+        /// <param name="truncationStrategy"> The strategy to use for dropping messages as the context windows moves forward. </param>
+        /// <param name="toolChoice"> Controls whether or not and which tool is called by the model. </param>
+        /// <param name="parallelToolCalls"> Whether to enable parallel function calling during tool use. </param>
+        /// <param name="responseFormat"> The response format of the tool calls used in this run. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ThreadRun(string id, string @object, string threadId, string assistantId, RunStatus status, RequiredAction requiredAction, RunError lastError, string model, string instructions, IReadOnlyList<ToolDefinition> tools, IReadOnlyList<string> fileIds, DateTimeOffset createdAt, DateTimeOffset? expiresAt, DateTimeOffset? startedAt, DateTimeOffset? completedAt, DateTimeOffset? cancelledAt, DateTimeOffset? failedAt, IReadOnlyDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal ThreadRun(string id, string @object, string threadId, string assistantId, RunStatus status, RequiredAction requiredAction, RunError lastError, string model, string instructions, IReadOnlyList<ToolDefinition> tools, DateTimeOffset createdAt, DateTimeOffset? expiresAt, DateTimeOffset? startedAt, DateTimeOffset? completedAt, DateTimeOffset? cancelledAt, DateTimeOffset? failedAt, IncompleteRunDetails? incompleteDetails, RunCompletionUsage usage, float? temperature, float? topP, int? maxPromptTokens, int? maxCompletionTokens, TruncationObject truncationStrategy, BinaryData toolChoice, bool parallelToolCalls, BinaryData responseFormat, IReadOnlyDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Id = id;
             Object = @object;
@@ -136,13 +158,22 @@ internal ThreadRun(string id, string @object, string threadId, string assistantI
             Model = model;
             Instructions = instructions;
             Tools = tools;
-            FileIds = fileIds;
             CreatedAt = createdAt;
             ExpiresAt = expiresAt;
             StartedAt = startedAt;
             CompletedAt = completedAt;
             CancelledAt = cancelledAt;
             FailedAt = failedAt;
+            IncompleteDetails = incompleteDetails;
+            Usage = usage;
+            Temperature = temperature;
+            TopP = topP;
+            MaxPromptTokens = maxPromptTokens;
+            MaxCompletionTokens = maxCompletionTokens;
+            TruncationStrategy = truncationStrategy;
+            ToolChoice = toolChoice;
+            ParallelToolCalls = parallelToolCalls;
+            ResponseFormat = responseFormat;
             Metadata = metadata;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
@@ -176,11 +207,9 @@ internal ThreadRun()
         /// <summary>
         /// The overridden enabled tools used for this assistant thread run.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
         /// </summary>
         public IReadOnlyList<ToolDefinition> Tools { get; }
-        /// <summary> A list of attached file IDs, ordered by creation date in ascending order. </summary>
-        public IReadOnlyList<string> FileIds { get; }
         /// <summary> The Unix timestamp, in seconds, representing when this object was created. </summary>
         public DateTimeOffset CreatedAt { get; }
         /// <summary> The Unix timestamp, in seconds, representing when this item expires. </summary>
@@ -193,6 +222,112 @@ internal ThreadRun()
         public DateTimeOffset? CancelledAt { get; }
         /// <summary> The Unix timestamp, in seconds, representing when this failed. </summary>
         public DateTimeOffset? FailedAt { get; }
+        /// <summary> Details on why the run is incomplete. Will be `null` if the run is not incomplete. </summary>
+        public IncompleteRunDetails? IncompleteDetails { get; }
+        /// <summary> Usage statistics related to the run. This value will be `null` if the run is not in a terminal state (i.e. `in_progress`, `queued`, etc.). </summary>
+        public RunCompletionUsage Usage { get; }
+        /// <summary> The sampling temperature used for this run. If not set, defaults to 1. </summary>
+        public float? Temperature { get; }
+        /// <summary> The nucleus sampling value used for this run. If not set, defaults to 1. </summary>
+        public float? TopP { get; }
+        /// <summary> The maximum number of prompt tokens specified to have been used over the course of the run. </summary>
+        public int? MaxPromptTokens { get; }
+        /// <summary> The maximum number of completion tokens specified to have been used over the course of the run. </summary>
+        public int? MaxCompletionTokens { get; }
+        /// <summary> The strategy to use for dropping messages as the context windows moves forward. </summary>
+        public TruncationObject TruncationStrategy { get; }
+        /// <summary>
+        /// Controls whether or not and which tool is called by the model.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="string"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiToolChoiceOptionMode"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsNamedToolChoice"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData ToolChoice { get; }
+        /// <summary> Whether to enable parallel function calling during tool use. </summary>
+        public bool ParallelToolCalls { get; }
+        /// <summary>
+        /// The response format of the tool calls used in this run.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="string"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiResponseFormatMode"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiResponseFormat"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData ResponseFormat { get; }
         /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
         public IReadOnlyDictionary<string, string> Metadata { get; }
     }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadStreamEvent.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadStreamEvent.cs
new file mode 100644
index 000000000000..172bd6c20d99
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ThreadStreamEvent.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Thread operation related streaming events. </summary>
+    public readonly partial struct ThreadStreamEvent : IEquatable<ThreadStreamEvent>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ThreadStreamEvent"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ThreadStreamEvent(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ThreadCreatedValue = "thread.created";
+
+        /// <summary> Event sent when a new thread is created. The data of this event is of type AssistantThread. </summary>
+        public static ThreadStreamEvent ThreadCreated { get; } = new ThreadStreamEvent(ThreadCreatedValue);
+        /// <summary> Determines if two <see cref="ThreadStreamEvent"/> values are the same. </summary>
+        public static bool operator ==(ThreadStreamEvent left, ThreadStreamEvent right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ThreadStreamEvent"/> values are not the same. </summary>
+        public static bool operator !=(ThreadStreamEvent left, ThreadStreamEvent right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ThreadStreamEvent"/>. </summary>
+        public static implicit operator ThreadStreamEvent(string value) => new ThreadStreamEvent(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ThreadStreamEvent other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ThreadStreamEvent other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ToolDefinition.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ToolDefinition.Serialization.cs
index e5bbd9e2b0cb..9ea0b740ff1a 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ToolDefinition.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ToolDefinition.Serialization.cs
@@ -71,8 +71,8 @@ internal static ToolDefinition DeserializeToolDefinition(JsonElement element, Mo
                 switch (discriminator.GetString())
                 {
                     case "code_interpreter": return CodeInterpreterToolDefinition.DeserializeCodeInterpreterToolDefinition(element, options);
+                    case "file_search": return FileSearchToolDefinition.DeserializeFileSearchToolDefinition(element, options);
                     case "function": return FunctionToolDefinition.DeserializeFunctionToolDefinition(element, options);
-                    case "retrieval": return RetrievalToolDefinition.DeserializeRetrievalToolDefinition(element, options);
                 }
             }
             return UnknownToolDefinition.DeserializeUnknownToolDefinition(element, options);
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ToolDefinition.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ToolDefinition.cs
index b9d063fe1c0c..be4c9b0d6cbf 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ToolDefinition.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ToolDefinition.cs
@@ -13,7 +13,7 @@ namespace Azure.AI.OpenAI.Assistants
     /// <summary>
     /// An abstract representation of an input tool definition that an assistant can use.
     /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-    /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+    /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
     /// </summary>
     public abstract partial class ToolDefinition
     {
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ToolResources.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ToolResources.Serialization.cs
new file mode 100644
index 000000000000..044ce4d7c443
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ToolResources.Serialization.cs
@@ -0,0 +1,157 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class ToolResources : IUtf8JsonSerializable, IJsonModel<ToolResources>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ToolResources>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ToolResources>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ToolResources>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ToolResources)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(CodeInterpreter))
+            {
+                writer.WritePropertyName("code_interpreter"u8);
+                writer.WriteObjectValue(CodeInterpreter, options);
+            }
+            if (Optional.IsDefined(FileSearch))
+            {
+                writer.WritePropertyName("file_search"u8);
+                writer.WriteObjectValue(FileSearch, options);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ToolResources IJsonModel<ToolResources>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ToolResources>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ToolResources)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeToolResources(document.RootElement, options);
+        }
+
+        internal static ToolResources DeserializeToolResources(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            CodeInterpreterToolResource codeInterpreter = default;
+            FileSearchToolResource fileSearch = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("code_interpreter"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    codeInterpreter = CodeInterpreterToolResource.DeserializeCodeInterpreterToolResource(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("file_search"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    fileSearch = FileSearchToolResource.DeserializeFileSearchToolResource(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ToolResources(codeInterpreter, fileSearch, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ToolResources>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ToolResources>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ToolResources)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ToolResources IPersistableModel<ToolResources>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ToolResources>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeToolResources(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ToolResources)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ToolResources>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ToolResources FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeToolResources(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ToolResources.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ToolResources.cs
new file mode 100644
index 000000000000..408316763e48
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/ToolResources.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary>
+    /// A set of resources that are used by the assistant's tools. The resources are specific to the type of
+    /// tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search`
+    /// tool requires a list of vector store IDs.
+    /// </summary>
+    public partial class ToolResources
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ToolResources"/>. </summary>
+        internal ToolResources()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ToolResources"/>. </summary>
+        /// <param name="codeInterpreter"> Resources to be used by the `code_interpreter tool` consisting of file IDs. </param>
+        /// <param name="fileSearch"> Resources to be used by the `file_search` tool consisting of vector store IDs. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ToolResources(CodeInterpreterToolResource codeInterpreter, FileSearchToolResource fileSearch, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            CodeInterpreter = codeInterpreter;
+            FileSearch = fileSearch;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Resources to be used by the `code_interpreter tool` consisting of file IDs. </summary>
+        public CodeInterpreterToolResource CodeInterpreter { get; }
+        /// <summary> Resources to be used by the `file_search` tool consisting of vector store IDs. </summary>
+        public FileSearchToolResource FileSearch { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/TruncationObject.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/TruncationObject.Serialization.cs
new file mode 100644
index 000000000000..d6f67e7b80e1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/TruncationObject.Serialization.cs
@@ -0,0 +1,158 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class TruncationObject : IUtf8JsonSerializable, IJsonModel<TruncationObject>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<TruncationObject>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<TruncationObject>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<TruncationObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(TruncationObject)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (Optional.IsDefined(LastMessages))
+            {
+                if (LastMessages != null)
+                {
+                    writer.WritePropertyName("last_messages"u8);
+                    writer.WriteNumberValue(LastMessages.Value);
+                }
+                else
+                {
+                    writer.WriteNull("last_messages");
+                }
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        TruncationObject IJsonModel<TruncationObject>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<TruncationObject>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(TruncationObject)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeTruncationObject(document.RootElement, options);
+        }
+
+        internal static TruncationObject DeserializeTruncationObject(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            TruncationStrategy type = default;
+            int? lastMessages = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = new TruncationStrategy(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("last_messages"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        lastMessages = null;
+                        continue;
+                    }
+                    lastMessages = property.Value.GetInt32();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new TruncationObject(type, lastMessages, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<TruncationObject>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<TruncationObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(TruncationObject)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        TruncationObject IPersistableModel<TruncationObject>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<TruncationObject>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeTruncationObject(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(TruncationObject)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<TruncationObject>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static TruncationObject FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeTruncationObject(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/TruncationObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/TruncationObject.cs
new file mode 100644
index 000000000000..a662e1b7761f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/TruncationObject.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary>
+    /// Controls for how a thread will be truncated prior to the run. Use this to control the initial
+    /// context window of the run.
+    /// </summary>
+    public partial class TruncationObject
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="TruncationObject"/>. </summary>
+        /// <param name="type">
+        /// The truncation strategy to use for the thread. The default is `auto`. If set to `last_messages`, the thread will
+        /// be truncated to the `lastMessages` count most recent messages in the thread. When set to `auto`, messages in the middle of the thread
+        /// will be dropped to fit the context length of the model, `max_prompt_tokens`.
+        /// </param>
+        public TruncationObject(TruncationStrategy type)
+        {
+            Type = type;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="TruncationObject"/>. </summary>
+        /// <param name="type">
+        /// The truncation strategy to use for the thread. The default is `auto`. If set to `last_messages`, the thread will
+        /// be truncated to the `lastMessages` count most recent messages in the thread. When set to `auto`, messages in the middle of the thread
+        /// will be dropped to fit the context length of the model, `max_prompt_tokens`.
+        /// </param>
+        /// <param name="lastMessages"> The number of most recent messages from the thread when constructing the context for the run. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal TruncationObject(TruncationStrategy type, int? lastMessages, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Type = type;
+            LastMessages = lastMessages;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="TruncationObject"/> for deserialization. </summary>
+        internal TruncationObject()
+        {
+        }
+
+        /// <summary>
+        /// The truncation strategy to use for the thread. The default is `auto`. If set to `last_messages`, the thread will
+        /// be truncated to the `lastMessages` count most recent messages in the thread. When set to `auto`, messages in the middle of the thread
+        /// will be dropped to fit the context length of the model, `max_prompt_tokens`.
+        /// </summary>
+        public TruncationStrategy Type { get; set; }
+        /// <summary> The number of most recent messages from the thread when constructing the context for the run. </summary>
+        public int? LastMessages { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/TruncationStrategy.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/TruncationStrategy.cs
new file mode 100644
index 000000000000..7e51ad3d3242
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/TruncationStrategy.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Possible truncation strategies for the thread. </summary>
+    public readonly partial struct TruncationStrategy : IEquatable<TruncationStrategy>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="TruncationStrategy"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public TruncationStrategy(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string AutoValue = "auto";
+        private const string LastMessagesValue = "last_messages";
+
+        /// <summary> Default value. Messages in the middle of the thread will be dropped to fit the context length of the model. </summary>
+        public static TruncationStrategy Auto { get; } = new TruncationStrategy(AutoValue);
+        /// <summary> The thread will truncate to the `lastMessages` count of recent messages. </summary>
+        public static TruncationStrategy LastMessages { get; } = new TruncationStrategy(LastMessagesValue);
+        /// <summary> Determines if two <see cref="TruncationStrategy"/> values are the same. </summary>
+        public static bool operator ==(TruncationStrategy left, TruncationStrategy right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="TruncationStrategy"/> values are not the same. </summary>
+        public static bool operator !=(TruncationStrategy left, TruncationStrategy right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="TruncationStrategy"/>. </summary>
+        public static implicit operator TruncationStrategy(string value) => new TruncationStrategy(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is TruncationStrategy other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(TruncationStrategy other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageDeltaContent.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageDeltaContent.Serialization.cs
new file mode 100644
index 000000000000..5a261b509b46
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageDeltaContent.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    internal partial class UnknownMessageDeltaContent : IUtf8JsonSerializable, IJsonModel<MessageDeltaContent>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageDeltaContent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageDeltaContent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaContent>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaContent)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageDeltaContent IJsonModel<MessageDeltaContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaContent>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaContent)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageDeltaContent(document.RootElement, options);
+        }
+
+        internal static UnknownMessageDeltaContent DeserializeUnknownMessageDeltaContent(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            int index = default;
+            string type = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownMessageDeltaContent(index, type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<MessageDeltaContent>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaContent>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaContent)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageDeltaContent IPersistableModel<MessageDeltaContent>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaContent>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageDeltaContent(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaContent)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageDeltaContent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownMessageDeltaContent FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownMessageDeltaContent(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<MessageDeltaContent>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageDeltaContent.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageDeltaContent.cs
new file mode 100644
index 000000000000..7b50c79a9122
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageDeltaContent.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Unknown version of MessageDeltaContent. </summary>
+    internal partial class UnknownMessageDeltaContent : MessageDeltaContent
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownMessageDeltaContent"/>. </summary>
+        /// <param name="index"> The index of the content part of the message. </param>
+        /// <param name="type"> The type of content for this content part. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownMessageDeltaContent(int index, string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(index, type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownMessageDeltaContent"/> for deserialization. </summary>
+        internal UnknownMessageDeltaContent()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageDeltaTextAnnotation.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageDeltaTextAnnotation.Serialization.cs
new file mode 100644
index 000000000000..649bf2346f43
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageDeltaTextAnnotation.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    internal partial class UnknownMessageDeltaTextAnnotation : IUtf8JsonSerializable, IJsonModel<MessageDeltaTextAnnotation>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MessageDeltaTextAnnotation>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MessageDeltaTextAnnotation>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextAnnotation)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MessageDeltaTextAnnotation IJsonModel<MessageDeltaTextAnnotation>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MessageDeltaTextAnnotation)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMessageDeltaTextAnnotation(document.RootElement, options);
+        }
+
+        internal static UnknownMessageDeltaTextAnnotation DeserializeUnknownMessageDeltaTextAnnotation(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            int index = default;
+            string type = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownMessageDeltaTextAnnotation(index, type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<MessageDeltaTextAnnotation>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextAnnotation)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MessageDeltaTextAnnotation IPersistableModel<MessageDeltaTextAnnotation>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MessageDeltaTextAnnotation>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMessageDeltaTextAnnotation(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MessageDeltaTextAnnotation)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MessageDeltaTextAnnotation>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownMessageDeltaTextAnnotation FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownMessageDeltaTextAnnotation(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<MessageDeltaTextAnnotation>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageDeltaTextAnnotation.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageDeltaTextAnnotation.cs
new file mode 100644
index 000000000000..3a65e8f866b4
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageDeltaTextAnnotation.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Unknown version of MessageDeltaTextAnnotation. </summary>
+    internal partial class UnknownMessageDeltaTextAnnotation : MessageDeltaTextAnnotation
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownMessageDeltaTextAnnotation"/>. </summary>
+        /// <param name="index"> The index of the annotation within a text content part. </param>
+        /// <param name="type"> The type of the text content annotation. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownMessageDeltaTextAnnotation(int index, string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(index, type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownMessageDeltaTextAnnotation"/> for deserialization. </summary>
+        internal UnknownMessageDeltaTextAnnotation()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageTextAnnotation.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageTextAnnotation.Serialization.cs
index f3ca2a8097cf..5c84db7d15dc 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageTextAnnotation.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageTextAnnotation.Serialization.cs
@@ -30,10 +30,6 @@ void IJsonModel<MessageTextAnnotation>.Write(Utf8JsonWriter writer, ModelReaderW
             writer.WriteStringValue(Type);
             writer.WritePropertyName("text"u8);
             writer.WriteStringValue(Text);
-            writer.WritePropertyName("start_index"u8);
-            writer.WriteNumberValue(StartIndex);
-            writer.WritePropertyName("end_index"u8);
-            writer.WriteNumberValue(EndIndex);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -74,8 +70,6 @@ internal static UnknownMessageTextAnnotation DeserializeUnknownMessageTextAnnota
             }
             string type = "Unknown";
             string text = default;
-            int startIndex = default;
-            int endIndex = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -90,23 +84,13 @@ internal static UnknownMessageTextAnnotation DeserializeUnknownMessageTextAnnota
                     text = property.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("start_index"u8))
-                {
-                    startIndex = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("end_index"u8))
-                {
-                    endIndex = property.Value.GetInt32();
-                    continue;
-                }
                 if (options.Format != "W")
                 {
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new UnknownMessageTextAnnotation(type, text, startIndex, endIndex, serializedAdditionalRawData);
+            return new UnknownMessageTextAnnotation(type, text, serializedAdditionalRawData);
         }
 
         BinaryData IPersistableModel<MessageTextAnnotation>.Write(ModelReaderWriterOptions options)
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageTextAnnotation.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageTextAnnotation.cs
index 707b99138307..8df46b4ee1f3 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageTextAnnotation.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownMessageTextAnnotation.cs
@@ -16,10 +16,8 @@ internal partial class UnknownMessageTextAnnotation : MessageTextAnnotation
         /// <summary> Initializes a new instance of <see cref="UnknownMessageTextAnnotation"/>. </summary>
         /// <param name="type"> The object type. </param>
         /// <param name="text"> The textual content associated with this text annotation item. </param>
-        /// <param name="startIndex"> The first text index associated with this text annotation. </param>
-        /// <param name="endIndex"> The last text index associated with this text annotation. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal UnknownMessageTextAnnotation(string type, string text, int startIndex, int endIndex, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, text, startIndex, endIndex, serializedAdditionalRawData)
+        internal UnknownMessageTextAnnotation(string type, string text, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, text, serializedAdditionalRawData)
         {
         }
 
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaCodeInterpreterOutput.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaCodeInterpreterOutput.Serialization.cs
new file mode 100644
index 000000000000..c7cdadff6c72
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaCodeInterpreterOutput.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    internal partial class UnknownRunStepDeltaCodeInterpreterOutput : IUtf8JsonSerializable, IJsonModel<RunStepDeltaCodeInterpreterOutput>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaCodeInterpreterOutput>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaCodeInterpreterOutput>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterOutput>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterOutput)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaCodeInterpreterOutput IJsonModel<RunStepDeltaCodeInterpreterOutput>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterOutput>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterOutput)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaCodeInterpreterOutput(document.RootElement, options);
+        }
+
+        internal static UnknownRunStepDeltaCodeInterpreterOutput DeserializeUnknownRunStepDeltaCodeInterpreterOutput(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            int index = default;
+            string type = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownRunStepDeltaCodeInterpreterOutput(index, type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaCodeInterpreterOutput>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterOutput>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterOutput)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaCodeInterpreterOutput IPersistableModel<RunStepDeltaCodeInterpreterOutput>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaCodeInterpreterOutput>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaCodeInterpreterOutput(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaCodeInterpreterOutput)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaCodeInterpreterOutput>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownRunStepDeltaCodeInterpreterOutput FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownRunStepDeltaCodeInterpreterOutput(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<RunStepDeltaCodeInterpreterOutput>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaCodeInterpreterOutput.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaCodeInterpreterOutput.cs
new file mode 100644
index 000000000000..cda7227367bc
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaCodeInterpreterOutput.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Unknown version of RunStepDeltaCodeInterpreterOutput. </summary>
+    internal partial class UnknownRunStepDeltaCodeInterpreterOutput : RunStepDeltaCodeInterpreterOutput
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownRunStepDeltaCodeInterpreterOutput"/>. </summary>
+        /// <param name="index"> The index of the output in the streaming run step tool call's Code Interpreter outputs array. </param>
+        /// <param name="type"> The type of the streaming run step tool call's Code Interpreter output. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownRunStepDeltaCodeInterpreterOutput(int index, string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(index, type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownRunStepDeltaCodeInterpreterOutput"/> for deserialization. </summary>
+        internal UnknownRunStepDeltaCodeInterpreterOutput()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaDetail.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaDetail.Serialization.cs
new file mode 100644
index 000000000000..5bad8ffd2844
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaDetail.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    internal partial class UnknownRunStepDeltaDetail : IUtf8JsonSerializable, IJsonModel<RunStepDeltaDetail>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaDetail>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaDetail>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaDetail>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaDetail)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaDetail IJsonModel<RunStepDeltaDetail>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaDetail>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaDetail)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaDetail(document.RootElement, options);
+        }
+
+        internal static UnknownRunStepDeltaDetail DeserializeUnknownRunStepDeltaDetail(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string type = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownRunStepDeltaDetail(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaDetail>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaDetail>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaDetail)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaDetail IPersistableModel<RunStepDeltaDetail>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaDetail>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaDetail(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaDetail)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaDetail>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownRunStepDeltaDetail FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownRunStepDeltaDetail(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<RunStepDeltaDetail>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaDetail.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaDetail.cs
new file mode 100644
index 000000000000..bf9efec7d936
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaDetail.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Unknown version of RunStepDeltaDetail. </summary>
+    internal partial class UnknownRunStepDeltaDetail : RunStepDeltaDetail
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownRunStepDeltaDetail"/>. </summary>
+        /// <param name="type"> The object type for the run step detail object. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownRunStepDeltaDetail(string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownRunStepDeltaDetail"/> for deserialization. </summary>
+        internal UnknownRunStepDeltaDetail()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaToolCall.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaToolCall.Serialization.cs
new file mode 100644
index 000000000000..a23cb38bcab1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaToolCall.Serialization.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    internal partial class UnknownRunStepDeltaToolCall : IUtf8JsonSerializable, IJsonModel<RunStepDeltaToolCall>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RunStepDeltaToolCall>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<RunStepDeltaToolCall>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaToolCall)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        RunStepDeltaToolCall IJsonModel<RunStepDeltaToolCall>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(RunStepDeltaToolCall)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRunStepDeltaToolCall(document.RootElement, options);
+        }
+
+        internal static UnknownRunStepDeltaToolCall DeserializeUnknownRunStepDeltaToolCall(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            int index = default;
+            string id = default;
+            string type = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownRunStepDeltaToolCall(index, id, type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<RunStepDeltaToolCall>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaToolCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaToolCall)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        RunStepDeltaToolCall IPersistableModel<RunStepDeltaToolCall>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<RunStepDeltaToolCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeRunStepDeltaToolCall(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(RunStepDeltaToolCall)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<RunStepDeltaToolCall>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownRunStepDeltaToolCall FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownRunStepDeltaToolCall(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<RunStepDeltaToolCall>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaToolCall.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaToolCall.cs
new file mode 100644
index 000000000000..01e29a7c3518
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownRunStepDeltaToolCall.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Unknown version of RunStepDeltaToolCall. </summary>
+    internal partial class UnknownRunStepDeltaToolCall : RunStepDeltaToolCall
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownRunStepDeltaToolCall"/>. </summary>
+        /// <param name="index"> The index of the tool call detail in the run step's tool_calls array. </param>
+        /// <param name="id"> The ID of the tool call, used when submitting outputs to the run. </param>
+        /// <param name="type"> The type of the tool call detail item in a streaming run step's details. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownRunStepDeltaToolCall(int index, string id, string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(index, id, type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownRunStepDeltaToolCall"/> for deserialization. </summary>
+        internal UnknownRunStepDeltaToolCall()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownVectorStoreChunkingStrategyRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownVectorStoreChunkingStrategyRequest.Serialization.cs
new file mode 100644
index 000000000000..a6bd403223af
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownVectorStoreChunkingStrategyRequest.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    internal partial class UnknownVectorStoreChunkingStrategyRequest : IUtf8JsonSerializable, IJsonModel<VectorStoreChunkingStrategyRequest>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreChunkingStrategyRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreChunkingStrategyRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyRequest)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreChunkingStrategyRequest IJsonModel<VectorStoreChunkingStrategyRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyRequest)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreChunkingStrategyRequest(document.RootElement, options);
+        }
+
+        internal static UnknownVectorStoreChunkingStrategyRequest DeserializeUnknownVectorStoreChunkingStrategyRequest(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            VectorStoreChunkingStrategyRequestType type = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = new VectorStoreChunkingStrategyRequestType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownVectorStoreChunkingStrategyRequest(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<VectorStoreChunkingStrategyRequest>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyRequest)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreChunkingStrategyRequest IPersistableModel<VectorStoreChunkingStrategyRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreChunkingStrategyRequest(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyRequest)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreChunkingStrategyRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownVectorStoreChunkingStrategyRequest FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownVectorStoreChunkingStrategyRequest(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<VectorStoreChunkingStrategyRequest>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownVectorStoreChunkingStrategyRequest.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownVectorStoreChunkingStrategyRequest.cs
new file mode 100644
index 000000000000..287e2c3a3496
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownVectorStoreChunkingStrategyRequest.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Unknown version of VectorStoreChunkingStrategyRequest. </summary>
+    internal partial class UnknownVectorStoreChunkingStrategyRequest : VectorStoreChunkingStrategyRequest
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownVectorStoreChunkingStrategyRequest"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownVectorStoreChunkingStrategyRequest(VectorStoreChunkingStrategyRequestType type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownVectorStoreChunkingStrategyRequest"/> for deserialization. </summary>
+        internal UnknownVectorStoreChunkingStrategyRequest()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownVectorStoreChunkingStrategyResponse.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownVectorStoreChunkingStrategyResponse.Serialization.cs
new file mode 100644
index 000000000000..1e409c04654c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownVectorStoreChunkingStrategyResponse.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    internal partial class UnknownVectorStoreChunkingStrategyResponse : IUtf8JsonSerializable, IJsonModel<VectorStoreChunkingStrategyResponse>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreChunkingStrategyResponse>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreChunkingStrategyResponse>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyResponse)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreChunkingStrategyResponse IJsonModel<VectorStoreChunkingStrategyResponse>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyResponse)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreChunkingStrategyResponse(document.RootElement, options);
+        }
+
+        internal static UnknownVectorStoreChunkingStrategyResponse DeserializeUnknownVectorStoreChunkingStrategyResponse(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            VectorStoreChunkingStrategyResponseType type = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = new VectorStoreChunkingStrategyResponseType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownVectorStoreChunkingStrategyResponse(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<VectorStoreChunkingStrategyResponse>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyResponse)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreChunkingStrategyResponse IPersistableModel<VectorStoreChunkingStrategyResponse>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreChunkingStrategyResponse(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyResponse)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreChunkingStrategyResponse>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownVectorStoreChunkingStrategyResponse FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownVectorStoreChunkingStrategyResponse(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<VectorStoreChunkingStrategyResponse>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownVectorStoreChunkingStrategyResponse.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownVectorStoreChunkingStrategyResponse.cs
new file mode 100644
index 000000000000..d81dc4925d3c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UnknownVectorStoreChunkingStrategyResponse.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Unknown version of VectorStoreChunkingStrategyResponse. </summary>
+    internal partial class UnknownVectorStoreChunkingStrategyResponse : VectorStoreChunkingStrategyResponse
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownVectorStoreChunkingStrategyResponse"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownVectorStoreChunkingStrategyResponse(VectorStoreChunkingStrategyResponseType type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownVectorStoreChunkingStrategyResponse"/> for deserialization. </summary>
+        internal UnknownVectorStoreChunkingStrategyResponse()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateAssistantOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateAssistantOptions.Serialization.cs
index c9b296e27af2..05de83029fa0 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateAssistantOptions.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateAssistantOptions.Serialization.cs
@@ -77,15 +77,53 @@ void IJsonModel<UpdateAssistantOptions>.Write(Utf8JsonWriter writer, ModelReader
                 }
                 writer.WriteEndArray();
             }
-            if (Optional.IsCollectionDefined(FileIds))
+            if (Optional.IsDefined(ToolResources))
             {
-                writer.WritePropertyName("file_ids"u8);
-                writer.WriteStartArray();
-                foreach (var item in FileIds)
+                writer.WritePropertyName("tool_resources"u8);
+                writer.WriteObjectValue(ToolResources, options);
+            }
+            if (Optional.IsDefined(Temperature))
+            {
+                if (Temperature != null)
                 {
-                    writer.WriteStringValue(item);
+                    writer.WritePropertyName("temperature"u8);
+                    writer.WriteNumberValue(Temperature.Value);
+                }
+                else
+                {
+                    writer.WriteNull("temperature");
+                }
+            }
+            if (Optional.IsDefined(TopP))
+            {
+                if (TopP != null)
+                {
+                    writer.WritePropertyName("top_p"u8);
+                    writer.WriteNumberValue(TopP.Value);
+                }
+                else
+                {
+                    writer.WriteNull("top_p");
+                }
+            }
+            if (Optional.IsDefined(ResponseFormat))
+            {
+                if (ResponseFormat != null)
+                {
+                    writer.WritePropertyName("response_format"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(ResponseFormat);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(ResponseFormat))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+                else
+                {
+                    writer.WriteNull("response_format");
                 }
-                writer.WriteEndArray();
             }
             if (Optional.IsCollectionDefined(Metadata))
             {
@@ -148,7 +186,10 @@ internal static UpdateAssistantOptions DeserializeUpdateAssistantOptions(JsonEle
             string description = default;
             string instructions = default;
             IList<ToolDefinition> tools = default;
-            IList<string> fileIds = default;
+            UpdateToolResourcesOptions toolResources = default;
+            float? temperature = default;
+            float? topP = default;
+            BinaryData responseFormat = default;
             IDictionary<string, string> metadata = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -203,18 +244,43 @@ internal static UpdateAssistantOptions DeserializeUpdateAssistantOptions(JsonEle
                     tools = array;
                     continue;
                 }
-                if (property.NameEquals("file_ids"u8))
+                if (property.NameEquals("tool_resources"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    toolResources = UpdateToolResourcesOptions.DeserializeUpdateToolResourcesOptions(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("temperature"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
                     {
-                        array.Add(item.GetString());
+                        temperature = null;
+                        continue;
+                    }
+                    temperature = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("top_p"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        topP = null;
+                        continue;
+                    }
+                    topP = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("response_format"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        responseFormat = null;
+                        continue;
                     }
-                    fileIds = array;
+                    responseFormat = BinaryData.FromString(property.Value.GetRawText());
                     continue;
                 }
                 if (property.NameEquals("metadata"u8))
@@ -243,7 +309,10 @@ internal static UpdateAssistantOptions DeserializeUpdateAssistantOptions(JsonEle
                 description,
                 instructions,
                 tools ?? new ChangeTrackingList<ToolDefinition>(),
-                fileIds ?? new ChangeTrackingList<string>(),
+                toolResources,
+                temperature,
+                topP,
+                responseFormat,
                 metadata ?? new ChangeTrackingDictionary<string, string>(),
                 serializedAdditionalRawData);
         }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateAssistantOptions.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateAssistantOptions.cs
index 85770c825c21..b3b50cb3bb79 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateAssistantOptions.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateAssistantOptions.cs
@@ -49,7 +49,6 @@ public partial class UpdateAssistantOptions
         public UpdateAssistantOptions()
         {
             Tools = new ChangeTrackingList<ToolDefinition>();
-            FileIds = new ChangeTrackingList<string>();
             Metadata = new ChangeTrackingDictionary<string, string>();
         }
 
@@ -61,19 +60,36 @@ public UpdateAssistantOptions()
         /// <param name="tools">
         /// The modified collection of tools to enable for the assistant.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
         /// </param>
-        /// <param name="fileIds"> The modified list of previously uploaded fileIDs to attach to the assistant. </param>
+        /// <param name="toolResources">
+        /// A set of resources that are used by the assistant's tools. The resources are specific to the type of tool. For example,
+        /// the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.
+        /// </param>
+        /// <param name="temperature">
+        /// What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random,
+        /// while lower values like 0.2 will make it more focused and deterministic.
+        /// </param>
+        /// <param name="topP">
+        /// An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass.
+        /// So 0.1 means only the tokens comprising the top 10% probability mass are considered.
+        ///
+        /// We generally recommend altering this or temperature but not both.
+        /// </param>
+        /// <param name="responseFormat"> The response format of the tool calls used by this assistant. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal UpdateAssistantOptions(string model, string name, string description, string instructions, IList<ToolDefinition> tools, IList<string> fileIds, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal UpdateAssistantOptions(string model, string name, string description, string instructions, IList<ToolDefinition> tools, UpdateToolResourcesOptions toolResources, float? temperature, float? topP, BinaryData responseFormat, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Model = model;
             Name = name;
             Description = description;
             Instructions = instructions;
             Tools = tools;
-            FileIds = fileIds;
+            ToolResources = toolResources;
+            Temperature = temperature;
+            TopP = topP;
+            ResponseFormat = responseFormat;
             Metadata = metadata;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
@@ -89,11 +105,71 @@ internal UpdateAssistantOptions(string model, string name, string description, s
         /// <summary>
         /// The modified collection of tools to enable for the assistant.
         /// Please note <see cref="ToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FunctionToolDefinition"/> and <see cref="RetrievalToolDefinition"/>.
+        /// The available derived classes include <see cref="CodeInterpreterToolDefinition"/>, <see cref="FileSearchToolDefinition"/> and <see cref="FunctionToolDefinition"/>.
         /// </summary>
         public IList<ToolDefinition> Tools { get; }
-        /// <summary> The modified list of previously uploaded fileIDs to attach to the assistant. </summary>
-        public IList<string> FileIds { get; }
+        /// <summary>
+        /// A set of resources that are used by the assistant's tools. The resources are specific to the type of tool. For example,
+        /// the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires a list of vector store IDs.
+        /// </summary>
+        public UpdateToolResourcesOptions ToolResources { get; set; }
+        /// <summary>
+        /// What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random,
+        /// while lower values like 0.2 will make it more focused and deterministic.
+        /// </summary>
+        public float? Temperature { get; set; }
+        /// <summary>
+        /// An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass.
+        /// So 0.1 means only the tokens comprising the top 10% probability mass are considered.
+        ///
+        /// We generally recommend altering this or temperature but not both.
+        /// </summary>
+        public float? TopP { get; set; }
+        /// <summary>
+        /// The response format of the tool calls used by this assistant.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="string"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiResponseFormatMode"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="AssistantsApiResponseFormat"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData ResponseFormat { get; set; }
         /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
         public IDictionary<string, string> Metadata { get; set; }
     }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateThreadRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateAssistantThreadOptions.Serialization.cs
similarity index 59%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateThreadRequest.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateAssistantThreadOptions.Serialization.cs
index efb58bc378ae..d9faa3c9ac02 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateThreadRequest.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateAssistantThreadOptions.Serialization.cs
@@ -13,19 +13,31 @@
 
 namespace Azure.AI.OpenAI.Assistants
 {
-    internal partial class UpdateThreadRequest : IUtf8JsonSerializable, IJsonModel<UpdateThreadRequest>
+    public partial class UpdateAssistantThreadOptions : IUtf8JsonSerializable, IJsonModel<UpdateAssistantThreadOptions>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<UpdateThreadRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<UpdateAssistantThreadOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<UpdateThreadRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<UpdateAssistantThreadOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<UpdateThreadRequest>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateAssistantThreadOptions>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(UpdateThreadRequest)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(UpdateAssistantThreadOptions)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
+            if (Optional.IsDefined(ToolResources))
+            {
+                if (ToolResources != null)
+                {
+                    writer.WritePropertyName("tool_resources"u8);
+                    writer.WriteObjectValue(ToolResources, options);
+                }
+                else
+                {
+                    writer.WriteNull("tool_resources");
+                }
+            }
             if (Optional.IsCollectionDefined(Metadata))
             {
                 if (Metadata != null)
@@ -62,19 +74,19 @@ void IJsonModel<UpdateThreadRequest>.Write(Utf8JsonWriter writer, ModelReaderWri
             writer.WriteEndObject();
         }
 
-        UpdateThreadRequest IJsonModel<UpdateThreadRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        UpdateAssistantThreadOptions IJsonModel<UpdateAssistantThreadOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<UpdateThreadRequest>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateAssistantThreadOptions>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(UpdateThreadRequest)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(UpdateAssistantThreadOptions)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeUpdateThreadRequest(document.RootElement, options);
+            return DeserializeUpdateAssistantThreadOptions(document.RootElement, options);
         }
 
-        internal static UpdateThreadRequest DeserializeUpdateThreadRequest(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static UpdateAssistantThreadOptions DeserializeUpdateAssistantThreadOptions(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -82,11 +94,22 @@ internal static UpdateThreadRequest DeserializeUpdateThreadRequest(JsonElement e
             {
                 return null;
             }
-            IReadOnlyDictionary<string, string> metadata = default;
+            UpdateToolResourcesOptions toolResources = default;
+            IDictionary<string, string> metadata = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
             {
+                if (property.NameEquals("tool_resources"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        toolResources = null;
+                        continue;
+                    }
+                    toolResources = UpdateToolResourcesOptions.DeserializeUpdateToolResourcesOptions(property.Value, options);
+                    continue;
+                }
                 if (property.NameEquals("metadata"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
@@ -107,46 +130,46 @@ internal static UpdateThreadRequest DeserializeUpdateThreadRequest(JsonElement e
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new UpdateThreadRequest(metadata ?? new ChangeTrackingDictionary<string, string>(), serializedAdditionalRawData);
+            return new UpdateAssistantThreadOptions(toolResources, metadata ?? new ChangeTrackingDictionary<string, string>(), serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<UpdateThreadRequest>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<UpdateAssistantThreadOptions>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<UpdateThreadRequest>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateAssistantThreadOptions>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(UpdateThreadRequest)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(UpdateAssistantThreadOptions)} does not support writing '{options.Format}' format.");
             }
         }
 
-        UpdateThreadRequest IPersistableModel<UpdateThreadRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
+        UpdateAssistantThreadOptions IPersistableModel<UpdateAssistantThreadOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<UpdateThreadRequest>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateAssistantThreadOptions>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeUpdateThreadRequest(document.RootElement, options);
+                        return DeserializeUpdateAssistantThreadOptions(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(UpdateThreadRequest)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(UpdateAssistantThreadOptions)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<UpdateThreadRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<UpdateAssistantThreadOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
         /// <param name="response"> The response to deserialize the model from. </param>
-        internal static UpdateThreadRequest FromResponse(Response response)
+        internal static UpdateAssistantThreadOptions FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeUpdateThreadRequest(document.RootElement);
+            return DeserializeUpdateAssistantThreadOptions(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateMessageRequest.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateAssistantThreadOptions.cs
similarity index 53%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateMessageRequest.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateAssistantThreadOptions.cs
index b58f5b245234..6b7141de049b 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateMessageRequest.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateAssistantThreadOptions.cs
@@ -10,8 +10,8 @@
 
 namespace Azure.AI.OpenAI.Assistants
 {
-    /// <summary> The CreateMessageRequest. </summary>
-    internal partial class CreateMessageRequest
+    /// <summary> The details used to update an existing assistant thread. </summary>
+    public partial class UpdateAssistantThreadOptions
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,47 +45,34 @@ internal partial class CreateMessageRequest
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="CreateMessageRequest"/>. </summary>
-        /// <param name="role"> The role to associate with the new message. </param>
-        /// <param name="content"> The textual content for the new message. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        internal CreateMessageRequest(MessageRole role, string content)
+        /// <summary> Initializes a new instance of <see cref="UpdateAssistantThreadOptions"/>. </summary>
+        public UpdateAssistantThreadOptions()
         {
-            Argument.AssertNotNull(content, nameof(content));
-
-            Role = role;
-            Content = content;
-            FileIds = new ChangeTrackingList<string>();
             Metadata = new ChangeTrackingDictionary<string, string>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="CreateMessageRequest"/>. </summary>
-        /// <param name="role"> The role to associate with the new message. </param>
-        /// <param name="content"> The textual content for the new message. </param>
-        /// <param name="fileIds"> A list of up to 10 file IDs to associate with the message, as used by tools like 'code_interpreter' or 'retrieval' that can read files. </param>
+        /// <summary> Initializes a new instance of <see cref="UpdateAssistantThreadOptions"/>. </summary>
+        /// <param name="toolResources">
+        /// A set of resources that are made available to the assistant's tools in this thread. The resources are specific to the
+        /// type of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires
+        /// a list of vector store IDs
+        /// </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal CreateMessageRequest(MessageRole role, string content, IReadOnlyList<string> fileIds, IReadOnlyDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal UpdateAssistantThreadOptions(UpdateToolResourcesOptions toolResources, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
-            Role = role;
-            Content = content;
-            FileIds = fileIds;
+            ToolResources = toolResources;
             Metadata = metadata;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="CreateMessageRequest"/> for deserialization. </summary>
-        internal CreateMessageRequest()
-        {
-        }
-
-        /// <summary> The role to associate with the new message. </summary>
-        public MessageRole Role { get; }
-        /// <summary> The textual content for the new message. </summary>
-        public string Content { get; }
-        /// <summary> A list of up to 10 file IDs to associate with the message, as used by tools like 'code_interpreter' or 'retrieval' that can read files. </summary>
-        public IReadOnlyList<string> FileIds { get; }
+        /// <summary>
+        /// A set of resources that are made available to the assistant's tools in this thread. The resources are specific to the
+        /// type of tool. For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires
+        /// a list of vector store IDs
+        /// </summary>
+        public UpdateToolResourcesOptions ToolResources { get; set; }
         /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
-        public IReadOnlyDictionary<string, string> Metadata { get; }
+        public IDictionary<string, string> Metadata { get; set; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateCodeInterpreterToolResourceOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateCodeInterpreterToolResourceOptions.Serialization.cs
new file mode 100644
index 000000000000..465ea22d89ba
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateCodeInterpreterToolResourceOptions.Serialization.cs
@@ -0,0 +1,152 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class UpdateCodeInterpreterToolResourceOptions : IUtf8JsonSerializable, IJsonModel<UpdateCodeInterpreterToolResourceOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<UpdateCodeInterpreterToolResourceOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<UpdateCodeInterpreterToolResourceOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateCodeInterpreterToolResourceOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(UpdateCodeInterpreterToolResourceOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsCollectionDefined(FileIds))
+            {
+                writer.WritePropertyName("file_ids"u8);
+                writer.WriteStartArray();
+                foreach (var item in FileIds)
+                {
+                    writer.WriteStringValue(item);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        UpdateCodeInterpreterToolResourceOptions IJsonModel<UpdateCodeInterpreterToolResourceOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateCodeInterpreterToolResourceOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(UpdateCodeInterpreterToolResourceOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeUpdateCodeInterpreterToolResourceOptions(document.RootElement, options);
+        }
+
+        internal static UpdateCodeInterpreterToolResourceOptions DeserializeUpdateCodeInterpreterToolResourceOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IList<string> fileIds = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_ids"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    fileIds = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UpdateCodeInterpreterToolResourceOptions(fileIds ?? new ChangeTrackingList<string>(), serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<UpdateCodeInterpreterToolResourceOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateCodeInterpreterToolResourceOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(UpdateCodeInterpreterToolResourceOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        UpdateCodeInterpreterToolResourceOptions IPersistableModel<UpdateCodeInterpreterToolResourceOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateCodeInterpreterToolResourceOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeUpdateCodeInterpreterToolResourceOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(UpdateCodeInterpreterToolResourceOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<UpdateCodeInterpreterToolResourceOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static UpdateCodeInterpreterToolResourceOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUpdateCodeInterpreterToolResourceOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateCodeInterpreterToolResourceOptions.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateCodeInterpreterToolResourceOptions.cs
new file mode 100644
index 000000000000..8c09267cd78d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateCodeInterpreterToolResourceOptions.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Request object to update `code_interpreted` tool resources. </summary>
+    public partial class UpdateCodeInterpreterToolResourceOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="UpdateCodeInterpreterToolResourceOptions"/>. </summary>
+        public UpdateCodeInterpreterToolResourceOptions()
+        {
+            FileIds = new ChangeTrackingList<string>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UpdateCodeInterpreterToolResourceOptions"/>. </summary>
+        /// <param name="fileIds"> A list of file IDs to override the current list of the assistant. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UpdateCodeInterpreterToolResourceOptions(IList<string> fileIds, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            FileIds = fileIds;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> A list of file IDs to override the current list of the assistant. </summary>
+        public IList<string> FileIds { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateFileSearchToolResourceOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateFileSearchToolResourceOptions.Serialization.cs
new file mode 100644
index 000000000000..8e5ab556eb60
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateFileSearchToolResourceOptions.Serialization.cs
@@ -0,0 +1,152 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class UpdateFileSearchToolResourceOptions : IUtf8JsonSerializable, IJsonModel<UpdateFileSearchToolResourceOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<UpdateFileSearchToolResourceOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<UpdateFileSearchToolResourceOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateFileSearchToolResourceOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(UpdateFileSearchToolResourceOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsCollectionDefined(VectorStoreIds))
+            {
+                writer.WritePropertyName("vector_store_ids"u8);
+                writer.WriteStartArray();
+                foreach (var item in VectorStoreIds)
+                {
+                    writer.WriteStringValue(item);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        UpdateFileSearchToolResourceOptions IJsonModel<UpdateFileSearchToolResourceOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateFileSearchToolResourceOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(UpdateFileSearchToolResourceOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeUpdateFileSearchToolResourceOptions(document.RootElement, options);
+        }
+
+        internal static UpdateFileSearchToolResourceOptions DeserializeUpdateFileSearchToolResourceOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IList<string> vectorStoreIds = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("vector_store_ids"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    vectorStoreIds = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UpdateFileSearchToolResourceOptions(vectorStoreIds ?? new ChangeTrackingList<string>(), serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<UpdateFileSearchToolResourceOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateFileSearchToolResourceOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(UpdateFileSearchToolResourceOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        UpdateFileSearchToolResourceOptions IPersistableModel<UpdateFileSearchToolResourceOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateFileSearchToolResourceOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeUpdateFileSearchToolResourceOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(UpdateFileSearchToolResourceOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<UpdateFileSearchToolResourceOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static UpdateFileSearchToolResourceOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUpdateFileSearchToolResourceOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateFileSearchToolResourceOptions.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateFileSearchToolResourceOptions.cs
new file mode 100644
index 000000000000..8742c5cd1b07
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateFileSearchToolResourceOptions.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Request object to update `file_search` tool resources. </summary>
+    public partial class UpdateFileSearchToolResourceOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="UpdateFileSearchToolResourceOptions"/>. </summary>
+        public UpdateFileSearchToolResourceOptions()
+        {
+            VectorStoreIds = new ChangeTrackingList<string>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UpdateFileSearchToolResourceOptions"/>. </summary>
+        /// <param name="vectorStoreIds"> A list of vector store IDs to override the current list of the assistant. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UpdateFileSearchToolResourceOptions(IList<string> vectorStoreIds, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            VectorStoreIds = vectorStoreIds;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> A list of vector store IDs to override the current list of the assistant. </summary>
+        public IList<string> VectorStoreIds { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateToolResourcesOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateToolResourcesOptions.Serialization.cs
new file mode 100644
index 000000000000..38dbde3243f4
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateToolResourcesOptions.Serialization.cs
@@ -0,0 +1,157 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class UpdateToolResourcesOptions : IUtf8JsonSerializable, IJsonModel<UpdateToolResourcesOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<UpdateToolResourcesOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<UpdateToolResourcesOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateToolResourcesOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(UpdateToolResourcesOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(CodeInterpreter))
+            {
+                writer.WritePropertyName("code_interpreter"u8);
+                writer.WriteObjectValue(CodeInterpreter, options);
+            }
+            if (Optional.IsDefined(FileSearch))
+            {
+                writer.WritePropertyName("file_search"u8);
+                writer.WriteObjectValue(FileSearch, options);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        UpdateToolResourcesOptions IJsonModel<UpdateToolResourcesOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateToolResourcesOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(UpdateToolResourcesOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeUpdateToolResourcesOptions(document.RootElement, options);
+        }
+
+        internal static UpdateToolResourcesOptions DeserializeUpdateToolResourcesOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            UpdateCodeInterpreterToolResourceOptions codeInterpreter = default;
+            UpdateFileSearchToolResourceOptions fileSearch = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("code_interpreter"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    codeInterpreter = UpdateCodeInterpreterToolResourceOptions.DeserializeUpdateCodeInterpreterToolResourceOptions(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("file_search"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    fileSearch = UpdateFileSearchToolResourceOptions.DeserializeUpdateFileSearchToolResourceOptions(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UpdateToolResourcesOptions(codeInterpreter, fileSearch, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<UpdateToolResourcesOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateToolResourcesOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(UpdateToolResourcesOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        UpdateToolResourcesOptions IPersistableModel<UpdateToolResourcesOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UpdateToolResourcesOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeUpdateToolResourcesOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(UpdateToolResourcesOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<UpdateToolResourcesOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static UpdateToolResourcesOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUpdateToolResourcesOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateToolResourcesOptions.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateToolResourcesOptions.cs
new file mode 100644
index 000000000000..919e93c57f1f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateToolResourcesOptions.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary>
+    /// Request object. A set of resources that are used by the assistant's tools. The resources are specific to the type of tool.
+    /// For example, the `code_interpreter` tool requires a list of file IDs, while the `file_search` tool requires a list of
+    /// vector store IDs.
+    /// </summary>
+    public partial class UpdateToolResourcesOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="UpdateToolResourcesOptions"/>. </summary>
+        public UpdateToolResourcesOptions()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UpdateToolResourcesOptions"/>. </summary>
+        /// <param name="codeInterpreter">
+        /// Overrides the list of file IDs made available to the `code_interpreter` tool. There can be a maximum of 20 files
+        /// associated with the tool.
+        /// </param>
+        /// <param name="fileSearch"> Overrides the vector store attached to this assistant. There can be a maximum of 1 vector store attached to the assistant. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UpdateToolResourcesOptions(UpdateCodeInterpreterToolResourceOptions codeInterpreter, UpdateFileSearchToolResourceOptions fileSearch, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            CodeInterpreter = codeInterpreter;
+            FileSearch = fileSearch;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary>
+        /// Overrides the list of file IDs made available to the `code_interpreter` tool. There can be a maximum of 20 files
+        /// associated with the tool.
+        /// </summary>
+        public UpdateCodeInterpreterToolResourceOptions CodeInterpreter { get; set; }
+        /// <summary> Overrides the vector store attached to this assistant. There can be a maximum of 1 vector store attached to the assistant. </summary>
+        public UpdateFileSearchToolResourceOptions FileSearch { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStore.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStore.Serialization.cs
new file mode 100644
index 000000000000..131a35e56010
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStore.Serialization.cs
@@ -0,0 +1,284 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class VectorStore : IUtf8JsonSerializable, IJsonModel<VectorStore>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStore>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStore>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStore>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStore)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("object"u8);
+            writer.WriteStringValue(Object.ToString());
+            writer.WritePropertyName("created_at"u8);
+            writer.WriteNumberValue(CreatedAt, "U");
+            writer.WritePropertyName("name"u8);
+            writer.WriteStringValue(Name);
+            writer.WritePropertyName("usage_bytes"u8);
+            writer.WriteNumberValue(UsageBytes);
+            writer.WritePropertyName("file_counts"u8);
+            writer.WriteObjectValue(FileCounts, options);
+            writer.WritePropertyName("status"u8);
+            writer.WriteStringValue(Status.ToString());
+            if (Optional.IsDefined(ExpiresAfter))
+            {
+                writer.WritePropertyName("expires_after"u8);
+                writer.WriteObjectValue(ExpiresAfter, options);
+            }
+            if (Optional.IsDefined(ExpiresAt))
+            {
+                if (ExpiresAt != null)
+                {
+                    writer.WritePropertyName("expires_at"u8);
+                    writer.WriteNumberValue(ExpiresAt.Value, "U");
+                }
+                else
+                {
+                    writer.WriteNull("expires_at");
+                }
+            }
+            if (LastActiveAt != null)
+            {
+                writer.WritePropertyName("last_active_at"u8);
+                writer.WriteNumberValue(LastActiveAt.Value, "U");
+            }
+            else
+            {
+                writer.WriteNull("last_active_at");
+            }
+            if (Metadata != null && Optional.IsCollectionDefined(Metadata))
+            {
+                writer.WritePropertyName("metadata"u8);
+                writer.WriteStartObject();
+                foreach (var item in Metadata)
+                {
+                    writer.WritePropertyName(item.Key);
+                    writer.WriteStringValue(item.Value);
+                }
+                writer.WriteEndObject();
+            }
+            else
+            {
+                writer.WriteNull("metadata");
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStore IJsonModel<VectorStore>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStore>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStore)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStore(document.RootElement, options);
+        }
+
+        internal static VectorStore DeserializeVectorStore(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string id = default;
+            VectorStoreObject @object = default;
+            DateTimeOffset createdAt = default;
+            string name = default;
+            int usageBytes = default;
+            VectorStoreFileCount fileCounts = default;
+            VectorStoreStatus status = default;
+            VectorStoreExpirationPolicy expiresAfter = default;
+            DateTimeOffset? expiresAt = default;
+            DateTimeOffset? lastActiveAt = default;
+            IReadOnlyDictionary<string, string> metadata = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("object"u8))
+                {
+                    @object = new VectorStoreObject(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("created_at"u8))
+                {
+                    createdAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("name"u8))
+                {
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("usage_bytes"u8))
+                {
+                    usageBytes = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("file_counts"u8))
+                {
+                    fileCounts = VectorStoreFileCount.DeserializeVectorStoreFileCount(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("status"u8))
+                {
+                    status = new VectorStoreStatus(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("expires_after"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    expiresAfter = VectorStoreExpirationPolicy.DeserializeVectorStoreExpirationPolicy(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("expires_at"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        expiresAt = null;
+                        continue;
+                    }
+                    expiresAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("last_active_at"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        lastActiveAt = null;
+                        continue;
+                    }
+                    lastActiveAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("metadata"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        metadata = new ChangeTrackingDictionary<string, string>();
+                        continue;
+                    }
+                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
+                    foreach (var property0 in property.Value.EnumerateObject())
+                    {
+                        dictionary.Add(property0.Name, property0.Value.GetString());
+                    }
+                    metadata = dictionary;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new VectorStore(
+                id,
+                @object,
+                createdAt,
+                name,
+                usageBytes,
+                fileCounts,
+                status,
+                expiresAfter,
+                expiresAt,
+                lastActiveAt,
+                metadata,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<VectorStore>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStore>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStore)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStore IPersistableModel<VectorStore>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStore>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStore(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStore)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStore>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static VectorStore FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStore(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStore.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStore.cs
new file mode 100644
index 000000000000..bd3231e10fc6
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStore.cs
@@ -0,0 +1,132 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> A vector store is a collection of processed files can be used by the `file_search` tool. </summary>
+    public partial class VectorStore
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStore"/>. </summary>
+        /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the vector store was created. </param>
+        /// <param name="name"> The name of the vector store. </param>
+        /// <param name="usageBytes"> The total number of bytes used by the files in the vector store. </param>
+        /// <param name="fileCounts"> Files count grouped by status processed or being processed by this vector store. </param>
+        /// <param name="status"> The status of the vector store, which can be either `expired`, `in_progress`, or `completed`. A status of `completed` indicates that the vector store is ready for use. </param>
+        /// <param name="lastActiveAt"> The Unix timestamp (in seconds) for when the vector store was last active. </param>
+        /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/>, <paramref name="name"/> or <paramref name="fileCounts"/> is null. </exception>
+        internal VectorStore(string id, DateTimeOffset createdAt, string name, int usageBytes, VectorStoreFileCount fileCounts, VectorStoreStatus status, DateTimeOffset? lastActiveAt, IReadOnlyDictionary<string, string> metadata)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+            Argument.AssertNotNull(name, nameof(name));
+            Argument.AssertNotNull(fileCounts, nameof(fileCounts));
+
+            Id = id;
+            CreatedAt = createdAt;
+            Name = name;
+            UsageBytes = usageBytes;
+            FileCounts = fileCounts;
+            Status = status;
+            LastActiveAt = lastActiveAt;
+            Metadata = metadata;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStore"/>. </summary>
+        /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
+        /// <param name="object"> The object type, which is always `vector_store`. </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the vector store was created. </param>
+        /// <param name="name"> The name of the vector store. </param>
+        /// <param name="usageBytes"> The total number of bytes used by the files in the vector store. </param>
+        /// <param name="fileCounts"> Files count grouped by status processed or being processed by this vector store. </param>
+        /// <param name="status"> The status of the vector store, which can be either `expired`, `in_progress`, or `completed`. A status of `completed` indicates that the vector store is ready for use. </param>
+        /// <param name="expiresAfter"> Details on when this vector store expires. </param>
+        /// <param name="expiresAt"> The Unix timestamp (in seconds) for when the vector store will expire. </param>
+        /// <param name="lastActiveAt"> The Unix timestamp (in seconds) for when the vector store was last active. </param>
+        /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal VectorStore(string id, VectorStoreObject @object, DateTimeOffset createdAt, string name, int usageBytes, VectorStoreFileCount fileCounts, VectorStoreStatus status, VectorStoreExpirationPolicy expiresAfter, DateTimeOffset? expiresAt, DateTimeOffset? lastActiveAt, IReadOnlyDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            Object = @object;
+            CreatedAt = createdAt;
+            Name = name;
+            UsageBytes = usageBytes;
+            FileCounts = fileCounts;
+            Status = status;
+            ExpiresAfter = expiresAfter;
+            ExpiresAt = expiresAt;
+            LastActiveAt = lastActiveAt;
+            Metadata = metadata;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStore"/> for deserialization. </summary>
+        internal VectorStore()
+        {
+        }
+
+        /// <summary> The identifier, which can be referenced in API endpoints. </summary>
+        public string Id { get; }
+        /// <summary> The object type, which is always `vector_store`. </summary>
+        public VectorStoreObject Object { get; } = VectorStoreObject.VectorStore;
+
+        /// <summary> The Unix timestamp (in seconds) for when the vector store was created. </summary>
+        public DateTimeOffset CreatedAt { get; }
+        /// <summary> The name of the vector store. </summary>
+        public string Name { get; }
+        /// <summary> The total number of bytes used by the files in the vector store. </summary>
+        public int UsageBytes { get; }
+        /// <summary> Files count grouped by status processed or being processed by this vector store. </summary>
+        public VectorStoreFileCount FileCounts { get; }
+        /// <summary> The status of the vector store, which can be either `expired`, `in_progress`, or `completed`. A status of `completed` indicates that the vector store is ready for use. </summary>
+        public VectorStoreStatus Status { get; }
+        /// <summary> Details on when this vector store expires. </summary>
+        public VectorStoreExpirationPolicy ExpiresAfter { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the vector store will expire. </summary>
+        public DateTimeOffset? ExpiresAt { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the vector store was last active. </summary>
+        public DateTimeOffset? LastActiveAt { get; }
+        /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
+        public IReadOnlyDictionary<string, string> Metadata { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreAutoChunkingStrategyRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreAutoChunkingStrategyRequest.Serialization.cs
new file mode 100644
index 000000000000..0502f7a71655
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreAutoChunkingStrategyRequest.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class VectorStoreAutoChunkingStrategyRequest : IUtf8JsonSerializable, IJsonModel<VectorStoreAutoChunkingStrategyRequest>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreAutoChunkingStrategyRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreAutoChunkingStrategyRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreAutoChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreAutoChunkingStrategyRequest)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreAutoChunkingStrategyRequest IJsonModel<VectorStoreAutoChunkingStrategyRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreAutoChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreAutoChunkingStrategyRequest)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreAutoChunkingStrategyRequest(document.RootElement, options);
+        }
+
+        internal static VectorStoreAutoChunkingStrategyRequest DeserializeVectorStoreAutoChunkingStrategyRequest(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            VectorStoreChunkingStrategyRequestType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = new VectorStoreChunkingStrategyRequestType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new VectorStoreAutoChunkingStrategyRequest(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<VectorStoreAutoChunkingStrategyRequest>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreAutoChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreAutoChunkingStrategyRequest)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreAutoChunkingStrategyRequest IPersistableModel<VectorStoreAutoChunkingStrategyRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreAutoChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreAutoChunkingStrategyRequest(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreAutoChunkingStrategyRequest)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreAutoChunkingStrategyRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new VectorStoreAutoChunkingStrategyRequest FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreAutoChunkingStrategyRequest(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreAutoChunkingStrategyRequest.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreAutoChunkingStrategyRequest.cs
new file mode 100644
index 000000000000..54ccde180223
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreAutoChunkingStrategyRequest.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The default strategy. This strategy currently uses a max_chunk_size_tokens of 800 and chunk_overlap_tokens of 400. </summary>
+    public partial class VectorStoreAutoChunkingStrategyRequest : VectorStoreChunkingStrategyRequest
+    {
+        /// <summary> Initializes a new instance of <see cref="VectorStoreAutoChunkingStrategyRequest"/>. </summary>
+        public VectorStoreAutoChunkingStrategyRequest()
+        {
+            Type = VectorStoreChunkingStrategyRequestType.Auto;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreAutoChunkingStrategyRequest"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal VectorStoreAutoChunkingStrategyRequest(VectorStoreChunkingStrategyRequestType type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreAutoChunkingStrategyResponse.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreAutoChunkingStrategyResponse.Serialization.cs
new file mode 100644
index 000000000000..b7858733008e
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreAutoChunkingStrategyResponse.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class VectorStoreAutoChunkingStrategyResponse : IUtf8JsonSerializable, IJsonModel<VectorStoreAutoChunkingStrategyResponse>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreAutoChunkingStrategyResponse>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreAutoChunkingStrategyResponse>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreAutoChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreAutoChunkingStrategyResponse)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreAutoChunkingStrategyResponse IJsonModel<VectorStoreAutoChunkingStrategyResponse>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreAutoChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreAutoChunkingStrategyResponse)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreAutoChunkingStrategyResponse(document.RootElement, options);
+        }
+
+        internal static VectorStoreAutoChunkingStrategyResponse DeserializeVectorStoreAutoChunkingStrategyResponse(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            VectorStoreChunkingStrategyResponseType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = new VectorStoreChunkingStrategyResponseType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new VectorStoreAutoChunkingStrategyResponse(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<VectorStoreAutoChunkingStrategyResponse>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreAutoChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreAutoChunkingStrategyResponse)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreAutoChunkingStrategyResponse IPersistableModel<VectorStoreAutoChunkingStrategyResponse>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreAutoChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreAutoChunkingStrategyResponse(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreAutoChunkingStrategyResponse)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreAutoChunkingStrategyResponse>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new VectorStoreAutoChunkingStrategyResponse FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreAutoChunkingStrategyResponse(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreAutoChunkingStrategyResponse.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreAutoChunkingStrategyResponse.cs
new file mode 100644
index 000000000000..17218eca2365
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreAutoChunkingStrategyResponse.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> This is returned when the chunking strategy is unknown. Typically, this is because the file was indexed before the chunking_strategy concept was introduced in the API. </summary>
+    public partial class VectorStoreAutoChunkingStrategyResponse : VectorStoreChunkingStrategyResponse
+    {
+        /// <summary> Initializes a new instance of <see cref="VectorStoreAutoChunkingStrategyResponse"/>. </summary>
+        internal VectorStoreAutoChunkingStrategyResponse()
+        {
+            Type = VectorStoreChunkingStrategyResponseType.Other;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreAutoChunkingStrategyResponse"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal VectorStoreAutoChunkingStrategyResponse(VectorStoreChunkingStrategyResponseType type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyRequest.Serialization.cs
new file mode 100644
index 000000000000..74503df2a436
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyRequest.Serialization.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    [PersistableModelProxy(typeof(UnknownVectorStoreChunkingStrategyRequest))]
+    public partial class VectorStoreChunkingStrategyRequest : IUtf8JsonSerializable, IJsonModel<VectorStoreChunkingStrategyRequest>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreChunkingStrategyRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreChunkingStrategyRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyRequest)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreChunkingStrategyRequest IJsonModel<VectorStoreChunkingStrategyRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyRequest)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreChunkingStrategyRequest(document.RootElement, options);
+        }
+
+        internal static VectorStoreChunkingStrategyRequest DeserializeVectorStoreChunkingStrategyRequest(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "auto": return VectorStoreAutoChunkingStrategyRequest.DeserializeVectorStoreAutoChunkingStrategyRequest(element, options);
+                    case "static": return VectorStoreStaticChunkingStrategyRequest.DeserializeVectorStoreStaticChunkingStrategyRequest(element, options);
+                }
+            }
+            return UnknownVectorStoreChunkingStrategyRequest.DeserializeUnknownVectorStoreChunkingStrategyRequest(element, options);
+        }
+
+        BinaryData IPersistableModel<VectorStoreChunkingStrategyRequest>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyRequest)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreChunkingStrategyRequest IPersistableModel<VectorStoreChunkingStrategyRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreChunkingStrategyRequest(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyRequest)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreChunkingStrategyRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static VectorStoreChunkingStrategyRequest FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreChunkingStrategyRequest(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyRequest.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyRequest.cs
new file mode 100644
index 000000000000..5f64bb63f131
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyRequest.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary>
+    /// An abstract representation of a vector store chunking strategy configuration.
+    /// Please note <see cref="VectorStoreChunkingStrategyRequest"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyRequest"/> and <see cref="VectorStoreStaticChunkingStrategyRequest"/>.
+    /// </summary>
+    public abstract partial class VectorStoreChunkingStrategyRequest
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreChunkingStrategyRequest"/>. </summary>
+        protected VectorStoreChunkingStrategyRequest()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreChunkingStrategyRequest"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal VectorStoreChunkingStrategyRequest(VectorStoreChunkingStrategyRequestType type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Type = type;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The object type. </summary>
+        internal VectorStoreChunkingStrategyRequestType Type { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyRequestType.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyRequestType.cs
new file mode 100644
index 000000000000..1b9a9691c970
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyRequestType.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Type of chunking strategy. </summary>
+    internal readonly partial struct VectorStoreChunkingStrategyRequestType : IEquatable<VectorStoreChunkingStrategyRequestType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreChunkingStrategyRequestType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public VectorStoreChunkingStrategyRequestType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string AutoValue = "auto";
+        private const string StaticValue = "static";
+
+        /// <summary> auto. </summary>
+        public static VectorStoreChunkingStrategyRequestType Auto { get; } = new VectorStoreChunkingStrategyRequestType(AutoValue);
+        /// <summary> static. </summary>
+        public static VectorStoreChunkingStrategyRequestType Static { get; } = new VectorStoreChunkingStrategyRequestType(StaticValue);
+        /// <summary> Determines if two <see cref="VectorStoreChunkingStrategyRequestType"/> values are the same. </summary>
+        public static bool operator ==(VectorStoreChunkingStrategyRequestType left, VectorStoreChunkingStrategyRequestType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="VectorStoreChunkingStrategyRequestType"/> values are not the same. </summary>
+        public static bool operator !=(VectorStoreChunkingStrategyRequestType left, VectorStoreChunkingStrategyRequestType right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="VectorStoreChunkingStrategyRequestType"/>. </summary>
+        public static implicit operator VectorStoreChunkingStrategyRequestType(string value) => new VectorStoreChunkingStrategyRequestType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is VectorStoreChunkingStrategyRequestType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(VectorStoreChunkingStrategyRequestType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyResponse.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyResponse.Serialization.cs
new file mode 100644
index 000000000000..49f33ceb5990
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyResponse.Serialization.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    [PersistableModelProxy(typeof(UnknownVectorStoreChunkingStrategyResponse))]
+    public partial class VectorStoreChunkingStrategyResponse : IUtf8JsonSerializable, IJsonModel<VectorStoreChunkingStrategyResponse>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreChunkingStrategyResponse>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreChunkingStrategyResponse>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyResponse)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreChunkingStrategyResponse IJsonModel<VectorStoreChunkingStrategyResponse>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyResponse)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreChunkingStrategyResponse(document.RootElement, options);
+        }
+
+        internal static VectorStoreChunkingStrategyResponse DeserializeVectorStoreChunkingStrategyResponse(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "other": return VectorStoreAutoChunkingStrategyResponse.DeserializeVectorStoreAutoChunkingStrategyResponse(element, options);
+                    case "static": return VectorStoreStaticChunkingStrategyResponse.DeserializeVectorStoreStaticChunkingStrategyResponse(element, options);
+                }
+            }
+            return UnknownVectorStoreChunkingStrategyResponse.DeserializeUnknownVectorStoreChunkingStrategyResponse(element, options);
+        }
+
+        BinaryData IPersistableModel<VectorStoreChunkingStrategyResponse>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyResponse)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreChunkingStrategyResponse IPersistableModel<VectorStoreChunkingStrategyResponse>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreChunkingStrategyResponse(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreChunkingStrategyResponse)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreChunkingStrategyResponse>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static VectorStoreChunkingStrategyResponse FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreChunkingStrategyResponse(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyResponse.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyResponse.cs
new file mode 100644
index 000000000000..a4e4bac4d2a8
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyResponse.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary>
+    /// An abstract representation of a vector store chunking strategy configuration.
+    /// Please note <see cref="VectorStoreChunkingStrategyResponse"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyResponse"/> and <see cref="VectorStoreStaticChunkingStrategyResponse"/>.
+    /// </summary>
+    public abstract partial class VectorStoreChunkingStrategyResponse
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreChunkingStrategyResponse"/>. </summary>
+        protected VectorStoreChunkingStrategyResponse()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreChunkingStrategyResponse"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal VectorStoreChunkingStrategyResponse(VectorStoreChunkingStrategyResponseType type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Type = type;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The object type. </summary>
+        internal VectorStoreChunkingStrategyResponseType Type { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyResponseType.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyResponseType.cs
new file mode 100644
index 000000000000..8b4d6338955c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreChunkingStrategyResponseType.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Type of chunking strategy. </summary>
+    internal readonly partial struct VectorStoreChunkingStrategyResponseType : IEquatable<VectorStoreChunkingStrategyResponseType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreChunkingStrategyResponseType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public VectorStoreChunkingStrategyResponseType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string OtherValue = "other";
+        private const string StaticValue = "static";
+
+        /// <summary> other. </summary>
+        public static VectorStoreChunkingStrategyResponseType Other { get; } = new VectorStoreChunkingStrategyResponseType(OtherValue);
+        /// <summary> static. </summary>
+        public static VectorStoreChunkingStrategyResponseType Static { get; } = new VectorStoreChunkingStrategyResponseType(StaticValue);
+        /// <summary> Determines if two <see cref="VectorStoreChunkingStrategyResponseType"/> values are the same. </summary>
+        public static bool operator ==(VectorStoreChunkingStrategyResponseType left, VectorStoreChunkingStrategyResponseType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="VectorStoreChunkingStrategyResponseType"/> values are not the same. </summary>
+        public static bool operator !=(VectorStoreChunkingStrategyResponseType left, VectorStoreChunkingStrategyResponseType right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="VectorStoreChunkingStrategyResponseType"/>. </summary>
+        public static implicit operator VectorStoreChunkingStrategyResponseType(string value) => new VectorStoreChunkingStrategyResponseType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is VectorStoreChunkingStrategyResponseType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(VectorStoreChunkingStrategyResponseType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalAssistantFileDeletionStatus.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreDeletionStatus.Serialization.cs
similarity index 62%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalAssistantFileDeletionStatus.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreDeletionStatus.Serialization.cs
index 10bfe96c2204..4e6da1fe0c1f 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalAssistantFileDeletionStatus.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreDeletionStatus.Serialization.cs
@@ -13,16 +13,16 @@
 
 namespace Azure.AI.OpenAI.Assistants
 {
-    internal partial class InternalAssistantFileDeletionStatus : IUtf8JsonSerializable, IJsonModel<InternalAssistantFileDeletionStatus>
+    public partial class VectorStoreDeletionStatus : IUtf8JsonSerializable, IJsonModel<VectorStoreDeletionStatus>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<InternalAssistantFileDeletionStatus>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreDeletionStatus>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<InternalAssistantFileDeletionStatus>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<VectorStoreDeletionStatus>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAssistantFileDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalAssistantFileDeletionStatus)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(VectorStoreDeletionStatus)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
@@ -50,19 +50,19 @@ void IJsonModel<InternalAssistantFileDeletionStatus>.Write(Utf8JsonWriter writer
             writer.WriteEndObject();
         }
 
-        InternalAssistantFileDeletionStatus IJsonModel<InternalAssistantFileDeletionStatus>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        VectorStoreDeletionStatus IJsonModel<VectorStoreDeletionStatus>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAssistantFileDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalAssistantFileDeletionStatus)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(VectorStoreDeletionStatus)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAssistantFileDeletionStatus(document.RootElement, options);
+            return DeserializeVectorStoreDeletionStatus(document.RootElement, options);
         }
 
-        internal static InternalAssistantFileDeletionStatus DeserializeInternalAssistantFileDeletionStatus(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static VectorStoreDeletionStatus DeserializeVectorStoreDeletionStatus(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -72,7 +72,7 @@ internal static InternalAssistantFileDeletionStatus DeserializeInternalAssistant
             }
             string id = default;
             bool deleted = default;
-            InternalAssistantFileDeletionStatusObject @object = default;
+            VectorStoreDeletionStatusObject @object = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -89,7 +89,7 @@ internal static InternalAssistantFileDeletionStatus DeserializeInternalAssistant
                 }
                 if (property.NameEquals("object"u8))
                 {
-                    @object = new InternalAssistantFileDeletionStatusObject(property.Value.GetString());
+                    @object = new VectorStoreDeletionStatusObject(property.Value.GetString());
                     continue;
                 }
                 if (options.Format != "W")
@@ -98,46 +98,46 @@ internal static InternalAssistantFileDeletionStatus DeserializeInternalAssistant
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAssistantFileDeletionStatus(id, deleted, @object, serializedAdditionalRawData);
+            return new VectorStoreDeletionStatus(id, deleted, @object, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<InternalAssistantFileDeletionStatus>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<VectorStoreDeletionStatus>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAssistantFileDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(InternalAssistantFileDeletionStatus)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(VectorStoreDeletionStatus)} does not support writing '{options.Format}' format.");
             }
         }
 
-        InternalAssistantFileDeletionStatus IPersistableModel<InternalAssistantFileDeletionStatus>.Create(BinaryData data, ModelReaderWriterOptions options)
+        VectorStoreDeletionStatus IPersistableModel<VectorStoreDeletionStatus>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAssistantFileDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAssistantFileDeletionStatus(document.RootElement, options);
+                        return DeserializeVectorStoreDeletionStatus(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(InternalAssistantFileDeletionStatus)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(VectorStoreDeletionStatus)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<InternalAssistantFileDeletionStatus>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<VectorStoreDeletionStatus>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
         /// <param name="response"> The response to deserialize the model from. </param>
-        internal static InternalAssistantFileDeletionStatus FromResponse(Response response)
+        internal static VectorStoreDeletionStatus FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAssistantFileDeletionStatus(document.RootElement);
+            return DeserializeVectorStoreDeletionStatus(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalAssistantFileDeletionStatus.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreDeletionStatus.cs
similarity index 71%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalAssistantFileDeletionStatus.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreDeletionStatus.cs
index 1a91eb299ceb..959f2da309e7 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/InternalAssistantFileDeletionStatus.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreDeletionStatus.cs
@@ -10,8 +10,8 @@
 
 namespace Azure.AI.OpenAI.Assistants
 {
-    /// <summary> The status of an assistant file deletion operation. </summary>
-    internal partial class InternalAssistantFileDeletionStatus
+    /// <summary> Response object for deleting a vector store. </summary>
+    public partial class VectorStoreDeletionStatus
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,11 +45,11 @@ internal partial class InternalAssistantFileDeletionStatus
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="InternalAssistantFileDeletionStatus"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="VectorStoreDeletionStatus"/>. </summary>
         /// <param name="id"> The ID of the resource specified for deletion. </param>
         /// <param name="deleted"> A value indicating whether deletion was successful. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
-        internal InternalAssistantFileDeletionStatus(string id, bool deleted)
+        internal VectorStoreDeletionStatus(string id, bool deleted)
         {
             Argument.AssertNotNull(id, nameof(id));
 
@@ -57,12 +57,12 @@ internal InternalAssistantFileDeletionStatus(string id, bool deleted)
             Deleted = deleted;
         }
 
-        /// <summary> Initializes a new instance of <see cref="InternalAssistantFileDeletionStatus"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="VectorStoreDeletionStatus"/>. </summary>
         /// <param name="id"> The ID of the resource specified for deletion. </param>
         /// <param name="deleted"> A value indicating whether deletion was successful. </param>
-        /// <param name="object"> The object type, which is always 'assistant.file.deleted'. </param>
+        /// <param name="object"> The object type, which is always 'vector_store.deleted'. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalAssistantFileDeletionStatus(string id, bool deleted, InternalAssistantFileDeletionStatusObject @object, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal VectorStoreDeletionStatus(string id, bool deleted, VectorStoreDeletionStatusObject @object, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Id = id;
             Deleted = deleted;
@@ -70,8 +70,8 @@ internal InternalAssistantFileDeletionStatus(string id, bool deleted, InternalAs
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="InternalAssistantFileDeletionStatus"/> for deserialization. </summary>
-        internal InternalAssistantFileDeletionStatus()
+        /// <summary> Initializes a new instance of <see cref="VectorStoreDeletionStatus"/> for deserialization. </summary>
+        internal VectorStoreDeletionStatus()
         {
         }
 
@@ -79,7 +79,7 @@ internal InternalAssistantFileDeletionStatus()
         public string Id { get; }
         /// <summary> A value indicating whether deletion was successful. </summary>
         public bool Deleted { get; }
-        /// <summary> The object type, which is always 'assistant.file.deleted'. </summary>
-        public InternalAssistantFileDeletionStatusObject Object { get; } = InternalAssistantFileDeletionStatusObject.AssistantFileDeleted;
+        /// <summary> The object type, which is always 'vector_store.deleted'. </summary>
+        public VectorStoreDeletionStatusObject Object { get; } = VectorStoreDeletionStatusObject.VectorStoreDeleted;
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreDeletionStatusObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreDeletionStatusObject.cs
new file mode 100644
index 000000000000..240b13fab2c5
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreDeletionStatusObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The VectorStoreDeletionStatus_object. </summary>
+    public readonly partial struct VectorStoreDeletionStatusObject : IEquatable<VectorStoreDeletionStatusObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreDeletionStatusObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public VectorStoreDeletionStatusObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string VectorStoreDeletedValue = "vector_store.deleted";
+
+        /// <summary> vector_store.deleted. </summary>
+        public static VectorStoreDeletionStatusObject VectorStoreDeleted { get; } = new VectorStoreDeletionStatusObject(VectorStoreDeletedValue);
+        /// <summary> Determines if two <see cref="VectorStoreDeletionStatusObject"/> values are the same. </summary>
+        public static bool operator ==(VectorStoreDeletionStatusObject left, VectorStoreDeletionStatusObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="VectorStoreDeletionStatusObject"/> values are not the same. </summary>
+        public static bool operator !=(VectorStoreDeletionStatusObject left, VectorStoreDeletionStatusObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="VectorStoreDeletionStatusObject"/>. </summary>
+        public static implicit operator VectorStoreDeletionStatusObject(string value) => new VectorStoreDeletionStatusObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is VectorStoreDeletionStatusObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(VectorStoreDeletionStatusObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreExpirationPolicy.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreExpirationPolicy.Serialization.cs
new file mode 100644
index 000000000000..2b0f6fd8341f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreExpirationPolicy.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class VectorStoreExpirationPolicy : IUtf8JsonSerializable, IJsonModel<VectorStoreExpirationPolicy>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreExpirationPolicy>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreExpirationPolicy>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreExpirationPolicy>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreExpirationPolicy)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("anchor"u8);
+            writer.WriteStringValue(Anchor.ToString());
+            writer.WritePropertyName("days"u8);
+            writer.WriteNumberValue(Days);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreExpirationPolicy IJsonModel<VectorStoreExpirationPolicy>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreExpirationPolicy>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreExpirationPolicy)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreExpirationPolicy(document.RootElement, options);
+        }
+
+        internal static VectorStoreExpirationPolicy DeserializeVectorStoreExpirationPolicy(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            VectorStoreExpirationPolicyAnchor anchor = default;
+            int days = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("anchor"u8))
+                {
+                    anchor = new VectorStoreExpirationPolicyAnchor(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("days"u8))
+                {
+                    days = property.Value.GetInt32();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new VectorStoreExpirationPolicy(anchor, days, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<VectorStoreExpirationPolicy>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreExpirationPolicy>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreExpirationPolicy)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreExpirationPolicy IPersistableModel<VectorStoreExpirationPolicy>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreExpirationPolicy>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreExpirationPolicy(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreExpirationPolicy)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreExpirationPolicy>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static VectorStoreExpirationPolicy FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreExpirationPolicy(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreExpirationPolicy.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreExpirationPolicy.cs
new file mode 100644
index 000000000000..345d82299d9d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreExpirationPolicy.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The expiration policy for a vector store. </summary>
+    public partial class VectorStoreExpirationPolicy
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreExpirationPolicy"/>. </summary>
+        /// <param name="anchor"> Anchor timestamp after which the expiration policy applies. Supported anchors: `last_active_at`. </param>
+        /// <param name="days"> The anchor timestamp after which the expiration policy applies. </param>
+        public VectorStoreExpirationPolicy(VectorStoreExpirationPolicyAnchor anchor, int days)
+        {
+            Anchor = anchor;
+            Days = days;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreExpirationPolicy"/>. </summary>
+        /// <param name="anchor"> Anchor timestamp after which the expiration policy applies. Supported anchors: `last_active_at`. </param>
+        /// <param name="days"> The anchor timestamp after which the expiration policy applies. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal VectorStoreExpirationPolicy(VectorStoreExpirationPolicyAnchor anchor, int days, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Anchor = anchor;
+            Days = days;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreExpirationPolicy"/> for deserialization. </summary>
+        internal VectorStoreExpirationPolicy()
+        {
+        }
+
+        /// <summary> Anchor timestamp after which the expiration policy applies. Supported anchors: `last_active_at`. </summary>
+        public VectorStoreExpirationPolicyAnchor Anchor { get; set; }
+        /// <summary> The anchor timestamp after which the expiration policy applies. </summary>
+        public int Days { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreExpirationPolicyAnchor.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreExpirationPolicyAnchor.cs
new file mode 100644
index 000000000000..864a769e6b50
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreExpirationPolicyAnchor.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Describes the relationship between the days and the expiration of this vector store. </summary>
+    public readonly partial struct VectorStoreExpirationPolicyAnchor : IEquatable<VectorStoreExpirationPolicyAnchor>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreExpirationPolicyAnchor"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public VectorStoreExpirationPolicyAnchor(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string LastActiveAtValue = "last_active_at";
+
+        /// <summary> The expiration policy is based on the last time the vector store was active. </summary>
+        public static VectorStoreExpirationPolicyAnchor LastActiveAt { get; } = new VectorStoreExpirationPolicyAnchor(LastActiveAtValue);
+        /// <summary> Determines if two <see cref="VectorStoreExpirationPolicyAnchor"/> values are the same. </summary>
+        public static bool operator ==(VectorStoreExpirationPolicyAnchor left, VectorStoreExpirationPolicyAnchor right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="VectorStoreExpirationPolicyAnchor"/> values are not the same. </summary>
+        public static bool operator !=(VectorStoreExpirationPolicyAnchor left, VectorStoreExpirationPolicyAnchor right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="VectorStoreExpirationPolicyAnchor"/>. </summary>
+        public static implicit operator VectorStoreExpirationPolicyAnchor(string value) => new VectorStoreExpirationPolicyAnchor(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is VectorStoreExpirationPolicyAnchor other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(VectorStoreExpirationPolicyAnchor other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFile.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFile.Serialization.cs
new file mode 100644
index 000000000000..c183395520a1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFile.Serialization.cs
@@ -0,0 +1,212 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class VectorStoreFile : IUtf8JsonSerializable, IJsonModel<VectorStoreFile>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreFile>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreFile>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFile>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreFile)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("object"u8);
+            writer.WriteStringValue(Object.ToString());
+            writer.WritePropertyName("usage_bytes"u8);
+            writer.WriteNumberValue(UsageBytes);
+            writer.WritePropertyName("created_at"u8);
+            writer.WriteNumberValue(CreatedAt, "U");
+            writer.WritePropertyName("vector_store_id"u8);
+            writer.WriteStringValue(VectorStoreId);
+            writer.WritePropertyName("status"u8);
+            writer.WriteStringValue(Status.ToString());
+            if (LastError != null)
+            {
+                writer.WritePropertyName("last_error"u8);
+                writer.WriteObjectValue(LastError, options);
+            }
+            else
+            {
+                writer.WriteNull("last_error");
+            }
+            writer.WritePropertyName("chunking_strategy"u8);
+            writer.WriteObjectValue(ChunkingStrategy, options);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreFile IJsonModel<VectorStoreFile>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFile>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreFile)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreFile(document.RootElement, options);
+        }
+
+        internal static VectorStoreFile DeserializeVectorStoreFile(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string id = default;
+            VectorStoreFileObject @object = default;
+            int usageBytes = default;
+            DateTimeOffset createdAt = default;
+            string vectorStoreId = default;
+            VectorStoreFileStatus status = default;
+            VectorStoreFileError lastError = default;
+            VectorStoreChunkingStrategyResponse chunkingStrategy = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("object"u8))
+                {
+                    @object = new VectorStoreFileObject(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("usage_bytes"u8))
+                {
+                    usageBytes = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("created_at"u8))
+                {
+                    createdAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("vector_store_id"u8))
+                {
+                    vectorStoreId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("status"u8))
+                {
+                    status = new VectorStoreFileStatus(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("last_error"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        lastError = null;
+                        continue;
+                    }
+                    lastError = VectorStoreFileError.DeserializeVectorStoreFileError(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("chunking_strategy"u8))
+                {
+                    chunkingStrategy = VectorStoreChunkingStrategyResponse.DeserializeVectorStoreChunkingStrategyResponse(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new VectorStoreFile(
+                id,
+                @object,
+                usageBytes,
+                createdAt,
+                vectorStoreId,
+                status,
+                lastError,
+                chunkingStrategy,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<VectorStoreFile>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFile>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreFile)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreFile IPersistableModel<VectorStoreFile>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFile>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreFile(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreFile)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreFile>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static VectorStoreFile FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreFile(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFile.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFile.cs
new file mode 100644
index 000000000000..d7c12dbf07d8
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFile.cs
@@ -0,0 +1,139 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Description of a file attached to a vector store. </summary>
+    public partial class VectorStoreFile
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFile"/>. </summary>
+        /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
+        /// <param name="usageBytes">
+        /// The total vector store usage in bytes. Note that this may be different from the original file
+        /// size.
+        /// </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the vector store file was created. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file is attached to. </param>
+        /// <param name="status"> The status of the vector store file, which can be either `in_progress`, `completed`, `cancelled`, or `failed`. The status `completed` indicates that the vector store file is ready for use. </param>
+        /// <param name="lastError"> The last error associated with this vector store file. Will be `null` if there are no errors. </param>
+        /// <param name="chunkingStrategy">
+        /// The strategy used to chunk the file.
+        /// Please note <see cref="VectorStoreChunkingStrategyResponse"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyResponse"/> and <see cref="VectorStoreStaticChunkingStrategyResponse"/>.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/>, <paramref name="vectorStoreId"/> or <paramref name="chunkingStrategy"/> is null. </exception>
+        internal VectorStoreFile(string id, int usageBytes, DateTimeOffset createdAt, string vectorStoreId, VectorStoreFileStatus status, VectorStoreFileError lastError, VectorStoreChunkingStrategyResponse chunkingStrategy)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+            Argument.AssertNotNull(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNull(chunkingStrategy, nameof(chunkingStrategy));
+
+            Id = id;
+            UsageBytes = usageBytes;
+            CreatedAt = createdAt;
+            VectorStoreId = vectorStoreId;
+            Status = status;
+            LastError = lastError;
+            ChunkingStrategy = chunkingStrategy;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFile"/>. </summary>
+        /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
+        /// <param name="object"> The object type, which is always `vector_store.file`. </param>
+        /// <param name="usageBytes">
+        /// The total vector store usage in bytes. Note that this may be different from the original file
+        /// size.
+        /// </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the vector store file was created. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file is attached to. </param>
+        /// <param name="status"> The status of the vector store file, which can be either `in_progress`, `completed`, `cancelled`, or `failed`. The status `completed` indicates that the vector store file is ready for use. </param>
+        /// <param name="lastError"> The last error associated with this vector store file. Will be `null` if there are no errors. </param>
+        /// <param name="chunkingStrategy">
+        /// The strategy used to chunk the file.
+        /// Please note <see cref="VectorStoreChunkingStrategyResponse"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyResponse"/> and <see cref="VectorStoreStaticChunkingStrategyResponse"/>.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal VectorStoreFile(string id, VectorStoreFileObject @object, int usageBytes, DateTimeOffset createdAt, string vectorStoreId, VectorStoreFileStatus status, VectorStoreFileError lastError, VectorStoreChunkingStrategyResponse chunkingStrategy, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            Object = @object;
+            UsageBytes = usageBytes;
+            CreatedAt = createdAt;
+            VectorStoreId = vectorStoreId;
+            Status = status;
+            LastError = lastError;
+            ChunkingStrategy = chunkingStrategy;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFile"/> for deserialization. </summary>
+        internal VectorStoreFile()
+        {
+        }
+
+        /// <summary> The identifier, which can be referenced in API endpoints. </summary>
+        public string Id { get; }
+        /// <summary> The object type, which is always `vector_store.file`. </summary>
+        public VectorStoreFileObject Object { get; } = VectorStoreFileObject.VectorStoreFile;
+
+        /// <summary>
+        /// The total vector store usage in bytes. Note that this may be different from the original file
+        /// size.
+        /// </summary>
+        public int UsageBytes { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the vector store file was created. </summary>
+        public DateTimeOffset CreatedAt { get; }
+        /// <summary> The ID of the vector store that the file is attached to. </summary>
+        public string VectorStoreId { get; }
+        /// <summary> The status of the vector store file, which can be either `in_progress`, `completed`, `cancelled`, or `failed`. The status `completed` indicates that the vector store file is ready for use. </summary>
+        public VectorStoreFileStatus Status { get; }
+        /// <summary> The last error associated with this vector store file. Will be `null` if there are no errors. </summary>
+        public VectorStoreFileError LastError { get; }
+        /// <summary>
+        /// The strategy used to chunk the file.
+        /// Please note <see cref="VectorStoreChunkingStrategyResponse"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyResponse"/> and <see cref="VectorStoreStaticChunkingStrategyResponse"/>.
+        /// </summary>
+        public VectorStoreChunkingStrategyResponse ChunkingStrategy { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileBatch.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileBatch.Serialization.cs
new file mode 100644
index 000000000000..5b4b53d5a7b6
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileBatch.Serialization.cs
@@ -0,0 +1,182 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class VectorStoreFileBatch : IUtf8JsonSerializable, IJsonModel<VectorStoreFileBatch>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreFileBatch>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreFileBatch>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileBatch>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreFileBatch)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("object"u8);
+            writer.WriteStringValue(Object.ToString());
+            writer.WritePropertyName("created_at"u8);
+            writer.WriteNumberValue(CreatedAt, "U");
+            writer.WritePropertyName("vector_store_id"u8);
+            writer.WriteStringValue(VectorStoreId);
+            writer.WritePropertyName("status"u8);
+            writer.WriteStringValue(Status.ToString());
+            writer.WritePropertyName("file_counts"u8);
+            writer.WriteObjectValue(FileCounts, options);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreFileBatch IJsonModel<VectorStoreFileBatch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileBatch>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreFileBatch)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreFileBatch(document.RootElement, options);
+        }
+
+        internal static VectorStoreFileBatch DeserializeVectorStoreFileBatch(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string id = default;
+            VectorStoreFileBatchObject @object = default;
+            DateTimeOffset createdAt = default;
+            string vectorStoreId = default;
+            VectorStoreFileBatchStatus status = default;
+            VectorStoreFileCount fileCounts = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("object"u8))
+                {
+                    @object = new VectorStoreFileBatchObject(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("created_at"u8))
+                {
+                    createdAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("vector_store_id"u8))
+                {
+                    vectorStoreId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("status"u8))
+                {
+                    status = new VectorStoreFileBatchStatus(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("file_counts"u8))
+                {
+                    fileCounts = VectorStoreFileCount.DeserializeVectorStoreFileCount(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new VectorStoreFileBatch(
+                id,
+                @object,
+                createdAt,
+                vectorStoreId,
+                status,
+                fileCounts,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<VectorStoreFileBatch>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileBatch>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreFileBatch)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreFileBatch IPersistableModel<VectorStoreFileBatch>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileBatch>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreFileBatch(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreFileBatch)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreFileBatch>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static VectorStoreFileBatch FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreFileBatch(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileBatch.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileBatch.cs
new file mode 100644
index 000000000000..898dd2ab2b55
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileBatch.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> A batch of files attached to a vector store. </summary>
+    public partial class VectorStoreFileBatch
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileBatch"/>. </summary>
+        /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the vector store files batch was created. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file is attached to. </param>
+        /// <param name="status"> The status of the vector store files batch, which can be either `in_progress`, `completed`, `cancelled` or `failed`. </param>
+        /// <param name="fileCounts"> Files count grouped by status processed or being processed by this vector store. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/>, <paramref name="vectorStoreId"/> or <paramref name="fileCounts"/> is null. </exception>
+        internal VectorStoreFileBatch(string id, DateTimeOffset createdAt, string vectorStoreId, VectorStoreFileBatchStatus status, VectorStoreFileCount fileCounts)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+            Argument.AssertNotNull(vectorStoreId, nameof(vectorStoreId));
+            Argument.AssertNotNull(fileCounts, nameof(fileCounts));
+
+            Id = id;
+            CreatedAt = createdAt;
+            VectorStoreId = vectorStoreId;
+            Status = status;
+            FileCounts = fileCounts;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileBatch"/>. </summary>
+        /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
+        /// <param name="object"> The object type, which is always `vector_store.file_batch`. </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the vector store files batch was created. </param>
+        /// <param name="vectorStoreId"> The ID of the vector store that the file is attached to. </param>
+        /// <param name="status"> The status of the vector store files batch, which can be either `in_progress`, `completed`, `cancelled` or `failed`. </param>
+        /// <param name="fileCounts"> Files count grouped by status processed or being processed by this vector store. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal VectorStoreFileBatch(string id, VectorStoreFileBatchObject @object, DateTimeOffset createdAt, string vectorStoreId, VectorStoreFileBatchStatus status, VectorStoreFileCount fileCounts, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            Object = @object;
+            CreatedAt = createdAt;
+            VectorStoreId = vectorStoreId;
+            Status = status;
+            FileCounts = fileCounts;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileBatch"/> for deserialization. </summary>
+        internal VectorStoreFileBatch()
+        {
+        }
+
+        /// <summary> The identifier, which can be referenced in API endpoints. </summary>
+        public string Id { get; }
+        /// <summary> The object type, which is always `vector_store.file_batch`. </summary>
+        public VectorStoreFileBatchObject Object { get; } = VectorStoreFileBatchObject.VectorStoreFilesBatch;
+
+        /// <summary> The Unix timestamp (in seconds) for when the vector store files batch was created. </summary>
+        public DateTimeOffset CreatedAt { get; }
+        /// <summary> The ID of the vector store that the file is attached to. </summary>
+        public string VectorStoreId { get; }
+        /// <summary> The status of the vector store files batch, which can be either `in_progress`, `completed`, `cancelled` or `failed`. </summary>
+        public VectorStoreFileBatchStatus Status { get; }
+        /// <summary> Files count grouped by status processed or being processed by this vector store. </summary>
+        public VectorStoreFileCount FileCounts { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileBatchObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileBatchObject.cs
new file mode 100644
index 000000000000..ff607d482dfa
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileBatchObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The VectorStoreFileBatch_object. </summary>
+    public readonly partial struct VectorStoreFileBatchObject : IEquatable<VectorStoreFileBatchObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileBatchObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public VectorStoreFileBatchObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string VectorStoreFilesBatchValue = "vector_store.files_batch";
+
+        /// <summary> vector_store.files_batch. </summary>
+        public static VectorStoreFileBatchObject VectorStoreFilesBatch { get; } = new VectorStoreFileBatchObject(VectorStoreFilesBatchValue);
+        /// <summary> Determines if two <see cref="VectorStoreFileBatchObject"/> values are the same. </summary>
+        public static bool operator ==(VectorStoreFileBatchObject left, VectorStoreFileBatchObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="VectorStoreFileBatchObject"/> values are not the same. </summary>
+        public static bool operator !=(VectorStoreFileBatchObject left, VectorStoreFileBatchObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="VectorStoreFileBatchObject"/>. </summary>
+        public static implicit operator VectorStoreFileBatchObject(string value) => new VectorStoreFileBatchObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is VectorStoreFileBatchObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(VectorStoreFileBatchObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileBatchStatus.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileBatchStatus.cs
new file mode 100644
index 000000000000..79d886ab6ccd
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileBatchStatus.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The status of the vector store file batch. </summary>
+    public readonly partial struct VectorStoreFileBatchStatus : IEquatable<VectorStoreFileBatchStatus>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileBatchStatus"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public VectorStoreFileBatchStatus(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string InProgressValue = "in_progress";
+        private const string CompletedValue = "completed";
+        private const string CancelledValue = "cancelled";
+        private const string FailedValue = "failed";
+
+        /// <summary> The vector store is still processing this file batch. </summary>
+        public static VectorStoreFileBatchStatus InProgress { get; } = new VectorStoreFileBatchStatus(InProgressValue);
+        /// <summary> the vector store file batch is ready for use. </summary>
+        public static VectorStoreFileBatchStatus Completed { get; } = new VectorStoreFileBatchStatus(CompletedValue);
+        /// <summary> The vector store file batch was cancelled. </summary>
+        public static VectorStoreFileBatchStatus Cancelled { get; } = new VectorStoreFileBatchStatus(CancelledValue);
+        /// <summary> The vector store file batch failed to process. </summary>
+        public static VectorStoreFileBatchStatus Failed { get; } = new VectorStoreFileBatchStatus(FailedValue);
+        /// <summary> Determines if two <see cref="VectorStoreFileBatchStatus"/> values are the same. </summary>
+        public static bool operator ==(VectorStoreFileBatchStatus left, VectorStoreFileBatchStatus right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="VectorStoreFileBatchStatus"/> values are not the same. </summary>
+        public static bool operator !=(VectorStoreFileBatchStatus left, VectorStoreFileBatchStatus right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="VectorStoreFileBatchStatus"/>. </summary>
+        public static implicit operator VectorStoreFileBatchStatus(string value) => new VectorStoreFileBatchStatus(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is VectorStoreFileBatchStatus other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(VectorStoreFileBatchStatus other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileCount.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileCount.Serialization.cs
new file mode 100644
index 000000000000..e69faa13eec3
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileCount.Serialization.cs
@@ -0,0 +1,173 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class VectorStoreFileCount : IUtf8JsonSerializable, IJsonModel<VectorStoreFileCount>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreFileCount>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreFileCount>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileCount>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreFileCount)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("in_progress"u8);
+            writer.WriteNumberValue(InProgress);
+            writer.WritePropertyName("completed"u8);
+            writer.WriteNumberValue(Completed);
+            writer.WritePropertyName("failed"u8);
+            writer.WriteNumberValue(Failed);
+            writer.WritePropertyName("cancelled"u8);
+            writer.WriteNumberValue(Cancelled);
+            writer.WritePropertyName("total"u8);
+            writer.WriteNumberValue(Total);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreFileCount IJsonModel<VectorStoreFileCount>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileCount>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreFileCount)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreFileCount(document.RootElement, options);
+        }
+
+        internal static VectorStoreFileCount DeserializeVectorStoreFileCount(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            int inProgress = default;
+            int completed = default;
+            int failed = default;
+            int cancelled = default;
+            int total = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("in_progress"u8))
+                {
+                    inProgress = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("completed"u8))
+                {
+                    completed = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("failed"u8))
+                {
+                    failed = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("cancelled"u8))
+                {
+                    cancelled = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("total"u8))
+                {
+                    total = property.Value.GetInt32();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new VectorStoreFileCount(
+                inProgress,
+                completed,
+                failed,
+                cancelled,
+                total,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<VectorStoreFileCount>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileCount>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreFileCount)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreFileCount IPersistableModel<VectorStoreFileCount>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileCount>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreFileCount(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreFileCount)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreFileCount>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static VectorStoreFileCount FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreFileCount(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileCount.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileCount.cs
new file mode 100644
index 000000000000..a4fe9273bff4
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileCount.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Counts of files processed or being processed by this vector store grouped by status. </summary>
+    public partial class VectorStoreFileCount
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileCount"/>. </summary>
+        /// <param name="inProgress"> The number of files that are currently being processed. </param>
+        /// <param name="completed"> The number of files that have been successfully processed. </param>
+        /// <param name="failed"> The number of files that have failed to process. </param>
+        /// <param name="cancelled"> The number of files that were cancelled. </param>
+        /// <param name="total"> The total number of files. </param>
+        internal VectorStoreFileCount(int inProgress, int completed, int failed, int cancelled, int total)
+        {
+            InProgress = inProgress;
+            Completed = completed;
+            Failed = failed;
+            Cancelled = cancelled;
+            Total = total;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileCount"/>. </summary>
+        /// <param name="inProgress"> The number of files that are currently being processed. </param>
+        /// <param name="completed"> The number of files that have been successfully processed. </param>
+        /// <param name="failed"> The number of files that have failed to process. </param>
+        /// <param name="cancelled"> The number of files that were cancelled. </param>
+        /// <param name="total"> The total number of files. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal VectorStoreFileCount(int inProgress, int completed, int failed, int cancelled, int total, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            InProgress = inProgress;
+            Completed = completed;
+            Failed = failed;
+            Cancelled = cancelled;
+            Total = total;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileCount"/> for deserialization. </summary>
+        internal VectorStoreFileCount()
+        {
+        }
+
+        /// <summary> The number of files that are currently being processed. </summary>
+        public int InProgress { get; }
+        /// <summary> The number of files that have been successfully processed. </summary>
+        public int Completed { get; }
+        /// <summary> The number of files that have failed to process. </summary>
+        public int Failed { get; }
+        /// <summary> The number of files that were cancelled. </summary>
+        public int Cancelled { get; }
+        /// <summary> The total number of files. </summary>
+        public int Total { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileDeletionStatus.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileDeletionStatus.Serialization.cs
new file mode 100644
index 000000000000..8ca0ff5dacf3
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileDeletionStatus.Serialization.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class VectorStoreFileDeletionStatus : IUtf8JsonSerializable, IJsonModel<VectorStoreFileDeletionStatus>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreFileDeletionStatus>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreFileDeletionStatus>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreFileDeletionStatus)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("deleted"u8);
+            writer.WriteBooleanValue(Deleted);
+            writer.WritePropertyName("object"u8);
+            writer.WriteStringValue(Object.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreFileDeletionStatus IJsonModel<VectorStoreFileDeletionStatus>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreFileDeletionStatus)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreFileDeletionStatus(document.RootElement, options);
+        }
+
+        internal static VectorStoreFileDeletionStatus DeserializeVectorStoreFileDeletionStatus(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string id = default;
+            bool deleted = default;
+            VectorStoreFileDeletionStatusObject @object = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("deleted"u8))
+                {
+                    deleted = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("object"u8))
+                {
+                    @object = new VectorStoreFileDeletionStatusObject(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new VectorStoreFileDeletionStatus(id, deleted, @object, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<VectorStoreFileDeletionStatus>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreFileDeletionStatus)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreFileDeletionStatus IPersistableModel<VectorStoreFileDeletionStatus>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreFileDeletionStatus(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreFileDeletionStatus)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreFileDeletionStatus>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static VectorStoreFileDeletionStatus FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreFileDeletionStatus(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileDeletionStatus.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileDeletionStatus.cs
new file mode 100644
index 000000000000..009e5942a8ac
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileDeletionStatus.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Response object for deleting a vector store file relationship. </summary>
+    public partial class VectorStoreFileDeletionStatus
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileDeletionStatus"/>. </summary>
+        /// <param name="id"> The ID of the resource specified for deletion. </param>
+        /// <param name="deleted"> A value indicating whether deletion was successful. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
+        internal VectorStoreFileDeletionStatus(string id, bool deleted)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+
+            Id = id;
+            Deleted = deleted;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileDeletionStatus"/>. </summary>
+        /// <param name="id"> The ID of the resource specified for deletion. </param>
+        /// <param name="deleted"> A value indicating whether deletion was successful. </param>
+        /// <param name="object"> The object type, which is always 'vector_store.deleted'. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal VectorStoreFileDeletionStatus(string id, bool deleted, VectorStoreFileDeletionStatusObject @object, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            Deleted = deleted;
+            Object = @object;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileDeletionStatus"/> for deserialization. </summary>
+        internal VectorStoreFileDeletionStatus()
+        {
+        }
+
+        /// <summary> The ID of the resource specified for deletion. </summary>
+        public string Id { get; }
+        /// <summary> A value indicating whether deletion was successful. </summary>
+        public bool Deleted { get; }
+        /// <summary> The object type, which is always 'vector_store.deleted'. </summary>
+        public VectorStoreFileDeletionStatusObject Object { get; } = VectorStoreFileDeletionStatusObject.VectorStoreFileDeleted;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileDeletionStatusObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileDeletionStatusObject.cs
new file mode 100644
index 000000000000..ebd2a6f4d22f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileDeletionStatusObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The VectorStoreFileDeletionStatus_object. </summary>
+    public readonly partial struct VectorStoreFileDeletionStatusObject : IEquatable<VectorStoreFileDeletionStatusObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileDeletionStatusObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public VectorStoreFileDeletionStatusObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string VectorStoreFileDeletedValue = "vector_store.file.deleted";
+
+        /// <summary> vector_store.file.deleted. </summary>
+        public static VectorStoreFileDeletionStatusObject VectorStoreFileDeleted { get; } = new VectorStoreFileDeletionStatusObject(VectorStoreFileDeletedValue);
+        /// <summary> Determines if two <see cref="VectorStoreFileDeletionStatusObject"/> values are the same. </summary>
+        public static bool operator ==(VectorStoreFileDeletionStatusObject left, VectorStoreFileDeletionStatusObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="VectorStoreFileDeletionStatusObject"/> values are not the same. </summary>
+        public static bool operator !=(VectorStoreFileDeletionStatusObject left, VectorStoreFileDeletionStatusObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="VectorStoreFileDeletionStatusObject"/>. </summary>
+        public static implicit operator VectorStoreFileDeletionStatusObject(string value) => new VectorStoreFileDeletionStatusObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is VectorStoreFileDeletionStatusObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(VectorStoreFileDeletionStatusObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileError.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileError.Serialization.cs
new file mode 100644
index 000000000000..8473487e4562
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileError.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class VectorStoreFileError : IUtf8JsonSerializable, IJsonModel<VectorStoreFileError>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreFileError>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreFileError>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileError>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreFileError)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("code"u8);
+            writer.WriteStringValue(Code.ToString());
+            writer.WritePropertyName("message"u8);
+            writer.WriteStringValue(Message);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreFileError IJsonModel<VectorStoreFileError>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileError>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreFileError)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreFileError(document.RootElement, options);
+        }
+
+        internal static VectorStoreFileError DeserializeVectorStoreFileError(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            VectorStoreFileErrorCode code = default;
+            string message = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("code"u8))
+                {
+                    code = new VectorStoreFileErrorCode(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("message"u8))
+                {
+                    message = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new VectorStoreFileError(code, message, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<VectorStoreFileError>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileError>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreFileError)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreFileError IPersistableModel<VectorStoreFileError>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreFileError>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreFileError(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreFileError)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreFileError>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static VectorStoreFileError FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreFileError(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterResultForPromptContentFilterResultsError.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileError.cs
similarity index 50%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterResultForPromptContentFilterResultsError.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileError.cs
index af8b8a13fe2a..5c96944e5f8e 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterResultForPromptContentFilterResultsError.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileError.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -5,10 +8,10 @@
 using System;
 using System.Collections.Generic;
 
-namespace Azure.AI.OpenAI
+namespace Azure.AI.OpenAI.Assistants
 {
-    /// <summary> The AzureContentFilterResultForPromptContentFilterResultsError. </summary>
-    internal partial class InternalAzureContentFilterResultForPromptContentFilterResultsError
+    /// <summary> Details on the error that may have ocurred while processing a file for this vector store. </summary>
+    public partial class VectorStoreFileError
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -40,12 +43,13 @@ internal partial class InternalAzureContentFilterResultForPromptContentFilterRes
         /// </list>
         /// </para>
         /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="InternalAzureContentFilterResultForPromptContentFilterResultsError"/>. </summary>
-        /// <param name="code"> A distinct, machine-readable code associated with the error. </param>
-        /// <param name="message"> A human-readable message associated with the error. </param>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileError"/>. </summary>
+        /// <param name="code"> One of `server_error` or `rate_limit_exceeded`. </param>
+        /// <param name="message"> A human-readable description of the error. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="message"/> is null. </exception>
-        internal InternalAzureContentFilterResultForPromptContentFilterResultsError(int code, string message)
+        internal VectorStoreFileError(VectorStoreFileErrorCode code, string message)
         {
             Argument.AssertNotNull(message, nameof(message));
 
@@ -53,26 +57,25 @@ internal InternalAzureContentFilterResultForPromptContentFilterResultsError(int
             Message = message;
         }
 
-        /// <summary> Initializes a new instance of <see cref="InternalAzureContentFilterResultForPromptContentFilterResultsError"/>. </summary>
-        /// <param name="code"> A distinct, machine-readable code associated with the error. </param>
-        /// <param name="message"> A human-readable message associated with the error. </param>
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileError"/>. </summary>
+        /// <param name="code"> One of `server_error` or `rate_limit_exceeded`. </param>
+        /// <param name="message"> A human-readable description of the error. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalAzureContentFilterResultForPromptContentFilterResultsError(int code, string message, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal VectorStoreFileError(VectorStoreFileErrorCode code, string message, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Code = code;
             Message = message;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="InternalAzureContentFilterResultForPromptContentFilterResultsError"/> for deserialization. </summary>
-        internal InternalAzureContentFilterResultForPromptContentFilterResultsError()
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileError"/> for deserialization. </summary>
+        internal VectorStoreFileError()
         {
         }
 
-        /// <summary> A distinct, machine-readable code associated with the error. </summary>
-        internal int Code { get; set; }
-        /// <summary> A human-readable message associated with the error. </summary>
-        internal string Message { get; set; }
+        /// <summary> One of `server_error` or `rate_limit_exceeded`. </summary>
+        public VectorStoreFileErrorCode Code { get; }
+        /// <summary> A human-readable description of the error. </summary>
+        public string Message { get; }
     }
 }
-
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileErrorCode.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileErrorCode.cs
new file mode 100644
index 000000000000..ab280b4614cf
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileErrorCode.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Error code variants for vector store file processing. </summary>
+    public readonly partial struct VectorStoreFileErrorCode : IEquatable<VectorStoreFileErrorCode>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileErrorCode"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public VectorStoreFileErrorCode(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string InternalErrorValue = "internal_error";
+        private const string FileNotFoundValue = "file_not_found";
+        private const string ParsingErrorValue = "parsing_error";
+        private const string UnhandledMimeTypeValue = "unhandled_mime_type";
+
+        /// <summary> An internal error occurred. </summary>
+        public static VectorStoreFileErrorCode InternalError { get; } = new VectorStoreFileErrorCode(InternalErrorValue);
+        /// <summary> The file was not found. </summary>
+        public static VectorStoreFileErrorCode FileNotFound { get; } = new VectorStoreFileErrorCode(FileNotFoundValue);
+        /// <summary> The file could not be parsed. </summary>
+        public static VectorStoreFileErrorCode ParsingError { get; } = new VectorStoreFileErrorCode(ParsingErrorValue);
+        /// <summary> The file has an unhandled mime type. </summary>
+        public static VectorStoreFileErrorCode UnhandledMimeType { get; } = new VectorStoreFileErrorCode(UnhandledMimeTypeValue);
+        /// <summary> Determines if two <see cref="VectorStoreFileErrorCode"/> values are the same. </summary>
+        public static bool operator ==(VectorStoreFileErrorCode left, VectorStoreFileErrorCode right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="VectorStoreFileErrorCode"/> values are not the same. </summary>
+        public static bool operator !=(VectorStoreFileErrorCode left, VectorStoreFileErrorCode right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="VectorStoreFileErrorCode"/>. </summary>
+        public static implicit operator VectorStoreFileErrorCode(string value) => new VectorStoreFileErrorCode(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is VectorStoreFileErrorCode other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(VectorStoreFileErrorCode other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileObject.cs
new file mode 100644
index 000000000000..f4d205e40ce2
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The VectorStoreFile_object. </summary>
+    public readonly partial struct VectorStoreFileObject : IEquatable<VectorStoreFileObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public VectorStoreFileObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string VectorStoreFileValue = "vector_store.file";
+
+        /// <summary> vector_store.file. </summary>
+        public static VectorStoreFileObject VectorStoreFile { get; } = new VectorStoreFileObject(VectorStoreFileValue);
+        /// <summary> Determines if two <see cref="VectorStoreFileObject"/> values are the same. </summary>
+        public static bool operator ==(VectorStoreFileObject left, VectorStoreFileObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="VectorStoreFileObject"/> values are not the same. </summary>
+        public static bool operator !=(VectorStoreFileObject left, VectorStoreFileObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="VectorStoreFileObject"/>. </summary>
+        public static implicit operator VectorStoreFileObject(string value) => new VectorStoreFileObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is VectorStoreFileObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(VectorStoreFileObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileStatus.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileStatus.cs
new file mode 100644
index 000000000000..62c5dc3711e8
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileStatus.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Vector store file status. </summary>
+    public readonly partial struct VectorStoreFileStatus : IEquatable<VectorStoreFileStatus>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileStatus"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public VectorStoreFileStatus(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string InProgressValue = "in_progress";
+        private const string CompletedValue = "completed";
+        private const string FailedValue = "failed";
+        private const string CancelledValue = "cancelled";
+
+        /// <summary> The file is currently being processed. </summary>
+        public static VectorStoreFileStatus InProgress { get; } = new VectorStoreFileStatus(InProgressValue);
+        /// <summary> The file has been successfully processed. </summary>
+        public static VectorStoreFileStatus Completed { get; } = new VectorStoreFileStatus(CompletedValue);
+        /// <summary> The file has failed to process. </summary>
+        public static VectorStoreFileStatus Failed { get; } = new VectorStoreFileStatus(FailedValue);
+        /// <summary> The file was cancelled. </summary>
+        public static VectorStoreFileStatus Cancelled { get; } = new VectorStoreFileStatus(CancelledValue);
+        /// <summary> Determines if two <see cref="VectorStoreFileStatus"/> values are the same. </summary>
+        public static bool operator ==(VectorStoreFileStatus left, VectorStoreFileStatus right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="VectorStoreFileStatus"/> values are not the same. </summary>
+        public static bool operator !=(VectorStoreFileStatus left, VectorStoreFileStatus right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="VectorStoreFileStatus"/>. </summary>
+        public static implicit operator VectorStoreFileStatus(string value) => new VectorStoreFileStatus(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is VectorStoreFileStatus other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(VectorStoreFileStatus other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileStatusFilter.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileStatusFilter.cs
new file mode 100644
index 000000000000..cd796f8cae2a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreFileStatusFilter.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Query parameter filter for vector store file retrieval endpoint. </summary>
+    public readonly partial struct VectorStoreFileStatusFilter : IEquatable<VectorStoreFileStatusFilter>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreFileStatusFilter"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public VectorStoreFileStatusFilter(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string InProgressValue = "in_progress";
+        private const string CompletedValue = "completed";
+        private const string FailedValue = "failed";
+        private const string CancelledValue = "cancelled";
+
+        /// <summary> Retrieve only files that are currently being processed. </summary>
+        public static VectorStoreFileStatusFilter InProgress { get; } = new VectorStoreFileStatusFilter(InProgressValue);
+        /// <summary> Retrieve only files that have been successfully processed. </summary>
+        public static VectorStoreFileStatusFilter Completed { get; } = new VectorStoreFileStatusFilter(CompletedValue);
+        /// <summary> Retrieve only files that have failed to process. </summary>
+        public static VectorStoreFileStatusFilter Failed { get; } = new VectorStoreFileStatusFilter(FailedValue);
+        /// <summary> Retrieve only files that were cancelled. </summary>
+        public static VectorStoreFileStatusFilter Cancelled { get; } = new VectorStoreFileStatusFilter(CancelledValue);
+        /// <summary> Determines if two <see cref="VectorStoreFileStatusFilter"/> values are the same. </summary>
+        public static bool operator ==(VectorStoreFileStatusFilter left, VectorStoreFileStatusFilter right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="VectorStoreFileStatusFilter"/> values are not the same. </summary>
+        public static bool operator !=(VectorStoreFileStatusFilter left, VectorStoreFileStatusFilter right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="VectorStoreFileStatusFilter"/>. </summary>
+        public static implicit operator VectorStoreFileStatusFilter(string value) => new VectorStoreFileStatusFilter(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is VectorStoreFileStatusFilter other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(VectorStoreFileStatusFilter other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreObject.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreObject.cs
new file mode 100644
index 000000000000..abbc8b915139
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> The VectorStore_object. </summary>
+    public readonly partial struct VectorStoreObject : IEquatable<VectorStoreObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public VectorStoreObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string VectorStoreValue = "vector_store";
+
+        /// <summary> vector_store. </summary>
+        public static VectorStoreObject VectorStore { get; } = new VectorStoreObject(VectorStoreValue);
+        /// <summary> Determines if two <see cref="VectorStoreObject"/> values are the same. </summary>
+        public static bool operator ==(VectorStoreObject left, VectorStoreObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="VectorStoreObject"/> values are not the same. </summary>
+        public static bool operator !=(VectorStoreObject left, VectorStoreObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="VectorStoreObject"/>. </summary>
+        public static implicit operator VectorStoreObject(string value) => new VectorStoreObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is VectorStoreObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(VectorStoreObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreOptions.Serialization.cs
new file mode 100644
index 000000000000..1d15eb029bc1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreOptions.Serialization.cs
@@ -0,0 +1,232 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class VectorStoreOptions : IUtf8JsonSerializable, IJsonModel<VectorStoreOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsCollectionDefined(FileIds))
+            {
+                writer.WritePropertyName("file_ids"u8);
+                writer.WriteStartArray();
+                foreach (var item in FileIds)
+                {
+                    writer.WriteStringValue(item);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsDefined(Name))
+            {
+                writer.WritePropertyName("name"u8);
+                writer.WriteStringValue(Name);
+            }
+            if (Optional.IsDefined(ExpiresAfter))
+            {
+                writer.WritePropertyName("expires_after"u8);
+                writer.WriteObjectValue(ExpiresAfter, options);
+            }
+            if (Optional.IsDefined(ChunkingStrategy))
+            {
+                writer.WritePropertyName("chunking_strategy"u8);
+                writer.WriteObjectValue(ChunkingStrategy, options);
+            }
+            if (Optional.IsCollectionDefined(Metadata))
+            {
+                if (Metadata != null)
+                {
+                    writer.WritePropertyName("metadata"u8);
+                    writer.WriteStartObject();
+                    foreach (var item in Metadata)
+                    {
+                        writer.WritePropertyName(item.Key);
+                        writer.WriteStringValue(item.Value);
+                    }
+                    writer.WriteEndObject();
+                }
+                else
+                {
+                    writer.WriteNull("metadata");
+                }
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreOptions IJsonModel<VectorStoreOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreOptions(document.RootElement, options);
+        }
+
+        internal static VectorStoreOptions DeserializeVectorStoreOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IList<string> fileIds = default;
+            string name = default;
+            VectorStoreExpirationPolicy expiresAfter = default;
+            VectorStoreChunkingStrategyRequest chunkingStrategy = default;
+            IDictionary<string, string> metadata = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file_ids"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    fileIds = array;
+                    continue;
+                }
+                if (property.NameEquals("name"u8))
+                {
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("expires_after"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    expiresAfter = VectorStoreExpirationPolicy.DeserializeVectorStoreExpirationPolicy(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("chunking_strategy"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    chunkingStrategy = VectorStoreChunkingStrategyRequest.DeserializeVectorStoreChunkingStrategyRequest(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("metadata"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
+                    foreach (var property0 in property.Value.EnumerateObject())
+                    {
+                        dictionary.Add(property0.Name, property0.Value.GetString());
+                    }
+                    metadata = dictionary;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new VectorStoreOptions(
+                fileIds ?? new ChangeTrackingList<string>(),
+                name,
+                expiresAfter,
+                chunkingStrategy,
+                metadata ?? new ChangeTrackingDictionary<string, string>(),
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<VectorStoreOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreOptions IPersistableModel<VectorStoreOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static VectorStoreOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreOptions.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreOptions.cs
new file mode 100644
index 000000000000..2aa8bd2f3858
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreOptions.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Request object for creating a vector store. </summary>
+    public partial class VectorStoreOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreOptions"/>. </summary>
+        public VectorStoreOptions()
+        {
+            FileIds = new ChangeTrackingList<string>();
+            Metadata = new ChangeTrackingDictionary<string, string>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreOptions"/>. </summary>
+        /// <param name="fileIds"> A list of file IDs that the vector store should use. Useful for tools like `file_search` that can access files. </param>
+        /// <param name="name"> The name of the vector store. </param>
+        /// <param name="expiresAfter"> Details on when this vector store expires. </param>
+        /// <param name="chunkingStrategy">
+        /// The chunking strategy used to chunk the file(s). If not set, will use the auto strategy. Only applicable if file_ids is non-empty.
+        /// Please note <see cref="VectorStoreChunkingStrategyRequest"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyRequest"/> and <see cref="VectorStoreStaticChunkingStrategyRequest"/>.
+        /// </param>
+        /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal VectorStoreOptions(IList<string> fileIds, string name, VectorStoreExpirationPolicy expiresAfter, VectorStoreChunkingStrategyRequest chunkingStrategy, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            FileIds = fileIds;
+            Name = name;
+            ExpiresAfter = expiresAfter;
+            ChunkingStrategy = chunkingStrategy;
+            Metadata = metadata;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> A list of file IDs that the vector store should use. Useful for tools like `file_search` that can access files. </summary>
+        public IList<string> FileIds { get; }
+        /// <summary> The name of the vector store. </summary>
+        public string Name { get; set; }
+        /// <summary> Details on when this vector store expires. </summary>
+        public VectorStoreExpirationPolicy ExpiresAfter { get; set; }
+        /// <summary>
+        /// The chunking strategy used to chunk the file(s). If not set, will use the auto strategy. Only applicable if file_ids is non-empty.
+        /// Please note <see cref="VectorStoreChunkingStrategyRequest"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="VectorStoreAutoChunkingStrategyRequest"/> and <see cref="VectorStoreStaticChunkingStrategyRequest"/>.
+        /// </summary>
+        public VectorStoreChunkingStrategyRequest ChunkingStrategy { get; set; }
+        /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
+        public IDictionary<string, string> Metadata { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyOptions.Serialization.cs
new file mode 100644
index 000000000000..0b18f5655b55
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyOptions.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class VectorStoreStaticChunkingStrategyOptions : IUtf8JsonSerializable, IJsonModel<VectorStoreStaticChunkingStrategyOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreStaticChunkingStrategyOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreStaticChunkingStrategyOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreStaticChunkingStrategyOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreStaticChunkingStrategyOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("max_chunk_size_tokens"u8);
+            writer.WriteNumberValue(MaxChunkSizeTokens);
+            writer.WritePropertyName("chunk_overlap_tokens"u8);
+            writer.WriteNumberValue(ChunkOverlapTokens);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreStaticChunkingStrategyOptions IJsonModel<VectorStoreStaticChunkingStrategyOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreStaticChunkingStrategyOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreStaticChunkingStrategyOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreStaticChunkingStrategyOptions(document.RootElement, options);
+        }
+
+        internal static VectorStoreStaticChunkingStrategyOptions DeserializeVectorStoreStaticChunkingStrategyOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            int maxChunkSizeTokens = default;
+            int chunkOverlapTokens = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("max_chunk_size_tokens"u8))
+                {
+                    maxChunkSizeTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("chunk_overlap_tokens"u8))
+                {
+                    chunkOverlapTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new VectorStoreStaticChunkingStrategyOptions(maxChunkSizeTokens, chunkOverlapTokens, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<VectorStoreStaticChunkingStrategyOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreStaticChunkingStrategyOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreStaticChunkingStrategyOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreStaticChunkingStrategyOptions IPersistableModel<VectorStoreStaticChunkingStrategyOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreStaticChunkingStrategyOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreStaticChunkingStrategyOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreStaticChunkingStrategyOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreStaticChunkingStrategyOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static VectorStoreStaticChunkingStrategyOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreStaticChunkingStrategyOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyOptions.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyOptions.cs
new file mode 100644
index 000000000000..38db6670abf3
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyOptions.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Options to configure a vector store static chunking strategy. </summary>
+    public partial class VectorStoreStaticChunkingStrategyOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreStaticChunkingStrategyOptions"/>. </summary>
+        /// <param name="maxChunkSizeTokens"> The maximum number of tokens in each chunk. The default value is 800. The minimum value is 100 and the maximum value is 4096. </param>
+        /// <param name="chunkOverlapTokens">
+        /// The number of tokens that overlap between chunks. The default value is 400.
+        /// Note that the overlap must not exceed half of max_chunk_size_tokens.     *
+        /// </param>
+        public VectorStoreStaticChunkingStrategyOptions(int maxChunkSizeTokens, int chunkOverlapTokens)
+        {
+            MaxChunkSizeTokens = maxChunkSizeTokens;
+            ChunkOverlapTokens = chunkOverlapTokens;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreStaticChunkingStrategyOptions"/>. </summary>
+        /// <param name="maxChunkSizeTokens"> The maximum number of tokens in each chunk. The default value is 800. The minimum value is 100 and the maximum value is 4096. </param>
+        /// <param name="chunkOverlapTokens">
+        /// The number of tokens that overlap between chunks. The default value is 400.
+        /// Note that the overlap must not exceed half of max_chunk_size_tokens.     *
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal VectorStoreStaticChunkingStrategyOptions(int maxChunkSizeTokens, int chunkOverlapTokens, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            MaxChunkSizeTokens = maxChunkSizeTokens;
+            ChunkOverlapTokens = chunkOverlapTokens;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreStaticChunkingStrategyOptions"/> for deserialization. </summary>
+        internal VectorStoreStaticChunkingStrategyOptions()
+        {
+        }
+
+        /// <summary> The maximum number of tokens in each chunk. The default value is 800. The minimum value is 100 and the maximum value is 4096. </summary>
+        public int MaxChunkSizeTokens { get; set; }
+        /// <summary>
+        /// The number of tokens that overlap between chunks. The default value is 400.
+        /// Note that the overlap must not exceed half of max_chunk_size_tokens.     *
+        /// </summary>
+        public int ChunkOverlapTokens { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyRequest.Serialization.cs
new file mode 100644
index 000000000000..2d5098c57c0c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyRequest.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class VectorStoreStaticChunkingStrategyRequest : IUtf8JsonSerializable, IJsonModel<VectorStoreStaticChunkingStrategyRequest>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreStaticChunkingStrategyRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreStaticChunkingStrategyRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreStaticChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreStaticChunkingStrategyRequest)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("static"u8);
+            writer.WriteObjectValue(Static, options);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreStaticChunkingStrategyRequest IJsonModel<VectorStoreStaticChunkingStrategyRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreStaticChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreStaticChunkingStrategyRequest)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreStaticChunkingStrategyRequest(document.RootElement, options);
+        }
+
+        internal static VectorStoreStaticChunkingStrategyRequest DeserializeVectorStoreStaticChunkingStrategyRequest(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            VectorStoreStaticChunkingStrategyOptions @static = default;
+            VectorStoreChunkingStrategyRequestType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("static"u8))
+                {
+                    @static = VectorStoreStaticChunkingStrategyOptions.DeserializeVectorStoreStaticChunkingStrategyOptions(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new VectorStoreChunkingStrategyRequestType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new VectorStoreStaticChunkingStrategyRequest(type, serializedAdditionalRawData, @static);
+        }
+
+        BinaryData IPersistableModel<VectorStoreStaticChunkingStrategyRequest>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreStaticChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreStaticChunkingStrategyRequest)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreStaticChunkingStrategyRequest IPersistableModel<VectorStoreStaticChunkingStrategyRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreStaticChunkingStrategyRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreStaticChunkingStrategyRequest(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreStaticChunkingStrategyRequest)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreStaticChunkingStrategyRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new VectorStoreStaticChunkingStrategyRequest FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreStaticChunkingStrategyRequest(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyRequest.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyRequest.cs
new file mode 100644
index 000000000000..0a65da2962bd
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyRequest.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> A statically configured chunking strategy. </summary>
+    public partial class VectorStoreStaticChunkingStrategyRequest : VectorStoreChunkingStrategyRequest
+    {
+        /// <summary> Initializes a new instance of <see cref="VectorStoreStaticChunkingStrategyRequest"/>. </summary>
+        /// <param name="static"> The options for the static chunking strategy. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="static"/> is null. </exception>
+        public VectorStoreStaticChunkingStrategyRequest(VectorStoreStaticChunkingStrategyOptions @static)
+        {
+            Argument.AssertNotNull(@static, nameof(@static));
+
+            Type = VectorStoreChunkingStrategyRequestType.Static;
+            Static = @static;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreStaticChunkingStrategyRequest"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="static"> The options for the static chunking strategy. </param>
+        internal VectorStoreStaticChunkingStrategyRequest(VectorStoreChunkingStrategyRequestType type, IDictionary<string, BinaryData> serializedAdditionalRawData, VectorStoreStaticChunkingStrategyOptions @static) : base(type, serializedAdditionalRawData)
+        {
+            Static = @static;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreStaticChunkingStrategyRequest"/> for deserialization. </summary>
+        internal VectorStoreStaticChunkingStrategyRequest()
+        {
+        }
+
+        /// <summary> The options for the static chunking strategy. </summary>
+        public VectorStoreStaticChunkingStrategyOptions Static { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyResponse.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyResponse.Serialization.cs
new file mode 100644
index 000000000000..d478d4b4f14f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyResponse.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class VectorStoreStaticChunkingStrategyResponse : IUtf8JsonSerializable, IJsonModel<VectorStoreStaticChunkingStrategyResponse>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreStaticChunkingStrategyResponse>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreStaticChunkingStrategyResponse>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreStaticChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreStaticChunkingStrategyResponse)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("static"u8);
+            writer.WriteObjectValue(Static, options);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreStaticChunkingStrategyResponse IJsonModel<VectorStoreStaticChunkingStrategyResponse>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreStaticChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreStaticChunkingStrategyResponse)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreStaticChunkingStrategyResponse(document.RootElement, options);
+        }
+
+        internal static VectorStoreStaticChunkingStrategyResponse DeserializeVectorStoreStaticChunkingStrategyResponse(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            VectorStoreStaticChunkingStrategyOptions @static = default;
+            VectorStoreChunkingStrategyResponseType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("static"u8))
+                {
+                    @static = VectorStoreStaticChunkingStrategyOptions.DeserializeVectorStoreStaticChunkingStrategyOptions(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new VectorStoreChunkingStrategyResponseType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new VectorStoreStaticChunkingStrategyResponse(type, serializedAdditionalRawData, @static);
+        }
+
+        BinaryData IPersistableModel<VectorStoreStaticChunkingStrategyResponse>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreStaticChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreStaticChunkingStrategyResponse)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreStaticChunkingStrategyResponse IPersistableModel<VectorStoreStaticChunkingStrategyResponse>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreStaticChunkingStrategyResponse>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreStaticChunkingStrategyResponse(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreStaticChunkingStrategyResponse)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreStaticChunkingStrategyResponse>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new VectorStoreStaticChunkingStrategyResponse FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreStaticChunkingStrategyResponse(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyResponse.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyResponse.cs
new file mode 100644
index 000000000000..5d2a0200bdcd
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStaticChunkingStrategyResponse.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> A statically configured chunking strategy. </summary>
+    public partial class VectorStoreStaticChunkingStrategyResponse : VectorStoreChunkingStrategyResponse
+    {
+        /// <summary> Initializes a new instance of <see cref="VectorStoreStaticChunkingStrategyResponse"/>. </summary>
+        /// <param name="static"> The options for the static chunking strategy. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="static"/> is null. </exception>
+        internal VectorStoreStaticChunkingStrategyResponse(VectorStoreStaticChunkingStrategyOptions @static)
+        {
+            Argument.AssertNotNull(@static, nameof(@static));
+
+            Type = VectorStoreChunkingStrategyResponseType.Static;
+            Static = @static;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreStaticChunkingStrategyResponse"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="static"> The options for the static chunking strategy. </param>
+        internal VectorStoreStaticChunkingStrategyResponse(VectorStoreChunkingStrategyResponseType type, IDictionary<string, BinaryData> serializedAdditionalRawData, VectorStoreStaticChunkingStrategyOptions @static) : base(type, serializedAdditionalRawData)
+        {
+            Static = @static;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreStaticChunkingStrategyResponse"/> for deserialization. </summary>
+        internal VectorStoreStaticChunkingStrategyResponse()
+        {
+        }
+
+        /// <summary> The options for the static chunking strategy. </summary>
+        public VectorStoreStaticChunkingStrategyOptions Static { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStatus.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStatus.cs
new file mode 100644
index 000000000000..d8b1d0e87b45
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreStatus.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    /// <summary> Vector store possible status. </summary>
+    public readonly partial struct VectorStoreStatus : IEquatable<VectorStoreStatus>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="VectorStoreStatus"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public VectorStoreStatus(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ExpiredValue = "expired";
+        private const string InProgressValue = "in_progress";
+        private const string CompletedValue = "completed";
+
+        /// <summary> expired status indicates that this vector store has expired and is no longer available for use. </summary>
+        public static VectorStoreStatus Expired { get; } = new VectorStoreStatus(ExpiredValue);
+        /// <summary> in_progress status indicates that this vector store is still processing files. </summary>
+        public static VectorStoreStatus InProgress { get; } = new VectorStoreStatus(InProgressValue);
+        /// <summary> completed status indicates that this vector store is ready for use. </summary>
+        public static VectorStoreStatus Completed { get; } = new VectorStoreStatus(CompletedValue);
+        /// <summary> Determines if two <see cref="VectorStoreStatus"/> values are the same. </summary>
+        public static bool operator ==(VectorStoreStatus left, VectorStoreStatus right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="VectorStoreStatus"/> values are not the same. </summary>
+        public static bool operator !=(VectorStoreStatus left, VectorStoreStatus right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="VectorStoreStatus"/>. </summary>
+        public static implicit operator VectorStoreStatus(string value) => new VectorStoreStatus(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is VectorStoreStatus other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(VectorStoreStatus other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreUpdateOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreUpdateOptions.Serialization.cs
new file mode 100644
index 000000000000..1719c5abd919
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreUpdateOptions.Serialization.cs
@@ -0,0 +1,206 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI.Assistants
+{
+    public partial class VectorStoreUpdateOptions : IUtf8JsonSerializable, IJsonModel<VectorStoreUpdateOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VectorStoreUpdateOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<VectorStoreUpdateOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreUpdateOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreUpdateOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Name))
+            {
+                if (Name != null)
+                {
+                    writer.WritePropertyName("name"u8);
+                    writer.WriteStringValue(Name);
+                }
+                else
+                {
+                    writer.WriteNull("name");
+                }
+            }
+            if (Optional.IsDefined(ExpiresAfter))
+            {
+                if (ExpiresAfter != null)
+                {
+                    writer.WritePropertyName("expires_after"u8);
+                    writer.WriteObjectValue(ExpiresAfter, options);
+                }
+                else
+                {
+                    writer.WriteNull("expires_after");
+                }
+            }
+            if (Optional.IsCollectionDefined(Metadata))
+            {
+                if (Metadata != null)
+                {
+                    writer.WritePropertyName("metadata"u8);
+                    writer.WriteStartObject();
+                    foreach (var item in Metadata)
+                    {
+                        writer.WritePropertyName(item.Key);
+                        writer.WriteStringValue(item.Value);
+                    }
+                    writer.WriteEndObject();
+                }
+                else
+                {
+                    writer.WriteNull("metadata");
+                }
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        VectorStoreUpdateOptions IJsonModel<VectorStoreUpdateOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreUpdateOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(VectorStoreUpdateOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeVectorStoreUpdateOptions(document.RootElement, options);
+        }
+
+        internal static VectorStoreUpdateOptions DeserializeVectorStoreUpdateOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string name = default;
+            VectorStoreExpirationPolicy expiresAfter = default;
+            IDictionary<string, string> metadata = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("name"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        name = null;
+                        continue;
+                    }
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("expires_after"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        expiresAfter = null;
+                        continue;
+                    }
+                    expiresAfter = VectorStoreExpirationPolicy.DeserializeVectorStoreExpirationPolicy(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("metadata"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
+                    foreach (var property0 in property.Value.EnumerateObject())
+                    {
+                        dictionary.Add(property0.Name, property0.Value.GetString());
+                    }
+                    metadata = dictionary;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new VectorStoreUpdateOptions(name, expiresAfter, metadata ?? new ChangeTrackingDictionary<string, string>(), serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<VectorStoreUpdateOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreUpdateOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreUpdateOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        VectorStoreUpdateOptions IPersistableModel<VectorStoreUpdateOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<VectorStoreUpdateOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeVectorStoreUpdateOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(VectorStoreUpdateOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<VectorStoreUpdateOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static VectorStoreUpdateOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeVectorStoreUpdateOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateThreadRequest.cs b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreUpdateOptions.cs
similarity index 69%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateThreadRequest.cs
rename to sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreUpdateOptions.cs
index 46ab2f35dbcb..e3bcef35dc48 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/UpdateThreadRequest.cs
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/VectorStoreUpdateOptions.cs
@@ -10,8 +10,8 @@
 
 namespace Azure.AI.OpenAI.Assistants
 {
-    /// <summary> The UpdateThreadRequest. </summary>
-    internal partial class UpdateThreadRequest
+    /// <summary> Request object for updating a vector store. </summary>
+    public partial class VectorStoreUpdateOptions
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,22 +45,30 @@ internal partial class UpdateThreadRequest
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="UpdateThreadRequest"/>. </summary>
-        internal UpdateThreadRequest()
+        /// <summary> Initializes a new instance of <see cref="VectorStoreUpdateOptions"/>. </summary>
+        public VectorStoreUpdateOptions()
         {
             Metadata = new ChangeTrackingDictionary<string, string>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="UpdateThreadRequest"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="VectorStoreUpdateOptions"/>. </summary>
+        /// <param name="name"> The name of the vector store. </param>
+        /// <param name="expiresAfter"> Details on when this vector store expires. </param>
         /// <param name="metadata"> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal UpdateThreadRequest(IReadOnlyDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal VectorStoreUpdateOptions(string name, VectorStoreExpirationPolicy expiresAfter, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
+            Name = name;
+            ExpiresAfter = expiresAfter;
             Metadata = metadata;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
+        /// <summary> The name of the vector store. </summary>
+        public string Name { get; set; }
+        /// <summary> Details on when this vector store expires. </summary>
+        public VectorStoreExpirationPolicy ExpiresAfter { get; set; }
         /// <summary> A set of up to 16 key/value pairs that can be attached to an object, used for storing additional information about that object in a structured format. Keys may be up to 64 characters in length and values may be up to 512 characters in length. </summary>
-        public IReadOnlyDictionary<string, string> Metadata { get; }
+        public IDictionary<string, string> Metadata { get; set; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/tsp-location.yaml b/sdk/openai/Azure.AI.OpenAI.Assistants/tsp-location.yaml
index 58f812caec89..2c62d8730936 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/tsp-location.yaml
+++ b/sdk/openai/Azure.AI.OpenAI.Assistants/tsp-location.yaml
@@ -1,3 +1,4 @@
 directory: specification/ai/OpenAI.Assistants
-commit: 4fef3a8d819f8fc8eef6a3b68320f710e666b72a
+commit: cc338f96a11ef2749b5cdf4a1ec0b69208763cc9
 repo: Azure/azure-rest-api-specs
+additionalDirectories: 
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AIOpenAIClientBuilderExtensions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AIOpenAIClientBuilderExtensions.cs
new file mode 100644
index 000000000000..bc32a7f2b1a4
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AIOpenAIClientBuilderExtensions.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using Azure;
+using Azure.AI.OpenAI;
+using Azure.Core.Extensions;
+
+namespace Microsoft.Extensions.Azure
+{
+    /// <summary> Extension methods to add <see cref="OpenAIClient"/> to client builder. </summary>
+    public static partial class AIOpenAIClientBuilderExtensions
+    {
+        /// <summary> Registers a <see cref="OpenAIClient"/> instance. </summary>
+        /// <param name="builder"> The builder to register with. </param>
+        /// <param name="endpoint">
+        /// Supported Cognitive Services endpoints (protocol and hostname, for example:
+        /// https://westus.api.cognitive.microsoft.com).
+        /// </param>
+        /// <param name="credential"> A credential used to authenticate to an Azure Service. </param>
+        public static IAzureClientBuilder<OpenAIClient, OpenAIClientOptions> AddOpenAIClient<TBuilder>(this TBuilder builder, Uri endpoint, AzureKeyCredential credential)
+        where TBuilder : IAzureClientFactoryBuilder
+        {
+            return builder.RegisterClientFactory<OpenAIClient, OpenAIClientOptions>((options) => new OpenAIClient(endpoint, credential, options));
+        }
+
+        /// <summary> Registers a <see cref="OpenAIClient"/> instance. </summary>
+        /// <param name="builder"> The builder to register with. </param>
+        /// <param name="endpoint">
+        /// Supported Cognitive Services endpoints (protocol and hostname, for example:
+        /// https://westus.api.cognitive.microsoft.com).
+        /// </param>
+        public static IAzureClientBuilder<OpenAIClient, OpenAIClientOptions> AddOpenAIClient<TBuilder>(this TBuilder builder, Uri endpoint)
+        where TBuilder : IAzureClientFactoryBuilderWithCredential
+        {
+            return builder.RegisterClientFactory<OpenAIClient, OpenAIClientOptions>((options, cred) => new OpenAIClient(endpoint, cred, options));
+        }
+
+        /// <summary> Registers a <see cref="OpenAIClient"/> instance. </summary>
+        /// <param name="builder"> The builder to register with. </param>
+        /// <param name="configuration"> The configuration values. </param>
+        public static IAzureClientBuilder<OpenAIClient, OpenAIClientOptions> AddOpenAIClient<TBuilder, TConfiguration>(this TBuilder builder, TConfiguration configuration)
+        where TBuilder : IAzureClientFactoryBuilderWithConfiguration<TConfiguration>
+        {
+            return builder.RegisterClientFactory<OpenAIClient, OpenAIClientOptions>(configuration);
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AIOpenAIModelFactory.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AIOpenAIModelFactory.cs
new file mode 100644
index 000000000000..3cdccf77ca30
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AIOpenAIModelFactory.cs
@@ -0,0 +1,1499 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Model factory for models. </summary>
+    public static partial class AIOpenAIModelFactory
+    {
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AudioTranscriptionOptions"/>. </summary>
+        /// <param name="audioData">
+        /// The audio data to transcribe. This must be the binary content of a file in one of the supported media formats:
+        ///  flac, mp3, mp4, mpeg, mpga, m4a, ogg, wav, webm.
+        /// </param>
+        /// <param name="filename"> The optional filename or descriptive identifier to associate with with the audio data. </param>
+        /// <param name="responseFormat"> The requested format of the transcription response data, which will influence the content and detail of the result. </param>
+        /// <param name="language">
+        /// The primary spoken language of the audio data to be transcribed, supplied as a two-letter ISO-639-1 language code
+        /// such as 'en' or 'fr'.
+        /// Providing this known input language is optional but may improve the accuracy and/or latency of transcription.
+        /// </param>
+        /// <param name="prompt">
+        /// An optional hint to guide the model's style or continue from a prior audio segment. The written language of the
+        /// prompt should match the primary spoken language of the audio data.
+        /// </param>
+        /// <param name="temperature">
+        /// The sampling temperature, between 0 and 1.
+        /// Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.
+        /// If set to 0, the model will use log probability to automatically increase the temperature until certain thresholds are hit.
+        /// </param>
+        /// <param name="timestampGranularities">
+        /// The timestamp granularities to populate for this transcription.
+        /// `response_format` must be set `verbose_json` to use timestamp granularities.
+        /// Either or both of these options are supported: `word`, or `segment`.
+        /// Note: There is no additional latency for segment timestamps, but generating word timestamps incurs additional latency.
+        /// </param>
+        /// <param name="deploymentName"> The model to use for this transcription request. </param>
+        /// <returns> A new <see cref="OpenAI.AudioTranscriptionOptions"/> instance for mocking. </returns>
+        public static AudioTranscriptionOptions AudioTranscriptionOptions(Stream audioData = null, string filename = null, AudioTranscriptionFormat? responseFormat = null, string language = null, string prompt = null, float? temperature = null, IEnumerable<AudioTranscriptionTimestampGranularity> timestampGranularities = null, string deploymentName = null)
+        {
+            timestampGranularities ??= new List<AudioTranscriptionTimestampGranularity>();
+
+            return new AudioTranscriptionOptions(
+                audioData,
+                filename,
+                responseFormat,
+                language,
+                prompt,
+                temperature,
+                timestampGranularities?.ToList(),
+                deploymentName,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AudioTranscriptionSegment"/>. </summary>
+        /// <param name="id"> The 0-based index of this segment within a transcription. </param>
+        /// <param name="start"> The time at which this segment started relative to the beginning of the transcribed audio. </param>
+        /// <param name="end"> The time at which this segment ended relative to the beginning of the transcribed audio. </param>
+        /// <param name="text"> The transcribed text that was part of this audio segment. </param>
+        /// <param name="temperature"> The temperature score associated with this audio segment. </param>
+        /// <param name="averageLogProbability"> The average log probability associated with this audio segment. </param>
+        /// <param name="compressionRatio"> The compression ratio of this audio segment. </param>
+        /// <param name="noSpeechProbability"> The probability of no speech detection within this audio segment. </param>
+        /// <param name="tokens"> The token IDs matching the transcribed text in this audio segment. </param>
+        /// <param name="seek">
+        /// The seek position associated with the processing of this audio segment.
+        /// Seek positions are expressed as hundredths of seconds.
+        /// The model may process several segments from a single seek position, so while the seek position will never represent
+        /// a later time than the segment's start, the segment's start may represent a significantly later time than the
+        /// segment's associated seek position.
+        /// </param>
+        /// <returns> A new <see cref="OpenAI.AudioTranscriptionSegment"/> instance for mocking. </returns>
+        public static AudioTranscriptionSegment AudioTranscriptionSegment(int id = default, TimeSpan start = default, TimeSpan end = default, string text = null, float temperature = default, float averageLogProbability = default, float compressionRatio = default, float noSpeechProbability = default, IEnumerable<int> tokens = null, int seek = default)
+        {
+            tokens ??= new List<int>();
+
+            return new AudioTranscriptionSegment(
+                id,
+                start,
+                end,
+                text,
+                temperature,
+                averageLogProbability,
+                compressionRatio,
+                noSpeechProbability,
+                tokens?.ToList(),
+                seek,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AudioTranscriptionWord"/>. </summary>
+        /// <param name="word"> The textual content of the word. </param>
+        /// <param name="start"> The start time of the word relative to the beginning of the audio, expressed in seconds. </param>
+        /// <param name="end"> The end time of the word relative to the beginning of the audio, expressed in seconds. </param>
+        /// <returns> A new <see cref="OpenAI.AudioTranscriptionWord"/> instance for mocking. </returns>
+        public static AudioTranscriptionWord AudioTranscriptionWord(string word = null, TimeSpan start = default, TimeSpan end = default)
+        {
+            return new AudioTranscriptionWord(word, start, end, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AudioTranslationOptions"/>. </summary>
+        /// <param name="audioData">
+        /// The audio data to translate. This must be the binary content of a file in one of the supported media formats:
+        ///  flac, mp3, mp4, mpeg, mpga, m4a, ogg, wav, webm.
+        /// </param>
+        /// <param name="filename"> The optional filename or descriptive identifier to associate with with the audio data. </param>
+        /// <param name="responseFormat"> The requested format of the translation response data, which will influence the content and detail of the result. </param>
+        /// <param name="prompt">
+        /// An optional hint to guide the model's style or continue from a prior audio segment. The written language of the
+        /// prompt should match the primary spoken language of the audio data.
+        /// </param>
+        /// <param name="temperature">
+        /// The sampling temperature, between 0 and 1.
+        /// Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.
+        /// If set to 0, the model will use log probability to automatically increase the temperature until certain thresholds are hit.
+        /// </param>
+        /// <param name="deploymentName"> The model to use for this translation request. </param>
+        /// <returns> A new <see cref="OpenAI.AudioTranslationOptions"/> instance for mocking. </returns>
+        public static AudioTranslationOptions AudioTranslationOptions(Stream audioData = null, string filename = null, AudioTranslationFormat? responseFormat = null, string prompt = null, float? temperature = null, string deploymentName = null)
+        {
+            return new AudioTranslationOptions(
+                audioData,
+                filename,
+                responseFormat,
+                prompt,
+                temperature,
+                deploymentName,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AudioTranslationSegment"/>. </summary>
+        /// <param name="id"> The 0-based index of this segment within a translation. </param>
+        /// <param name="start"> The time at which this segment started relative to the beginning of the translated audio. </param>
+        /// <param name="end"> The time at which this segment ended relative to the beginning of the translated audio. </param>
+        /// <param name="text"> The translated text that was part of this audio segment. </param>
+        /// <param name="temperature"> The temperature score associated with this audio segment. </param>
+        /// <param name="averageLogProbability"> The average log probability associated with this audio segment. </param>
+        /// <param name="compressionRatio"> The compression ratio of this audio segment. </param>
+        /// <param name="noSpeechProbability"> The probability of no speech detection within this audio segment. </param>
+        /// <param name="tokens"> The token IDs matching the translated text in this audio segment. </param>
+        /// <param name="seek">
+        /// The seek position associated with the processing of this audio segment.
+        /// Seek positions are expressed as hundredths of seconds.
+        /// The model may process several segments from a single seek position, so while the seek position will never represent
+        /// a later time than the segment's start, the segment's start may represent a significantly later time than the
+        /// segment's associated seek position.
+        /// </param>
+        /// <returns> A new <see cref="OpenAI.AudioTranslationSegment"/> instance for mocking. </returns>
+        public static AudioTranslationSegment AudioTranslationSegment(int id = default, TimeSpan start = default, TimeSpan end = default, string text = null, float temperature = default, float averageLogProbability = default, float compressionRatio = default, float noSpeechProbability = default, IEnumerable<int> tokens = null, int seek = default)
+        {
+            tokens ??= new List<int>();
+
+            return new AudioTranslationSegment(
+                id,
+                start,
+                end,
+                text,
+                temperature,
+                averageLogProbability,
+                compressionRatio,
+                noSpeechProbability,
+                tokens?.ToList(),
+                seek,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.Completions"/>. </summary>
+        /// <param name="id"> A unique identifier associated with this completions response. </param>
+        /// <param name="created">
+        /// The first timestamp associated with generation activity for this completions response,
+        /// represented as seconds since the beginning of the Unix epoch of 00:00 on 1 Jan 1970.
+        /// </param>
+        /// <param name="promptFilterResults">
+        /// Content filtering results for zero or more prompts in the request. In a streaming request,
+        /// results for different prompts may arrive at different times or in different orders.
+        /// </param>
+        /// <param name="choices">
+        /// The collection of completions choices associated with this completions response.
+        /// Generally, `n` choices are generated per provided prompt with a default value of 1.
+        /// Token limits and other settings may limit the number of choices generated.
+        /// </param>
+        /// <param name="usage"> Usage information for tokens processed and generated as part of this completions operation. </param>
+        /// <param name="systemFingerprint">
+        /// This fingerprint represents the backend configuration that the model runs with.
+        ///
+        /// Can be used in conjunction with the `seed` request parameter to understand when backend changes have been made that might impact determinism.
+        /// </param>
+        /// <returns> A new <see cref="OpenAI.Completions"/> instance for mocking. </returns>
+        public static Completions Completions(string id = null, DateTimeOffset created = default, IEnumerable<ContentFilterResultsForPrompt> promptFilterResults = null, IEnumerable<Choice> choices = null, CompletionsUsage usage = null, string systemFingerprint = null)
+        {
+            promptFilterResults ??= new List<ContentFilterResultsForPrompt>();
+            choices ??= new List<Choice>();
+
+            return new Completions(
+                id,
+                created,
+                promptFilterResults?.ToList(),
+                choices?.ToList(),
+                usage,
+                systemFingerprint,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ContentFilterResultsForPrompt"/>. </summary>
+        /// <param name="promptIndex"> The index of this prompt in the set of prompt results. </param>
+        /// <param name="contentFilterResults"> Content filtering results for this prompt. </param>
+        /// <returns> A new <see cref="OpenAI.ContentFilterResultsForPrompt"/> instance for mocking. </returns>
+        public static ContentFilterResultsForPrompt ContentFilterResultsForPrompt(int promptIndex = default, ContentFilterResultDetailsForPrompt contentFilterResults = null)
+        {
+            return new ContentFilterResultsForPrompt(promptIndex, contentFilterResults, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ContentFilterResultDetailsForPrompt"/>. </summary>
+        /// <param name="sexual">
+        /// Describes language related to anatomical organs and genitals, romantic relationships,
+        ///  acts portrayed in erotic or affectionate terms, physical sexual acts, including
+        ///  those portrayed as an assault or a forced sexual violent act against one’s will,
+        ///  prostitution, pornography, and abuse.
+        /// </param>
+        /// <param name="violence">
+        /// Describes language related to physical actions intended to hurt, injure, damage, or
+        /// kill someone or something; describes weapons, etc.
+        /// </param>
+        /// <param name="hate">
+        /// Describes language attacks or uses that include pejorative or discriminatory language
+        /// with reference to a person or identity group on the basis of certain differentiating
+        /// attributes of these groups including but not limited to race, ethnicity, nationality,
+        /// gender identity and expression, sexual orientation, religion, immigration status, ability
+        /// status, personal appearance, and body size.
+        /// </param>
+        /// <param name="selfHarm">
+        /// Describes language related to physical actions intended to purposely hurt, injure,
+        /// or damage one’s body, or kill oneself.
+        /// </param>
+        /// <param name="profanity"> Describes whether profanity was detected. </param>
+        /// <param name="customBlocklists"> Describes detection results against configured custom blocklists. </param>
+        /// <param name="error">
+        /// Describes an error returned if the content filtering system is
+        /// down or otherwise unable to complete the operation in time.
+        /// </param>
+        /// <param name="jailbreak"> Whether a jailbreak attempt was detected in the prompt. </param>
+        /// <param name="indirectAttack"> Whether an indirect attack was detected in the prompt. </param>
+        /// <returns> A new <see cref="OpenAI.ContentFilterResultDetailsForPrompt"/> instance for mocking. </returns>
+        public static ContentFilterResultDetailsForPrompt ContentFilterResultDetailsForPrompt(ContentFilterResult sexual = null, ContentFilterResult violence = null, ContentFilterResult hate = null, ContentFilterResult selfHarm = null, ContentFilterDetectionResult profanity = null, ContentFilterDetailedResults customBlocklists = null, ResponseError error = null, ContentFilterDetectionResult jailbreak = null, ContentFilterDetectionResult indirectAttack = null)
+        {
+            return new ContentFilterResultDetailsForPrompt(
+                sexual,
+                violence,
+                hate,
+                selfHarm,
+                profanity,
+                customBlocklists,
+                error,
+                jailbreak,
+                indirectAttack,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ContentFilterResult"/>. </summary>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
+        /// <param name="severity"> Ratings for the intensity and risk level of filtered content. </param>
+        /// <returns> A new <see cref="OpenAI.ContentFilterResult"/> instance for mocking. </returns>
+        public static ContentFilterResult ContentFilterResult(bool filtered = default, ContentFilterSeverity severity = default)
+        {
+            return new ContentFilterResult(filtered, severity, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ContentFilterDetectionResult"/>. </summary>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
+        /// <param name="detected"> A value indicating whether detection occurred, irrespective of severity or whether the content was filtered. </param>
+        /// <returns> A new <see cref="OpenAI.ContentFilterDetectionResult"/> instance for mocking. </returns>
+        public static ContentFilterDetectionResult ContentFilterDetectionResult(bool filtered = default, bool detected = default)
+        {
+            return new ContentFilterDetectionResult(filtered, detected, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ContentFilterDetailedResults"/>. </summary>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
+        /// <param name="details"> The collection of detailed blocklist result information. </param>
+        /// <returns> A new <see cref="OpenAI.ContentFilterDetailedResults"/> instance for mocking. </returns>
+        public static ContentFilterDetailedResults ContentFilterDetailedResults(bool filtered = default, IEnumerable<ContentFilterBlocklistIdResult> details = null)
+        {
+            details ??= new List<ContentFilterBlocklistIdResult>();
+
+            return new ContentFilterDetailedResults(filtered, details?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ContentFilterBlocklistIdResult"/>. </summary>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
+        /// <param name="id"> The ID of the custom blocklist evaluated. </param>
+        /// <returns> A new <see cref="OpenAI.ContentFilterBlocklistIdResult"/> instance for mocking. </returns>
+        public static ContentFilterBlocklistIdResult ContentFilterBlocklistIdResult(bool filtered = default, string id = null)
+        {
+            return new ContentFilterBlocklistIdResult(filtered, id, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.Choice"/>. </summary>
+        /// <param name="text"> The generated text for a given completions prompt. </param>
+        /// <param name="index"> The ordered index associated with this completions choice. </param>
+        /// <param name="contentFilterResults">
+        /// Information about the content filtering category (hate, sexual, violence, self_harm), if it
+        /// has been detected, as well as the severity level (very_low, low, medium, high-scale that
+        /// determines the intensity and risk level of harmful content) and if it has been filtered or not.
+        /// </param>
+        /// <param name="logProbabilityModel"> The log probabilities model for tokens associated with this completions choice. </param>
+        /// <param name="finishReason"> Reason for finishing. </param>
+        /// <returns> A new <see cref="OpenAI.Choice"/> instance for mocking. </returns>
+        public static Choice Choice(string text = null, int index = default, ContentFilterResultsForChoice contentFilterResults = null, CompletionsLogProbabilityModel logProbabilityModel = null, CompletionsFinishReason? finishReason = null)
+        {
+            return new Choice(
+                text,
+                index,
+                contentFilterResults,
+                logProbabilityModel,
+                finishReason,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ContentFilterResultsForChoice"/>. </summary>
+        /// <param name="sexual">
+        /// Describes language related to anatomical organs and genitals, romantic relationships,
+        ///  acts portrayed in erotic or affectionate terms, physical sexual acts, including
+        ///  those portrayed as an assault or a forced sexual violent act against one’s will,
+        ///  prostitution, pornography, and abuse.
+        /// </param>
+        /// <param name="violence">
+        /// Describes language related to physical actions intended to hurt, injure, damage, or
+        /// kill someone or something; describes weapons, etc.
+        /// </param>
+        /// <param name="hate">
+        /// Describes language attacks or uses that include pejorative or discriminatory language
+        /// with reference to a person or identity group on the basis of certain differentiating
+        /// attributes of these groups including but not limited to race, ethnicity, nationality,
+        /// gender identity and expression, sexual orientation, religion, immigration status, ability
+        /// status, personal appearance, and body size.
+        /// </param>
+        /// <param name="selfHarm">
+        /// Describes language related to physical actions intended to purposely hurt, injure,
+        /// or damage one’s body, or kill oneself.
+        /// </param>
+        /// <param name="profanity"> Describes whether profanity was detected. </param>
+        /// <param name="customBlocklists"> Describes detection results against configured custom blocklists. </param>
+        /// <param name="error">
+        /// Describes an error returned if the content filtering system is
+        /// down or otherwise unable to complete the operation in time.
+        /// </param>
+        /// <param name="protectedMaterialText"> Information about detection of protected text material. </param>
+        /// <param name="protectedMaterialCode"> Information about detection of protected code material. </param>
+        /// <returns> A new <see cref="OpenAI.ContentFilterResultsForChoice"/> instance for mocking. </returns>
+        public static ContentFilterResultsForChoice ContentFilterResultsForChoice(ContentFilterResult sexual = null, ContentFilterResult violence = null, ContentFilterResult hate = null, ContentFilterResult selfHarm = null, ContentFilterDetectionResult profanity = null, ContentFilterDetailedResults customBlocklists = null, ResponseError error = null, ContentFilterDetectionResult protectedMaterialText = null, ContentFilterCitedDetectionResult protectedMaterialCode = null)
+        {
+            return new ContentFilterResultsForChoice(
+                sexual,
+                violence,
+                hate,
+                selfHarm,
+                profanity,
+                customBlocklists,
+                error,
+                protectedMaterialText,
+                protectedMaterialCode,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ContentFilterCitedDetectionResult"/>. </summary>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
+        /// <param name="detected"> A value indicating whether detection occurred, irrespective of severity or whether the content was filtered. </param>
+        /// <param name="url"> The internet location associated with the detection. </param>
+        /// <param name="license"> The license description associated with the detection. </param>
+        /// <returns> A new <see cref="OpenAI.ContentFilterCitedDetectionResult"/> instance for mocking. </returns>
+        public static ContentFilterCitedDetectionResult ContentFilterCitedDetectionResult(bool filtered = default, bool detected = default, Uri url = null, string license = null)
+        {
+            return new ContentFilterCitedDetectionResult(filtered, detected, url, license, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.CompletionsLogProbabilityModel"/>. </summary>
+        /// <param name="tokens"> The textual forms of tokens evaluated in this probability model. </param>
+        /// <param name="tokenLogProbabilities"> A collection of log probability values for the tokens in this completions data. </param>
+        /// <param name="topLogProbabilities"> A mapping of tokens to maximum log probability values in this completions data. </param>
+        /// <param name="textOffsets"> The text offsets associated with tokens in this completions data. </param>
+        /// <returns> A new <see cref="OpenAI.CompletionsLogProbabilityModel"/> instance for mocking. </returns>
+        public static CompletionsLogProbabilityModel CompletionsLogProbabilityModel(IEnumerable<string> tokens = null, IEnumerable<float?> tokenLogProbabilities = null, IEnumerable<IDictionary<string, float?>> topLogProbabilities = null, IEnumerable<int> textOffsets = null)
+        {
+            tokens ??= new List<string>();
+            tokenLogProbabilities ??= new List<float?>();
+            topLogProbabilities ??= new List<IDictionary<string, float?>>();
+            textOffsets ??= new List<int>();
+
+            return new CompletionsLogProbabilityModel(tokens?.ToList(), tokenLogProbabilities?.ToList(), topLogProbabilities?.ToList(), textOffsets?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.CompletionsUsage"/>. </summary>
+        /// <param name="completionTokens"> The number of tokens generated across all completions emissions. </param>
+        /// <param name="promptTokens"> The number of tokens in the provided prompts for the completions request. </param>
+        /// <param name="totalTokens"> The total number of tokens processed for the completions request and response. </param>
+        /// <param name="completionTokensDetails"> Breakdown of tokens used in a completion. </param>
+        /// <returns> A new <see cref="OpenAI.CompletionsUsage"/> instance for mocking. </returns>
+        public static CompletionsUsage CompletionsUsage(int completionTokens = default, int promptTokens = default, int totalTokens = default, CompletionsUsageCompletionTokensDetails completionTokensDetails = null)
+        {
+            return new CompletionsUsage(completionTokens, promptTokens, totalTokens, completionTokensDetails, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.CompletionsUsageCompletionTokensDetails"/>. </summary>
+        /// <param name="reasoningTokens"> Tokens generated by the model for reasoning. </param>
+        /// <returns> A new <see cref="OpenAI.CompletionsUsageCompletionTokensDetails"/> instance for mocking. </returns>
+        public static CompletionsUsageCompletionTokensDetails CompletionsUsageCompletionTokensDetails(int? reasoningTokens = null)
+        {
+            return new CompletionsUsageCompletionTokensDetails(reasoningTokens, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatRequestSystemMessage"/>. </summary>
+        /// <param name="content"> The contents of the system message. </param>
+        /// <param name="name"> An optional name for the participant. </param>
+        /// <returns> A new <see cref="OpenAI.ChatRequestSystemMessage"/> instance for mocking. </returns>
+        public static ChatRequestSystemMessage ChatRequestSystemMessage(BinaryData content = null, string name = null)
+        {
+            return new ChatRequestSystemMessage(ChatRole.System, serializedAdditionalRawData: null, content, name);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatMessageTextContentItem"/>. </summary>
+        /// <param name="text"> The content of the message. </param>
+        /// <returns> A new <see cref="OpenAI.ChatMessageTextContentItem"/> instance for mocking. </returns>
+        public static ChatMessageTextContentItem ChatMessageTextContentItem(string text = null)
+        {
+            return new ChatMessageTextContentItem("text", serializedAdditionalRawData: null, text);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatMessageRefusalContentItem"/>. </summary>
+        /// <param name="refusal"> The refusal message. </param>
+        /// <returns> A new <see cref="OpenAI.ChatMessageRefusalContentItem"/> instance for mocking. </returns>
+        public static ChatMessageRefusalContentItem ChatMessageRefusalContentItem(string refusal = null)
+        {
+            return new ChatMessageRefusalContentItem("refusal", serializedAdditionalRawData: null, refusal);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatMessageImageContentItem"/>. </summary>
+        /// <param name="imageUrl"> An internet location, which must be accessible to the model,from which the image may be retrieved. </param>
+        /// <returns> A new <see cref="OpenAI.ChatMessageImageContentItem"/> instance for mocking. </returns>
+        public static ChatMessageImageContentItem ChatMessageImageContentItem(ChatMessageImageUrl imageUrl = null)
+        {
+            return new ChatMessageImageContentItem("image_url", serializedAdditionalRawData: null, imageUrl);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatMessageImageUrl"/>. </summary>
+        /// <param name="url"> The URL of the image. </param>
+        /// <param name="detail">
+        /// The evaluation quality setting to use, which controls relative prioritization of speed, token consumption, and
+        /// accuracy.
+        /// </param>
+        /// <returns> A new <see cref="OpenAI.ChatMessageImageUrl"/> instance for mocking. </returns>
+        public static ChatMessageImageUrl ChatMessageImageUrl(Uri url = null, ChatMessageImageDetailLevel? detail = null)
+        {
+            return new ChatMessageImageUrl(url, detail, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatRequestUserMessage"/>. </summary>
+        /// <param name="content"> The contents of the user message, with available input types varying by selected model. </param>
+        /// <param name="name"> An optional name for the participant. </param>
+        /// <returns> A new <see cref="OpenAI.ChatRequestUserMessage"/> instance for mocking. </returns>
+        public static ChatRequestUserMessage ChatRequestUserMessage(BinaryData content = null, string name = null)
+        {
+            return new ChatRequestUserMessage(ChatRole.User, serializedAdditionalRawData: null, content, name);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatRequestAssistantMessage"/>. </summary>
+        /// <param name="content"> The content of the message. </param>
+        /// <param name="name"> An optional name for the participant. </param>
+        /// <param name="toolCalls">
+        /// The tool calls that must be resolved and have their outputs appended to subsequent input messages for the chat
+        /// completions request to resolve as configured.
+        /// Please note <see cref="ChatCompletionsToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="ChatCompletionsFunctionToolCall"/>.
+        /// </param>
+        /// <param name="functionCall">
+        /// The function call that must be resolved and have its output appended to subsequent input messages for the chat
+        /// completions request to resolve as configured.
+        /// </param>
+        /// <param name="refusal"> The refusal message by the assistant. </param>
+        /// <returns> A new <see cref="OpenAI.ChatRequestAssistantMessage"/> instance for mocking. </returns>
+        public static ChatRequestAssistantMessage ChatRequestAssistantMessage(BinaryData content = null, string name = null, IEnumerable<ChatCompletionsToolCall> toolCalls = null, FunctionCall functionCall = null, string refusal = null)
+        {
+            toolCalls ??= new List<ChatCompletionsToolCall>();
+
+            return new ChatRequestAssistantMessage(
+                ChatRole.Assistant,
+                serializedAdditionalRawData: null,
+                content,
+                name,
+                toolCalls?.ToList(),
+                functionCall,
+                refusal);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatRequestToolMessage"/>. </summary>
+        /// <param name="content"> The content of the message. </param>
+        /// <param name="toolCallId"> The ID of the tool call resolved by the provided content. </param>
+        /// <returns> A new <see cref="OpenAI.ChatRequestToolMessage"/> instance for mocking. </returns>
+        public static ChatRequestToolMessage ChatRequestToolMessage(BinaryData content = null, string toolCallId = null)
+        {
+            return new ChatRequestToolMessage(ChatRole.Tool, serializedAdditionalRawData: null, content, toolCallId);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatRequestFunctionMessage"/>. </summary>
+        /// <param name="name"> The name of the function that was called to produce output. </param>
+        /// <param name="content"> The output of the function as requested by the function call. </param>
+        /// <returns> A new <see cref="OpenAI.ChatRequestFunctionMessage"/> instance for mocking. </returns>
+        public static ChatRequestFunctionMessage ChatRequestFunctionMessage(string name = null, string content = null)
+        {
+            return new ChatRequestFunctionMessage(ChatRole.Function, serializedAdditionalRawData: null, name, content);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.FunctionDefinition"/>. </summary>
+        /// <param name="name"> The name of the function to be called. </param>
+        /// <param name="description">
+        /// A description of what the function does. The model will use this description when selecting the function and
+        /// interpreting its parameters.
+        /// </param>
+        /// <param name="parameters"> The parameters the function accepts, described as a JSON Schema object. </param>
+        /// <returns> A new <see cref="OpenAI.FunctionDefinition"/> instance for mocking. </returns>
+        public static FunctionDefinition FunctionDefinition(string name = null, string description = null, BinaryData parameters = null)
+        {
+            return new FunctionDefinition(name, description, parameters, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AzureSearchChatExtensionConfiguration"/>. </summary>
+        /// <param name="parameters"> The parameters to use when configuring Azure Search. </param>
+        /// <returns> A new <see cref="OpenAI.AzureSearchChatExtensionConfiguration"/> instance for mocking. </returns>
+        public static AzureSearchChatExtensionConfiguration AzureSearchChatExtensionConfiguration(AzureSearchChatExtensionParameters parameters = null)
+        {
+            return new AzureSearchChatExtensionConfiguration(AzureChatExtensionType.AzureSearch, serializedAdditionalRawData: null, parameters);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AzureSearchChatExtensionParameters"/>. </summary>
+        /// <param name="documentCount"> The configured top number of documents to feature for the configured query. </param>
+        /// <param name="shouldRestrictResultScope"> Whether queries should be restricted to use of indexed data. </param>
+        /// <param name="strictness"> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </param>
+        /// <param name="maxSearchQueries">
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </param>
+        /// <param name="allowPartialResult">
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </param>
+        /// <param name="includeContexts"> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </param>
+        /// <param name="authentication">
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// Please note <see cref="OnYourDataAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OpenAI.OnYourDataAccessTokenAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataApiKeyAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataConnectionStringAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataEncodedApiKeyAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataKeyAndKeyIdAuthenticationOptions"/>, <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> and <see cref="OpenAI.OnYourDataUsernameAndPasswordAuthenticationOptions"/>.
+        /// </param>
+        /// <param name="searchEndpoint"> The absolute endpoint path for the Azure Cognitive Search resource to use. </param>
+        /// <param name="indexName"> The name of the index to use as available in the referenced Azure Cognitive Search resource. </param>
+        /// <param name="fieldMappingOptions"> Customized field mapping behavior to use when interacting with the search index. </param>
+        /// <param name="queryType"> The query type to use with Azure Cognitive Search. </param>
+        /// <param name="semanticConfiguration"> The additional semantic configuration for the query. </param>
+        /// <param name="filter"> Search filter. </param>
+        /// <param name="embeddingDependency">
+        /// The embedding dependency for vector search.
+        /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OpenAI.OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OpenAI.OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OpenAI.OnYourDataModelIdVectorizationSource"/>.
+        /// </param>
+        /// <returns> A new <see cref="OpenAI.AzureSearchChatExtensionParameters"/> instance for mocking. </returns>
+        public static AzureSearchChatExtensionParameters AzureSearchChatExtensionParameters(int? documentCount = null, bool? shouldRestrictResultScope = null, int? strictness = null, int? maxSearchQueries = null, bool? allowPartialResult = null, IEnumerable<OnYourDataContextProperty> includeContexts = null, OnYourDataAuthenticationOptions authentication = null, Uri searchEndpoint = null, string indexName = null, AzureSearchIndexFieldMappingOptions fieldMappingOptions = null, AzureSearchQueryType? queryType = null, string semanticConfiguration = null, string filter = null, OnYourDataVectorizationSource embeddingDependency = null)
+        {
+            includeContexts ??= new List<OnYourDataContextProperty>();
+
+            return new AzureSearchChatExtensionParameters(
+                documentCount,
+                shouldRestrictResultScope,
+                strictness,
+                maxSearchQueries,
+                allowPartialResult,
+                includeContexts?.ToList(),
+                authentication,
+                searchEndpoint,
+                indexName,
+                fieldMappingOptions,
+                queryType,
+                semanticConfiguration,
+                filter,
+                embeddingDependency,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.OnYourDataApiKeyAuthenticationOptions"/>. </summary>
+        /// <param name="key"> The API key to use for authentication. </param>
+        /// <returns> A new <see cref="OpenAI.OnYourDataApiKeyAuthenticationOptions"/> instance for mocking. </returns>
+        public static OnYourDataApiKeyAuthenticationOptions OnYourDataApiKeyAuthenticationOptions(string key = null)
+        {
+            return new OnYourDataApiKeyAuthenticationOptions(OnYourDataAuthenticationType.ApiKey, serializedAdditionalRawData: null, key);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.OnYourDataConnectionStringAuthenticationOptions"/>. </summary>
+        /// <param name="connectionString"> The connection string to use for authentication. </param>
+        /// <returns> A new <see cref="OpenAI.OnYourDataConnectionStringAuthenticationOptions"/> instance for mocking. </returns>
+        public static OnYourDataConnectionStringAuthenticationOptions OnYourDataConnectionStringAuthenticationOptions(string connectionString = null)
+        {
+            return new OnYourDataConnectionStringAuthenticationOptions(OnYourDataAuthenticationType.ConnectionString, serializedAdditionalRawData: null, connectionString);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.OnYourDataKeyAndKeyIdAuthenticationOptions"/>. </summary>
+        /// <param name="key"> The key to use for authentication. </param>
+        /// <param name="keyId"> The key ID to use for authentication. </param>
+        /// <returns> A new <see cref="OpenAI.OnYourDataKeyAndKeyIdAuthenticationOptions"/> instance for mocking. </returns>
+        public static OnYourDataKeyAndKeyIdAuthenticationOptions OnYourDataKeyAndKeyIdAuthenticationOptions(string key = null, string keyId = null)
+        {
+            return new OnYourDataKeyAndKeyIdAuthenticationOptions(OnYourDataAuthenticationType.KeyAndKeyId, serializedAdditionalRawData: null, key, keyId);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.OnYourDataEncodedApiKeyAuthenticationOptions"/>. </summary>
+        /// <param name="encodedApiKey"> The encoded API key to use for authentication. </param>
+        /// <returns> A new <see cref="OpenAI.OnYourDataEncodedApiKeyAuthenticationOptions"/> instance for mocking. </returns>
+        public static OnYourDataEncodedApiKeyAuthenticationOptions OnYourDataEncodedApiKeyAuthenticationOptions(string encodedApiKey = null)
+        {
+            return new OnYourDataEncodedApiKeyAuthenticationOptions(OnYourDataAuthenticationType.EncodedApiKey, serializedAdditionalRawData: null, encodedApiKey);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.OnYourDataUsernameAndPasswordAuthenticationOptions"/>. </summary>
+        /// <param name="username"> The username. </param>
+        /// <param name="password"> The password. </param>
+        /// <returns> A new <see cref="OpenAI.OnYourDataUsernameAndPasswordAuthenticationOptions"/> instance for mocking. </returns>
+        public static OnYourDataUsernameAndPasswordAuthenticationOptions OnYourDataUsernameAndPasswordAuthenticationOptions(string username = null, string password = null)
+        {
+            return new OnYourDataUsernameAndPasswordAuthenticationOptions(OnYourDataAuthenticationType.UsernameAndPassword, serializedAdditionalRawData: null, username, password);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.OnYourDataAccessTokenAuthenticationOptions"/>. </summary>
+        /// <param name="accessToken"> The access token to use for authentication. </param>
+        /// <returns> A new <see cref="OpenAI.OnYourDataAccessTokenAuthenticationOptions"/> instance for mocking. </returns>
+        public static OnYourDataAccessTokenAuthenticationOptions OnYourDataAccessTokenAuthenticationOptions(string accessToken = null)
+        {
+            return new OnYourDataAccessTokenAuthenticationOptions(OnYourDataAuthenticationType.AccessToken, serializedAdditionalRawData: null, accessToken);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/>. </summary>
+        /// <param name="managedIdentityResourceId"> The resource ID of the user-assigned managed identity to use for authentication. </param>
+        /// <returns> A new <see cref="OpenAI.OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> instance for mocking. </returns>
+        public static OnYourDataUserAssignedManagedIdentityAuthenticationOptions OnYourDataUserAssignedManagedIdentityAuthenticationOptions(string managedIdentityResourceId = null)
+        {
+            return new OnYourDataUserAssignedManagedIdentityAuthenticationOptions(OnYourDataAuthenticationType.UserAssignedManagedIdentity, serializedAdditionalRawData: null, managedIdentityResourceId);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.OnYourDataEndpointVectorizationSource"/>. </summary>
+        /// <param name="endpoint"> Specifies the resource endpoint URL from which embeddings should be retrieved. It should be in the format of https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYMENT_NAME/embeddings. The api-version query parameter is not allowed. </param>
+        /// <param name="authentication">
+        /// Specifies the authentication options to use when retrieving embeddings from the specified endpoint.
+        /// Please note <see cref="OnYourDataVectorSearchAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OpenAI.OnYourDataVectorSearchAccessTokenAuthenticationOptions"/> and <see cref="OpenAI.OnYourDataVectorSearchApiKeyAuthenticationOptions"/>.
+        /// </param>
+        /// <returns> A new <see cref="OpenAI.OnYourDataEndpointVectorizationSource"/> instance for mocking. </returns>
+        public static OnYourDataEndpointVectorizationSource OnYourDataEndpointVectorizationSource(Uri endpoint = null, OnYourDataVectorSearchAuthenticationOptions authentication = null)
+        {
+            return new OnYourDataEndpointVectorizationSource(OnYourDataVectorizationSourceType.Endpoint, serializedAdditionalRawData: null, endpoint, authentication);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.OnYourDataVectorSearchApiKeyAuthenticationOptions"/>. </summary>
+        /// <param name="key"> The API key to use for authentication. </param>
+        /// <returns> A new <see cref="OpenAI.OnYourDataVectorSearchApiKeyAuthenticationOptions"/> instance for mocking. </returns>
+        public static OnYourDataVectorSearchApiKeyAuthenticationOptions OnYourDataVectorSearchApiKeyAuthenticationOptions(string key = null)
+        {
+            return new OnYourDataVectorSearchApiKeyAuthenticationOptions(OnYourDataVectorSearchAuthenticationType.ApiKey, serializedAdditionalRawData: null, key);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.OnYourDataVectorSearchAccessTokenAuthenticationOptions"/>. </summary>
+        /// <param name="accessToken"> The access token to use for authentication. </param>
+        /// <returns> A new <see cref="OpenAI.OnYourDataVectorSearchAccessTokenAuthenticationOptions"/> instance for mocking. </returns>
+        public static OnYourDataVectorSearchAccessTokenAuthenticationOptions OnYourDataVectorSearchAccessTokenAuthenticationOptions(string accessToken = null)
+        {
+            return new OnYourDataVectorSearchAccessTokenAuthenticationOptions(OnYourDataVectorSearchAuthenticationType.AccessToken, serializedAdditionalRawData: null, accessToken);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.OnYourDataDeploymentNameVectorizationSource"/>. </summary>
+        /// <param name="deploymentName"> The embedding model deployment name within the same Azure OpenAI resource. This enables you to use vector search without Azure OpenAI api-key and without Azure OpenAI public network access. </param>
+        /// <param name="dimensions"> The number of dimensions the embeddings should have. Only supported in `text-embedding-3` and later models. </param>
+        /// <returns> A new <see cref="OpenAI.OnYourDataDeploymentNameVectorizationSource"/> instance for mocking. </returns>
+        public static OnYourDataDeploymentNameVectorizationSource OnYourDataDeploymentNameVectorizationSource(string deploymentName = null, int? dimensions = null)
+        {
+            return new OnYourDataDeploymentNameVectorizationSource(OnYourDataVectorizationSourceType.DeploymentName, serializedAdditionalRawData: null, deploymentName, dimensions);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.OnYourDataModelIdVectorizationSource"/>. </summary>
+        /// <param name="modelId"> The embedding model ID build inside the search service. Currently only supported by Elasticsearch®. </param>
+        /// <returns> A new <see cref="OpenAI.OnYourDataModelIdVectorizationSource"/> instance for mocking. </returns>
+        public static OnYourDataModelIdVectorizationSource OnYourDataModelIdVectorizationSource(string modelId = null)
+        {
+            return new OnYourDataModelIdVectorizationSource(OnYourDataVectorizationSourceType.ModelId, serializedAdditionalRawData: null, modelId);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AzureCosmosDBChatExtensionConfiguration"/>. </summary>
+        /// <param name="parameters"> The parameters to use when configuring Azure OpenAI CosmosDB chat extensions. </param>
+        /// <returns> A new <see cref="OpenAI.AzureCosmosDBChatExtensionConfiguration"/> instance for mocking. </returns>
+        public static AzureCosmosDBChatExtensionConfiguration AzureCosmosDBChatExtensionConfiguration(AzureCosmosDBChatExtensionParameters parameters = null)
+        {
+            return new AzureCosmosDBChatExtensionConfiguration(AzureChatExtensionType.AzureCosmosDB, serializedAdditionalRawData: null, parameters);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AzureCosmosDBChatExtensionParameters"/>. </summary>
+        /// <param name="documentCount"> The configured top number of documents to feature for the configured query. </param>
+        /// <param name="shouldRestrictResultScope"> Whether queries should be restricted to use of indexed data. </param>
+        /// <param name="strictness"> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </param>
+        /// <param name="maxSearchQueries">
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </param>
+        /// <param name="allowPartialResult">
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </param>
+        /// <param name="includeContexts"> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </param>
+        /// <param name="authentication">
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// Please note <see cref="OnYourDataAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OpenAI.OnYourDataAccessTokenAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataApiKeyAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataConnectionStringAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataEncodedApiKeyAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataKeyAndKeyIdAuthenticationOptions"/>, <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> and <see cref="OpenAI.OnYourDataUsernameAndPasswordAuthenticationOptions"/>.
+        /// </param>
+        /// <param name="databaseName"> The MongoDB vCore database name to use with Azure Cosmos DB. </param>
+        /// <param name="containerName"> The name of the Azure Cosmos DB resource container. </param>
+        /// <param name="indexName"> The MongoDB vCore index name to use with Azure Cosmos DB. </param>
+        /// <param name="fieldMappingOptions"> Customized field mapping behavior to use when interacting with the search index. </param>
+        /// <param name="embeddingDependency">
+        /// The embedding dependency for vector search.
+        /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OpenAI.OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OpenAI.OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OpenAI.OnYourDataModelIdVectorizationSource"/>.
+        /// </param>
+        /// <returns> A new <see cref="OpenAI.AzureCosmosDBChatExtensionParameters"/> instance for mocking. </returns>
+        public static AzureCosmosDBChatExtensionParameters AzureCosmosDBChatExtensionParameters(int? documentCount = null, bool? shouldRestrictResultScope = null, int? strictness = null, int? maxSearchQueries = null, bool? allowPartialResult = null, IEnumerable<OnYourDataContextProperty> includeContexts = null, OnYourDataAuthenticationOptions authentication = null, string databaseName = null, string containerName = null, string indexName = null, AzureCosmosDBFieldMappingOptions fieldMappingOptions = null, OnYourDataVectorizationSource embeddingDependency = null)
+        {
+            includeContexts ??= new List<OnYourDataContextProperty>();
+
+            return new AzureCosmosDBChatExtensionParameters(
+                documentCount,
+                shouldRestrictResultScope,
+                strictness,
+                maxSearchQueries,
+                allowPartialResult,
+                includeContexts?.ToList(),
+                authentication,
+                databaseName,
+                containerName,
+                indexName,
+                fieldMappingOptions,
+                embeddingDependency,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ElasticsearchChatExtensionConfiguration"/>. </summary>
+        /// <param name="parameters"> The parameters to use when configuring Elasticsearch®. </param>
+        /// <returns> A new <see cref="OpenAI.ElasticsearchChatExtensionConfiguration"/> instance for mocking. </returns>
+        public static ElasticsearchChatExtensionConfiguration ElasticsearchChatExtensionConfiguration(ElasticsearchChatExtensionParameters parameters = null)
+        {
+            return new ElasticsearchChatExtensionConfiguration(AzureChatExtensionType.Elasticsearch, serializedAdditionalRawData: null, parameters);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ElasticsearchChatExtensionParameters"/>. </summary>
+        /// <param name="documentCount"> The configured top number of documents to feature for the configured query. </param>
+        /// <param name="shouldRestrictResultScope"> Whether queries should be restricted to use of indexed data. </param>
+        /// <param name="strictness"> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </param>
+        /// <param name="maxSearchQueries">
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </param>
+        /// <param name="allowPartialResult">
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </param>
+        /// <param name="includeContexts"> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </param>
+        /// <param name="authentication">
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// Please note <see cref="OnYourDataAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OpenAI.OnYourDataAccessTokenAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataApiKeyAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataConnectionStringAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataEncodedApiKeyAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataKeyAndKeyIdAuthenticationOptions"/>, <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> and <see cref="OpenAI.OnYourDataUsernameAndPasswordAuthenticationOptions"/>.
+        /// </param>
+        /// <param name="endpoint"> The endpoint of Elasticsearch®. </param>
+        /// <param name="indexName"> The index name of Elasticsearch®. </param>
+        /// <param name="fieldMappingOptions"> The index field mapping options of Elasticsearch®. </param>
+        /// <param name="queryType"> The query type of Elasticsearch®. </param>
+        /// <param name="embeddingDependency">
+        /// The embedding dependency for vector search.
+        /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OpenAI.OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OpenAI.OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OpenAI.OnYourDataModelIdVectorizationSource"/>.
+        /// </param>
+        /// <returns> A new <see cref="OpenAI.ElasticsearchChatExtensionParameters"/> instance for mocking. </returns>
+        public static ElasticsearchChatExtensionParameters ElasticsearchChatExtensionParameters(int? documentCount = null, bool? shouldRestrictResultScope = null, int? strictness = null, int? maxSearchQueries = null, bool? allowPartialResult = null, IEnumerable<OnYourDataContextProperty> includeContexts = null, OnYourDataAuthenticationOptions authentication = null, Uri endpoint = null, string indexName = null, ElasticsearchIndexFieldMappingOptions fieldMappingOptions = null, ElasticsearchQueryType? queryType = null, OnYourDataVectorizationSource embeddingDependency = null)
+        {
+            includeContexts ??= new List<OnYourDataContextProperty>();
+
+            return new ElasticsearchChatExtensionParameters(
+                documentCount,
+                shouldRestrictResultScope,
+                strictness,
+                maxSearchQueries,
+                allowPartialResult,
+                includeContexts?.ToList(),
+                authentication,
+                endpoint,
+                indexName,
+                fieldMappingOptions,
+                queryType,
+                embeddingDependency,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.MongoDBChatExtensionConfiguration"/>. </summary>
+        /// <param name="parameters"> The parameters for the MongoDB chat extension. </param>
+        /// <returns> A new <see cref="OpenAI.MongoDBChatExtensionConfiguration"/> instance for mocking. </returns>
+        public static MongoDBChatExtensionConfiguration MongoDBChatExtensionConfiguration(MongoDBChatExtensionParameters parameters = null)
+        {
+            return new MongoDBChatExtensionConfiguration(AzureChatExtensionType.MongoDB, serializedAdditionalRawData: null, parameters);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.MongoDBChatExtensionParameters"/>. </summary>
+        /// <param name="documentCount"> The configured top number of documents to feature for the configured query. </param>
+        /// <param name="shouldRestrictResultScope"> Whether queries should be restricted to use of indexed data. </param>
+        /// <param name="strictness"> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </param>
+        /// <param name="maxSearchQueries">
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </param>
+        /// <param name="allowPartialResult">
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </param>
+        /// <param name="includeContexts"> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </param>
+        /// <param name="authentication">
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// </param>
+        /// <param name="endpoint"> The endpoint name for MongoDB. </param>
+        /// <param name="collectionName"> The collection name for MongoDB. </param>
+        /// <param name="databaseName"> The database name for MongoDB. </param>
+        /// <param name="appName"> The app name for MongoDB. </param>
+        /// <param name="indexName"> The name of the MongoDB index. </param>
+        /// <param name="fieldsMapping">
+        /// Field mappings to apply to data used by the MongoDB data source.
+        /// Note that content and vector field mappings are required for MongoDB.
+        /// </param>
+        /// <param name="embeddingDependency"> The vectorization source to use with the MongoDB chat extension. </param>
+        /// <returns> A new <see cref="OpenAI.MongoDBChatExtensionParameters"/> instance for mocking. </returns>
+        public static MongoDBChatExtensionParameters MongoDBChatExtensionParameters(int? documentCount = null, bool? shouldRestrictResultScope = null, int? strictness = null, int? maxSearchQueries = null, bool? allowPartialResult = null, IEnumerable<OnYourDataContextProperty> includeContexts = null, OnYourDataUsernameAndPasswordAuthenticationOptions authentication = null, string endpoint = null, string collectionName = null, string databaseName = null, string appName = null, string indexName = null, MongoDBChatExtensionParametersFieldsMapping fieldsMapping = null, BinaryData embeddingDependency = null)
+        {
+            includeContexts ??= new List<OnYourDataContextProperty>();
+
+            return new MongoDBChatExtensionParameters(
+                documentCount,
+                shouldRestrictResultScope,
+                strictness,
+                maxSearchQueries,
+                allowPartialResult,
+                includeContexts?.ToList(),
+                authentication,
+                endpoint,
+                collectionName,
+                databaseName,
+                appName,
+                indexName,
+                fieldsMapping,
+                embeddingDependency,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.PineconeChatExtensionConfiguration"/>. </summary>
+        /// <param name="parameters"> The parameters to use when configuring Azure OpenAI chat extensions. </param>
+        /// <returns> A new <see cref="OpenAI.PineconeChatExtensionConfiguration"/> instance for mocking. </returns>
+        public static PineconeChatExtensionConfiguration PineconeChatExtensionConfiguration(PineconeChatExtensionParameters parameters = null)
+        {
+            return new PineconeChatExtensionConfiguration(AzureChatExtensionType.Pinecone, serializedAdditionalRawData: null, parameters);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.PineconeChatExtensionParameters"/>. </summary>
+        /// <param name="documentCount"> The configured top number of documents to feature for the configured query. </param>
+        /// <param name="shouldRestrictResultScope"> Whether queries should be restricted to use of indexed data. </param>
+        /// <param name="strictness"> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </param>
+        /// <param name="maxSearchQueries">
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </param>
+        /// <param name="allowPartialResult">
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </param>
+        /// <param name="includeContexts"> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </param>
+        /// <param name="authentication">
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// Please note <see cref="OnYourDataAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OpenAI.OnYourDataAccessTokenAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataApiKeyAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataConnectionStringAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataEncodedApiKeyAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataKeyAndKeyIdAuthenticationOptions"/>, <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>, <see cref="OpenAI.OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> and <see cref="OpenAI.OnYourDataUsernameAndPasswordAuthenticationOptions"/>.
+        /// </param>
+        /// <param name="environmentName"> The environment name of Pinecone. </param>
+        /// <param name="indexName"> The name of the Pinecone database index. </param>
+        /// <param name="fieldMappingOptions"> Customized field mapping behavior to use when interacting with the search index. </param>
+        /// <param name="embeddingDependency">
+        /// The embedding dependency for vector search.
+        /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OpenAI.OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OpenAI.OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OpenAI.OnYourDataModelIdVectorizationSource"/>.
+        /// </param>
+        /// <returns> A new <see cref="OpenAI.PineconeChatExtensionParameters"/> instance for mocking. </returns>
+        public static PineconeChatExtensionParameters PineconeChatExtensionParameters(int? documentCount = null, bool? shouldRestrictResultScope = null, int? strictness = null, int? maxSearchQueries = null, bool? allowPartialResult = null, IEnumerable<OnYourDataContextProperty> includeContexts = null, OnYourDataAuthenticationOptions authentication = null, string environmentName = null, string indexName = null, PineconeFieldMappingOptions fieldMappingOptions = null, OnYourDataVectorizationSource embeddingDependency = null)
+        {
+            includeContexts ??= new List<OnYourDataContextProperty>();
+
+            return new PineconeChatExtensionParameters(
+                documentCount,
+                shouldRestrictResultScope,
+                strictness,
+                maxSearchQueries,
+                allowPartialResult,
+                includeContexts?.ToList(),
+                authentication,
+                environmentName,
+                indexName,
+                fieldMappingOptions,
+                embeddingDependency,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatCompletionsJsonSchemaResponseFormat"/>. </summary>
+        /// <param name="jsonSchema"></param>
+        /// <returns> A new <see cref="OpenAI.ChatCompletionsJsonSchemaResponseFormat"/> instance for mocking. </returns>
+        public static ChatCompletionsJsonSchemaResponseFormat ChatCompletionsJsonSchemaResponseFormat(ChatCompletionsJsonSchemaResponseFormatJsonSchema jsonSchema = null)
+        {
+            return new ChatCompletionsJsonSchemaResponseFormat("json_schema", serializedAdditionalRawData: null, jsonSchema);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatCompletionsJsonSchemaResponseFormatJsonSchema"/>. </summary>
+        /// <param name="description"> A description of what the response format is for, used by the model to determine how to respond in the format. </param>
+        /// <param name="name"> The name of the response format. Must be a-z, A-Z, 0-9, or contain underscores and dashes, with a maximum length of 64. </param>
+        /// <param name="schema"></param>
+        /// <param name="strict"> Whether to enable strict schema adherence when generating the output. If set to true, the model will always follow the exact schema defined in the `schema` field. Only a subset of JSON Schema is supported when `strict` is `true`. To learn more, read the [Structured Outputs guide](/docs/guides/structured-outputs). </param>
+        /// <returns> A new <see cref="OpenAI.ChatCompletionsJsonSchemaResponseFormatJsonSchema"/> instance for mocking. </returns>
+        public static ChatCompletionsJsonSchemaResponseFormatJsonSchema ChatCompletionsJsonSchemaResponseFormatJsonSchema(string description = null, string name = null, BinaryData schema = null, bool? strict = null)
+        {
+            return new ChatCompletionsJsonSchemaResponseFormatJsonSchema(description, name, schema, strict, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatCompletionsFunctionToolDefinition"/>. </summary>
+        /// <param name="function"> The function definition details for the function tool. </param>
+        /// <returns> A new <see cref="OpenAI.ChatCompletionsFunctionToolDefinition"/> instance for mocking. </returns>
+        public static ChatCompletionsFunctionToolDefinition ChatCompletionsFunctionToolDefinition(ChatCompletionsFunctionToolDefinitionFunction function = null)
+        {
+            return new ChatCompletionsFunctionToolDefinition("function", serializedAdditionalRawData: null, function);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatCompletionsFunctionToolDefinitionFunction"/>. </summary>
+        /// <param name="description"> A description of what the function does, used by the model to choose when and how to call the function. </param>
+        /// <param name="name"> The name of the function to be called. Must be a-z, A-Z, 0-9, or contain underscores and dashes, with a maximum length of 64. </param>
+        /// <param name="parameters"></param>
+        /// <param name="strict"> Whether to enable strict schema adherence when generating the function call. If set to true, the model will follow the exact schema defined in the `parameters` field. Only a subset of JSON Schema is supported when `strict` is `true`. Learn more about Structured Outputs in the [function calling guide](docs/guides/function-calling). </param>
+        /// <returns> A new <see cref="OpenAI.ChatCompletionsFunctionToolDefinitionFunction"/> instance for mocking. </returns>
+        public static ChatCompletionsFunctionToolDefinitionFunction ChatCompletionsFunctionToolDefinitionFunction(string description = null, string name = null, BinaryData parameters = null, bool? strict = null)
+        {
+            return new ChatCompletionsFunctionToolDefinitionFunction(description, name, parameters, strict, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatCompletionsNamedFunctionToolSelection"/>. </summary>
+        /// <param name="function"> The function that should be called. </param>
+        /// <returns> A new <see cref="OpenAI.ChatCompletionsNamedFunctionToolSelection"/> instance for mocking. </returns>
+        public static ChatCompletionsNamedFunctionToolSelection ChatCompletionsNamedFunctionToolSelection(ChatCompletionsFunctionToolSelection function = null)
+        {
+            return new ChatCompletionsNamedFunctionToolSelection("function", serializedAdditionalRawData: null, function);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatCompletions"/>. </summary>
+        /// <param name="id"> A unique identifier associated with this chat completions response. </param>
+        /// <param name="created">
+        /// The first timestamp associated with generation activity for this completions response,
+        /// represented as seconds since the beginning of the Unix epoch of 00:00 on 1 Jan 1970.
+        /// </param>
+        /// <param name="choices">
+        /// The collection of completions choices associated with this completions response.
+        /// Generally, `n` choices are generated per provided prompt with a default value of 1.
+        /// Token limits and other settings may limit the number of choices generated.
+        /// </param>
+        /// <param name="model"> The model name used for this completions request. </param>
+        /// <param name="promptFilterResults">
+        /// Content filtering results for zero or more prompts in the request. In a streaming request,
+        /// results for different prompts may arrive at different times or in different orders.
+        /// </param>
+        /// <param name="systemFingerprint">
+        /// Can be used in conjunction with the `seed` request parameter to understand when backend changes have been made that
+        /// might impact determinism.
+        /// </param>
+        /// <param name="usage"> Usage information for tokens processed and generated as part of this completions operation. </param>
+        /// <returns> A new <see cref="OpenAI.ChatCompletions"/> instance for mocking. </returns>
+        public static ChatCompletions ChatCompletions(string id = null, DateTimeOffset created = default, IEnumerable<ChatChoice> choices = null, string model = null, IEnumerable<ContentFilterResultsForPrompt> promptFilterResults = null, string systemFingerprint = null, CompletionsUsage usage = null)
+        {
+            choices ??= new List<ChatChoice>();
+            promptFilterResults ??= new List<ContentFilterResultsForPrompt>();
+
+            return new ChatCompletions(
+                id,
+                created,
+                choices?.ToList(),
+                model,
+                promptFilterResults?.ToList(),
+                systemFingerprint,
+                usage,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatChoice"/>. </summary>
+        /// <param name="message"> The chat message for a given chat completions prompt. </param>
+        /// <param name="logProbabilityInfo"> The log probability information for this choice, as enabled via the 'logprobs' request option. </param>
+        /// <param name="index"> The ordered index associated with this chat completions choice. </param>
+        /// <param name="finishReason"> The reason that this chat completions choice completed its generated. </param>
+        /// <param name="internalStreamingDeltaMessage"> The delta message content for a streaming response. </param>
+        /// <param name="contentFilterResults">
+        /// Information about the content filtering category (hate, sexual, violence, self_harm), if it
+        /// has been detected, as well as the severity level (very_low, low, medium, high-scale that
+        /// determines the intensity and risk level of harmful content) and if it has been filtered or not.
+        /// </param>
+        /// <param name="enhancements">
+        /// Represents the output results of Azure OpenAI enhancements to chat completions, as configured via the matching input
+        /// provided in the request. This supplementary information is only available when using Azure OpenAI and only when the
+        /// request is configured to use enhancements.
+        /// </param>
+        /// <returns> A new <see cref="OpenAI.ChatChoice"/> instance for mocking. </returns>
+        public static ChatChoice ChatChoice(ChatResponseMessage message = null, ChatChoiceLogProbabilityInfo logProbabilityInfo = null, int index = default, CompletionsFinishReason? finishReason = null, ChatResponseMessage internalStreamingDeltaMessage = null, ContentFilterResultsForChoice contentFilterResults = null, AzureChatEnhancements enhancements = null)
+        {
+            return new ChatChoice(
+                message,
+                logProbabilityInfo,
+                index,
+                finishReason,
+                internalStreamingDeltaMessage,
+                contentFilterResults,
+                enhancements,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatResponseMessage"/>. </summary>
+        /// <param name="role"> The chat role associated with the message. </param>
+        /// <param name="refusal"> The refusal message generated by the model. </param>
+        /// <param name="content"> The content of the message. </param>
+        /// <param name="toolCalls">
+        /// The tool calls that must be resolved and have their outputs appended to subsequent input messages for the chat
+        /// completions request to resolve as configured.
+        /// Please note <see cref="ChatCompletionsToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="ChatCompletionsFunctionToolCall"/>.
+        /// </param>
+        /// <param name="functionCall">
+        /// The function call that must be resolved and have its output appended to subsequent input messages for the chat
+        /// completions request to resolve as configured.
+        /// </param>
+        /// <param name="azureExtensionsContext">
+        /// If Azure OpenAI chat extensions are configured, this array represents the incremental steps performed by those
+        /// extensions while processing the chat completions request.
+        /// </param>
+        /// <returns> A new <see cref="OpenAI.ChatResponseMessage"/> instance for mocking. </returns>
+        public static ChatResponseMessage ChatResponseMessage(ChatRole role = default, string refusal = null, string content = null, IEnumerable<ChatCompletionsToolCall> toolCalls = null, FunctionCall functionCall = null, AzureChatExtensionsMessageContext azureExtensionsContext = null)
+        {
+            toolCalls ??= new List<ChatCompletionsToolCall>();
+
+            return new ChatResponseMessage(
+                role,
+                refusal,
+                content,
+                toolCalls?.ToList(),
+                functionCall,
+                azureExtensionsContext,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AzureChatExtensionsMessageContext"/>. </summary>
+        /// <param name="citations">
+        ///   The contextual information associated with the Azure chat extensions used for a chat completions request.
+        ///   These messages describe the data source retrievals, plugin invocations, and other intermediate steps taken in the
+        ///   course of generating a chat completions response that was augmented by capabilities from Azure OpenAI chat
+        ///   extensions.
+        /// </param>
+        /// <param name="intent"> The detected intent from the chat history, used to pass to the next turn to carry over the context. </param>
+        /// <param name="allRetrievedDocuments"> All the retrieved documents. </param>
+        /// <returns> A new <see cref="OpenAI.AzureChatExtensionsMessageContext"/> instance for mocking. </returns>
+        public static AzureChatExtensionsMessageContext AzureChatExtensionsMessageContext(IEnumerable<AzureChatExtensionDataSourceResponseCitation> citations = null, string intent = null, IEnumerable<AzureChatExtensionRetrievedDocument> allRetrievedDocuments = null)
+        {
+            citations ??= new List<AzureChatExtensionDataSourceResponseCitation>();
+            allRetrievedDocuments ??= new List<AzureChatExtensionRetrievedDocument>();
+
+            return new AzureChatExtensionsMessageContext(citations?.ToList(), intent, allRetrievedDocuments?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AzureChatExtensionDataSourceResponseCitation"/>. </summary>
+        /// <param name="content"> The content of the citation. </param>
+        /// <param name="title"> The title of the citation. </param>
+        /// <param name="url"> The URL of the citation. </param>
+        /// <param name="filepath"> The file path of the citation. </param>
+        /// <param name="chunkId"> The chunk ID of the citation. </param>
+        /// <param name="rerankScore"> The rerank score of the retrieved document. </param>
+        /// <returns> A new <see cref="OpenAI.AzureChatExtensionDataSourceResponseCitation"/> instance for mocking. </returns>
+        public static AzureChatExtensionDataSourceResponseCitation AzureChatExtensionDataSourceResponseCitation(string content = null, string title = null, string url = null, string filepath = null, string chunkId = null, double? rerankScore = null)
+        {
+            return new AzureChatExtensionDataSourceResponseCitation(
+                content,
+                title,
+                url,
+                filepath,
+                chunkId,
+                rerankScore,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AzureChatExtensionRetrievedDocument"/>. </summary>
+        /// <param name="content"> The content of the citation. </param>
+        /// <param name="title"> The title of the citation. </param>
+        /// <param name="url"> The URL of the citation. </param>
+        /// <param name="filepath"> The file path of the citation. </param>
+        /// <param name="chunkId"> The chunk ID of the citation. </param>
+        /// <param name="rerankScore"> The rerank score of the retrieved document. </param>
+        /// <param name="searchQueries"> The search queries used to retrieve the document. </param>
+        /// <param name="dataSourceIndex"> The index of the data source. </param>
+        /// <param name="originalSearchScore"> The original search score of the retrieved document. </param>
+        /// <param name="filterReason">
+        /// Represents the rationale for filtering the document. If the document does not undergo filtering,
+        /// this field will remain unset.
+        /// </param>
+        /// <returns> A new <see cref="OpenAI.AzureChatExtensionRetrievedDocument"/> instance for mocking. </returns>
+        public static AzureChatExtensionRetrievedDocument AzureChatExtensionRetrievedDocument(string content = null, string title = null, string url = null, string filepath = null, string chunkId = null, double? rerankScore = null, IEnumerable<string> searchQueries = null, int dataSourceIndex = default, double? originalSearchScore = null, AzureChatExtensionRetrieveDocumentFilterReason? filterReason = null)
+        {
+            searchQueries ??= new List<string>();
+
+            return new AzureChatExtensionRetrievedDocument(
+                content,
+                title,
+                url,
+                filepath,
+                chunkId,
+                rerankScore,
+                searchQueries?.ToList(),
+                dataSourceIndex,
+                originalSearchScore,
+                filterReason,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatChoiceLogProbabilityInfo"/>. </summary>
+        /// <param name="tokenLogProbabilityResults"> The list of log probability information entries for the choice's message content tokens, as requested via the 'logprobs' option. </param>
+        /// <param name="refusal"> The list of log probability information entries for the choice's message refusal message tokens, as requested via the 'logprobs' option. </param>
+        /// <returns> A new <see cref="OpenAI.ChatChoiceLogProbabilityInfo"/> instance for mocking. </returns>
+        public static ChatChoiceLogProbabilityInfo ChatChoiceLogProbabilityInfo(IEnumerable<ChatTokenLogProbabilityResult> tokenLogProbabilityResults = null, IEnumerable<ChatTokenLogProbabilityResult> refusal = null)
+        {
+            tokenLogProbabilityResults ??= new List<ChatTokenLogProbabilityResult>();
+            refusal ??= new List<ChatTokenLogProbabilityResult>();
+
+            return new ChatChoiceLogProbabilityInfo(tokenLogProbabilityResults?.ToList(), refusal?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatTokenLogProbabilityResult"/>. </summary>
+        /// <param name="token"> The message content token. </param>
+        /// <param name="logProbability"> The log probability of the message content token. </param>
+        /// <param name="utf8ByteValues"> A list of integers representing the UTF-8 bytes representation of the token. Useful in instances where characters are represented by multiple tokens and their byte representations must be combined to generate the correct text representation. Can be null if there is no bytes representation for the token. </param>
+        /// <param name="topLogProbabilityEntries"> The list of most likely tokens and their log probability information, as requested via 'top_logprobs'. </param>
+        /// <returns> A new <see cref="OpenAI.ChatTokenLogProbabilityResult"/> instance for mocking. </returns>
+        public static ChatTokenLogProbabilityResult ChatTokenLogProbabilityResult(string token = null, float logProbability = default, IEnumerable<int> utf8ByteValues = null, IEnumerable<ChatTokenLogProbabilityInfo> topLogProbabilityEntries = null)
+        {
+            utf8ByteValues ??= new List<int>();
+            topLogProbabilityEntries ??= new List<ChatTokenLogProbabilityInfo>();
+
+            return new ChatTokenLogProbabilityResult(token, logProbability, utf8ByteValues?.ToList(), topLogProbabilityEntries?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ChatTokenLogProbabilityInfo"/>. </summary>
+        /// <param name="token"> The message content token. </param>
+        /// <param name="logProbability"> The log probability of the message content token. </param>
+        /// <param name="utf8ByteValues"> A list of integers representing the UTF-8 bytes representation of the token. Useful in instances where characters are represented by multiple tokens and their byte representations must be combined to generate the correct text representation. Can be null if there is no bytes representation for the token. </param>
+        /// <returns> A new <see cref="OpenAI.ChatTokenLogProbabilityInfo"/> instance for mocking. </returns>
+        public static ChatTokenLogProbabilityInfo ChatTokenLogProbabilityInfo(string token = null, float logProbability = default, IEnumerable<int> utf8ByteValues = null)
+        {
+            utf8ByteValues ??= new List<int>();
+
+            return new ChatTokenLogProbabilityInfo(token, logProbability, utf8ByteValues?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AzureChatEnhancements"/>. </summary>
+        /// <param name="grounding"> The grounding enhancement that returns the bounding box of the objects detected in the image. </param>
+        /// <returns> A new <see cref="OpenAI.AzureChatEnhancements"/> instance for mocking. </returns>
+        public static AzureChatEnhancements AzureChatEnhancements(AzureGroundingEnhancement grounding = null)
+        {
+            return new AzureChatEnhancements(grounding, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AzureGroundingEnhancement"/>. </summary>
+        /// <param name="lines"> The lines of text detected by the grounding enhancement. </param>
+        /// <returns> A new <see cref="OpenAI.AzureGroundingEnhancement"/> instance for mocking. </returns>
+        public static AzureGroundingEnhancement AzureGroundingEnhancement(IEnumerable<AzureGroundingEnhancementLine> lines = null)
+        {
+            lines ??= new List<AzureGroundingEnhancementLine>();
+
+            return new AzureGroundingEnhancement(lines?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AzureGroundingEnhancementLine"/>. </summary>
+        /// <param name="text"> The text within the line. </param>
+        /// <param name="spans"> An array of spans that represent detected objects and its bounding box information. </param>
+        /// <returns> A new <see cref="OpenAI.AzureGroundingEnhancementLine"/> instance for mocking. </returns>
+        public static AzureGroundingEnhancementLine AzureGroundingEnhancementLine(string text = null, IEnumerable<AzureGroundingEnhancementLineSpan> spans = null)
+        {
+            spans ??= new List<AzureGroundingEnhancementLineSpan>();
+
+            return new AzureGroundingEnhancementLine(text, spans?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AzureGroundingEnhancementLineSpan"/>. </summary>
+        /// <param name="text"> The text content of the span that represents the detected object. </param>
+        /// <param name="offset">
+        /// The character offset within the text where the span begins. This offset is defined as the position of the first
+        /// character of the span, counting from the start of the text as Unicode codepoints.
+        /// </param>
+        /// <param name="length"> The length of the span in characters, measured in Unicode codepoints. </param>
+        /// <param name="polygon"> An array of objects representing points in the polygon that encloses the detected object. </param>
+        /// <returns> A new <see cref="OpenAI.AzureGroundingEnhancementLineSpan"/> instance for mocking. </returns>
+        public static AzureGroundingEnhancementLineSpan AzureGroundingEnhancementLineSpan(string text = null, int offset = default, int length = default, IEnumerable<AzureGroundingEnhancementCoordinatePoint> polygon = null)
+        {
+            polygon ??= new List<AzureGroundingEnhancementCoordinatePoint>();
+
+            return new AzureGroundingEnhancementLineSpan(text, offset, length, polygon?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.AzureGroundingEnhancementCoordinatePoint"/>. </summary>
+        /// <param name="x"> The x-coordinate (horizontal axis) of the point. </param>
+        /// <param name="y"> The y-coordinate (vertical axis) of the point. </param>
+        /// <returns> A new <see cref="OpenAI.AzureGroundingEnhancementCoordinatePoint"/> instance for mocking. </returns>
+        public static AzureGroundingEnhancementCoordinatePoint AzureGroundingEnhancementCoordinatePoint(float x = default, float y = default)
+        {
+            return new AzureGroundingEnhancementCoordinatePoint(x, y, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ImageGenerations"/>. </summary>
+        /// <param name="created">
+        /// A timestamp representing when this operation was started.
+        /// Expressed in seconds since the Unix epoch of 1970-01-01T00:00:00+0000.
+        /// </param>
+        /// <param name="data"> The images generated by the operation. </param>
+        /// <returns> A new <see cref="OpenAI.ImageGenerations"/> instance for mocking. </returns>
+        public static ImageGenerations ImageGenerations(DateTimeOffset created = default, IEnumerable<ImageGenerationData> data = null)
+        {
+            data ??= new List<ImageGenerationData>();
+
+            return new ImageGenerations(created, data?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ImageGenerationData"/>. </summary>
+        /// <param name="url"> The URL that provides temporary access to download the generated image. </param>
+        /// <param name="base64Data"> The complete data for an image, represented as a base64-encoded string. </param>
+        /// <param name="contentFilterResults"> Information about the content filtering results. </param>
+        /// <param name="revisedPrompt">
+        /// The final prompt used by the model to generate the image.
+        /// Only provided with dall-3-models and only when revisions were made to the prompt.
+        /// </param>
+        /// <param name="promptFilterResults">
+        /// Information about the content filtering category (hate, sexual, violence, self_harm), if
+        /// it has been detected, as well as the severity level (very_low, low, medium, high-scale
+        /// that determines the intensity and risk level of harmful content) and if it has been
+        /// filtered or not. Information about jailbreak content and profanity, if it has been detected,
+        /// and if it has been filtered or not. And information about customer block list, if it has
+        /// been filtered and its id.
+        /// </param>
+        /// <returns> A new <see cref="OpenAI.ImageGenerationData"/> instance for mocking. </returns>
+        public static ImageGenerationData ImageGenerationData(Uri url = null, string base64Data = null, ImageGenerationContentFilterResults contentFilterResults = null, string revisedPrompt = null, ImageGenerationPromptFilterResults promptFilterResults = null)
+        {
+            return new ImageGenerationData(
+                url,
+                base64Data,
+                contentFilterResults,
+                revisedPrompt,
+                promptFilterResults,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ImageGenerationContentFilterResults"/>. </summary>
+        /// <param name="sexual">
+        /// Describes language related to anatomical organs and genitals, romantic relationships,
+        ///  acts portrayed in erotic or affectionate terms, physical sexual acts, including
+        ///  those portrayed as an assault or a forced sexual violent act against one’s will,
+        ///  prostitution, pornography, and abuse.
+        /// </param>
+        /// <param name="violence">
+        /// Describes language related to physical actions intended to hurt, injure, damage, or
+        /// kill someone or something; describes weapons, etc.
+        /// </param>
+        /// <param name="hate">
+        /// Describes language attacks or uses that include pejorative or discriminatory language
+        /// with reference to a person or identity group on the basis of certain differentiating
+        /// attributes of these groups including but not limited to race, ethnicity, nationality,
+        /// gender identity and expression, sexual orientation, religion, immigration status, ability
+        /// status, personal appearance, and body size.
+        /// </param>
+        /// <param name="selfHarm">
+        /// Describes language related to physical actions intended to purposely hurt, injure,
+        /// or damage one’s body, or kill oneself.
+        /// </param>
+        /// <returns> A new <see cref="OpenAI.ImageGenerationContentFilterResults"/> instance for mocking. </returns>
+        public static ImageGenerationContentFilterResults ImageGenerationContentFilterResults(ContentFilterResult sexual = null, ContentFilterResult violence = null, ContentFilterResult hate = null, ContentFilterResult selfHarm = null)
+        {
+            return new ImageGenerationContentFilterResults(sexual, violence, hate, selfHarm, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.ImageGenerationPromptFilterResults"/>. </summary>
+        /// <param name="sexual">
+        /// Describes language related to anatomical organs and genitals, romantic relationships,
+        ///  acts portrayed in erotic or affectionate terms, physical sexual acts, including
+        ///  those portrayed as an assault or a forced sexual violent act against one’s will,
+        ///  prostitution, pornography, and abuse.
+        /// </param>
+        /// <param name="violence">
+        /// Describes language related to physical actions intended to hurt, injure, damage, or
+        /// kill someone or something; describes weapons, etc.
+        /// </param>
+        /// <param name="hate">
+        /// Describes language attacks or uses that include pejorative or discriminatory language
+        /// with reference to a person or identity group on the basis of certain differentiating
+        /// attributes of these groups including but not limited to race, ethnicity, nationality,
+        /// gender identity and expression, sexual orientation, religion, immigration status, ability
+        /// status, personal appearance, and body size.
+        /// </param>
+        /// <param name="selfHarm">
+        /// Describes language related to physical actions intended to purposely hurt, injure,
+        /// or damage one’s body, or kill oneself.
+        /// </param>
+        /// <param name="profanity"> Describes whether profanity was detected. </param>
+        /// <param name="jailbreak"> Whether a jailbreak attempt was detected in the prompt. </param>
+        /// <param name="customBlocklists"> Information about customer block lists and if something was detected the associated list ID. </param>
+        /// <returns> A new <see cref="OpenAI.ImageGenerationPromptFilterResults"/> instance for mocking. </returns>
+        public static ImageGenerationPromptFilterResults ImageGenerationPromptFilterResults(ContentFilterResult sexual = null, ContentFilterResult violence = null, ContentFilterResult hate = null, ContentFilterResult selfHarm = null, ContentFilterDetectionResult profanity = null, ContentFilterDetectionResult jailbreak = null, ContentFilterDetailedResults customBlocklists = null)
+        {
+            return new ImageGenerationPromptFilterResults(
+                sexual,
+                violence,
+                hate,
+                selfHarm,
+                profanity,
+                jailbreak,
+                customBlocklists,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.SpeechGenerationOptions"/>. </summary>
+        /// <param name="input"> The text to generate audio for. The maximum length is 4096 characters. </param>
+        /// <param name="voice"> The voice to use for text-to-speech. </param>
+        /// <param name="responseFormat"> The audio output format for the spoken text. By default, the MP3 format will be used. </param>
+        /// <param name="speed"> The speed of speech for generated audio. Values are valid in the range from 0.25 to 4.0, with 1.0 the default and higher values corresponding to faster speech. </param>
+        /// <param name="deploymentName"> The model to use for this text-to-speech request. </param>
+        /// <returns> A new <see cref="OpenAI.SpeechGenerationOptions"/> instance for mocking. </returns>
+        public static SpeechGenerationOptions SpeechGenerationOptions(string input = null, SpeechVoice voice = default, SpeechGenerationResponseFormat? responseFormat = null, float? speed = null, string deploymentName = null)
+        {
+            return new SpeechGenerationOptions(
+                input,
+                voice,
+                responseFormat,
+                speed,
+                deploymentName,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.FileListResponse"/>. </summary>
+        /// <param name="object"> The object type, which is always 'list'. </param>
+        /// <param name="data"> The files returned for the request. </param>
+        /// <returns> A new <see cref="OpenAI.FileListResponse"/> instance for mocking. </returns>
+        public static FileListResponse FileListResponse(FileListResponseObject @object = default, IEnumerable<OpenAIFile> data = null)
+        {
+            data ??= new List<OpenAIFile>();
+
+            return new FileListResponse(@object, data?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.OpenAIFile"/>. </summary>
+        /// <param name="object"> The object type, which is always 'file'. </param>
+        /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
+        /// <param name="bytes"> The size of the file, in bytes. </param>
+        /// <param name="filename"> The name of the file. </param>
+        /// <param name="createdAt"> The Unix timestamp, in seconds, representing when this object was created. </param>
+        /// <param name="purpose"> The intended purpose of a file. </param>
+        /// <param name="status"> The state of the file. This field is available in Azure OpenAI only. </param>
+        /// <param name="statusDetails"> The error message with details in case processing of this file failed. This field is available in Azure OpenAI only. </param>
+        /// <returns> A new <see cref="OpenAI.OpenAIFile"/> instance for mocking. </returns>
+        public static OpenAIFile OpenAIFile(OpenAIFileObject @object = default, string id = null, int bytes = default, string filename = null, DateTimeOffset createdAt = default, FilePurpose purpose = default, FileState? status = null, string statusDetails = null)
+        {
+            return new OpenAIFile(
+                @object,
+                id,
+                bytes,
+                filename,
+                createdAt,
+                purpose,
+                status,
+                statusDetails,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.FileDeletionStatus"/>. </summary>
+        /// <param name="id"> The ID of the resource specified for deletion. </param>
+        /// <param name="deleted"> A value indicating whether deletion was successful. </param>
+        /// <param name="object"> The object type, which is always 'file'. </param>
+        /// <returns> A new <see cref="OpenAI.FileDeletionStatus"/> instance for mocking. </returns>
+        public static FileDeletionStatus FileDeletionStatus(string id = null, bool deleted = default, FileDeletionStatusObject @object = default)
+        {
+            return new FileDeletionStatus(id, deleted, @object, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.OpenAIPageableListOfBatch"/>. </summary>
+        /// <param name="object"> The object type, which is always list. </param>
+        /// <param name="data"> The requested list of items. </param>
+        /// <param name="firstId"> The first ID represented in this list. </param>
+        /// <param name="lastId"> The last ID represented in this list. </param>
+        /// <param name="hasMore"> A value indicating whether there are additional values available not captured in this list. </param>
+        /// <returns> A new <see cref="OpenAI.OpenAIPageableListOfBatch"/> instance for mocking. </returns>
+        public static OpenAIPageableListOfBatch OpenAIPageableListOfBatch(OpenAIPageableListOfBatchObject @object = default, IEnumerable<OpenAI.Batch> data = null, string firstId = null, string lastId = null, bool? hasMore = null)
+        {
+            data ??= new List<OpenAI.Batch>();
+
+            return new OpenAIPageableListOfBatch(
+                @object,
+                data?.ToList(),
+                firstId,
+                lastId,
+                hasMore,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.BatchCreateRequest"/>. </summary>
+        /// <param name="endpoint"> The API endpoint used by the batch. </param>
+        /// <param name="inputFileId"> The ID of the input file for the batch. </param>
+        /// <param name="completionWindow"> The time frame within which the batch should be processed. </param>
+        /// <param name="metadata"> A set of key-value pairs that can be attached to the batch. This can be useful for storing additional information about the batch in a structured format. </param>
+        /// <returns> A new <see cref="OpenAI.BatchCreateRequest"/> instance for mocking. </returns>
+        public static BatchCreateRequest BatchCreateRequest(string endpoint = null, string inputFileId = null, string completionWindow = null, IDictionary<string, string> metadata = null)
+        {
+            metadata ??= new Dictionary<string, string>();
+
+            return new BatchCreateRequest(endpoint, inputFileId, completionWindow, metadata, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.Upload"/>. </summary>
+        /// <param name="id"> The Upload unique identifier, which can be referenced in API endpoints. </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the Upload was created. </param>
+        /// <param name="filename"> The name of the file to be uploaded. </param>
+        /// <param name="bytes"> The intended number of bytes to be uploaded. </param>
+        /// <param name="purpose"> The intended purpose of the file. </param>
+        /// <param name="status"> The status of the Upload. </param>
+        /// <param name="expiresAt"> The Unix timestamp (in seconds) for when the Upload was created. </param>
+        /// <param name="object"> The object type, which is always "upload". </param>
+        /// <param name="file"> The ready File object after the Upload is completed. </param>
+        /// <returns> A new <see cref="OpenAI.Upload"/> instance for mocking. </returns>
+        public static Upload Upload(string id = null, DateTimeOffset createdAt = default, string filename = null, long bytes = default, UploadPurpose purpose = default, UploadStatus status = default, DateTimeOffset expiresAt = default, UploadObject? @object = null, OpenAIFile file = null)
+        {
+            return new Upload(
+                id,
+                createdAt,
+                filename,
+                bytes,
+                purpose,
+                status,
+                expiresAt,
+                @object,
+                file,
+                serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.UploadPart"/>. </summary>
+        /// <param name="id"> The upload Part unique identifier, which can be referenced in API endpoints. </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the Part was created. </param>
+        /// <param name="uploadId"> The ID of the Upload object that this Part was added to. </param>
+        /// <param name="object"> The object type, which is always `upload.part`. </param>
+        /// <param name="azureBlockId"> Azure only field. </param>
+        /// <returns> A new <see cref="OpenAI.UploadPart"/> instance for mocking. </returns>
+        public static UploadPart UploadPart(string id = null, DateTimeOffset createdAt = default, string uploadId = null, UploadPartObject @object = default, string azureBlockId = null)
+        {
+            return new UploadPart(
+                id,
+                createdAt,
+                uploadId,
+                @object,
+                azureBlockId,
+                serializedAdditionalRawData: null);
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AddUploadPartRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AddUploadPartRequest.Serialization.cs
new file mode 100644
index 000000000000..58e0723f445a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AddUploadPartRequest.Serialization.cs
@@ -0,0 +1,167 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AddUploadPartRequest : IUtf8JsonSerializable, IJsonModel<AddUploadPartRequest>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AddUploadPartRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AddUploadPartRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AddUploadPartRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AddUploadPartRequest)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("data"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(global::System.BinaryData.FromStream(Data));
+#else
+            using (JsonDocument document = JsonDocument.Parse(BinaryData.FromStream(Data)))
+            {
+                JsonSerializer.Serialize(writer, document.RootElement);
+            }
+#endif
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AddUploadPartRequest IJsonModel<AddUploadPartRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AddUploadPartRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AddUploadPartRequest)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAddUploadPartRequest(document.RootElement, options);
+        }
+
+        internal static AddUploadPartRequest DeserializeAddUploadPartRequest(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            Stream data = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("data"u8))
+                {
+                    data = BinaryData.FromString(property.Value.GetRawText()).ToStream();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AddUploadPartRequest(data, serializedAdditionalRawData);
+        }
+
+        private BinaryData SerializeMultipart(ModelReaderWriterOptions options)
+        {
+            using MultipartFormDataRequestContent content = ToMultipartRequestContent();
+            using MemoryStream stream = new MemoryStream();
+            content.WriteTo(stream);
+            if (stream.Position > int.MaxValue)
+            {
+                return BinaryData.FromStream(stream);
+            }
+            else
+            {
+                return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position));
+            }
+        }
+
+        internal virtual MultipartFormDataRequestContent ToMultipartRequestContent()
+        {
+            MultipartFormDataRequestContent content = new MultipartFormDataRequestContent();
+            content.Add(Data, "data", "data", "application/octet-stream");
+            return content;
+        }
+
+        BinaryData IPersistableModel<AddUploadPartRequest>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AddUploadPartRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                case "MFD":
+                    return SerializeMultipart(options);
+                default:
+                    throw new FormatException($"The model {nameof(AddUploadPartRequest)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AddUploadPartRequest IPersistableModel<AddUploadPartRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AddUploadPartRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAddUploadPartRequest(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AddUploadPartRequest)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AddUploadPartRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "MFD";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AddUploadPartRequest FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAddUploadPartRequest(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AddUploadPartRequest.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AddUploadPartRequest.cs
new file mode 100644
index 000000000000..9f8e672d50eb
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AddUploadPartRequest.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The multipart/form-data request body of a data part addition request for an upload. </summary>
+    public partial class AddUploadPartRequest
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AddUploadPartRequest"/>. </summary>
+        /// <param name="data"> The chunk of bytes for this Part. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
+        public AddUploadPartRequest(Stream data)
+        {
+            Argument.AssertNotNull(data, nameof(data));
+
+            Data = data;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AddUploadPartRequest"/>. </summary>
+        /// <param name="data"> The chunk of bytes for this Part. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AddUploadPartRequest(Stream data, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Data = data;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AddUploadPartRequest"/> for deserialization. </summary>
+        internal AddUploadPartRequest()
+        {
+        }
+
+        /// <summary> The chunk of bytes for this Part. </summary>
+        public Stream Data { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTaskLabel.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTaskLabel.cs
new file mode 100644
index 000000000000..e4669cce267d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTaskLabel.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Defines the possible descriptors for available audio operation responses. </summary>
+    internal readonly partial struct AudioTaskLabel : IEquatable<AudioTaskLabel>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="AudioTaskLabel"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public AudioTaskLabel(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string TranscribeValue = "transcribe";
+        private const string TranslateValue = "translate";
+
+        /// <summary> Accompanying response data resulted from an audio transcription task. </summary>
+        public static AudioTaskLabel Transcribe { get; } = new AudioTaskLabel(TranscribeValue);
+        /// <summary> Accompanying response data resulted from an audio translation task. </summary>
+        public static AudioTaskLabel Translate { get; } = new AudioTaskLabel(TranslateValue);
+        /// <summary> Determines if two <see cref="AudioTaskLabel"/> values are the same. </summary>
+        public static bool operator ==(AudioTaskLabel left, AudioTaskLabel right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="AudioTaskLabel"/> values are not the same. </summary>
+        public static bool operator !=(AudioTaskLabel left, AudioTaskLabel right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="AudioTaskLabel"/>. </summary>
+        public static implicit operator AudioTaskLabel(string value) => new AudioTaskLabel(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is AudioTaskLabel other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(AudioTaskLabel other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscription.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscription.Serialization.cs
new file mode 100644
index 000000000000..dbc82068808b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscription.Serialization.cs
@@ -0,0 +1,233 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AudioTranscription : IUtf8JsonSerializable, IJsonModel<AudioTranscription>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AudioTranscription>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AudioTranscription>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscription>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AudioTranscription)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("text"u8);
+            writer.WriteStringValue(Text);
+            if (Optional.IsDefined(InternalAudioTaskLabel))
+            {
+                writer.WritePropertyName("task"u8);
+                writer.WriteStringValue(InternalAudioTaskLabel.Value.ToString());
+            }
+            if (Optional.IsDefined(Language))
+            {
+                writer.WritePropertyName("language"u8);
+                writer.WriteStringValue(Language);
+            }
+            if (Optional.IsDefined(Duration))
+            {
+                writer.WritePropertyName("duration"u8);
+                writer.WriteNumberValue(Convert.ToDouble(Duration.Value.ToString("s\\.FFF")));
+            }
+            if (Optional.IsCollectionDefined(Segments))
+            {
+                writer.WritePropertyName("segments"u8);
+                writer.WriteStartArray();
+                foreach (var item in Segments)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsCollectionDefined(Words))
+            {
+                writer.WritePropertyName("words"u8);
+                writer.WriteStartArray();
+                foreach (var item in Words)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AudioTranscription IJsonModel<AudioTranscription>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscription>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AudioTranscription)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAudioTranscription(document.RootElement, options);
+        }
+
+        internal static AudioTranscription DeserializeAudioTranscription(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string text = default;
+            AudioTaskLabel? task = default;
+            string language = default;
+            TimeSpan? duration = default;
+            IReadOnlyList<AudioTranscriptionSegment> segments = default;
+            IReadOnlyList<AudioTranscriptionWord> words = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("text"u8))
+                {
+                    text = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("task"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    task = new AudioTaskLabel(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("language"u8))
+                {
+                    language = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("duration"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    duration = TimeSpan.FromSeconds(property.Value.GetDouble());
+                    continue;
+                }
+                if (property.NameEquals("segments"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<AudioTranscriptionSegment> array = new List<AudioTranscriptionSegment>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(AudioTranscriptionSegment.DeserializeAudioTranscriptionSegment(item, options));
+                    }
+                    segments = array;
+                    continue;
+                }
+                if (property.NameEquals("words"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<AudioTranscriptionWord> array = new List<AudioTranscriptionWord>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(AudioTranscriptionWord.DeserializeAudioTranscriptionWord(item, options));
+                    }
+                    words = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AudioTranscription(
+                text,
+                task,
+                language,
+                duration,
+                segments ?? new ChangeTrackingList<AudioTranscriptionSegment>(),
+                words ?? new ChangeTrackingList<AudioTranscriptionWord>(),
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AudioTranscription>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscription>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AudioTranscription)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AudioTranscription IPersistableModel<AudioTranscription>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscription>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAudioTranscription(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AudioTranscription)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AudioTranscription>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AudioTranscription FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAudioTranscription(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscription.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscription.cs
new file mode 100644
index 000000000000..af332f94ac50
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscription.cs
@@ -0,0 +1,103 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Result information for an operation that transcribed spoken audio into written text. </summary>
+    public partial class AudioTranscription
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranscription"/>. </summary>
+        /// <param name="text"> The transcribed text for the provided audio data. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="text"/> is null. </exception>
+        internal AudioTranscription(string text)
+        {
+            Argument.AssertNotNull(text, nameof(text));
+
+            Text = text;
+            Segments = new ChangeTrackingList<AudioTranscriptionSegment>();
+            Words = new ChangeTrackingList<AudioTranscriptionWord>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranscription"/>. </summary>
+        /// <param name="text"> The transcribed text for the provided audio data. </param>
+        /// <param name="internalAudioTaskLabel"> The label that describes which operation type generated the accompanying response data. </param>
+        /// <param name="language">
+        /// The spoken language that was detected in the transcribed audio data.
+        /// This is expressed as a two-letter ISO-639-1 language code like 'en' or 'fr'.
+        /// </param>
+        /// <param name="duration"> The total duration of the audio processed to produce accompanying transcription information. </param>
+        /// <param name="segments"> A collection of information about the timing, probabilities, and other detail of each processed audio segment. </param>
+        /// <param name="words"> A collection of information about the timing of each processed word. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AudioTranscription(string text, AudioTaskLabel? internalAudioTaskLabel, string language, TimeSpan? duration, IReadOnlyList<AudioTranscriptionSegment> segments, IReadOnlyList<AudioTranscriptionWord> words, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Text = text;
+            InternalAudioTaskLabel = internalAudioTaskLabel;
+            Language = language;
+            Duration = duration;
+            Segments = segments;
+            Words = words;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranscription"/> for deserialization. </summary>
+        internal AudioTranscription()
+        {
+        }
+
+        /// <summary> The transcribed text for the provided audio data. </summary>
+        public string Text { get; }
+        /// <summary> The label that describes which operation type generated the accompanying response data. </summary>
+        public AudioTaskLabel? InternalAudioTaskLabel { get; }
+        /// <summary>
+        /// The spoken language that was detected in the transcribed audio data.
+        /// This is expressed as a two-letter ISO-639-1 language code like 'en' or 'fr'.
+        /// </summary>
+        public string Language { get; }
+        /// <summary> The total duration of the audio processed to produce accompanying transcription information. </summary>
+        public TimeSpan? Duration { get; }
+        /// <summary> A collection of information about the timing, probabilities, and other detail of each processed audio segment. </summary>
+        public IReadOnlyList<AudioTranscriptionSegment> Segments { get; }
+        /// <summary> A collection of information about the timing of each processed word. </summary>
+        public IReadOnlyList<AudioTranscriptionWord> Words { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionFormat.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionFormat.cs
new file mode 100644
index 000000000000..fc8228609c41
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionFormat.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Defines available options for the underlying response format of output transcription information. </summary>
+    public readonly partial struct AudioTranscriptionFormat : IEquatable<AudioTranscriptionFormat>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranscriptionFormat"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public AudioTranscriptionFormat(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string SimpleValue = "json";
+        private const string VerboseValue = "verbose_json";
+        private const string InternalPlainTextValue = "text";
+        private const string SrtValue = "srt";
+        private const string VttValue = "vtt";
+
+        /// <summary> Use a response body that is a JSON object containing a single 'text' field for the transcription. </summary>
+        public static AudioTranscriptionFormat Simple { get; } = new AudioTranscriptionFormat(SimpleValue);
+        /// <summary>
+        /// Use a response body that is a JSON object containing transcription text along with timing, segments, and other
+        /// metadata.
+        /// </summary>
+        public static AudioTranscriptionFormat Verbose { get; } = new AudioTranscriptionFormat(VerboseValue);
+        /// <summary> Use a response body that is plain text containing the raw, unannotated transcription. </summary>
+        public static AudioTranscriptionFormat InternalPlainText { get; } = new AudioTranscriptionFormat(InternalPlainTextValue);
+        /// <summary> Use a response body that is plain text in SubRip (SRT) format that also includes timing information. </summary>
+        public static AudioTranscriptionFormat Srt { get; } = new AudioTranscriptionFormat(SrtValue);
+        /// <summary> Use a response body that is plain text in Web Video Text Tracks (VTT) format that also includes timing information. </summary>
+        public static AudioTranscriptionFormat Vtt { get; } = new AudioTranscriptionFormat(VttValue);
+        /// <summary> Determines if two <see cref="AudioTranscriptionFormat"/> values are the same. </summary>
+        public static bool operator ==(AudioTranscriptionFormat left, AudioTranscriptionFormat right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="AudioTranscriptionFormat"/> values are not the same. </summary>
+        public static bool operator !=(AudioTranscriptionFormat left, AudioTranscriptionFormat right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="AudioTranscriptionFormat"/>. </summary>
+        public static implicit operator AudioTranscriptionFormat(string value) => new AudioTranscriptionFormat(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is AudioTranscriptionFormat other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(AudioTranscriptionFormat other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionOptions.Serialization.cs
new file mode 100644
index 000000000000..4ccb6b9f52f3
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionOptions.Serialization.cs
@@ -0,0 +1,306 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AudioTranscriptionOptions : IUtf8JsonSerializable, IJsonModel<AudioTranscriptionOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AudioTranscriptionOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AudioTranscriptionOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscriptionOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AudioTranscriptionOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("file"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(global::System.BinaryData.FromStream(AudioData));
+#else
+            using (JsonDocument document = JsonDocument.Parse(BinaryData.FromStream(AudioData)))
+            {
+                JsonSerializer.Serialize(writer, document.RootElement);
+            }
+#endif
+            if (Optional.IsDefined(Filename))
+            {
+                writer.WritePropertyName("filename"u8);
+                writer.WriteStringValue(Filename);
+            }
+            if (Optional.IsDefined(ResponseFormat))
+            {
+                writer.WritePropertyName("response_format"u8);
+                writer.WriteStringValue(ResponseFormat.Value.ToString());
+            }
+            if (Optional.IsDefined(Language))
+            {
+                writer.WritePropertyName("language"u8);
+                writer.WriteStringValue(Language);
+            }
+            if (Optional.IsDefined(Prompt))
+            {
+                writer.WritePropertyName("prompt"u8);
+                writer.WriteStringValue(Prompt);
+            }
+            if (Optional.IsDefined(Temperature))
+            {
+                writer.WritePropertyName("temperature"u8);
+                writer.WriteNumberValue(Temperature.Value);
+            }
+            if (Optional.IsCollectionDefined(TimestampGranularities))
+            {
+                writer.WritePropertyName("timestamp_granularities"u8);
+                writer.WriteStartArray();
+                foreach (var item in TimestampGranularities)
+                {
+                    writer.WriteStringValue(item.ToString());
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsDefined(DeploymentName))
+            {
+                writer.WritePropertyName("model"u8);
+                writer.WriteStringValue(DeploymentName);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AudioTranscriptionOptions IJsonModel<AudioTranscriptionOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscriptionOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AudioTranscriptionOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAudioTranscriptionOptions(document.RootElement, options);
+        }
+
+        internal static AudioTranscriptionOptions DeserializeAudioTranscriptionOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            Stream file = default;
+            string filename = default;
+            AudioTranscriptionFormat? responseFormat = default;
+            string language = default;
+            string prompt = default;
+            float? temperature = default;
+            IList<AudioTranscriptionTimestampGranularity> timestampGranularities = default;
+            string model = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file"u8))
+                {
+                    file = BinaryData.FromString(property.Value.GetRawText()).ToStream();
+                    continue;
+                }
+                if (property.NameEquals("filename"u8))
+                {
+                    filename = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("response_format"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    responseFormat = new AudioTranscriptionFormat(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("language"u8))
+                {
+                    language = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("prompt"u8))
+                {
+                    prompt = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("temperature"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    temperature = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("timestamp_granularities"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<AudioTranscriptionTimestampGranularity> array = new List<AudioTranscriptionTimestampGranularity>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(new AudioTranscriptionTimestampGranularity(item.GetString()));
+                    }
+                    timestampGranularities = array;
+                    continue;
+                }
+                if (property.NameEquals("model"u8))
+                {
+                    model = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AudioTranscriptionOptions(
+                file,
+                filename,
+                responseFormat,
+                language,
+                prompt,
+                temperature,
+                timestampGranularities ?? new ChangeTrackingList<AudioTranscriptionTimestampGranularity>(),
+                model,
+                serializedAdditionalRawData);
+        }
+
+        private BinaryData SerializeMultipart(ModelReaderWriterOptions options)
+        {
+            using MultipartFormDataRequestContent content = ToMultipartRequestContent();
+            using MemoryStream stream = new MemoryStream();
+            content.WriteTo(stream);
+            if (stream.Position > int.MaxValue)
+            {
+                return BinaryData.FromStream(stream);
+            }
+            else
+            {
+                return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position));
+            }
+        }
+
+        internal virtual MultipartFormDataRequestContent ToMultipartRequestContent()
+        {
+            MultipartFormDataRequestContent content = new MultipartFormDataRequestContent();
+            content.Add(AudioData, "file", "file", "application/octet-stream");
+            if (Optional.IsDefined(Filename))
+            {
+                content.Add(Filename, "filename");
+            }
+            if (Optional.IsDefined(ResponseFormat))
+            {
+                content.Add(ResponseFormat.Value.ToString(), "response_format");
+            }
+            if (Optional.IsDefined(Language))
+            {
+                content.Add(Language, "language");
+            }
+            if (Optional.IsDefined(Prompt))
+            {
+                content.Add(Prompt, "prompt");
+            }
+            if (Optional.IsDefined(Temperature))
+            {
+                content.Add(Temperature.Value, "temperature");
+            }
+            if (Optional.IsCollectionDefined(TimestampGranularities))
+            {
+                foreach (AudioTranscriptionTimestampGranularity item in TimestampGranularities)
+                {
+                    content.Add(item.ToString(), "timestamp_granularities");
+                }
+            }
+            if (Optional.IsDefined(DeploymentName))
+            {
+                content.Add(DeploymentName, "model");
+            }
+            return content;
+        }
+
+        BinaryData IPersistableModel<AudioTranscriptionOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscriptionOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                case "MFD":
+                    return SerializeMultipart(options);
+                default:
+                    throw new FormatException($"The model {nameof(AudioTranscriptionOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AudioTranscriptionOptions IPersistableModel<AudioTranscriptionOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscriptionOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAudioTranscriptionOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AudioTranscriptionOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AudioTranscriptionOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "MFD";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AudioTranscriptionOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAudioTranscriptionOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionOptions.cs
new file mode 100644
index 000000000000..e4c0a5294401
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionOptions.cs
@@ -0,0 +1,146 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The configuration information for an audio transcription request. </summary>
+    public partial class AudioTranscriptionOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranscriptionOptions"/>. </summary>
+        /// <param name="audioData">
+        /// The audio data to transcribe. This must be the binary content of a file in one of the supported media formats:
+        ///  flac, mp3, mp4, mpeg, mpga, m4a, ogg, wav, webm.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="audioData"/> is null. </exception>
+        public AudioTranscriptionOptions(Stream audioData)
+        {
+            Argument.AssertNotNull(audioData, nameof(audioData));
+
+            AudioData = audioData;
+            TimestampGranularities = new ChangeTrackingList<AudioTranscriptionTimestampGranularity>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranscriptionOptions"/>. </summary>
+        /// <param name="audioData">
+        /// The audio data to transcribe. This must be the binary content of a file in one of the supported media formats:
+        ///  flac, mp3, mp4, mpeg, mpga, m4a, ogg, wav, webm.
+        /// </param>
+        /// <param name="filename"> The optional filename or descriptive identifier to associate with with the audio data. </param>
+        /// <param name="responseFormat"> The requested format of the transcription response data, which will influence the content and detail of the result. </param>
+        /// <param name="language">
+        /// The primary spoken language of the audio data to be transcribed, supplied as a two-letter ISO-639-1 language code
+        /// such as 'en' or 'fr'.
+        /// Providing this known input language is optional but may improve the accuracy and/or latency of transcription.
+        /// </param>
+        /// <param name="prompt">
+        /// An optional hint to guide the model's style or continue from a prior audio segment. The written language of the
+        /// prompt should match the primary spoken language of the audio data.
+        /// </param>
+        /// <param name="temperature">
+        /// The sampling temperature, between 0 and 1.
+        /// Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.
+        /// If set to 0, the model will use log probability to automatically increase the temperature until certain thresholds are hit.
+        /// </param>
+        /// <param name="timestampGranularities">
+        /// The timestamp granularities to populate for this transcription.
+        /// `response_format` must be set `verbose_json` to use timestamp granularities.
+        /// Either or both of these options are supported: `word`, or `segment`.
+        /// Note: There is no additional latency for segment timestamps, but generating word timestamps incurs additional latency.
+        /// </param>
+        /// <param name="deploymentName"> The model to use for this transcription request. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AudioTranscriptionOptions(Stream audioData, string filename, AudioTranscriptionFormat? responseFormat, string language, string prompt, float? temperature, IList<AudioTranscriptionTimestampGranularity> timestampGranularities, string deploymentName, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            AudioData = audioData;
+            Filename = filename;
+            ResponseFormat = responseFormat;
+            Language = language;
+            Prompt = prompt;
+            Temperature = temperature;
+            TimestampGranularities = timestampGranularities;
+            DeploymentName = deploymentName;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranscriptionOptions"/> for deserialization. </summary>
+        internal AudioTranscriptionOptions()
+        {
+        }
+
+        /// <summary>
+        /// The audio data to transcribe. This must be the binary content of a file in one of the supported media formats:
+        ///  flac, mp3, mp4, mpeg, mpga, m4a, ogg, wav, webm.
+        /// </summary>
+        public Stream AudioData { get; }
+        /// <summary> The optional filename or descriptive identifier to associate with with the audio data. </summary>
+        public string Filename { get; set; }
+        /// <summary> The requested format of the transcription response data, which will influence the content and detail of the result. </summary>
+        public AudioTranscriptionFormat? ResponseFormat { get; set; }
+        /// <summary>
+        /// The primary spoken language of the audio data to be transcribed, supplied as a two-letter ISO-639-1 language code
+        /// such as 'en' or 'fr'.
+        /// Providing this known input language is optional but may improve the accuracy and/or latency of transcription.
+        /// </summary>
+        public string Language { get; set; }
+        /// <summary>
+        /// An optional hint to guide the model's style or continue from a prior audio segment. The written language of the
+        /// prompt should match the primary spoken language of the audio data.
+        /// </summary>
+        public string Prompt { get; set; }
+        /// <summary>
+        /// The sampling temperature, between 0 and 1.
+        /// Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.
+        /// If set to 0, the model will use log probability to automatically increase the temperature until certain thresholds are hit.
+        /// </summary>
+        public float? Temperature { get; set; }
+        /// <summary>
+        /// The timestamp granularities to populate for this transcription.
+        /// `response_format` must be set `verbose_json` to use timestamp granularities.
+        /// Either or both of these options are supported: `word`, or `segment`.
+        /// Note: There is no additional latency for segment timestamps, but generating word timestamps incurs additional latency.
+        /// </summary>
+        public IList<AudioTranscriptionTimestampGranularity> TimestampGranularities { get; }
+        /// <summary> The model to use for this transcription request. </summary>
+        public string DeploymentName { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionSegment.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionSegment.Serialization.cs
new file mode 100644
index 000000000000..a5782a864796
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionSegment.Serialization.cs
@@ -0,0 +1,228 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AudioTranscriptionSegment : IUtf8JsonSerializable, IJsonModel<AudioTranscriptionSegment>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AudioTranscriptionSegment>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AudioTranscriptionSegment>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscriptionSegment>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AudioTranscriptionSegment)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("id"u8);
+            writer.WriteNumberValue(Id);
+            writer.WritePropertyName("start"u8);
+            writer.WriteNumberValue(Convert.ToDouble(Start.ToString("s\\.FFF")));
+            writer.WritePropertyName("end"u8);
+            writer.WriteNumberValue(Convert.ToDouble(End.ToString("s\\.FFF")));
+            writer.WritePropertyName("text"u8);
+            writer.WriteStringValue(Text);
+            writer.WritePropertyName("temperature"u8);
+            writer.WriteNumberValue(Temperature);
+            writer.WritePropertyName("avg_logprob"u8);
+            writer.WriteNumberValue(AverageLogProbability);
+            writer.WritePropertyName("compression_ratio"u8);
+            writer.WriteNumberValue(CompressionRatio);
+            writer.WritePropertyName("no_speech_prob"u8);
+            writer.WriteNumberValue(NoSpeechProbability);
+            writer.WritePropertyName("tokens"u8);
+            writer.WriteStartArray();
+            foreach (var item in Tokens)
+            {
+                writer.WriteNumberValue(item);
+            }
+            writer.WriteEndArray();
+            writer.WritePropertyName("seek"u8);
+            writer.WriteNumberValue(Seek);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AudioTranscriptionSegment IJsonModel<AudioTranscriptionSegment>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscriptionSegment>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AudioTranscriptionSegment)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAudioTranscriptionSegment(document.RootElement, options);
+        }
+
+        internal static AudioTranscriptionSegment DeserializeAudioTranscriptionSegment(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            int id = default;
+            TimeSpan start = default;
+            TimeSpan end = default;
+            string text = default;
+            float temperature = default;
+            float avgLogprob = default;
+            float compressionRatio = default;
+            float noSpeechProb = default;
+            IReadOnlyList<int> tokens = default;
+            int seek = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("start"u8))
+                {
+                    start = TimeSpan.FromSeconds(property.Value.GetDouble());
+                    continue;
+                }
+                if (property.NameEquals("end"u8))
+                {
+                    end = TimeSpan.FromSeconds(property.Value.GetDouble());
+                    continue;
+                }
+                if (property.NameEquals("text"u8))
+                {
+                    text = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("temperature"u8))
+                {
+                    temperature = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("avg_logprob"u8))
+                {
+                    avgLogprob = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("compression_ratio"u8))
+                {
+                    compressionRatio = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("no_speech_prob"u8))
+                {
+                    noSpeechProb = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("tokens"u8))
+                {
+                    List<int> array = new List<int>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetInt32());
+                    }
+                    tokens = array;
+                    continue;
+                }
+                if (property.NameEquals("seek"u8))
+                {
+                    seek = property.Value.GetInt32();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AudioTranscriptionSegment(
+                id,
+                start,
+                end,
+                text,
+                temperature,
+                avgLogprob,
+                compressionRatio,
+                noSpeechProb,
+                tokens,
+                seek,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AudioTranscriptionSegment>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscriptionSegment>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AudioTranscriptionSegment)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AudioTranscriptionSegment IPersistableModel<AudioTranscriptionSegment>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscriptionSegment>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAudioTranscriptionSegment(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AudioTranscriptionSegment)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AudioTranscriptionSegment>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AudioTranscriptionSegment FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAudioTranscriptionSegment(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionSegment.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionSegment.cs
new file mode 100644
index 000000000000..e1dd9c8fad59
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionSegment.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// Extended information about a single segment of transcribed audio data.
+    /// Segments generally represent roughly 5-10 seconds of speech. Segment boundaries typically occur between words but not
+    /// necessarily sentences.
+    /// </summary>
+    public partial class AudioTranscriptionSegment
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranscriptionSegment"/>. </summary>
+        /// <param name="id"> The 0-based index of this segment within a transcription. </param>
+        /// <param name="start"> The time at which this segment started relative to the beginning of the transcribed audio. </param>
+        /// <param name="end"> The time at which this segment ended relative to the beginning of the transcribed audio. </param>
+        /// <param name="text"> The transcribed text that was part of this audio segment. </param>
+        /// <param name="temperature"> The temperature score associated with this audio segment. </param>
+        /// <param name="averageLogProbability"> The average log probability associated with this audio segment. </param>
+        /// <param name="compressionRatio"> The compression ratio of this audio segment. </param>
+        /// <param name="noSpeechProbability"> The probability of no speech detection within this audio segment. </param>
+        /// <param name="tokens"> The token IDs matching the transcribed text in this audio segment. </param>
+        /// <param name="seek">
+        /// The seek position associated with the processing of this audio segment.
+        /// Seek positions are expressed as hundredths of seconds.
+        /// The model may process several segments from a single seek position, so while the seek position will never represent
+        /// a later time than the segment's start, the segment's start may represent a significantly later time than the
+        /// segment's associated seek position.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="text"/> or <paramref name="tokens"/> is null. </exception>
+        internal AudioTranscriptionSegment(int id, TimeSpan start, TimeSpan end, string text, float temperature, float averageLogProbability, float compressionRatio, float noSpeechProbability, IEnumerable<int> tokens, int seek)
+        {
+            Argument.AssertNotNull(text, nameof(text));
+            Argument.AssertNotNull(tokens, nameof(tokens));
+
+            Id = id;
+            Start = start;
+            End = end;
+            Text = text;
+            Temperature = temperature;
+            AverageLogProbability = averageLogProbability;
+            CompressionRatio = compressionRatio;
+            NoSpeechProbability = noSpeechProbability;
+            Tokens = tokens.ToList();
+            Seek = seek;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranscriptionSegment"/>. </summary>
+        /// <param name="id"> The 0-based index of this segment within a transcription. </param>
+        /// <param name="start"> The time at which this segment started relative to the beginning of the transcribed audio. </param>
+        /// <param name="end"> The time at which this segment ended relative to the beginning of the transcribed audio. </param>
+        /// <param name="text"> The transcribed text that was part of this audio segment. </param>
+        /// <param name="temperature"> The temperature score associated with this audio segment. </param>
+        /// <param name="averageLogProbability"> The average log probability associated with this audio segment. </param>
+        /// <param name="compressionRatio"> The compression ratio of this audio segment. </param>
+        /// <param name="noSpeechProbability"> The probability of no speech detection within this audio segment. </param>
+        /// <param name="tokens"> The token IDs matching the transcribed text in this audio segment. </param>
+        /// <param name="seek">
+        /// The seek position associated with the processing of this audio segment.
+        /// Seek positions are expressed as hundredths of seconds.
+        /// The model may process several segments from a single seek position, so while the seek position will never represent
+        /// a later time than the segment's start, the segment's start may represent a significantly later time than the
+        /// segment's associated seek position.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AudioTranscriptionSegment(int id, TimeSpan start, TimeSpan end, string text, float temperature, float averageLogProbability, float compressionRatio, float noSpeechProbability, IReadOnlyList<int> tokens, int seek, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            Start = start;
+            End = end;
+            Text = text;
+            Temperature = temperature;
+            AverageLogProbability = averageLogProbability;
+            CompressionRatio = compressionRatio;
+            NoSpeechProbability = noSpeechProbability;
+            Tokens = tokens;
+            Seek = seek;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranscriptionSegment"/> for deserialization. </summary>
+        internal AudioTranscriptionSegment()
+        {
+        }
+
+        /// <summary> The 0-based index of this segment within a transcription. </summary>
+        public int Id { get; }
+        /// <summary> The time at which this segment started relative to the beginning of the transcribed audio. </summary>
+        public TimeSpan Start { get; }
+        /// <summary> The time at which this segment ended relative to the beginning of the transcribed audio. </summary>
+        public TimeSpan End { get; }
+        /// <summary> The transcribed text that was part of this audio segment. </summary>
+        public string Text { get; }
+        /// <summary> The temperature score associated with this audio segment. </summary>
+        public float Temperature { get; }
+        /// <summary> The average log probability associated with this audio segment. </summary>
+        public float AverageLogProbability { get; }
+        /// <summary> The compression ratio of this audio segment. </summary>
+        public float CompressionRatio { get; }
+        /// <summary> The probability of no speech detection within this audio segment. </summary>
+        public float NoSpeechProbability { get; }
+        /// <summary> The token IDs matching the transcribed text in this audio segment. </summary>
+        public IReadOnlyList<int> Tokens { get; }
+        /// <summary>
+        /// The seek position associated with the processing of this audio segment.
+        /// Seek positions are expressed as hundredths of seconds.
+        /// The model may process several segments from a single seek position, so while the seek position will never represent
+        /// a later time than the segment's start, the segment's start may represent a significantly later time than the
+        /// segment's associated seek position.
+        /// </summary>
+        public int Seek { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionTimestampGranularity.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionTimestampGranularity.cs
new file mode 100644
index 000000000000..b0ae51145060
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionTimestampGranularity.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Defines the timestamp granularities that can be requested on a verbose transcription response. </summary>
+    public readonly partial struct AudioTranscriptionTimestampGranularity : IEquatable<AudioTranscriptionTimestampGranularity>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranscriptionTimestampGranularity"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public AudioTranscriptionTimestampGranularity(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string WordValue = "word";
+        private const string SegmentValue = "segment";
+
+        /// <summary>
+        /// Indicates that responses should include timing information about each transcribed word. Note that generating word
+        /// timestamp information will incur additional response latency.
+        /// </summary>
+        public static AudioTranscriptionTimestampGranularity Word { get; } = new AudioTranscriptionTimestampGranularity(WordValue);
+        /// <summary>
+        /// Indicates that responses should include timing and other information about each transcribed audio segment. Audio
+        /// segment timestamp information does not incur any additional latency.
+        /// </summary>
+        public static AudioTranscriptionTimestampGranularity Segment { get; } = new AudioTranscriptionTimestampGranularity(SegmentValue);
+        /// <summary> Determines if two <see cref="AudioTranscriptionTimestampGranularity"/> values are the same. </summary>
+        public static bool operator ==(AudioTranscriptionTimestampGranularity left, AudioTranscriptionTimestampGranularity right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="AudioTranscriptionTimestampGranularity"/> values are not the same. </summary>
+        public static bool operator !=(AudioTranscriptionTimestampGranularity left, AudioTranscriptionTimestampGranularity right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="AudioTranscriptionTimestampGranularity"/>. </summary>
+        public static implicit operator AudioTranscriptionTimestampGranularity(string value) => new AudioTranscriptionTimestampGranularity(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is AudioTranscriptionTimestampGranularity other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(AudioTranscriptionTimestampGranularity other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionWord.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionWord.Serialization.cs
new file mode 100644
index 000000000000..5d28770f0eed
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionWord.Serialization.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AudioTranscriptionWord : IUtf8JsonSerializable, IJsonModel<AudioTranscriptionWord>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AudioTranscriptionWord>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AudioTranscriptionWord>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscriptionWord>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AudioTranscriptionWord)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("word"u8);
+            writer.WriteStringValue(Word);
+            writer.WritePropertyName("start"u8);
+            writer.WriteNumberValue(Convert.ToDouble(Start.ToString("s\\.FFF")));
+            writer.WritePropertyName("end"u8);
+            writer.WriteNumberValue(Convert.ToDouble(End.ToString("s\\.FFF")));
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AudioTranscriptionWord IJsonModel<AudioTranscriptionWord>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscriptionWord>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AudioTranscriptionWord)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAudioTranscriptionWord(document.RootElement, options);
+        }
+
+        internal static AudioTranscriptionWord DeserializeAudioTranscriptionWord(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string word = default;
+            TimeSpan start = default;
+            TimeSpan end = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("word"u8))
+                {
+                    word = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("start"u8))
+                {
+                    start = TimeSpan.FromSeconds(property.Value.GetDouble());
+                    continue;
+                }
+                if (property.NameEquals("end"u8))
+                {
+                    end = TimeSpan.FromSeconds(property.Value.GetDouble());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AudioTranscriptionWord(word, start, end, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AudioTranscriptionWord>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscriptionWord>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AudioTranscriptionWord)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AudioTranscriptionWord IPersistableModel<AudioTranscriptionWord>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranscriptionWord>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAudioTranscriptionWord(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AudioTranscriptionWord)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AudioTranscriptionWord>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AudioTranscriptionWord FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAudioTranscriptionWord(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionWord.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionWord.cs
new file mode 100644
index 000000000000..9fa92dfadb66
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranscriptionWord.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Extended information about a single transcribed word, as provided on responses when the 'word' timestamp granularity is provided. </summary>
+    public partial class AudioTranscriptionWord
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranscriptionWord"/>. </summary>
+        /// <param name="word"> The textual content of the word. </param>
+        /// <param name="start"> The start time of the word relative to the beginning of the audio, expressed in seconds. </param>
+        /// <param name="end"> The end time of the word relative to the beginning of the audio, expressed in seconds. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="word"/> is null. </exception>
+        internal AudioTranscriptionWord(string word, TimeSpan start, TimeSpan end)
+        {
+            Argument.AssertNotNull(word, nameof(word));
+
+            Word = word;
+            Start = start;
+            End = end;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranscriptionWord"/>. </summary>
+        /// <param name="word"> The textual content of the word. </param>
+        /// <param name="start"> The start time of the word relative to the beginning of the audio, expressed in seconds. </param>
+        /// <param name="end"> The end time of the word relative to the beginning of the audio, expressed in seconds. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AudioTranscriptionWord(string word, TimeSpan start, TimeSpan end, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Word = word;
+            Start = start;
+            End = end;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranscriptionWord"/> for deserialization. </summary>
+        internal AudioTranscriptionWord()
+        {
+        }
+
+        /// <summary> The textual content of the word. </summary>
+        public string Word { get; }
+        /// <summary> The start time of the word relative to the beginning of the audio, expressed in seconds. </summary>
+        public TimeSpan Start { get; }
+        /// <summary> The end time of the word relative to the beginning of the audio, expressed in seconds. </summary>
+        public TimeSpan End { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslation.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslation.Serialization.cs
new file mode 100644
index 000000000000..559a1b8dbe70
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslation.Serialization.cs
@@ -0,0 +1,207 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AudioTranslation : IUtf8JsonSerializable, IJsonModel<AudioTranslation>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AudioTranslation>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AudioTranslation>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranslation>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AudioTranslation)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("text"u8);
+            writer.WriteStringValue(Text);
+            if (Optional.IsDefined(InternalAudioTaskLabel))
+            {
+                writer.WritePropertyName("task"u8);
+                writer.WriteStringValue(InternalAudioTaskLabel.Value.ToString());
+            }
+            if (Optional.IsDefined(Language))
+            {
+                writer.WritePropertyName("language"u8);
+                writer.WriteStringValue(Language);
+            }
+            if (Optional.IsDefined(Duration))
+            {
+                writer.WritePropertyName("duration"u8);
+                writer.WriteNumberValue(Convert.ToDouble(Duration.Value.ToString("s\\.FFF")));
+            }
+            if (Optional.IsCollectionDefined(Segments))
+            {
+                writer.WritePropertyName("segments"u8);
+                writer.WriteStartArray();
+                foreach (var item in Segments)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AudioTranslation IJsonModel<AudioTranslation>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranslation>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AudioTranslation)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAudioTranslation(document.RootElement, options);
+        }
+
+        internal static AudioTranslation DeserializeAudioTranslation(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string text = default;
+            AudioTaskLabel? task = default;
+            string language = default;
+            TimeSpan? duration = default;
+            IReadOnlyList<AudioTranslationSegment> segments = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("text"u8))
+                {
+                    text = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("task"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    task = new AudioTaskLabel(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("language"u8))
+                {
+                    language = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("duration"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    duration = TimeSpan.FromSeconds(property.Value.GetDouble());
+                    continue;
+                }
+                if (property.NameEquals("segments"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<AudioTranslationSegment> array = new List<AudioTranslationSegment>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(AudioTranslationSegment.DeserializeAudioTranslationSegment(item, options));
+                    }
+                    segments = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AudioTranslation(
+                text,
+                task,
+                language,
+                duration,
+                segments ?? new ChangeTrackingList<AudioTranslationSegment>(),
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AudioTranslation>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranslation>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AudioTranslation)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AudioTranslation IPersistableModel<AudioTranslation>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranslation>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAudioTranslation(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AudioTranslation)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AudioTranslation>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AudioTranslation FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAudioTranslation(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslation.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslation.cs
new file mode 100644
index 000000000000..476c481e3824
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslation.cs
@@ -0,0 +1,98 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Result information for an operation that translated spoken audio into written text. </summary>
+    public partial class AudioTranslation
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranslation"/>. </summary>
+        /// <param name="text"> The translated text for the provided audio data. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="text"/> is null. </exception>
+        internal AudioTranslation(string text)
+        {
+            Argument.AssertNotNull(text, nameof(text));
+
+            Text = text;
+            Segments = new ChangeTrackingList<AudioTranslationSegment>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranslation"/>. </summary>
+        /// <param name="text"> The translated text for the provided audio data. </param>
+        /// <param name="internalAudioTaskLabel"> The label that describes which operation type generated the accompanying response data. </param>
+        /// <param name="language">
+        /// The spoken language that was detected in the translated audio data.
+        /// This is expressed as a two-letter ISO-639-1 language code like 'en' or 'fr'.
+        /// </param>
+        /// <param name="duration"> The total duration of the audio processed to produce accompanying translation information. </param>
+        /// <param name="segments"> A collection of information about the timing, probabilities, and other detail of each processed audio segment. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AudioTranslation(string text, AudioTaskLabel? internalAudioTaskLabel, string language, TimeSpan? duration, IReadOnlyList<AudioTranslationSegment> segments, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Text = text;
+            InternalAudioTaskLabel = internalAudioTaskLabel;
+            Language = language;
+            Duration = duration;
+            Segments = segments;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranslation"/> for deserialization. </summary>
+        internal AudioTranslation()
+        {
+        }
+
+        /// <summary> The translated text for the provided audio data. </summary>
+        public string Text { get; }
+        /// <summary> The label that describes which operation type generated the accompanying response data. </summary>
+        public AudioTaskLabel? InternalAudioTaskLabel { get; }
+        /// <summary>
+        /// The spoken language that was detected in the translated audio data.
+        /// This is expressed as a two-letter ISO-639-1 language code like 'en' or 'fr'.
+        /// </summary>
+        public string Language { get; }
+        /// <summary> The total duration of the audio processed to produce accompanying translation information. </summary>
+        public TimeSpan? Duration { get; }
+        /// <summary> A collection of information about the timing, probabilities, and other detail of each processed audio segment. </summary>
+        public IReadOnlyList<AudioTranslationSegment> Segments { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationFormat.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationFormat.cs
new file mode 100644
index 000000000000..0c8068cb6afe
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationFormat.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Defines available options for the underlying response format of output translation information. </summary>
+    public readonly partial struct AudioTranslationFormat : IEquatable<AudioTranslationFormat>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranslationFormat"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public AudioTranslationFormat(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string SimpleValue = "json";
+        private const string VerboseValue = "verbose_json";
+        private const string InternalPlainTextValue = "text";
+        private const string SrtValue = "srt";
+        private const string VttValue = "vtt";
+
+        /// <summary> Use a response body that is a JSON object containing a single 'text' field for the translation. </summary>
+        public static AudioTranslationFormat Simple { get; } = new AudioTranslationFormat(SimpleValue);
+        /// <summary>
+        /// Use a response body that is a JSON object containing translation text along with timing, segments, and other
+        /// metadata.
+        /// </summary>
+        public static AudioTranslationFormat Verbose { get; } = new AudioTranslationFormat(VerboseValue);
+        /// <summary> Use a response body that is plain text containing the raw, unannotated translation. </summary>
+        public static AudioTranslationFormat InternalPlainText { get; } = new AudioTranslationFormat(InternalPlainTextValue);
+        /// <summary> Use a response body that is plain text in SubRip (SRT) format that also includes timing information. </summary>
+        public static AudioTranslationFormat Srt { get; } = new AudioTranslationFormat(SrtValue);
+        /// <summary> Use a response body that is plain text in Web Video Text Tracks (VTT) format that also includes timing information. </summary>
+        public static AudioTranslationFormat Vtt { get; } = new AudioTranslationFormat(VttValue);
+        /// <summary> Determines if two <see cref="AudioTranslationFormat"/> values are the same. </summary>
+        public static bool operator ==(AudioTranslationFormat left, AudioTranslationFormat right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="AudioTranslationFormat"/> values are not the same. </summary>
+        public static bool operator !=(AudioTranslationFormat left, AudioTranslationFormat right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="AudioTranslationFormat"/>. </summary>
+        public static implicit operator AudioTranslationFormat(string value) => new AudioTranslationFormat(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is AudioTranslationFormat other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(AudioTranslationFormat other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationOptions.Serialization.cs
new file mode 100644
index 000000000000..120ed0644d67
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationOptions.Serialization.cs
@@ -0,0 +1,257 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AudioTranslationOptions : IUtf8JsonSerializable, IJsonModel<AudioTranslationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AudioTranslationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AudioTranslationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranslationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AudioTranslationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("file"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(global::System.BinaryData.FromStream(AudioData));
+#else
+            using (JsonDocument document = JsonDocument.Parse(BinaryData.FromStream(AudioData)))
+            {
+                JsonSerializer.Serialize(writer, document.RootElement);
+            }
+#endif
+            if (Optional.IsDefined(Filename))
+            {
+                writer.WritePropertyName("filename"u8);
+                writer.WriteStringValue(Filename);
+            }
+            if (Optional.IsDefined(ResponseFormat))
+            {
+                writer.WritePropertyName("response_format"u8);
+                writer.WriteStringValue(ResponseFormat.Value.ToString());
+            }
+            if (Optional.IsDefined(Prompt))
+            {
+                writer.WritePropertyName("prompt"u8);
+                writer.WriteStringValue(Prompt);
+            }
+            if (Optional.IsDefined(Temperature))
+            {
+                writer.WritePropertyName("temperature"u8);
+                writer.WriteNumberValue(Temperature.Value);
+            }
+            if (Optional.IsDefined(DeploymentName))
+            {
+                writer.WritePropertyName("model"u8);
+                writer.WriteStringValue(DeploymentName);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AudioTranslationOptions IJsonModel<AudioTranslationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranslationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AudioTranslationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAudioTranslationOptions(document.RootElement, options);
+        }
+
+        internal static AudioTranslationOptions DeserializeAudioTranslationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            Stream file = default;
+            string filename = default;
+            AudioTranslationFormat? responseFormat = default;
+            string prompt = default;
+            float? temperature = default;
+            string model = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file"u8))
+                {
+                    file = BinaryData.FromString(property.Value.GetRawText()).ToStream();
+                    continue;
+                }
+                if (property.NameEquals("filename"u8))
+                {
+                    filename = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("response_format"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    responseFormat = new AudioTranslationFormat(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("prompt"u8))
+                {
+                    prompt = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("temperature"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    temperature = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("model"u8))
+                {
+                    model = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AudioTranslationOptions(
+                file,
+                filename,
+                responseFormat,
+                prompt,
+                temperature,
+                model,
+                serializedAdditionalRawData);
+        }
+
+        private BinaryData SerializeMultipart(ModelReaderWriterOptions options)
+        {
+            using MultipartFormDataRequestContent content = ToMultipartRequestContent();
+            using MemoryStream stream = new MemoryStream();
+            content.WriteTo(stream);
+            if (stream.Position > int.MaxValue)
+            {
+                return BinaryData.FromStream(stream);
+            }
+            else
+            {
+                return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position));
+            }
+        }
+
+        internal virtual MultipartFormDataRequestContent ToMultipartRequestContent()
+        {
+            MultipartFormDataRequestContent content = new MultipartFormDataRequestContent();
+            content.Add(AudioData, "file", "file", "application/octet-stream");
+            if (Optional.IsDefined(Filename))
+            {
+                content.Add(Filename, "filename");
+            }
+            if (Optional.IsDefined(ResponseFormat))
+            {
+                content.Add(ResponseFormat.Value.ToString(), "response_format");
+            }
+            if (Optional.IsDefined(Prompt))
+            {
+                content.Add(Prompt, "prompt");
+            }
+            if (Optional.IsDefined(Temperature))
+            {
+                content.Add(Temperature.Value, "temperature");
+            }
+            if (Optional.IsDefined(DeploymentName))
+            {
+                content.Add(DeploymentName, "model");
+            }
+            return content;
+        }
+
+        BinaryData IPersistableModel<AudioTranslationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranslationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                case "MFD":
+                    return SerializeMultipart(options);
+                default:
+                    throw new FormatException($"The model {nameof(AudioTranslationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AudioTranslationOptions IPersistableModel<AudioTranslationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranslationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAudioTranslationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AudioTranslationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AudioTranslationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "MFD";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AudioTranslationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAudioTranslationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationOptions.cs
new file mode 100644
index 000000000000..63936f35c61c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationOptions.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The configuration information for an audio translation request. </summary>
+    public partial class AudioTranslationOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranslationOptions"/>. </summary>
+        /// <param name="audioData">
+        /// The audio data to translate. This must be the binary content of a file in one of the supported media formats:
+        ///  flac, mp3, mp4, mpeg, mpga, m4a, ogg, wav, webm.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="audioData"/> is null. </exception>
+        public AudioTranslationOptions(Stream audioData)
+        {
+            Argument.AssertNotNull(audioData, nameof(audioData));
+
+            AudioData = audioData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranslationOptions"/>. </summary>
+        /// <param name="audioData">
+        /// The audio data to translate. This must be the binary content of a file in one of the supported media formats:
+        ///  flac, mp3, mp4, mpeg, mpga, m4a, ogg, wav, webm.
+        /// </param>
+        /// <param name="filename"> The optional filename or descriptive identifier to associate with with the audio data. </param>
+        /// <param name="responseFormat"> The requested format of the translation response data, which will influence the content and detail of the result. </param>
+        /// <param name="prompt">
+        /// An optional hint to guide the model's style or continue from a prior audio segment. The written language of the
+        /// prompt should match the primary spoken language of the audio data.
+        /// </param>
+        /// <param name="temperature">
+        /// The sampling temperature, between 0 and 1.
+        /// Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.
+        /// If set to 0, the model will use log probability to automatically increase the temperature until certain thresholds are hit.
+        /// </param>
+        /// <param name="deploymentName"> The model to use for this translation request. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AudioTranslationOptions(Stream audioData, string filename, AudioTranslationFormat? responseFormat, string prompt, float? temperature, string deploymentName, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            AudioData = audioData;
+            Filename = filename;
+            ResponseFormat = responseFormat;
+            Prompt = prompt;
+            Temperature = temperature;
+            DeploymentName = deploymentName;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranslationOptions"/> for deserialization. </summary>
+        internal AudioTranslationOptions()
+        {
+        }
+
+        /// <summary>
+        /// The audio data to translate. This must be the binary content of a file in one of the supported media formats:
+        ///  flac, mp3, mp4, mpeg, mpga, m4a, ogg, wav, webm.
+        /// </summary>
+        public Stream AudioData { get; }
+        /// <summary> The optional filename or descriptive identifier to associate with with the audio data. </summary>
+        public string Filename { get; set; }
+        /// <summary> The requested format of the translation response data, which will influence the content and detail of the result. </summary>
+        public AudioTranslationFormat? ResponseFormat { get; set; }
+        /// <summary>
+        /// An optional hint to guide the model's style or continue from a prior audio segment. The written language of the
+        /// prompt should match the primary spoken language of the audio data.
+        /// </summary>
+        public string Prompt { get; set; }
+        /// <summary>
+        /// The sampling temperature, between 0 and 1.
+        /// Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.
+        /// If set to 0, the model will use log probability to automatically increase the temperature until certain thresholds are hit.
+        /// </summary>
+        public float? Temperature { get; set; }
+        /// <summary> The model to use for this translation request. </summary>
+        public string DeploymentName { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationSegment.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationSegment.Serialization.cs
new file mode 100644
index 000000000000..e8ec35cffb1b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationSegment.Serialization.cs
@@ -0,0 +1,228 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AudioTranslationSegment : IUtf8JsonSerializable, IJsonModel<AudioTranslationSegment>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AudioTranslationSegment>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AudioTranslationSegment>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranslationSegment>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AudioTranslationSegment)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("id"u8);
+            writer.WriteNumberValue(Id);
+            writer.WritePropertyName("start"u8);
+            writer.WriteNumberValue(Convert.ToDouble(Start.ToString("s\\.FFF")));
+            writer.WritePropertyName("end"u8);
+            writer.WriteNumberValue(Convert.ToDouble(End.ToString("s\\.FFF")));
+            writer.WritePropertyName("text"u8);
+            writer.WriteStringValue(Text);
+            writer.WritePropertyName("temperature"u8);
+            writer.WriteNumberValue(Temperature);
+            writer.WritePropertyName("avg_logprob"u8);
+            writer.WriteNumberValue(AverageLogProbability);
+            writer.WritePropertyName("compression_ratio"u8);
+            writer.WriteNumberValue(CompressionRatio);
+            writer.WritePropertyName("no_speech_prob"u8);
+            writer.WriteNumberValue(NoSpeechProbability);
+            writer.WritePropertyName("tokens"u8);
+            writer.WriteStartArray();
+            foreach (var item in Tokens)
+            {
+                writer.WriteNumberValue(item);
+            }
+            writer.WriteEndArray();
+            writer.WritePropertyName("seek"u8);
+            writer.WriteNumberValue(Seek);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AudioTranslationSegment IJsonModel<AudioTranslationSegment>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranslationSegment>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AudioTranslationSegment)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAudioTranslationSegment(document.RootElement, options);
+        }
+
+        internal static AudioTranslationSegment DeserializeAudioTranslationSegment(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            int id = default;
+            TimeSpan start = default;
+            TimeSpan end = default;
+            string text = default;
+            float temperature = default;
+            float avgLogprob = default;
+            float compressionRatio = default;
+            float noSpeechProb = default;
+            IReadOnlyList<int> tokens = default;
+            int seek = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("start"u8))
+                {
+                    start = TimeSpan.FromSeconds(property.Value.GetDouble());
+                    continue;
+                }
+                if (property.NameEquals("end"u8))
+                {
+                    end = TimeSpan.FromSeconds(property.Value.GetDouble());
+                    continue;
+                }
+                if (property.NameEquals("text"u8))
+                {
+                    text = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("temperature"u8))
+                {
+                    temperature = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("avg_logprob"u8))
+                {
+                    avgLogprob = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("compression_ratio"u8))
+                {
+                    compressionRatio = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("no_speech_prob"u8))
+                {
+                    noSpeechProb = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("tokens"u8))
+                {
+                    List<int> array = new List<int>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetInt32());
+                    }
+                    tokens = array;
+                    continue;
+                }
+                if (property.NameEquals("seek"u8))
+                {
+                    seek = property.Value.GetInt32();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AudioTranslationSegment(
+                id,
+                start,
+                end,
+                text,
+                temperature,
+                avgLogprob,
+                compressionRatio,
+                noSpeechProb,
+                tokens,
+                seek,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AudioTranslationSegment>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranslationSegment>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AudioTranslationSegment)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AudioTranslationSegment IPersistableModel<AudioTranslationSegment>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AudioTranslationSegment>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAudioTranslationSegment(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AudioTranslationSegment)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AudioTranslationSegment>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AudioTranslationSegment FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAudioTranslationSegment(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationSegment.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationSegment.cs
new file mode 100644
index 000000000000..4eba8ec055ae
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AudioTranslationSegment.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// Extended information about a single segment of translated audio data.
+    /// Segments generally represent roughly 5-10 seconds of speech. Segment boundaries typically occur between words but not
+    /// necessarily sentences.
+    /// </summary>
+    public partial class AudioTranslationSegment
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranslationSegment"/>. </summary>
+        /// <param name="id"> The 0-based index of this segment within a translation. </param>
+        /// <param name="start"> The time at which this segment started relative to the beginning of the translated audio. </param>
+        /// <param name="end"> The time at which this segment ended relative to the beginning of the translated audio. </param>
+        /// <param name="text"> The translated text that was part of this audio segment. </param>
+        /// <param name="temperature"> The temperature score associated with this audio segment. </param>
+        /// <param name="averageLogProbability"> The average log probability associated with this audio segment. </param>
+        /// <param name="compressionRatio"> The compression ratio of this audio segment. </param>
+        /// <param name="noSpeechProbability"> The probability of no speech detection within this audio segment. </param>
+        /// <param name="tokens"> The token IDs matching the translated text in this audio segment. </param>
+        /// <param name="seek">
+        /// The seek position associated with the processing of this audio segment.
+        /// Seek positions are expressed as hundredths of seconds.
+        /// The model may process several segments from a single seek position, so while the seek position will never represent
+        /// a later time than the segment's start, the segment's start may represent a significantly later time than the
+        /// segment's associated seek position.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="text"/> or <paramref name="tokens"/> is null. </exception>
+        internal AudioTranslationSegment(int id, TimeSpan start, TimeSpan end, string text, float temperature, float averageLogProbability, float compressionRatio, float noSpeechProbability, IEnumerable<int> tokens, int seek)
+        {
+            Argument.AssertNotNull(text, nameof(text));
+            Argument.AssertNotNull(tokens, nameof(tokens));
+
+            Id = id;
+            Start = start;
+            End = end;
+            Text = text;
+            Temperature = temperature;
+            AverageLogProbability = averageLogProbability;
+            CompressionRatio = compressionRatio;
+            NoSpeechProbability = noSpeechProbability;
+            Tokens = tokens.ToList();
+            Seek = seek;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranslationSegment"/>. </summary>
+        /// <param name="id"> The 0-based index of this segment within a translation. </param>
+        /// <param name="start"> The time at which this segment started relative to the beginning of the translated audio. </param>
+        /// <param name="end"> The time at which this segment ended relative to the beginning of the translated audio. </param>
+        /// <param name="text"> The translated text that was part of this audio segment. </param>
+        /// <param name="temperature"> The temperature score associated with this audio segment. </param>
+        /// <param name="averageLogProbability"> The average log probability associated with this audio segment. </param>
+        /// <param name="compressionRatio"> The compression ratio of this audio segment. </param>
+        /// <param name="noSpeechProbability"> The probability of no speech detection within this audio segment. </param>
+        /// <param name="tokens"> The token IDs matching the translated text in this audio segment. </param>
+        /// <param name="seek">
+        /// The seek position associated with the processing of this audio segment.
+        /// Seek positions are expressed as hundredths of seconds.
+        /// The model may process several segments from a single seek position, so while the seek position will never represent
+        /// a later time than the segment's start, the segment's start may represent a significantly later time than the
+        /// segment's associated seek position.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AudioTranslationSegment(int id, TimeSpan start, TimeSpan end, string text, float temperature, float averageLogProbability, float compressionRatio, float noSpeechProbability, IReadOnlyList<int> tokens, int seek, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            Start = start;
+            End = end;
+            Text = text;
+            Temperature = temperature;
+            AverageLogProbability = averageLogProbability;
+            CompressionRatio = compressionRatio;
+            NoSpeechProbability = noSpeechProbability;
+            Tokens = tokens;
+            Seek = seek;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AudioTranslationSegment"/> for deserialization. </summary>
+        internal AudioTranslationSegment()
+        {
+        }
+
+        /// <summary> The 0-based index of this segment within a translation. </summary>
+        public int Id { get; }
+        /// <summary> The time at which this segment started relative to the beginning of the translated audio. </summary>
+        public TimeSpan Start { get; }
+        /// <summary> The time at which this segment ended relative to the beginning of the translated audio. </summary>
+        public TimeSpan End { get; }
+        /// <summary> The translated text that was part of this audio segment. </summary>
+        public string Text { get; }
+        /// <summary> The temperature score associated with this audio segment. </summary>
+        public float Temperature { get; }
+        /// <summary> The average log probability associated with this audio segment. </summary>
+        public float AverageLogProbability { get; }
+        /// <summary> The compression ratio of this audio segment. </summary>
+        public float CompressionRatio { get; }
+        /// <summary> The probability of no speech detection within this audio segment. </summary>
+        public float NoSpeechProbability { get; }
+        /// <summary> The token IDs matching the translated text in this audio segment. </summary>
+        public IReadOnlyList<int> Tokens { get; }
+        /// <summary>
+        /// The seek position associated with the processing of this audio segment.
+        /// Seek positions are expressed as hundredths of seconds.
+        /// The model may process several segments from a single seek position, so while the seek position will never represent
+        /// a later time than the segment's start, the segment's start may represent a significantly later time than the
+        /// segment's associated seek position.
+        /// </summary>
+        public int Seek { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatEnhancementConfiguration.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatEnhancementConfiguration.Serialization.cs
new file mode 100644
index 000000000000..1a12e637d389
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatEnhancementConfiguration.Serialization.cs
@@ -0,0 +1,157 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AzureChatEnhancementConfiguration : IUtf8JsonSerializable, IJsonModel<AzureChatEnhancementConfiguration>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureChatEnhancementConfiguration>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureChatEnhancementConfiguration>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatEnhancementConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureChatEnhancementConfiguration)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Grounding))
+            {
+                writer.WritePropertyName("grounding"u8);
+                writer.WriteObjectValue(Grounding, options);
+            }
+            if (Optional.IsDefined(Ocr))
+            {
+                writer.WritePropertyName("ocr"u8);
+                writer.WriteObjectValue(Ocr, options);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AzureChatEnhancementConfiguration IJsonModel<AzureChatEnhancementConfiguration>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatEnhancementConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureChatEnhancementConfiguration)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAzureChatEnhancementConfiguration(document.RootElement, options);
+        }
+
+        internal static AzureChatEnhancementConfiguration DeserializeAzureChatEnhancementConfiguration(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            AzureChatGroundingEnhancementConfiguration grounding = default;
+            AzureChatOCREnhancementConfiguration ocr = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("grounding"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    grounding = AzureChatGroundingEnhancementConfiguration.DeserializeAzureChatGroundingEnhancementConfiguration(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("ocr"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    ocr = AzureChatOCREnhancementConfiguration.DeserializeAzureChatOCREnhancementConfiguration(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AzureChatEnhancementConfiguration(grounding, ocr, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AzureChatEnhancementConfiguration>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatEnhancementConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AzureChatEnhancementConfiguration)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AzureChatEnhancementConfiguration IPersistableModel<AzureChatEnhancementConfiguration>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatEnhancementConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAzureChatEnhancementConfiguration(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AzureChatEnhancementConfiguration)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AzureChatEnhancementConfiguration>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureChatEnhancementConfiguration FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAzureChatEnhancementConfiguration(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatEnhancementConfiguration.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatEnhancementConfiguration.cs
new file mode 100644
index 000000000000..9abaf36c33a7
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatEnhancementConfiguration.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A representation of the available Azure OpenAI enhancement configurations. </summary>
+    public partial class AzureChatEnhancementConfiguration
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatEnhancementConfiguration"/>. </summary>
+        public AzureChatEnhancementConfiguration()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatEnhancementConfiguration"/>. </summary>
+        /// <param name="grounding"> A representation of the available options for the Azure OpenAI grounding enhancement. </param>
+        /// <param name="ocr"> A representation of the available options for the Azure OpenAI optical character recognition (OCR) enhancement. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AzureChatEnhancementConfiguration(AzureChatGroundingEnhancementConfiguration grounding, AzureChatOCREnhancementConfiguration ocr, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Grounding = grounding;
+            Ocr = ocr;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> A representation of the available options for the Azure OpenAI grounding enhancement. </summary>
+        public AzureChatGroundingEnhancementConfiguration Grounding { get; set; }
+        /// <summary> A representation of the available options for the Azure OpenAI optical character recognition (OCR) enhancement. </summary>
+        public AzureChatOCREnhancementConfiguration Ocr { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatEnhancements.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatEnhancements.Serialization.cs
new file mode 100644
index 000000000000..8d4215b9c075
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatEnhancements.Serialization.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AzureChatEnhancements : IUtf8JsonSerializable, IJsonModel<AzureChatEnhancements>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureChatEnhancements>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureChatEnhancements>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatEnhancements>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureChatEnhancements)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Grounding))
+            {
+                writer.WritePropertyName("grounding"u8);
+                writer.WriteObjectValue(Grounding, options);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AzureChatEnhancements IJsonModel<AzureChatEnhancements>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatEnhancements>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureChatEnhancements)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAzureChatEnhancements(document.RootElement, options);
+        }
+
+        internal static AzureChatEnhancements DeserializeAzureChatEnhancements(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            AzureGroundingEnhancement grounding = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("grounding"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    grounding = AzureGroundingEnhancement.DeserializeAzureGroundingEnhancement(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AzureChatEnhancements(grounding, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AzureChatEnhancements>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatEnhancements>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AzureChatEnhancements)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AzureChatEnhancements IPersistableModel<AzureChatEnhancements>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatEnhancements>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAzureChatEnhancements(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AzureChatEnhancements)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AzureChatEnhancements>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureChatEnhancements FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAzureChatEnhancements(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIDalleErrorResponse.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatEnhancements.cs
similarity index 61%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIDalleErrorResponse.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatEnhancements.cs
index 6aafb0c3d308..113d9a88ea0a 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIDalleErrorResponse.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatEnhancements.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -7,8 +10,11 @@
 
 namespace Azure.AI.OpenAI
 {
-    /// <summary> A structured representation of an error an Azure OpenAI request. </summary>
-    internal partial class AzureOpenAIDalleErrorResponse
+    /// <summary>
+    /// Represents the output results of Azure enhancements to chat completions, as configured via the matching input provided
+    /// in the request.
+    /// </summary>
+    public partial class AzureChatEnhancements
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -40,22 +46,23 @@ internal partial class AzureOpenAIDalleErrorResponse
         /// </list>
         /// </para>
         /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="AzureOpenAIDalleErrorResponse"/>. </summary>
-        internal AzureOpenAIDalleErrorResponse()
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatEnhancements"/>. </summary>
+        internal AzureChatEnhancements()
         {
         }
 
-        /// <summary> Initializes a new instance of <see cref="AzureOpenAIDalleErrorResponse"/>. </summary>
-        /// <param name="error"></param>
+        /// <summary> Initializes a new instance of <see cref="AzureChatEnhancements"/>. </summary>
+        /// <param name="grounding"> The grounding enhancement that returns the bounding box of the objects detected in the image. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AzureOpenAIDalleErrorResponse(AzureOpenAIDalleError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal AzureChatEnhancements(AzureGroundingEnhancement grounding, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
-            Error = error;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
+            Grounding = grounding;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Gets the error. </summary>
-        public AzureOpenAIDalleError Error { get; }
+        /// <summary> The grounding enhancement that returns the bounding box of the objects detected in the image. </summary>
+        public AzureGroundingEnhancement Grounding { get; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionConfiguration.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionConfiguration.Serialization.cs
new file mode 100644
index 000000000000..58d4f9d5a503
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionConfiguration.Serialization.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    [PersistableModelProxy(typeof(UnknownAzureChatExtensionConfiguration))]
+    public partial class AzureChatExtensionConfiguration : IUtf8JsonSerializable, IJsonModel<AzureChatExtensionConfiguration>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureChatExtensionConfiguration>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureChatExtensionConfiguration>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureChatExtensionConfiguration)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AzureChatExtensionConfiguration IJsonModel<AzureChatExtensionConfiguration>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureChatExtensionConfiguration)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAzureChatExtensionConfiguration(document.RootElement, options);
+        }
+
+        internal static AzureChatExtensionConfiguration DeserializeAzureChatExtensionConfiguration(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "azure_cosmos_db": return AzureCosmosDBChatExtensionConfiguration.DeserializeAzureCosmosDBChatExtensionConfiguration(element, options);
+                    case "azure_search": return AzureSearchChatExtensionConfiguration.DeserializeAzureSearchChatExtensionConfiguration(element, options);
+                    case "elasticsearch": return ElasticsearchChatExtensionConfiguration.DeserializeElasticsearchChatExtensionConfiguration(element, options);
+                    case "mongo_db": return MongoDBChatExtensionConfiguration.DeserializeMongoDBChatExtensionConfiguration(element, options);
+                    case "pinecone": return PineconeChatExtensionConfiguration.DeserializePineconeChatExtensionConfiguration(element, options);
+                }
+            }
+            return UnknownAzureChatExtensionConfiguration.DeserializeUnknownAzureChatExtensionConfiguration(element, options);
+        }
+
+        BinaryData IPersistableModel<AzureChatExtensionConfiguration>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AzureChatExtensionConfiguration)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AzureChatExtensionConfiguration IPersistableModel<AzureChatExtensionConfiguration>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAzureChatExtensionConfiguration(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AzureChatExtensionConfiguration)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AzureChatExtensionConfiguration>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureChatExtensionConfiguration FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAzureChatExtensionConfiguration(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionConfiguration.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionConfiguration.cs
new file mode 100644
index 000000000000..689f1809d2b8
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionConfiguration.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    ///   A representation of configuration data for a single Azure OpenAI chat extension. This will be used by a chat
+    ///   completions request that should use Azure OpenAI chat extensions to augment the response behavior.
+    ///   The use of this configuration is compatible only with Azure OpenAI.
+    /// Please note <see cref="AzureChatExtensionConfiguration"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="AzureCosmosDBChatExtensionConfiguration"/>, <see cref="AzureSearchChatExtensionConfiguration"/>, <see cref="ElasticsearchChatExtensionConfiguration"/>, <see cref="MongoDBChatExtensionConfiguration"/> and <see cref="PineconeChatExtensionConfiguration"/>.
+    /// </summary>
+    public abstract partial class AzureChatExtensionConfiguration
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatExtensionConfiguration"/>. </summary>
+        protected AzureChatExtensionConfiguration()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatExtensionConfiguration"/>. </summary>
+        /// <param name="type">
+        ///   The label for the type of an Azure chat extension. This typically corresponds to a matching Azure resource.
+        ///   Azure chat extensions are only compatible with Azure OpenAI.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AzureChatExtensionConfiguration(AzureChatExtensionType type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Type = type;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary>
+        ///   The label for the type of an Azure chat extension. This typically corresponds to a matching Azure resource.
+        ///   Azure chat extensions are only compatible with Azure OpenAI.
+        /// </summary>
+        internal AzureChatExtensionType Type { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCitation.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionDataSourceResponseCitation.Serialization.cs
similarity index 56%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCitation.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionDataSourceResponseCitation.Serialization.cs
index d361f85eecfd..792a06a92a2e 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCitation.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionDataSourceResponseCitation.Serialization.cs
@@ -1,64 +1,62 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI
 {
-    public partial class ChatCitation : IJsonModel<ChatCitation>
+    public partial class AzureChatExtensionDataSourceResponseCitation : IUtf8JsonSerializable, IJsonModel<AzureChatExtensionDataSourceResponseCitation>
     {
-        void IJsonModel<ChatCitation>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureChatExtensionDataSourceResponseCitation>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureChatExtensionDataSourceResponseCitation>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCitation>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionDataSourceResponseCitation>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatCitation)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(AzureChatExtensionDataSourceResponseCitation)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("content") != true)
-            {
-                writer.WritePropertyName("content"u8);
-                writer.WriteStringValue(Content);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("title") != true && Optional.IsDefined(Title))
+            writer.WritePropertyName("content"u8);
+            writer.WriteStringValue(Content);
+            if (Optional.IsDefined(Title))
             {
                 writer.WritePropertyName("title"u8);
                 writer.WriteStringValue(Title);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("url") != true && Optional.IsDefined(Uri))
+            if (Optional.IsDefined(Url))
             {
                 writer.WritePropertyName("url"u8);
-                writer.WriteStringValue(Uri.AbsoluteUri);
+                writer.WriteStringValue(Url);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("filepath") != true && Optional.IsDefined(FilePath))
+            if (Optional.IsDefined(Filepath))
             {
                 writer.WritePropertyName("filepath"u8);
-                writer.WriteStringValue(FilePath);
+                writer.WriteStringValue(Filepath);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("chunk_id") != true && Optional.IsDefined(ChunkId))
+            if (Optional.IsDefined(ChunkId))
             {
                 writer.WritePropertyName("chunk_id"u8);
                 writer.WriteStringValue(ChunkId);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("rerank_score") != true && Optional.IsDefined(RerankScore))
+            if (Optional.IsDefined(RerankScore))
             {
                 writer.WritePropertyName("rerank_score"u8);
                 writer.WriteNumberValue(RerankScore.Value);
             }
-            if (SerializedAdditionalRawData != null)
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -73,19 +71,19 @@ void IJsonModel<ChatCitation>.Write(Utf8JsonWriter writer, ModelReaderWriterOpti
             writer.WriteEndObject();
         }
 
-        ChatCitation IJsonModel<ChatCitation>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        AzureChatExtensionDataSourceResponseCitation IJsonModel<AzureChatExtensionDataSourceResponseCitation>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCitation>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionDataSourceResponseCitation>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatCitation)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(AzureChatExtensionDataSourceResponseCitation)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeChatCitation(document.RootElement, options);
+            return DeserializeAzureChatExtensionDataSourceResponseCitation(document.RootElement, options);
         }
 
-        internal static ChatCitation DeserializeChatCitation(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static AzureChatExtensionDataSourceResponseCitation DeserializeAzureChatExtensionDataSourceResponseCitation(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -95,7 +93,7 @@ internal static ChatCitation DeserializeChatCitation(JsonElement element, ModelR
             }
             string content = default;
             string title = default;
-            Uri url = default;
+            string url = default;
             string filepath = default;
             string chunkId = default;
             double? rerankScore = default;
@@ -115,11 +113,7 @@ internal static ChatCitation DeserializeChatCitation(JsonElement element, ModelR
                 }
                 if (property.NameEquals("url"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    url = new Uri(property.Value.GetString());
+                    url = property.Value.GetString();
                     continue;
                 }
                 if (property.NameEquals("filepath"u8))
@@ -143,12 +137,11 @@ internal static ChatCitation DeserializeChatCitation(JsonElement element, ModelR
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new ChatCitation(
+            return new AzureChatExtensionDataSourceResponseCitation(
                 content,
                 title,
                 url,
@@ -158,49 +151,51 @@ internal static ChatCitation DeserializeChatCitation(JsonElement element, ModelR
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<ChatCitation>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<AzureChatExtensionDataSourceResponseCitation>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCitation>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionDataSourceResponseCitation>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(ChatCitation)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(AzureChatExtensionDataSourceResponseCitation)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ChatCitation IPersistableModel<ChatCitation>.Create(BinaryData data, ModelReaderWriterOptions options)
+        AzureChatExtensionDataSourceResponseCitation IPersistableModel<AzureChatExtensionDataSourceResponseCitation>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCitation>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionDataSourceResponseCitation>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeChatCitation(document.RootElement, options);
+                        return DeserializeAzureChatExtensionDataSourceResponseCitation(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(ChatCitation)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(AzureChatExtensionDataSourceResponseCitation)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ChatCitation>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<AzureChatExtensionDataSourceResponseCitation>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static ChatCitation FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureChatExtensionDataSourceResponseCitation FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeChatCitation(document.RootElement);
+            return DeserializeAzureChatExtensionDataSourceResponseCitation(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCitation.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionDataSourceResponseCitation.cs
similarity index 50%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCitation.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionDataSourceResponseCitation.cs
index 6d49dbb6950e..b07ff2f62a95 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCitation.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionDataSourceResponseCitation.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -5,10 +8,14 @@
 using System;
 using System.Collections.Generic;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI
 {
-    /// <summary> The AzureChatMessageContextCitation. </summary>
-    public partial class ChatCitation
+    /// <summary>
+    /// A single instance of additional context information available when Azure OpenAI chat extensions are involved
+    /// in the generation of a corresponding chat completions response. This context information is only populated when
+    /// using an Azure OpenAI request configured to use a matching extension.
+    /// </summary>
+    public partial class AzureChatExtensionDataSourceResponseCitation
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -40,48 +47,53 @@ public partial class ChatCitation
         /// </list>
         /// </para>
         /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="ChatCitation"/>. </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatExtensionDataSourceResponseCitation"/>. </summary>
         /// <param name="content"> The content of the citation. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        internal ChatCitation(string content)
+        internal AzureChatExtensionDataSourceResponseCitation(string content)
         {
             Argument.AssertNotNull(content, nameof(content));
 
             Content = content;
         }
 
-        /// <summary> Initializes a new instance of <see cref="ChatCitation"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="AzureChatExtensionDataSourceResponseCitation"/>. </summary>
         /// <param name="content"> The content of the citation. </param>
-        /// <param name="title"> The title for the citation. </param>
-        /// <param name="uri"> The URL of the citation. </param>
-        /// <param name="filePath"> The file path for the citation. </param>
-        /// <param name="chunkId"> The chunk ID for the citation. </param>
-        /// <param name="rerankScore"> The rerank score for the retrieval. </param>
+        /// <param name="title"> The title of the citation. </param>
+        /// <param name="url"> The URL of the citation. </param>
+        /// <param name="filepath"> The file path of the citation. </param>
+        /// <param name="chunkId"> The chunk ID of the citation. </param>
+        /// <param name="rerankScore"> The rerank score of the retrieved document. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ChatCitation(string content, string title, Uri uri, string filePath, string chunkId, double? rerankScore, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal AzureChatExtensionDataSourceResponseCitation(string content, string title, string url, string filepath, string chunkId, double? rerankScore, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Content = content;
             Title = title;
-            Uri = uri;
-            FilePath = filePath;
+            Url = url;
+            Filepath = filepath;
             ChunkId = chunkId;
             RerankScore = rerankScore;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="ChatCitation"/> for deserialization. </summary>
-        internal ChatCitation()
+        /// <summary> Initializes a new instance of <see cref="AzureChatExtensionDataSourceResponseCitation"/> for deserialization. </summary>
+        internal AzureChatExtensionDataSourceResponseCitation()
         {
         }
 
         /// <summary> The content of the citation. </summary>
         public string Content { get; }
-        /// <summary> The title for the citation. </summary>
+        /// <summary> The title of the citation. </summary>
         public string Title { get; }
-        /// <summary> The chunk ID for the citation. </summary>
+        /// <summary> The URL of the citation. </summary>
+        public string Url { get; }
+        /// <summary> The file path of the citation. </summary>
+        public string Filepath { get; }
+        /// <summary> The chunk ID of the citation. </summary>
         public string ChunkId { get; }
-        /// <summary> The rerank score for the retrieval. </summary>
+        /// <summary> The rerank score of the retrieved document. </summary>
         public double? RerankScore { get; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionRetrieveDocumentFilterReason.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionRetrieveDocumentFilterReason.Serialization.cs
new file mode 100644
index 000000000000..97679b72fb36
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionRetrieveDocumentFilterReason.Serialization.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+
+namespace Azure.AI.OpenAI
+{
+    internal static partial class AzureChatExtensionRetrieveDocumentFilterReasonExtensions
+    {
+        public static string ToSerialString(this AzureChatExtensionRetrieveDocumentFilterReason value) => value switch
+        {
+            AzureChatExtensionRetrieveDocumentFilterReason.Score => "score",
+            AzureChatExtensionRetrieveDocumentFilterReason.Rerank => "rerank",
+            _ => throw new ArgumentOutOfRangeException(nameof(value), value, "Unknown AzureChatExtensionRetrieveDocumentFilterReason value.")
+        };
+
+        public static AzureChatExtensionRetrieveDocumentFilterReason ToAzureChatExtensionRetrieveDocumentFilterReason(this string value)
+        {
+            if (StringComparer.OrdinalIgnoreCase.Equals(value, "score")) return AzureChatExtensionRetrieveDocumentFilterReason.Score;
+            if (StringComparer.OrdinalIgnoreCase.Equals(value, "rerank")) return AzureChatExtensionRetrieveDocumentFilterReason.Rerank;
+            throw new ArgumentOutOfRangeException(nameof(value), value, "Unknown AzureChatExtensionRetrieveDocumentFilterReason value.");
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionRetrieveDocumentFilterReason.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionRetrieveDocumentFilterReason.cs
new file mode 100644
index 000000000000..a0ff002c2627
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionRetrieveDocumentFilterReason.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The reason for filtering the retrieved document. </summary>
+    public enum AzureChatExtensionRetrieveDocumentFilterReason
+    {
+        /// <summary> The document is filtered by original search score threshold defined by `strictness` configure. </summary>
+        Score,
+        /// <summary> The document is not filtered by original search score threshold, but is filtered by rerank score and `top_n_documents` configure. </summary>
+        Rerank
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRetrievedDocument.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionRetrievedDocument.Serialization.cs
similarity index 57%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRetrievedDocument.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionRetrievedDocument.Serialization.cs
index 2ab576c95b61..109482b70d3d 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRetrievedDocument.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionRetrievedDocument.Serialization.cs
@@ -1,89 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI
 {
-    public partial class ChatRetrievedDocument : IJsonModel<ChatRetrievedDocument>
+    public partial class AzureChatExtensionRetrievedDocument : IUtf8JsonSerializable, IJsonModel<AzureChatExtensionRetrievedDocument>
     {
-        void IJsonModel<ChatRetrievedDocument>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureChatExtensionRetrievedDocument>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureChatExtensionRetrievedDocument>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatRetrievedDocument>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionRetrievedDocument>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatRetrievedDocument)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(AzureChatExtensionRetrievedDocument)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("content") != true)
-            {
-                writer.WritePropertyName("content"u8);
-                writer.WriteStringValue(Content);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("title") != true && Optional.IsDefined(Title))
+            writer.WritePropertyName("content"u8);
+            writer.WriteStringValue(Content);
+            if (Optional.IsDefined(Title))
             {
                 writer.WritePropertyName("title"u8);
                 writer.WriteStringValue(Title);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("url") != true && Optional.IsDefined(Uri))
+            if (Optional.IsDefined(Url))
             {
                 writer.WritePropertyName("url"u8);
-                writer.WriteStringValue(Uri.AbsoluteUri);
+                writer.WriteStringValue(Url);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("filepath") != true && Optional.IsDefined(FilePath))
+            if (Optional.IsDefined(Filepath))
             {
                 writer.WritePropertyName("filepath"u8);
-                writer.WriteStringValue(FilePath);
+                writer.WriteStringValue(Filepath);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("chunk_id") != true && Optional.IsDefined(ChunkId))
+            if (Optional.IsDefined(ChunkId))
             {
                 writer.WritePropertyName("chunk_id"u8);
                 writer.WriteStringValue(ChunkId);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("rerank_score") != true && Optional.IsDefined(RerankScore))
+            if (Optional.IsDefined(RerankScore))
             {
                 writer.WritePropertyName("rerank_score"u8);
                 writer.WriteNumberValue(RerankScore.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("search_queries") != true)
-            {
-                writer.WritePropertyName("search_queries"u8);
-                writer.WriteStartArray();
-                foreach (var item in SearchQueries)
-                {
-                    writer.WriteStringValue(item);
-                }
-                writer.WriteEndArray();
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("data_source_index") != true)
+            writer.WritePropertyName("search_queries"u8);
+            writer.WriteStartArray();
+            foreach (var item in SearchQueries)
             {
-                writer.WritePropertyName("data_source_index"u8);
-                writer.WriteNumberValue(DataSourceIndex);
+                writer.WriteStringValue(item);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("original_search_score") != true && Optional.IsDefined(OriginalSearchScore))
+            writer.WriteEndArray();
+            writer.WritePropertyName("data_source_index"u8);
+            writer.WriteNumberValue(DataSourceIndex);
+            if (Optional.IsDefined(OriginalSearchScore))
             {
                 writer.WritePropertyName("original_search_score"u8);
                 writer.WriteNumberValue(OriginalSearchScore.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("filter_reason") != true && Optional.IsDefined(FilterReason))
+            if (Optional.IsDefined(FilterReason))
             {
                 writer.WritePropertyName("filter_reason"u8);
-                writer.WriteStringValue(FilterReason.Value.ToString());
+                writer.WriteStringValue(FilterReason.Value.ToSerialString());
             }
-            if (SerializedAdditionalRawData != null)
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -98,19 +90,19 @@ void IJsonModel<ChatRetrievedDocument>.Write(Utf8JsonWriter writer, ModelReaderW
             writer.WriteEndObject();
         }
 
-        ChatRetrievedDocument IJsonModel<ChatRetrievedDocument>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        AzureChatExtensionRetrievedDocument IJsonModel<AzureChatExtensionRetrievedDocument>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatRetrievedDocument>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionRetrievedDocument>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatRetrievedDocument)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(AzureChatExtensionRetrievedDocument)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeChatRetrievedDocument(document.RootElement, options);
+            return DeserializeAzureChatExtensionRetrievedDocument(document.RootElement, options);
         }
 
-        internal static ChatRetrievedDocument DeserializeChatRetrievedDocument(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static AzureChatExtensionRetrievedDocument DeserializeAzureChatExtensionRetrievedDocument(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -120,14 +112,14 @@ internal static ChatRetrievedDocument DeserializeChatRetrievedDocument(JsonEleme
             }
             string content = default;
             string title = default;
-            Uri url = default;
+            string url = default;
             string filepath = default;
             string chunkId = default;
             double? rerankScore = default;
             IReadOnlyList<string> searchQueries = default;
             int dataSourceIndex = default;
             double? originalSearchScore = default;
-            ChatDocumentFilterReason? filterReason = default;
+            AzureChatExtensionRetrieveDocumentFilterReason? filterReason = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -144,11 +136,7 @@ internal static ChatRetrievedDocument DeserializeChatRetrievedDocument(JsonEleme
                 }
                 if (property.NameEquals("url"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    url = new Uri(property.Value.GetString());
+                    url = property.Value.GetString();
                     continue;
                 }
                 if (property.NameEquals("filepath"u8))
@@ -200,17 +188,16 @@ internal static ChatRetrievedDocument DeserializeChatRetrievedDocument(JsonEleme
                     {
                         continue;
                     }
-                    filterReason = new ChatDocumentFilterReason(property.Value.GetString());
+                    filterReason = property.Value.GetString().ToAzureChatExtensionRetrieveDocumentFilterReason();
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new ChatRetrievedDocument(
+            return new AzureChatExtensionRetrievedDocument(
                 content,
                 title,
                 url,
@@ -224,49 +211,51 @@ internal static ChatRetrievedDocument DeserializeChatRetrievedDocument(JsonEleme
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<ChatRetrievedDocument>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<AzureChatExtensionRetrievedDocument>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatRetrievedDocument>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionRetrievedDocument>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(ChatRetrievedDocument)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(AzureChatExtensionRetrievedDocument)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ChatRetrievedDocument IPersistableModel<ChatRetrievedDocument>.Create(BinaryData data, ModelReaderWriterOptions options)
+        AzureChatExtensionRetrievedDocument IPersistableModel<AzureChatExtensionRetrievedDocument>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatRetrievedDocument>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionRetrievedDocument>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeChatRetrievedDocument(document.RootElement, options);
+                        return DeserializeAzureChatExtensionRetrievedDocument(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(ChatRetrievedDocument)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(AzureChatExtensionRetrievedDocument)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ChatRetrievedDocument>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<AzureChatExtensionRetrievedDocument>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static ChatRetrievedDocument FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureChatExtensionRetrievedDocument FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeChatRetrievedDocument(document.RootElement);
+            return DeserializeAzureChatExtensionRetrievedDocument(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionRetrievedDocument.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionRetrievedDocument.cs
new file mode 100644
index 000000000000..8ee20083b474
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionRetrievedDocument.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The retrieved document. </summary>
+    public partial class AzureChatExtensionRetrievedDocument
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatExtensionRetrievedDocument"/>. </summary>
+        /// <param name="content"> The content of the citation. </param>
+        /// <param name="searchQueries"> The search queries used to retrieve the document. </param>
+        /// <param name="dataSourceIndex"> The index of the data source. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> or <paramref name="searchQueries"/> is null. </exception>
+        internal AzureChatExtensionRetrievedDocument(string content, IEnumerable<string> searchQueries, int dataSourceIndex)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+            Argument.AssertNotNull(searchQueries, nameof(searchQueries));
+
+            Content = content;
+            SearchQueries = searchQueries.ToList();
+            DataSourceIndex = dataSourceIndex;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatExtensionRetrievedDocument"/>. </summary>
+        /// <param name="content"> The content of the citation. </param>
+        /// <param name="title"> The title of the citation. </param>
+        /// <param name="url"> The URL of the citation. </param>
+        /// <param name="filepath"> The file path of the citation. </param>
+        /// <param name="chunkId"> The chunk ID of the citation. </param>
+        /// <param name="rerankScore"> The rerank score of the retrieved document. </param>
+        /// <param name="searchQueries"> The search queries used to retrieve the document. </param>
+        /// <param name="dataSourceIndex"> The index of the data source. </param>
+        /// <param name="originalSearchScore"> The original search score of the retrieved document. </param>
+        /// <param name="filterReason">
+        /// Represents the rationale for filtering the document. If the document does not undergo filtering,
+        /// this field will remain unset.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AzureChatExtensionRetrievedDocument(string content, string title, string url, string filepath, string chunkId, double? rerankScore, IReadOnlyList<string> searchQueries, int dataSourceIndex, double? originalSearchScore, AzureChatExtensionRetrieveDocumentFilterReason? filterReason, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Content = content;
+            Title = title;
+            Url = url;
+            Filepath = filepath;
+            ChunkId = chunkId;
+            RerankScore = rerankScore;
+            SearchQueries = searchQueries;
+            DataSourceIndex = dataSourceIndex;
+            OriginalSearchScore = originalSearchScore;
+            FilterReason = filterReason;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatExtensionRetrievedDocument"/> for deserialization. </summary>
+        internal AzureChatExtensionRetrievedDocument()
+        {
+        }
+
+        /// <summary> The content of the citation. </summary>
+        public string Content { get; }
+        /// <summary> The title of the citation. </summary>
+        public string Title { get; }
+        /// <summary> The URL of the citation. </summary>
+        public string Url { get; }
+        /// <summary> The file path of the citation. </summary>
+        public string Filepath { get; }
+        /// <summary> The chunk ID of the citation. </summary>
+        public string ChunkId { get; }
+        /// <summary> The rerank score of the retrieved document. </summary>
+        public double? RerankScore { get; }
+        /// <summary> The search queries used to retrieve the document. </summary>
+        public IReadOnlyList<string> SearchQueries { get; }
+        /// <summary> The index of the data source. </summary>
+        public int DataSourceIndex { get; }
+        /// <summary> The original search score of the retrieved document. </summary>
+        public double? OriginalSearchScore { get; }
+        /// <summary>
+        /// Represents the rationale for filtering the document. If the document does not undergo filtering,
+        /// this field will remain unset.
+        /// </summary>
+        public AzureChatExtensionRetrieveDocumentFilterReason? FilterReason { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionType.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionType.cs
new file mode 100644
index 000000000000..43ed79a551d4
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionType.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    ///   A representation of configuration data for a single Azure OpenAI chat extension. This will be used by a chat
+    ///   completions request that should use Azure OpenAI chat extensions to augment the response behavior.
+    ///   The use of this configuration is compatible only with Azure OpenAI.
+    /// </summary>
+    internal readonly partial struct AzureChatExtensionType : IEquatable<AzureChatExtensionType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatExtensionType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public AzureChatExtensionType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string AzureSearchValue = "azure_search";
+        private const string AzureCosmosDBValue = "azure_cosmos_db";
+        private const string ElasticsearchValue = "elasticsearch";
+        private const string PineconeValue = "pinecone";
+        private const string MongoDBValue = "mongo_db";
+
+        /// <summary> Represents the use of Azure AI Search as an Azure OpenAI chat extension. </summary>
+        public static AzureChatExtensionType AzureSearch { get; } = new AzureChatExtensionType(AzureSearchValue);
+        /// <summary> Represents the use of Azure Cosmos DB as an Azure OpenAI chat extension. </summary>
+        public static AzureChatExtensionType AzureCosmosDB { get; } = new AzureChatExtensionType(AzureCosmosDBValue);
+        /// <summary> Represents the use of Elasticsearch® index as an Azure OpenAI chat extension. </summary>
+        public static AzureChatExtensionType Elasticsearch { get; } = new AzureChatExtensionType(ElasticsearchValue);
+        /// <summary> Represents the use of Pinecone index as an Azure OpenAI chat extension. </summary>
+        public static AzureChatExtensionType Pinecone { get; } = new AzureChatExtensionType(PineconeValue);
+        /// <summary> Represents the use of a MongoDB chat extension. </summary>
+        public static AzureChatExtensionType MongoDB { get; } = new AzureChatExtensionType(MongoDBValue);
+        /// <summary> Determines if two <see cref="AzureChatExtensionType"/> values are the same. </summary>
+        public static bool operator ==(AzureChatExtensionType left, AzureChatExtensionType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="AzureChatExtensionType"/> values are not the same. </summary>
+        public static bool operator !=(AzureChatExtensionType left, AzureChatExtensionType right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="AzureChatExtensionType"/>. </summary>
+        public static implicit operator AzureChatExtensionType(string value) => new AzureChatExtensionType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is AzureChatExtensionType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(AzureChatExtensionType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionsMessageContext.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionsMessageContext.Serialization.cs
new file mode 100644
index 000000000000..5a1352cfa877
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionsMessageContext.Serialization.cs
@@ -0,0 +1,188 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AzureChatExtensionsMessageContext : IUtf8JsonSerializable, IJsonModel<AzureChatExtensionsMessageContext>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureChatExtensionsMessageContext>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureChatExtensionsMessageContext>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionsMessageContext>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureChatExtensionsMessageContext)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsCollectionDefined(Citations))
+            {
+                writer.WritePropertyName("citations"u8);
+                writer.WriteStartArray();
+                foreach (var item in Citations)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsDefined(Intent))
+            {
+                writer.WritePropertyName("intent"u8);
+                writer.WriteStringValue(Intent);
+            }
+            if (Optional.IsCollectionDefined(AllRetrievedDocuments))
+            {
+                writer.WritePropertyName("all_retrieved_documents"u8);
+                writer.WriteStartArray();
+                foreach (var item in AllRetrievedDocuments)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AzureChatExtensionsMessageContext IJsonModel<AzureChatExtensionsMessageContext>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionsMessageContext>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureChatExtensionsMessageContext)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAzureChatExtensionsMessageContext(document.RootElement, options);
+        }
+
+        internal static AzureChatExtensionsMessageContext DeserializeAzureChatExtensionsMessageContext(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IReadOnlyList<AzureChatExtensionDataSourceResponseCitation> citations = default;
+            string intent = default;
+            IReadOnlyList<AzureChatExtensionRetrievedDocument> allRetrievedDocuments = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("citations"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<AzureChatExtensionDataSourceResponseCitation> array = new List<AzureChatExtensionDataSourceResponseCitation>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(AzureChatExtensionDataSourceResponseCitation.DeserializeAzureChatExtensionDataSourceResponseCitation(item, options));
+                    }
+                    citations = array;
+                    continue;
+                }
+                if (property.NameEquals("intent"u8))
+                {
+                    intent = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("all_retrieved_documents"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<AzureChatExtensionRetrievedDocument> array = new List<AzureChatExtensionRetrievedDocument>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(AzureChatExtensionRetrievedDocument.DeserializeAzureChatExtensionRetrievedDocument(item, options));
+                    }
+                    allRetrievedDocuments = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AzureChatExtensionsMessageContext(citations ?? new ChangeTrackingList<AzureChatExtensionDataSourceResponseCitation>(), intent, allRetrievedDocuments ?? new ChangeTrackingList<AzureChatExtensionRetrievedDocument>(), serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AzureChatExtensionsMessageContext>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionsMessageContext>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AzureChatExtensionsMessageContext)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AzureChatExtensionsMessageContext IPersistableModel<AzureChatExtensionsMessageContext>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionsMessageContext>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAzureChatExtensionsMessageContext(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AzureChatExtensionsMessageContext)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AzureChatExtensionsMessageContext>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureChatExtensionsMessageContext FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAzureChatExtensionsMessageContext(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionsMessageContext.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionsMessageContext.cs
new file mode 100644
index 000000000000..0591400215bc
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatExtensionsMessageContext.cs
@@ -0,0 +1,89 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    ///   A representation of the additional context information available when Azure OpenAI chat extensions are involved
+    ///   in the generation of a corresponding chat completions response. This context information is only populated when
+    ///   using an Azure OpenAI request configured to use a matching extension.
+    /// </summary>
+    public partial class AzureChatExtensionsMessageContext
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatExtensionsMessageContext"/>. </summary>
+        internal AzureChatExtensionsMessageContext()
+        {
+            Citations = new ChangeTrackingList<AzureChatExtensionDataSourceResponseCitation>();
+            AllRetrievedDocuments = new ChangeTrackingList<AzureChatExtensionRetrievedDocument>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatExtensionsMessageContext"/>. </summary>
+        /// <param name="citations">
+        ///   The contextual information associated with the Azure chat extensions used for a chat completions request.
+        ///   These messages describe the data source retrievals, plugin invocations, and other intermediate steps taken in the
+        ///   course of generating a chat completions response that was augmented by capabilities from Azure OpenAI chat
+        ///   extensions.
+        /// </param>
+        /// <param name="intent"> The detected intent from the chat history, used to pass to the next turn to carry over the context. </param>
+        /// <param name="allRetrievedDocuments"> All the retrieved documents. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AzureChatExtensionsMessageContext(IReadOnlyList<AzureChatExtensionDataSourceResponseCitation> citations, string intent, IReadOnlyList<AzureChatExtensionRetrievedDocument> allRetrievedDocuments, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Citations = citations;
+            Intent = intent;
+            AllRetrievedDocuments = allRetrievedDocuments;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary>
+        ///   The contextual information associated with the Azure chat extensions used for a chat completions request.
+        ///   These messages describe the data source retrievals, plugin invocations, and other intermediate steps taken in the
+        ///   course of generating a chat completions response that was augmented by capabilities from Azure OpenAI chat
+        ///   extensions.
+        /// </summary>
+        public IReadOnlyList<AzureChatExtensionDataSourceResponseCitation> Citations { get; }
+        /// <summary> The detected intent from the chat history, used to pass to the next turn to carry over the context. </summary>
+        public string Intent { get; }
+        /// <summary> All the retrieved documents. </summary>
+        public IReadOnlyList<AzureChatExtensionRetrievedDocument> AllRetrievedDocuments { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatGroundingEnhancementConfiguration.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatGroundingEnhancementConfiguration.Serialization.cs
new file mode 100644
index 000000000000..9f1f19aa97af
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatGroundingEnhancementConfiguration.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AzureChatGroundingEnhancementConfiguration : IUtf8JsonSerializable, IJsonModel<AzureChatGroundingEnhancementConfiguration>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureChatGroundingEnhancementConfiguration>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureChatGroundingEnhancementConfiguration>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatGroundingEnhancementConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureChatGroundingEnhancementConfiguration)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("enabled"u8);
+            writer.WriteBooleanValue(Enabled);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AzureChatGroundingEnhancementConfiguration IJsonModel<AzureChatGroundingEnhancementConfiguration>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatGroundingEnhancementConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureChatGroundingEnhancementConfiguration)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAzureChatGroundingEnhancementConfiguration(document.RootElement, options);
+        }
+
+        internal static AzureChatGroundingEnhancementConfiguration DeserializeAzureChatGroundingEnhancementConfiguration(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            bool enabled = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("enabled"u8))
+                {
+                    enabled = property.Value.GetBoolean();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AzureChatGroundingEnhancementConfiguration(enabled, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AzureChatGroundingEnhancementConfiguration>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatGroundingEnhancementConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AzureChatGroundingEnhancementConfiguration)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AzureChatGroundingEnhancementConfiguration IPersistableModel<AzureChatGroundingEnhancementConfiguration>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatGroundingEnhancementConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAzureChatGroundingEnhancementConfiguration(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AzureChatGroundingEnhancementConfiguration)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AzureChatGroundingEnhancementConfiguration>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureChatGroundingEnhancementConfiguration FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAzureChatGroundingEnhancementConfiguration(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatGroundingEnhancementConfiguration.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatGroundingEnhancementConfiguration.cs
new file mode 100644
index 000000000000..8e14c4e438d2
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatGroundingEnhancementConfiguration.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A representation of the available options for the Azure OpenAI grounding enhancement. </summary>
+    public partial class AzureChatGroundingEnhancementConfiguration
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatGroundingEnhancementConfiguration"/>. </summary>
+        /// <param name="enabled"> Specifies whether the enhancement is enabled. </param>
+        public AzureChatGroundingEnhancementConfiguration(bool enabled)
+        {
+            Enabled = enabled;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatGroundingEnhancementConfiguration"/>. </summary>
+        /// <param name="enabled"> Specifies whether the enhancement is enabled. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AzureChatGroundingEnhancementConfiguration(bool enabled, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Enabled = enabled;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatGroundingEnhancementConfiguration"/> for deserialization. </summary>
+        internal AzureChatGroundingEnhancementConfiguration()
+        {
+        }
+
+        /// <summary> Specifies whether the enhancement is enabled. </summary>
+        public bool Enabled { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatOCREnhancementConfiguration.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatOCREnhancementConfiguration.Serialization.cs
new file mode 100644
index 000000000000..058d5d43c564
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatOCREnhancementConfiguration.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AzureChatOCREnhancementConfiguration : IUtf8JsonSerializable, IJsonModel<AzureChatOCREnhancementConfiguration>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureChatOCREnhancementConfiguration>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureChatOCREnhancementConfiguration>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatOCREnhancementConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureChatOCREnhancementConfiguration)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("enabled"u8);
+            writer.WriteBooleanValue(Enabled);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AzureChatOCREnhancementConfiguration IJsonModel<AzureChatOCREnhancementConfiguration>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatOCREnhancementConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureChatOCREnhancementConfiguration)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAzureChatOCREnhancementConfiguration(document.RootElement, options);
+        }
+
+        internal static AzureChatOCREnhancementConfiguration DeserializeAzureChatOCREnhancementConfiguration(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            bool enabled = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("enabled"u8))
+                {
+                    enabled = property.Value.GetBoolean();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AzureChatOCREnhancementConfiguration(enabled, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AzureChatOCREnhancementConfiguration>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatOCREnhancementConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AzureChatOCREnhancementConfiguration)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AzureChatOCREnhancementConfiguration IPersistableModel<AzureChatOCREnhancementConfiguration>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatOCREnhancementConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAzureChatOCREnhancementConfiguration(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AzureChatOCREnhancementConfiguration)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AzureChatOCREnhancementConfiguration>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureChatOCREnhancementConfiguration FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAzureChatOCREnhancementConfiguration(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatOCREnhancementConfiguration.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatOCREnhancementConfiguration.cs
new file mode 100644
index 000000000000..6f3aee5baa5a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureChatOCREnhancementConfiguration.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A representation of the available options for the Azure OpenAI optical character recognition (OCR) enhancement. </summary>
+    public partial class AzureChatOCREnhancementConfiguration
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatOCREnhancementConfiguration"/>. </summary>
+        /// <param name="enabled"> Specifies whether the enhancement is enabled. </param>
+        public AzureChatOCREnhancementConfiguration(bool enabled)
+        {
+            Enabled = enabled;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatOCREnhancementConfiguration"/>. </summary>
+        /// <param name="enabled"> Specifies whether the enhancement is enabled. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AzureChatOCREnhancementConfiguration(bool enabled, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Enabled = enabled;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureChatOCREnhancementConfiguration"/> for deserialization. </summary>
+        internal AzureChatOCREnhancementConfiguration()
+        {
+        }
+
+        /// <summary> Specifies whether the enhancement is enabled. </summary>
+        public bool Enabled { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBChatExtensionConfiguration.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBChatExtensionConfiguration.Serialization.cs
new file mode 100644
index 000000000000..b909db380846
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBChatExtensionConfiguration.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AzureCosmosDBChatExtensionConfiguration : IUtf8JsonSerializable, IJsonModel<AzureCosmosDBChatExtensionConfiguration>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureCosmosDBChatExtensionConfiguration>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureCosmosDBChatExtensionConfiguration>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureCosmosDBChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureCosmosDBChatExtensionConfiguration)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("parameters"u8);
+            writer.WriteObjectValue(Parameters, options);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AzureCosmosDBChatExtensionConfiguration IJsonModel<AzureCosmosDBChatExtensionConfiguration>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureCosmosDBChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureCosmosDBChatExtensionConfiguration)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAzureCosmosDBChatExtensionConfiguration(document.RootElement, options);
+        }
+
+        internal static AzureCosmosDBChatExtensionConfiguration DeserializeAzureCosmosDBChatExtensionConfiguration(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            AzureCosmosDBChatExtensionParameters parameters = default;
+            AzureChatExtensionType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("parameters"u8))
+                {
+                    parameters = AzureCosmosDBChatExtensionParameters.DeserializeAzureCosmosDBChatExtensionParameters(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new AzureChatExtensionType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AzureCosmosDBChatExtensionConfiguration(type, serializedAdditionalRawData, parameters);
+        }
+
+        BinaryData IPersistableModel<AzureCosmosDBChatExtensionConfiguration>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureCosmosDBChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AzureCosmosDBChatExtensionConfiguration)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AzureCosmosDBChatExtensionConfiguration IPersistableModel<AzureCosmosDBChatExtensionConfiguration>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureCosmosDBChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAzureCosmosDBChatExtensionConfiguration(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AzureCosmosDBChatExtensionConfiguration)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AzureCosmosDBChatExtensionConfiguration>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new AzureCosmosDBChatExtensionConfiguration FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAzureCosmosDBChatExtensionConfiguration(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBChatExtensionConfiguration.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBChatExtensionConfiguration.cs
new file mode 100644
index 000000000000..c3b36d9749ea
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBChatExtensionConfiguration.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// A specific representation of configurable options for Azure Cosmos DB when using it as an Azure OpenAI chat
+    /// extension.
+    /// </summary>
+    public partial class AzureCosmosDBChatExtensionConfiguration : AzureChatExtensionConfiguration
+    {
+        /// <summary> Initializes a new instance of <see cref="AzureCosmosDBChatExtensionConfiguration"/>. </summary>
+        /// <param name="parameters"> The parameters to use when configuring Azure OpenAI CosmosDB chat extensions. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="parameters"/> is null. </exception>
+        public AzureCosmosDBChatExtensionConfiguration(AzureCosmosDBChatExtensionParameters parameters)
+        {
+            Argument.AssertNotNull(parameters, nameof(parameters));
+
+            Type = AzureChatExtensionType.AzureCosmosDB;
+            Parameters = parameters;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureCosmosDBChatExtensionConfiguration"/>. </summary>
+        /// <param name="type">
+        ///   The label for the type of an Azure chat extension. This typically corresponds to a matching Azure resource.
+        ///   Azure chat extensions are only compatible with Azure OpenAI.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="parameters"> The parameters to use when configuring Azure OpenAI CosmosDB chat extensions. </param>
+        internal AzureCosmosDBChatExtensionConfiguration(AzureChatExtensionType type, IDictionary<string, BinaryData> serializedAdditionalRawData, AzureCosmosDBChatExtensionParameters parameters) : base(type, serializedAdditionalRawData)
+        {
+            Parameters = parameters;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureCosmosDBChatExtensionConfiguration"/> for deserialization. </summary>
+        internal AzureCosmosDBChatExtensionConfiguration()
+        {
+        }
+
+        /// <summary> The parameters to use when configuring Azure OpenAI CosmosDB chat extensions. </summary>
+        public AzureCosmosDBChatExtensionParameters Parameters { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureCosmosDBChatDataSourceParameters.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBChatExtensionParameters.Serialization.cs
similarity index 54%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureCosmosDBChatDataSourceParameters.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBChatExtensionParameters.Serialization.cs
index 677a0355da0b..5c999d2cac84 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureCosmosDBChatDataSourceParameters.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBChatExtensionParameters.Serialization.cs
@@ -1,99 +1,85 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI
 {
-    internal partial class InternalAzureCosmosDBChatDataSourceParameters : IJsonModel<InternalAzureCosmosDBChatDataSourceParameters>
+    public partial class AzureCosmosDBChatExtensionParameters : IUtf8JsonSerializable, IJsonModel<AzureCosmosDBChatExtensionParameters>
     {
-        void IJsonModel<InternalAzureCosmosDBChatDataSourceParameters>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureCosmosDBChatExtensionParameters>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureCosmosDBChatExtensionParameters>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureCosmosDBChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureCosmosDBChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalAzureCosmosDBChatDataSourceParameters)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(AzureCosmosDBChatExtensionParameters)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("top_n_documents") != true && Optional.IsDefined(TopNDocuments))
+            if (Optional.IsDefined(DocumentCount))
             {
                 writer.WritePropertyName("top_n_documents"u8);
-                writer.WriteNumberValue(TopNDocuments.Value);
+                writer.WriteNumberValue(DocumentCount.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("in_scope") != true && Optional.IsDefined(InScope))
+            if (Optional.IsDefined(ShouldRestrictResultScope))
             {
                 writer.WritePropertyName("in_scope"u8);
-                writer.WriteBooleanValue(InScope.Value);
+                writer.WriteBooleanValue(ShouldRestrictResultScope.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("strictness") != true && Optional.IsDefined(Strictness))
+            if (Optional.IsDefined(Strictness))
             {
                 writer.WritePropertyName("strictness"u8);
                 writer.WriteNumberValue(Strictness.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("max_search_queries") != true && Optional.IsDefined(MaxSearchQueries))
+            if (Optional.IsDefined(MaxSearchQueries))
             {
                 writer.WritePropertyName("max_search_queries"u8);
                 writer.WriteNumberValue(MaxSearchQueries.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("allow_partial_result") != true && Optional.IsDefined(AllowPartialResult))
+            if (Optional.IsDefined(AllowPartialResult))
             {
                 writer.WritePropertyName("allow_partial_result"u8);
                 writer.WriteBooleanValue(AllowPartialResult.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("include_contexts") != true && Optional.IsCollectionDefined(_internalIncludeContexts))
+            if (Optional.IsCollectionDefined(IncludeContexts))
             {
                 writer.WritePropertyName("include_contexts"u8);
                 writer.WriteStartArray();
-                foreach (var item in _internalIncludeContexts)
+                foreach (var item in IncludeContexts)
                 {
-                    writer.WriteStringValue(item);
+                    writer.WriteStringValue(item.ToString());
                 }
                 writer.WriteEndArray();
             }
-            if (SerializedAdditionalRawData?.ContainsKey("container_name") != true)
-            {
-                writer.WritePropertyName("container_name"u8);
-                writer.WriteStringValue(ContainerName);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("database_name") != true)
-            {
-                writer.WritePropertyName("database_name"u8);
-                writer.WriteStringValue(DatabaseName);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("embedding_dependency") != true)
-            {
-                writer.WritePropertyName("embedding_dependency"u8);
-                writer.WriteObjectValue<DataSourceVectorizer>(VectorizationSource, options);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("index_name") != true)
-            {
-                writer.WritePropertyName("index_name"u8);
-                writer.WriteStringValue(IndexName);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("authentication") != true)
+            if (Optional.IsDefined(Authentication))
             {
                 writer.WritePropertyName("authentication"u8);
-                writer.WriteObjectValue<DataSourceAuthentication>(Authentication, options);
+                writer.WriteObjectValue(Authentication, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("fields_mapping") != true)
+            writer.WritePropertyName("database_name"u8);
+            writer.WriteStringValue(DatabaseName);
+            writer.WritePropertyName("container_name"u8);
+            writer.WriteStringValue(ContainerName);
+            writer.WritePropertyName("index_name"u8);
+            writer.WriteStringValue(IndexName);
+            writer.WritePropertyName("fields_mapping"u8);
+            writer.WriteObjectValue(FieldMappingOptions, options);
+            writer.WritePropertyName("embedding_dependency"u8);
+            writer.WriteObjectValue(EmbeddingDependency, options);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                writer.WritePropertyName("fields_mapping"u8);
-                writer.WriteObjectValue<DataSourceFieldMappings>(FieldMappings, options);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -108,19 +94,19 @@ void IJsonModel<InternalAzureCosmosDBChatDataSourceParameters>.Write(Utf8JsonWri
             writer.WriteEndObject();
         }
 
-        InternalAzureCosmosDBChatDataSourceParameters IJsonModel<InternalAzureCosmosDBChatDataSourceParameters>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        AzureCosmosDBChatExtensionParameters IJsonModel<AzureCosmosDBChatExtensionParameters>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureCosmosDBChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureCosmosDBChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalAzureCosmosDBChatDataSourceParameters)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(AzureCosmosDBChatExtensionParameters)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureCosmosDBChatDataSourceParameters(document.RootElement, options);
+            return DeserializeAzureCosmosDBChatExtensionParameters(document.RootElement, options);
         }
 
-        internal static InternalAzureCosmosDBChatDataSourceParameters DeserializeInternalAzureCosmosDBChatDataSourceParameters(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static AzureCosmosDBChatExtensionParameters DeserializeAzureCosmosDBChatExtensionParameters(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -133,13 +119,13 @@ internal static InternalAzureCosmosDBChatDataSourceParameters DeserializeInterna
             int? strictness = default;
             int? maxSearchQueries = default;
             bool? allowPartialResult = default;
-            IList<string> includeContexts = default;
-            string containerName = default;
+            IList<OnYourDataContextProperty> includeContexts = default;
+            OnYourDataAuthenticationOptions authentication = default;
             string databaseName = default;
-            DataSourceVectorizer embeddingDependency = default;
+            string containerName = default;
             string indexName = default;
-            DataSourceAuthentication authentication = default;
-            DataSourceFieldMappings fieldsMapping = default;
+            AzureCosmosDBFieldMappingOptions fieldsMapping = default;
+            OnYourDataVectorizationSource embeddingDependency = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -195,17 +181,21 @@ internal static InternalAzureCosmosDBChatDataSourceParameters DeserializeInterna
                     {
                         continue;
                     }
-                    List<string> array = new List<string>();
+                    List<OnYourDataContextProperty> array = new List<OnYourDataContextProperty>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(item.GetString());
+                        array.Add(new OnYourDataContextProperty(item.GetString()));
                     }
                     includeContexts = array;
                     continue;
                 }
-                if (property.NameEquals("container_name"u8))
+                if (property.NameEquals("authentication"u8))
                 {
-                    containerName = property.Value.GetString();
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    authentication = OnYourDataAuthenticationOptions.DeserializeOnYourDataAuthenticationOptions(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("database_name"u8))
@@ -213,9 +203,9 @@ internal static InternalAzureCosmosDBChatDataSourceParameters DeserializeInterna
                     databaseName = property.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("embedding_dependency"u8))
+                if (property.NameEquals("container_name"u8))
                 {
-                    embeddingDependency = DataSourceVectorizer.DeserializeDataSourceVectorizer(property.Value, options);
+                    containerName = property.Value.GetString();
                     continue;
                 }
                 if (property.NameEquals("index_name"u8))
@@ -223,83 +213,83 @@ internal static InternalAzureCosmosDBChatDataSourceParameters DeserializeInterna
                     indexName = property.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("authentication"u8))
+                if (property.NameEquals("fields_mapping"u8))
                 {
-                    authentication = DataSourceAuthentication.DeserializeDataSourceAuthentication(property.Value, options);
+                    fieldsMapping = AzureCosmosDBFieldMappingOptions.DeserializeAzureCosmosDBFieldMappingOptions(property.Value, options);
                     continue;
                 }
-                if (property.NameEquals("fields_mapping"u8))
+                if (property.NameEquals("embedding_dependency"u8))
                 {
-                    fieldsMapping = DataSourceFieldMappings.DeserializeDataSourceFieldMappings(property.Value, options);
+                    embeddingDependency = OnYourDataVectorizationSource.DeserializeOnYourDataVectorizationSource(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureCosmosDBChatDataSourceParameters(
+            return new AzureCosmosDBChatExtensionParameters(
                 topNDocuments,
                 inScope,
                 strictness,
                 maxSearchQueries,
                 allowPartialResult,
-                includeContexts ?? new ChangeTrackingList<string>(),
-                containerName,
+                includeContexts ?? new ChangeTrackingList<OnYourDataContextProperty>(),
+                authentication,
                 databaseName,
-                embeddingDependency,
+                containerName,
                 indexName,
-                authentication,
                 fieldsMapping,
+                embeddingDependency,
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<InternalAzureCosmosDBChatDataSourceParameters>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<AzureCosmosDBChatExtensionParameters>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureCosmosDBChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureCosmosDBChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(InternalAzureCosmosDBChatDataSourceParameters)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(AzureCosmosDBChatExtensionParameters)} does not support writing '{options.Format}' format.");
             }
         }
 
-        InternalAzureCosmosDBChatDataSourceParameters IPersistableModel<InternalAzureCosmosDBChatDataSourceParameters>.Create(BinaryData data, ModelReaderWriterOptions options)
+        AzureCosmosDBChatExtensionParameters IPersistableModel<AzureCosmosDBChatExtensionParameters>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureCosmosDBChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureCosmosDBChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureCosmosDBChatDataSourceParameters(document.RootElement, options);
+                        return DeserializeAzureCosmosDBChatExtensionParameters(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(InternalAzureCosmosDBChatDataSourceParameters)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(AzureCosmosDBChatExtensionParameters)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<InternalAzureCosmosDBChatDataSourceParameters>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<AzureCosmosDBChatExtensionParameters>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static InternalAzureCosmosDBChatDataSourceParameters FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureCosmosDBChatExtensionParameters FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureCosmosDBChatDataSourceParameters(document.RootElement);
+            return DeserializeAzureCosmosDBChatExtensionParameters(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBChatExtensionParameters.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBChatExtensionParameters.cs
new file mode 100644
index 000000000000..af4079791b60
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBChatExtensionParameters.cs
@@ -0,0 +1,175 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// Parameters to use when configuring Azure OpenAI On Your Data chat extensions when using Azure Cosmos DB for
+    /// MongoDB vCore. The supported authentication type is ConnectionString.
+    /// </summary>
+    public partial class AzureCosmosDBChatExtensionParameters
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureCosmosDBChatExtensionParameters"/>. </summary>
+        /// <param name="databaseName"> The MongoDB vCore database name to use with Azure Cosmos DB. </param>
+        /// <param name="containerName"> The name of the Azure Cosmos DB resource container. </param>
+        /// <param name="indexName"> The MongoDB vCore index name to use with Azure Cosmos DB. </param>
+        /// <param name="fieldMappingOptions"> Customized field mapping behavior to use when interacting with the search index. </param>
+        /// <param name="embeddingDependency">
+        /// The embedding dependency for vector search.
+        /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OnYourDataModelIdVectorizationSource"/>.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="databaseName"/>, <paramref name="containerName"/>, <paramref name="indexName"/>, <paramref name="fieldMappingOptions"/> or <paramref name="embeddingDependency"/> is null. </exception>
+        public AzureCosmosDBChatExtensionParameters(string databaseName, string containerName, string indexName, AzureCosmosDBFieldMappingOptions fieldMappingOptions, OnYourDataVectorizationSource embeddingDependency)
+        {
+            Argument.AssertNotNull(databaseName, nameof(databaseName));
+            Argument.AssertNotNull(containerName, nameof(containerName));
+            Argument.AssertNotNull(indexName, nameof(indexName));
+            Argument.AssertNotNull(fieldMappingOptions, nameof(fieldMappingOptions));
+            Argument.AssertNotNull(embeddingDependency, nameof(embeddingDependency));
+
+            IncludeContexts = new ChangeTrackingList<OnYourDataContextProperty>();
+            DatabaseName = databaseName;
+            ContainerName = containerName;
+            IndexName = indexName;
+            FieldMappingOptions = fieldMappingOptions;
+            EmbeddingDependency = embeddingDependency;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureCosmosDBChatExtensionParameters"/>. </summary>
+        /// <param name="documentCount"> The configured top number of documents to feature for the configured query. </param>
+        /// <param name="shouldRestrictResultScope"> Whether queries should be restricted to use of indexed data. </param>
+        /// <param name="strictness"> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </param>
+        /// <param name="maxSearchQueries">
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </param>
+        /// <param name="allowPartialResult">
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </param>
+        /// <param name="includeContexts"> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </param>
+        /// <param name="authentication">
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// Please note <see cref="OnYourDataAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataAccessTokenAuthenticationOptions"/>, <see cref="OnYourDataApiKeyAuthenticationOptions"/>, <see cref="OnYourDataConnectionStringAuthenticationOptions"/>, <see cref="OnYourDataEncodedApiKeyAuthenticationOptions"/>, <see cref="OnYourDataKeyAndKeyIdAuthenticationOptions"/>, <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>, <see cref="OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> and <see cref="OnYourDataUsernameAndPasswordAuthenticationOptions"/>.
+        /// </param>
+        /// <param name="databaseName"> The MongoDB vCore database name to use with Azure Cosmos DB. </param>
+        /// <param name="containerName"> The name of the Azure Cosmos DB resource container. </param>
+        /// <param name="indexName"> The MongoDB vCore index name to use with Azure Cosmos DB. </param>
+        /// <param name="fieldMappingOptions"> Customized field mapping behavior to use when interacting with the search index. </param>
+        /// <param name="embeddingDependency">
+        /// The embedding dependency for vector search.
+        /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OnYourDataModelIdVectorizationSource"/>.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AzureCosmosDBChatExtensionParameters(int? documentCount, bool? shouldRestrictResultScope, int? strictness, int? maxSearchQueries, bool? allowPartialResult, IList<OnYourDataContextProperty> includeContexts, OnYourDataAuthenticationOptions authentication, string databaseName, string containerName, string indexName, AzureCosmosDBFieldMappingOptions fieldMappingOptions, OnYourDataVectorizationSource embeddingDependency, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            DocumentCount = documentCount;
+            ShouldRestrictResultScope = shouldRestrictResultScope;
+            Strictness = strictness;
+            MaxSearchQueries = maxSearchQueries;
+            AllowPartialResult = allowPartialResult;
+            IncludeContexts = includeContexts;
+            Authentication = authentication;
+            DatabaseName = databaseName;
+            ContainerName = containerName;
+            IndexName = indexName;
+            FieldMappingOptions = fieldMappingOptions;
+            EmbeddingDependency = embeddingDependency;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureCosmosDBChatExtensionParameters"/> for deserialization. </summary>
+        internal AzureCosmosDBChatExtensionParameters()
+        {
+        }
+
+        /// <summary> The configured top number of documents to feature for the configured query. </summary>
+        public int? DocumentCount { get; set; }
+        /// <summary> Whether queries should be restricted to use of indexed data. </summary>
+        public bool? ShouldRestrictResultScope { get; set; }
+        /// <summary> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </summary>
+        public int? Strictness { get; set; }
+        /// <summary>
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </summary>
+        public int? MaxSearchQueries { get; set; }
+        /// <summary>
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </summary>
+        public bool? AllowPartialResult { get; set; }
+        /// <summary> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </summary>
+        public IList<OnYourDataContextProperty> IncludeContexts { get; }
+        /// <summary>
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// Please note <see cref="OnYourDataAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataAccessTokenAuthenticationOptions"/>, <see cref="OnYourDataApiKeyAuthenticationOptions"/>, <see cref="OnYourDataConnectionStringAuthenticationOptions"/>, <see cref="OnYourDataEncodedApiKeyAuthenticationOptions"/>, <see cref="OnYourDataKeyAndKeyIdAuthenticationOptions"/>, <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>, <see cref="OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> and <see cref="OnYourDataUsernameAndPasswordAuthenticationOptions"/>.
+        /// </summary>
+        public OnYourDataAuthenticationOptions Authentication { get; set; }
+        /// <summary> The MongoDB vCore database name to use with Azure Cosmos DB. </summary>
+        public string DatabaseName { get; }
+        /// <summary> The name of the Azure Cosmos DB resource container. </summary>
+        public string ContainerName { get; }
+        /// <summary> The MongoDB vCore index name to use with Azure Cosmos DB. </summary>
+        public string IndexName { get; }
+        /// <summary> Customized field mapping behavior to use when interacting with the search index. </summary>
+        public AzureCosmosDBFieldMappingOptions FieldMappingOptions { get; }
+        /// <summary>
+        /// The embedding dependency for vector search.
+        /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OnYourDataModelIdVectorizationSource"/>.
+        /// </summary>
+        public OnYourDataVectorizationSource EmbeddingDependency { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBFieldMappingOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBFieldMappingOptions.Serialization.cs
new file mode 100644
index 000000000000..462a964dd0b2
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBFieldMappingOptions.Serialization.cs
@@ -0,0 +1,214 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AzureCosmosDBFieldMappingOptions : IUtf8JsonSerializable, IJsonModel<AzureCosmosDBFieldMappingOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureCosmosDBFieldMappingOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureCosmosDBFieldMappingOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureCosmosDBFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureCosmosDBFieldMappingOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(TitleFieldName))
+            {
+                writer.WritePropertyName("title_field"u8);
+                writer.WriteStringValue(TitleFieldName);
+            }
+            if (Optional.IsDefined(UrlFieldName))
+            {
+                writer.WritePropertyName("url_field"u8);
+                writer.WriteStringValue(UrlFieldName);
+            }
+            if (Optional.IsDefined(FilepathFieldName))
+            {
+                writer.WritePropertyName("filepath_field"u8);
+                writer.WriteStringValue(FilepathFieldName);
+            }
+            writer.WritePropertyName("content_fields"u8);
+            writer.WriteStartArray();
+            foreach (var item in ContentFieldNames)
+            {
+                writer.WriteStringValue(item);
+            }
+            writer.WriteEndArray();
+            if (Optional.IsDefined(ContentFieldSeparator))
+            {
+                writer.WritePropertyName("content_fields_separator"u8);
+                writer.WriteStringValue(ContentFieldSeparator);
+            }
+            writer.WritePropertyName("vector_fields"u8);
+            writer.WriteStartArray();
+            foreach (var item in VectorFieldNames)
+            {
+                writer.WriteStringValue(item);
+            }
+            writer.WriteEndArray();
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AzureCosmosDBFieldMappingOptions IJsonModel<AzureCosmosDBFieldMappingOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureCosmosDBFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureCosmosDBFieldMappingOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAzureCosmosDBFieldMappingOptions(document.RootElement, options);
+        }
+
+        internal static AzureCosmosDBFieldMappingOptions DeserializeAzureCosmosDBFieldMappingOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string titleField = default;
+            string urlField = default;
+            string filepathField = default;
+            IList<string> contentFields = default;
+            string contentFieldsSeparator = default;
+            IList<string> vectorFields = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("title_field"u8))
+                {
+                    titleField = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("url_field"u8))
+                {
+                    urlField = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("filepath_field"u8))
+                {
+                    filepathField = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("content_fields"u8))
+                {
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    contentFields = array;
+                    continue;
+                }
+                if (property.NameEquals("content_fields_separator"u8))
+                {
+                    contentFieldsSeparator = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("vector_fields"u8))
+                {
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    vectorFields = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AzureCosmosDBFieldMappingOptions(
+                titleField,
+                urlField,
+                filepathField,
+                contentFields,
+                contentFieldsSeparator,
+                vectorFields,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AzureCosmosDBFieldMappingOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureCosmosDBFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AzureCosmosDBFieldMappingOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AzureCosmosDBFieldMappingOptions IPersistableModel<AzureCosmosDBFieldMappingOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureCosmosDBFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAzureCosmosDBFieldMappingOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AzureCosmosDBFieldMappingOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AzureCosmosDBFieldMappingOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureCosmosDBFieldMappingOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAzureCosmosDBFieldMappingOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBFieldMappingOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBFieldMappingOptions.cs
new file mode 100644
index 000000000000..aff56c9de289
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureCosmosDBFieldMappingOptions.cs
@@ -0,0 +1,99 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Optional settings to control how fields are processed when using a configured Azure Cosmos DB resource. </summary>
+    public partial class AzureCosmosDBFieldMappingOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureCosmosDBFieldMappingOptions"/>. </summary>
+        /// <param name="contentFieldNames"> The names of index fields that should be treated as content. </param>
+        /// <param name="vectorFieldNames"> The names of fields that represent vector data. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="contentFieldNames"/> or <paramref name="vectorFieldNames"/> is null. </exception>
+        public AzureCosmosDBFieldMappingOptions(IEnumerable<string> contentFieldNames, IEnumerable<string> vectorFieldNames)
+        {
+            Argument.AssertNotNull(contentFieldNames, nameof(contentFieldNames));
+            Argument.AssertNotNull(vectorFieldNames, nameof(vectorFieldNames));
+
+            ContentFieldNames = contentFieldNames.ToList();
+            VectorFieldNames = vectorFieldNames.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureCosmosDBFieldMappingOptions"/>. </summary>
+        /// <param name="titleFieldName"> The name of the index field to use as a title. </param>
+        /// <param name="urlFieldName"> The name of the index field to use as a URL. </param>
+        /// <param name="filepathFieldName"> The name of the index field to use as a filepath. </param>
+        /// <param name="contentFieldNames"> The names of index fields that should be treated as content. </param>
+        /// <param name="contentFieldSeparator"> The separator pattern that content fields should use. </param>
+        /// <param name="vectorFieldNames"> The names of fields that represent vector data. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AzureCosmosDBFieldMappingOptions(string titleFieldName, string urlFieldName, string filepathFieldName, IList<string> contentFieldNames, string contentFieldSeparator, IList<string> vectorFieldNames, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            TitleFieldName = titleFieldName;
+            UrlFieldName = urlFieldName;
+            FilepathFieldName = filepathFieldName;
+            ContentFieldNames = contentFieldNames;
+            ContentFieldSeparator = contentFieldSeparator;
+            VectorFieldNames = vectorFieldNames;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureCosmosDBFieldMappingOptions"/> for deserialization. </summary>
+        internal AzureCosmosDBFieldMappingOptions()
+        {
+        }
+
+        /// <summary> The name of the index field to use as a title. </summary>
+        public string TitleFieldName { get; set; }
+        /// <summary> The name of the index field to use as a URL. </summary>
+        public string UrlFieldName { get; set; }
+        /// <summary> The name of the index field to use as a filepath. </summary>
+        public string FilepathFieldName { get; set; }
+        /// <summary> The names of index fields that should be treated as content. </summary>
+        public IList<string> ContentFieldNames { get; }
+        /// <summary> The separator pattern that content fields should use. </summary>
+        public string ContentFieldSeparator { get; set; }
+        /// <summary> The names of fields that represent vector data. </summary>
+        public IList<string> VectorFieldNames { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancement.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancement.Serialization.cs
new file mode 100644
index 000000000000..204ed5ac7a3a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancement.Serialization.cs
@@ -0,0 +1,145 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AzureGroundingEnhancement : IUtf8JsonSerializable, IJsonModel<AzureGroundingEnhancement>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureGroundingEnhancement>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureGroundingEnhancement>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancement>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureGroundingEnhancement)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("lines"u8);
+            writer.WriteStartArray();
+            foreach (var item in Lines)
+            {
+                writer.WriteObjectValue(item, options);
+            }
+            writer.WriteEndArray();
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AzureGroundingEnhancement IJsonModel<AzureGroundingEnhancement>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancement>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureGroundingEnhancement)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAzureGroundingEnhancement(document.RootElement, options);
+        }
+
+        internal static AzureGroundingEnhancement DeserializeAzureGroundingEnhancement(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IReadOnlyList<AzureGroundingEnhancementLine> lines = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("lines"u8))
+                {
+                    List<AzureGroundingEnhancementLine> array = new List<AzureGroundingEnhancementLine>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(AzureGroundingEnhancementLine.DeserializeAzureGroundingEnhancementLine(item, options));
+                    }
+                    lines = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AzureGroundingEnhancement(lines, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AzureGroundingEnhancement>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancement>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AzureGroundingEnhancement)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AzureGroundingEnhancement IPersistableModel<AzureGroundingEnhancement>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancement>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAzureGroundingEnhancement(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AzureGroundingEnhancement)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AzureGroundingEnhancement>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureGroundingEnhancement FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAzureGroundingEnhancement(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancement.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancement.cs
new file mode 100644
index 000000000000..c0194b3dfa44
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancement.cs
@@ -0,0 +1,76 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The grounding enhancement that returns the bounding box of the objects detected in the image. </summary>
+    public partial class AzureGroundingEnhancement
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureGroundingEnhancement"/>. </summary>
+        /// <param name="lines"> The lines of text detected by the grounding enhancement. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="lines"/> is null. </exception>
+        internal AzureGroundingEnhancement(IEnumerable<AzureGroundingEnhancementLine> lines)
+        {
+            Argument.AssertNotNull(lines, nameof(lines));
+
+            Lines = lines.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureGroundingEnhancement"/>. </summary>
+        /// <param name="lines"> The lines of text detected by the grounding enhancement. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AzureGroundingEnhancement(IReadOnlyList<AzureGroundingEnhancementLine> lines, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Lines = lines;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureGroundingEnhancement"/> for deserialization. </summary>
+        internal AzureGroundingEnhancement()
+        {
+        }
+
+        /// <summary> The lines of text detected by the grounding enhancement. </summary>
+        public IReadOnlyList<AzureGroundingEnhancementLine> Lines { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementCoordinatePoint.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementCoordinatePoint.Serialization.cs
new file mode 100644
index 000000000000..e4ef867aaff2
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementCoordinatePoint.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AzureGroundingEnhancementCoordinatePoint : IUtf8JsonSerializable, IJsonModel<AzureGroundingEnhancementCoordinatePoint>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureGroundingEnhancementCoordinatePoint>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureGroundingEnhancementCoordinatePoint>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancementCoordinatePoint>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureGroundingEnhancementCoordinatePoint)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("x"u8);
+            writer.WriteNumberValue(X);
+            writer.WritePropertyName("y"u8);
+            writer.WriteNumberValue(Y);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AzureGroundingEnhancementCoordinatePoint IJsonModel<AzureGroundingEnhancementCoordinatePoint>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancementCoordinatePoint>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureGroundingEnhancementCoordinatePoint)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAzureGroundingEnhancementCoordinatePoint(document.RootElement, options);
+        }
+
+        internal static AzureGroundingEnhancementCoordinatePoint DeserializeAzureGroundingEnhancementCoordinatePoint(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            float x = default;
+            float y = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("x"u8))
+                {
+                    x = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("y"u8))
+                {
+                    y = property.Value.GetSingle();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AzureGroundingEnhancementCoordinatePoint(x, y, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AzureGroundingEnhancementCoordinatePoint>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancementCoordinatePoint>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AzureGroundingEnhancementCoordinatePoint)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AzureGroundingEnhancementCoordinatePoint IPersistableModel<AzureGroundingEnhancementCoordinatePoint>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancementCoordinatePoint>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAzureGroundingEnhancementCoordinatePoint(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AzureGroundingEnhancementCoordinatePoint)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AzureGroundingEnhancementCoordinatePoint>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureGroundingEnhancementCoordinatePoint FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAzureGroundingEnhancementCoordinatePoint(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementCoordinatePoint.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementCoordinatePoint.cs
new file mode 100644
index 000000000000..44b5c9dcbd18
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementCoordinatePoint.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A representation of a single polygon point as used by the Azure grounding enhancement. </summary>
+    public partial class AzureGroundingEnhancementCoordinatePoint
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureGroundingEnhancementCoordinatePoint"/>. </summary>
+        /// <param name="x"> The x-coordinate (horizontal axis) of the point. </param>
+        /// <param name="y"> The y-coordinate (vertical axis) of the point. </param>
+        internal AzureGroundingEnhancementCoordinatePoint(float x, float y)
+        {
+            X = x;
+            Y = y;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureGroundingEnhancementCoordinatePoint"/>. </summary>
+        /// <param name="x"> The x-coordinate (horizontal axis) of the point. </param>
+        /// <param name="y"> The y-coordinate (vertical axis) of the point. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AzureGroundingEnhancementCoordinatePoint(float x, float y, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            X = x;
+            Y = y;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureGroundingEnhancementCoordinatePoint"/> for deserialization. </summary>
+        internal AzureGroundingEnhancementCoordinatePoint()
+        {
+        }
+
+        /// <summary> The x-coordinate (horizontal axis) of the point. </summary>
+        public float X { get; }
+        /// <summary> The y-coordinate (vertical axis) of the point. </summary>
+        public float Y { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementLine.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementLine.Serialization.cs
new file mode 100644
index 000000000000..51b343d861fc
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementLine.Serialization.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AzureGroundingEnhancementLine : IUtf8JsonSerializable, IJsonModel<AzureGroundingEnhancementLine>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureGroundingEnhancementLine>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureGroundingEnhancementLine>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancementLine>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureGroundingEnhancementLine)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("text"u8);
+            writer.WriteStringValue(Text);
+            writer.WritePropertyName("spans"u8);
+            writer.WriteStartArray();
+            foreach (var item in Spans)
+            {
+                writer.WriteObjectValue(item, options);
+            }
+            writer.WriteEndArray();
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AzureGroundingEnhancementLine IJsonModel<AzureGroundingEnhancementLine>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancementLine>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureGroundingEnhancementLine)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAzureGroundingEnhancementLine(document.RootElement, options);
+        }
+
+        internal static AzureGroundingEnhancementLine DeserializeAzureGroundingEnhancementLine(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string text = default;
+            IReadOnlyList<AzureGroundingEnhancementLineSpan> spans = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("text"u8))
+                {
+                    text = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("spans"u8))
+                {
+                    List<AzureGroundingEnhancementLineSpan> array = new List<AzureGroundingEnhancementLineSpan>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(AzureGroundingEnhancementLineSpan.DeserializeAzureGroundingEnhancementLineSpan(item, options));
+                    }
+                    spans = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AzureGroundingEnhancementLine(text, spans, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AzureGroundingEnhancementLine>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancementLine>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AzureGroundingEnhancementLine)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AzureGroundingEnhancementLine IPersistableModel<AzureGroundingEnhancementLine>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancementLine>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAzureGroundingEnhancementLine(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AzureGroundingEnhancementLine)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AzureGroundingEnhancementLine>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureGroundingEnhancementLine FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAzureGroundingEnhancementLine(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementLine.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementLine.cs
new file mode 100644
index 000000000000..5ce268709106
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementLine.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A content line object consisting of an adjacent sequence of content elements, such as words and selection marks. </summary>
+    public partial class AzureGroundingEnhancementLine
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureGroundingEnhancementLine"/>. </summary>
+        /// <param name="text"> The text within the line. </param>
+        /// <param name="spans"> An array of spans that represent detected objects and its bounding box information. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="text"/> or <paramref name="spans"/> is null. </exception>
+        internal AzureGroundingEnhancementLine(string text, IEnumerable<AzureGroundingEnhancementLineSpan> spans)
+        {
+            Argument.AssertNotNull(text, nameof(text));
+            Argument.AssertNotNull(spans, nameof(spans));
+
+            Text = text;
+            Spans = spans.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureGroundingEnhancementLine"/>. </summary>
+        /// <param name="text"> The text within the line. </param>
+        /// <param name="spans"> An array of spans that represent detected objects and its bounding box information. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AzureGroundingEnhancementLine(string text, IReadOnlyList<AzureGroundingEnhancementLineSpan> spans, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Text = text;
+            Spans = spans;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureGroundingEnhancementLine"/> for deserialization. </summary>
+        internal AzureGroundingEnhancementLine()
+        {
+        }
+
+        /// <summary> The text within the line. </summary>
+        public string Text { get; }
+        /// <summary> An array of spans that represent detected objects and its bounding box information. </summary>
+        public IReadOnlyList<AzureGroundingEnhancementLineSpan> Spans { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementLineSpan.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementLineSpan.Serialization.cs
new file mode 100644
index 000000000000..a7db6c01a403
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementLineSpan.Serialization.cs
@@ -0,0 +1,169 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AzureGroundingEnhancementLineSpan : IUtf8JsonSerializable, IJsonModel<AzureGroundingEnhancementLineSpan>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureGroundingEnhancementLineSpan>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureGroundingEnhancementLineSpan>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancementLineSpan>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureGroundingEnhancementLineSpan)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("text"u8);
+            writer.WriteStringValue(Text);
+            writer.WritePropertyName("offset"u8);
+            writer.WriteNumberValue(Offset);
+            writer.WritePropertyName("length"u8);
+            writer.WriteNumberValue(Length);
+            writer.WritePropertyName("polygon"u8);
+            writer.WriteStartArray();
+            foreach (var item in Polygon)
+            {
+                writer.WriteObjectValue(item, options);
+            }
+            writer.WriteEndArray();
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AzureGroundingEnhancementLineSpan IJsonModel<AzureGroundingEnhancementLineSpan>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancementLineSpan>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureGroundingEnhancementLineSpan)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAzureGroundingEnhancementLineSpan(document.RootElement, options);
+        }
+
+        internal static AzureGroundingEnhancementLineSpan DeserializeAzureGroundingEnhancementLineSpan(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string text = default;
+            int offset = default;
+            int length = default;
+            IReadOnlyList<AzureGroundingEnhancementCoordinatePoint> polygon = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("text"u8))
+                {
+                    text = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("offset"u8))
+                {
+                    offset = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("length"u8))
+                {
+                    length = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("polygon"u8))
+                {
+                    List<AzureGroundingEnhancementCoordinatePoint> array = new List<AzureGroundingEnhancementCoordinatePoint>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(AzureGroundingEnhancementCoordinatePoint.DeserializeAzureGroundingEnhancementCoordinatePoint(item, options));
+                    }
+                    polygon = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AzureGroundingEnhancementLineSpan(text, offset, length, polygon, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AzureGroundingEnhancementLineSpan>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancementLineSpan>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AzureGroundingEnhancementLineSpan)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AzureGroundingEnhancementLineSpan IPersistableModel<AzureGroundingEnhancementLineSpan>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureGroundingEnhancementLineSpan>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAzureGroundingEnhancementLineSpan(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AzureGroundingEnhancementLineSpan)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AzureGroundingEnhancementLineSpan>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureGroundingEnhancementLineSpan FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAzureGroundingEnhancementLineSpan(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementLineSpan.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementLineSpan.cs
new file mode 100644
index 000000000000..0c370dd4d762
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureGroundingEnhancementLineSpan.cs
@@ -0,0 +1,104 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A span object that represents a detected object and its bounding box information. </summary>
+    public partial class AzureGroundingEnhancementLineSpan
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureGroundingEnhancementLineSpan"/>. </summary>
+        /// <param name="text"> The text content of the span that represents the detected object. </param>
+        /// <param name="offset">
+        /// The character offset within the text where the span begins. This offset is defined as the position of the first
+        /// character of the span, counting from the start of the text as Unicode codepoints.
+        /// </param>
+        /// <param name="length"> The length of the span in characters, measured in Unicode codepoints. </param>
+        /// <param name="polygon"> An array of objects representing points in the polygon that encloses the detected object. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="text"/> or <paramref name="polygon"/> is null. </exception>
+        internal AzureGroundingEnhancementLineSpan(string text, int offset, int length, IEnumerable<AzureGroundingEnhancementCoordinatePoint> polygon)
+        {
+            Argument.AssertNotNull(text, nameof(text));
+            Argument.AssertNotNull(polygon, nameof(polygon));
+
+            Text = text;
+            Offset = offset;
+            Length = length;
+            Polygon = polygon.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureGroundingEnhancementLineSpan"/>. </summary>
+        /// <param name="text"> The text content of the span that represents the detected object. </param>
+        /// <param name="offset">
+        /// The character offset within the text where the span begins. This offset is defined as the position of the first
+        /// character of the span, counting from the start of the text as Unicode codepoints.
+        /// </param>
+        /// <param name="length"> The length of the span in characters, measured in Unicode codepoints. </param>
+        /// <param name="polygon"> An array of objects representing points in the polygon that encloses the detected object. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AzureGroundingEnhancementLineSpan(string text, int offset, int length, IReadOnlyList<AzureGroundingEnhancementCoordinatePoint> polygon, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Text = text;
+            Offset = offset;
+            Length = length;
+            Polygon = polygon;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureGroundingEnhancementLineSpan"/> for deserialization. </summary>
+        internal AzureGroundingEnhancementLineSpan()
+        {
+        }
+
+        /// <summary> The text content of the span that represents the detected object. </summary>
+        public string Text { get; }
+        /// <summary>
+        /// The character offset within the text where the span begins. This offset is defined as the position of the first
+        /// character of the span, counting from the start of the text as Unicode codepoints.
+        /// </summary>
+        public int Offset { get; }
+        /// <summary> The length of the span in characters, measured in Unicode codepoints. </summary>
+        public int Length { get; }
+        /// <summary> An array of objects representing points in the polygon that encloses the detected object. </summary>
+        public IReadOnlyList<AzureGroundingEnhancementCoordinatePoint> Polygon { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIChatError.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIChatError.Serialization.cs
deleted file mode 100644
index d4bda9baa41c..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIChatError.Serialization.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI
-{
-    internal partial class AzureOpenAIChatError : IJsonModel<AzureOpenAIChatError>
-    {
-        void IJsonModel<AzureOpenAIChatError>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIChatError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AzureOpenAIChatError)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("code") != true && Optional.IsDefined(Code))
-            {
-                writer.WritePropertyName("code"u8);
-                writer.WriteStringValue(Code);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("message") != true && Optional.IsDefined(Message))
-            {
-                writer.WritePropertyName("message"u8);
-                writer.WriteStringValue(Message);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("param") != true && Optional.IsDefined(Param))
-            {
-                writer.WritePropertyName("param"u8);
-                writer.WriteStringValue(Param);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true && Optional.IsDefined(Type))
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("inner_error") != true && Optional.IsDefined(InnerError))
-            {
-                writer.WritePropertyName("inner_error"u8);
-                writer.WriteObjectValue(InnerError, options);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        AzureOpenAIChatError IJsonModel<AzureOpenAIChatError>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIChatError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AzureOpenAIChatError)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAzureOpenAIChatError(document.RootElement, options);
-        }
-
-        internal static AzureOpenAIChatError DeserializeAzureOpenAIChatError(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string code = default;
-            string message = default;
-            string param = default;
-            string type = default;
-            InternalAzureOpenAIChatErrorInnerError innerError = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("code"u8))
-                {
-                    code = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("message"u8))
-                {
-                    message = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("param"u8))
-                {
-                    param = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("inner_error"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    innerError = InternalAzureOpenAIChatErrorInnerError.DeserializeInternalAzureOpenAIChatErrorInnerError(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AzureOpenAIChatError(
-                code,
-                message,
-                param,
-                type,
-                innerError,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AzureOpenAIChatError>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIChatError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AzureOpenAIChatError)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AzureOpenAIChatError IPersistableModel<AzureOpenAIChatError>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIChatError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAzureOpenAIChatError(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AzureOpenAIChatError)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AzureOpenAIChatError>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static AzureOpenAIChatError FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAzureOpenAIChatError(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIChatError.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIChatError.cs
deleted file mode 100644
index b379c88ac0a8..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIChatError.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI
-{
-    /// <summary> The structured representation of an error from an Azure OpenAI chat completion request. </summary>
-    internal partial class AzureOpenAIChatError
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="AzureOpenAIChatError"/>. </summary>
-        internal AzureOpenAIChatError()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AzureOpenAIChatError"/>. </summary>
-        /// <param name="code"> The distinct, machine-generated identifier for the error. </param>
-        /// <param name="message"> A human-readable message associated with the error. </param>
-        /// <param name="param"> If applicable, the request input parameter associated with the error. </param>
-        /// <param name="type"> If applicable, the input line number associated with the error. </param>
-        /// <param name="innerError"> If applicable, an upstream error that originated this error. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AzureOpenAIChatError(string code, string message, string param, string type, InternalAzureOpenAIChatErrorInnerError innerError, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Code = code;
-            Message = message;
-            Param = param;
-            Type = type;
-            InnerError = innerError;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The distinct, machine-generated identifier for the error. </summary>
-        public string Code { get; }
-        /// <summary> A human-readable message associated with the error. </summary>
-        public string Message { get; }
-        /// <summary> If applicable, the request input parameter associated with the error. </summary>
-        public string Param { get; }
-        /// <summary> If applicable, the input line number associated with the error. </summary>
-        public string Type { get; }
-        /// <summary> If applicable, an upstream error that originated this error. </summary>
-        public InternalAzureOpenAIChatErrorInnerError InnerError { get; }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIChatErrorResponse.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIChatErrorResponse.Serialization.cs
deleted file mode 100644
index a85c386fd313..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIChatErrorResponse.Serialization.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI
-{
-    internal partial class AzureOpenAIChatErrorResponse : IJsonModel<AzureOpenAIChatErrorResponse>
-    {
-        void IJsonModel<AzureOpenAIChatErrorResponse>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIChatErrorResponse>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AzureOpenAIChatErrorResponse)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("error") != true && Optional.IsDefined(Error))
-            {
-                writer.WritePropertyName("error"u8);
-                writer.WriteObjectValue(Error, options);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        AzureOpenAIChatErrorResponse IJsonModel<AzureOpenAIChatErrorResponse>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIChatErrorResponse>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AzureOpenAIChatErrorResponse)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAzureOpenAIChatErrorResponse(document.RootElement, options);
-        }
-
-        internal static AzureOpenAIChatErrorResponse DeserializeAzureOpenAIChatErrorResponse(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AzureOpenAIChatError error = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("error"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    error = AzureOpenAIChatError.DeserializeAzureOpenAIChatError(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AzureOpenAIChatErrorResponse(error, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AzureOpenAIChatErrorResponse>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIChatErrorResponse>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AzureOpenAIChatErrorResponse)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AzureOpenAIChatErrorResponse IPersistableModel<AzureOpenAIChatErrorResponse>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIChatErrorResponse>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAzureOpenAIChatErrorResponse(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AzureOpenAIChatErrorResponse)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AzureOpenAIChatErrorResponse>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static AzureOpenAIChatErrorResponse FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAzureOpenAIChatErrorResponse(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIDalleError.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIDalleError.Serialization.cs
deleted file mode 100644
index 2498a9dac44b..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIDalleError.Serialization.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI
-{
-    internal partial class AzureOpenAIDalleError : IJsonModel<AzureOpenAIDalleError>
-    {
-        void IJsonModel<AzureOpenAIDalleError>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIDalleError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AzureOpenAIDalleError)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("code") != true && Optional.IsDefined(Code))
-            {
-                writer.WritePropertyName("code"u8);
-                writer.WriteStringValue(Code);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("message") != true && Optional.IsDefined(Message))
-            {
-                writer.WritePropertyName("message"u8);
-                writer.WriteStringValue(Message);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("param") != true && Optional.IsDefined(Param))
-            {
-                writer.WritePropertyName("param"u8);
-                writer.WriteStringValue(Param);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true && Optional.IsDefined(Type))
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("inner_error") != true && Optional.IsDefined(InnerError))
-            {
-                writer.WritePropertyName("inner_error"u8);
-                writer.WriteObjectValue(InnerError, options);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        AzureOpenAIDalleError IJsonModel<AzureOpenAIDalleError>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIDalleError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AzureOpenAIDalleError)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAzureOpenAIDalleError(document.RootElement, options);
-        }
-
-        internal static AzureOpenAIDalleError DeserializeAzureOpenAIDalleError(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string code = default;
-            string message = default;
-            string param = default;
-            string type = default;
-            InternalAzureOpenAIDalleErrorInnerError innerError = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("code"u8))
-                {
-                    code = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("message"u8))
-                {
-                    message = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("param"u8))
-                {
-                    param = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("inner_error"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    innerError = InternalAzureOpenAIDalleErrorInnerError.DeserializeInternalAzureOpenAIDalleErrorInnerError(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AzureOpenAIDalleError(
-                code,
-                message,
-                param,
-                type,
-                innerError,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AzureOpenAIDalleError>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIDalleError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AzureOpenAIDalleError)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AzureOpenAIDalleError IPersistableModel<AzureOpenAIDalleError>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIDalleError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAzureOpenAIDalleError(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AzureOpenAIDalleError)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AzureOpenAIDalleError>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static AzureOpenAIDalleError FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAzureOpenAIDalleError(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIDalleError.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIDalleError.cs
deleted file mode 100644
index 7dfb2de16f66..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIDalleError.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI
-{
-    /// <summary> The structured representation of an error from an Azure OpenAI image generation request. </summary>
-    internal partial class AzureOpenAIDalleError
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="AzureOpenAIDalleError"/>. </summary>
-        internal AzureOpenAIDalleError()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="AzureOpenAIDalleError"/>. </summary>
-        /// <param name="code"> The distinct, machine-generated identifier for the error. </param>
-        /// <param name="message"> A human-readable message associated with the error. </param>
-        /// <param name="param"> If applicable, the request input parameter associated with the error. </param>
-        /// <param name="type"> If applicable, the input line number associated with the error. </param>
-        /// <param name="innerError"> If applicable, an upstream error that originated this error. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AzureOpenAIDalleError(string code, string message, string param, string type, InternalAzureOpenAIDalleErrorInnerError innerError, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Code = code;
-            Message = message;
-            Param = param;
-            Type = type;
-            InnerError = innerError;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The distinct, machine-generated identifier for the error. </summary>
-        public string Code { get; }
-        /// <summary> A human-readable message associated with the error. </summary>
-        public string Message { get; }
-        /// <summary> If applicable, the request input parameter associated with the error. </summary>
-        public string Param { get; }
-        /// <summary> If applicable, the input line number associated with the error. </summary>
-        public string Type { get; }
-        /// <summary> If applicable, an upstream error that originated this error. </summary>
-        public InternalAzureOpenAIDalleErrorInnerError InnerError { get; }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIDalleErrorResponse.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIDalleErrorResponse.Serialization.cs
deleted file mode 100644
index cdcc8bc203a6..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureOpenAIDalleErrorResponse.Serialization.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI
-{
-    internal partial class AzureOpenAIDalleErrorResponse : IJsonModel<AzureOpenAIDalleErrorResponse>
-    {
-        void IJsonModel<AzureOpenAIDalleErrorResponse>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIDalleErrorResponse>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AzureOpenAIDalleErrorResponse)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("error") != true && Optional.IsDefined(Error))
-            {
-                writer.WritePropertyName("error"u8);
-                writer.WriteObjectValue(Error, options);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        AzureOpenAIDalleErrorResponse IJsonModel<AzureOpenAIDalleErrorResponse>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIDalleErrorResponse>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AzureOpenAIDalleErrorResponse)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAzureOpenAIDalleErrorResponse(document.RootElement, options);
-        }
-
-        internal static AzureOpenAIDalleErrorResponse DeserializeAzureOpenAIDalleErrorResponse(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            AzureOpenAIDalleError error = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("error"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    error = AzureOpenAIDalleError.DeserializeAzureOpenAIDalleError(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AzureOpenAIDalleErrorResponse(error, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<AzureOpenAIDalleErrorResponse>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIDalleErrorResponse>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AzureOpenAIDalleErrorResponse)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AzureOpenAIDalleErrorResponse IPersistableModel<AzureOpenAIDalleErrorResponse>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureOpenAIDalleErrorResponse>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAzureOpenAIDalleErrorResponse(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AzureOpenAIDalleErrorResponse)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AzureOpenAIDalleErrorResponse>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static AzureOpenAIDalleErrorResponse FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAzureOpenAIDalleErrorResponse(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatDataSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatDataSource.Serialization.cs
deleted file mode 100644
index a9deddec3d6a..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatDataSource.Serialization.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    public partial class AzureSearchChatDataSource : IJsonModel<AzureSearchChatDataSource>
-    {
-        void IJsonModel<AzureSearchChatDataSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AzureSearchChatDataSource)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("parameters") != true)
-            {
-                writer.WritePropertyName("parameters"u8);
-                writer.WriteObjectValue<InternalAzureSearchChatDataSourceParameters>(InternalParameters, options);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        AzureSearchChatDataSource IJsonModel<AzureSearchChatDataSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AzureSearchChatDataSource)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAzureSearchChatDataSource(document.RootElement, options);
-        }
-
-        internal static AzureSearchChatDataSource DeserializeAzureSearchChatDataSource(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            InternalAzureSearchChatDataSourceParameters parameters = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("parameters"u8))
-                {
-                    parameters = InternalAzureSearchChatDataSourceParameters.DeserializeInternalAzureSearchChatDataSourceParameters(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AzureSearchChatDataSource(type, serializedAdditionalRawData, parameters);
-        }
-
-        BinaryData IPersistableModel<AzureSearchChatDataSource>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AzureSearchChatDataSource)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AzureSearchChatDataSource IPersistableModel<AzureSearchChatDataSource>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAzureSearchChatDataSource(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AzureSearchChatDataSource)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AzureSearchChatDataSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new AzureSearchChatDataSource FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAzureSearchChatDataSource(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatDataSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatDataSource.cs
deleted file mode 100644
index 417a6abd7220..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatDataSource.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> Represents a data source configuration that will use an Azure Search resource. </summary>
-    public partial class AzureSearchChatDataSource : ChatDataSource
-    {
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatExtensionConfiguration.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatExtensionConfiguration.Serialization.cs
new file mode 100644
index 000000000000..546f78ce3966
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatExtensionConfiguration.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class AzureSearchChatExtensionConfiguration : IUtf8JsonSerializable, IJsonModel<AzureSearchChatExtensionConfiguration>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureSearchChatExtensionConfiguration>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureSearchChatExtensionConfiguration>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureSearchChatExtensionConfiguration)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("parameters"u8);
+            writer.WriteObjectValue(Parameters, options);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AzureSearchChatExtensionConfiguration IJsonModel<AzureSearchChatExtensionConfiguration>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureSearchChatExtensionConfiguration)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAzureSearchChatExtensionConfiguration(document.RootElement, options);
+        }
+
+        internal static AzureSearchChatExtensionConfiguration DeserializeAzureSearchChatExtensionConfiguration(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            AzureSearchChatExtensionParameters parameters = default;
+            AzureChatExtensionType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("parameters"u8))
+                {
+                    parameters = AzureSearchChatExtensionParameters.DeserializeAzureSearchChatExtensionParameters(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new AzureChatExtensionType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new AzureSearchChatExtensionConfiguration(type, serializedAdditionalRawData, parameters);
+        }
+
+        BinaryData IPersistableModel<AzureSearchChatExtensionConfiguration>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AzureSearchChatExtensionConfiguration)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AzureSearchChatExtensionConfiguration IPersistableModel<AzureSearchChatExtensionConfiguration>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAzureSearchChatExtensionConfiguration(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AzureSearchChatExtensionConfiguration)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AzureSearchChatExtensionConfiguration>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new AzureSearchChatExtensionConfiguration FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeAzureSearchChatExtensionConfiguration(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatExtensionConfiguration.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatExtensionConfiguration.cs
new file mode 100644
index 000000000000..5123cfe7c574
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatExtensionConfiguration.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// A specific representation of configurable options for Azure Search when using it as an Azure OpenAI chat
+    /// extension.
+    /// </summary>
+    public partial class AzureSearchChatExtensionConfiguration : AzureChatExtensionConfiguration
+    {
+        /// <summary> Initializes a new instance of <see cref="AzureSearchChatExtensionConfiguration"/>. </summary>
+        /// <param name="parameters"> The parameters to use when configuring Azure Search. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="parameters"/> is null. </exception>
+        public AzureSearchChatExtensionConfiguration(AzureSearchChatExtensionParameters parameters)
+        {
+            Argument.AssertNotNull(parameters, nameof(parameters));
+
+            Type = AzureChatExtensionType.AzureSearch;
+            Parameters = parameters;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureSearchChatExtensionConfiguration"/>. </summary>
+        /// <param name="type">
+        ///   The label for the type of an Azure chat extension. This typically corresponds to a matching Azure resource.
+        ///   Azure chat extensions are only compatible with Azure OpenAI.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="parameters"> The parameters to use when configuring Azure Search. </param>
+        internal AzureSearchChatExtensionConfiguration(AzureChatExtensionType type, IDictionary<string, BinaryData> serializedAdditionalRawData, AzureSearchChatExtensionParameters parameters) : base(type, serializedAdditionalRawData)
+        {
+            Parameters = parameters;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureSearchChatExtensionConfiguration"/> for deserialization. </summary>
+        internal AzureSearchChatExtensionConfiguration()
+        {
+        }
+
+        /// <summary> The parameters to use when configuring Azure Search. </summary>
+        public AzureSearchChatExtensionParameters Parameters { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureSearchChatDataSourceParameters.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatExtensionParameters.Serialization.cs
similarity index 58%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureSearchChatDataSourceParameters.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatExtensionParameters.Serialization.cs
index 49694aa0a5ec..25c7ae3fa091 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureSearchChatDataSourceParameters.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatExtensionParameters.Serialization.cs
@@ -1,109 +1,104 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI
 {
-    internal partial class InternalAzureSearchChatDataSourceParameters : IJsonModel<InternalAzureSearchChatDataSourceParameters>
+    public partial class AzureSearchChatExtensionParameters : IUtf8JsonSerializable, IJsonModel<AzureSearchChatExtensionParameters>
     {
-        void IJsonModel<InternalAzureSearchChatDataSourceParameters>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureSearchChatExtensionParameters>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureSearchChatExtensionParameters>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureSearchChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalAzureSearchChatDataSourceParameters)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(AzureSearchChatExtensionParameters)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("top_n_documents") != true && Optional.IsDefined(TopNDocuments))
+            if (Optional.IsDefined(DocumentCount))
             {
                 writer.WritePropertyName("top_n_documents"u8);
-                writer.WriteNumberValue(TopNDocuments.Value);
+                writer.WriteNumberValue(DocumentCount.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("in_scope") != true && Optional.IsDefined(InScope))
+            if (Optional.IsDefined(ShouldRestrictResultScope))
             {
                 writer.WritePropertyName("in_scope"u8);
-                writer.WriteBooleanValue(InScope.Value);
+                writer.WriteBooleanValue(ShouldRestrictResultScope.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("strictness") != true && Optional.IsDefined(Strictness))
+            if (Optional.IsDefined(Strictness))
             {
                 writer.WritePropertyName("strictness"u8);
                 writer.WriteNumberValue(Strictness.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("max_search_queries") != true && Optional.IsDefined(MaxSearchQueries))
+            if (Optional.IsDefined(MaxSearchQueries))
             {
                 writer.WritePropertyName("max_search_queries"u8);
                 writer.WriteNumberValue(MaxSearchQueries.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("allow_partial_result") != true && Optional.IsDefined(AllowPartialResult))
+            if (Optional.IsDefined(AllowPartialResult))
             {
                 writer.WritePropertyName("allow_partial_result"u8);
                 writer.WriteBooleanValue(AllowPartialResult.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("include_contexts") != true && Optional.IsCollectionDefined(_internalIncludeContexts))
+            if (Optional.IsCollectionDefined(IncludeContexts))
             {
                 writer.WritePropertyName("include_contexts"u8);
                 writer.WriteStartArray();
-                foreach (var item in _internalIncludeContexts)
+                foreach (var item in IncludeContexts)
                 {
-                    writer.WriteStringValue(item);
+                    writer.WriteStringValue(item.ToString());
                 }
                 writer.WriteEndArray();
             }
-            if (SerializedAdditionalRawData?.ContainsKey("endpoint") != true)
-            {
-                writer.WritePropertyName("endpoint"u8);
-                writer.WriteStringValue(Endpoint.AbsoluteUri);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("index_name") != true)
-            {
-                writer.WritePropertyName("index_name"u8);
-                writer.WriteStringValue(IndexName);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("authentication") != true)
+            if (Optional.IsDefined(Authentication))
             {
                 writer.WritePropertyName("authentication"u8);
-                writer.WriteObjectValue<DataSourceAuthentication>(Authentication, options);
+                writer.WriteObjectValue(Authentication, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("fields_mapping") != true && Optional.IsDefined(FieldMappings))
+            writer.WritePropertyName("endpoint"u8);
+            writer.WriteStringValue(SearchEndpoint.AbsoluteUri);
+            writer.WritePropertyName("index_name"u8);
+            writer.WriteStringValue(IndexName);
+            if (Optional.IsDefined(FieldMappingOptions))
             {
                 writer.WritePropertyName("fields_mapping"u8);
-                writer.WriteObjectValue<DataSourceFieldMappings>(FieldMappings, options);
+                writer.WriteObjectValue(FieldMappingOptions, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("query_type") != true && Optional.IsDefined(QueryType))
+            if (Optional.IsDefined(QueryType))
             {
                 writer.WritePropertyName("query_type"u8);
                 writer.WriteStringValue(QueryType.Value.ToString());
             }
-            if (SerializedAdditionalRawData?.ContainsKey("semantic_configuration") != true && Optional.IsDefined(SemanticConfiguration))
+            if (Optional.IsDefined(SemanticConfiguration))
             {
                 writer.WritePropertyName("semantic_configuration"u8);
                 writer.WriteStringValue(SemanticConfiguration);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("filter") != true && Optional.IsDefined(Filter))
+            if (Optional.IsDefined(Filter))
             {
                 writer.WritePropertyName("filter"u8);
                 writer.WriteStringValue(Filter);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("embedding_dependency") != true && Optional.IsDefined(VectorizationSource))
+            if (Optional.IsDefined(EmbeddingDependency))
             {
                 writer.WritePropertyName("embedding_dependency"u8);
-                writer.WriteObjectValue<DataSourceVectorizer>(VectorizationSource, options);
+                writer.WriteObjectValue(EmbeddingDependency, options);
             }
-            if (SerializedAdditionalRawData != null)
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -118,19 +113,19 @@ void IJsonModel<InternalAzureSearchChatDataSourceParameters>.Write(Utf8JsonWrite
             writer.WriteEndObject();
         }
 
-        InternalAzureSearchChatDataSourceParameters IJsonModel<InternalAzureSearchChatDataSourceParameters>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        AzureSearchChatExtensionParameters IJsonModel<AzureSearchChatExtensionParameters>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureSearchChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalAzureSearchChatDataSourceParameters)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(AzureSearchChatExtensionParameters)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureSearchChatDataSourceParameters(document.RootElement, options);
+            return DeserializeAzureSearchChatExtensionParameters(document.RootElement, options);
         }
 
-        internal static InternalAzureSearchChatDataSourceParameters DeserializeInternalAzureSearchChatDataSourceParameters(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static AzureSearchChatExtensionParameters DeserializeAzureSearchChatExtensionParameters(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -143,15 +138,15 @@ internal static InternalAzureSearchChatDataSourceParameters DeserializeInternalA
             int? strictness = default;
             int? maxSearchQueries = default;
             bool? allowPartialResult = default;
-            IList<string> includeContexts = default;
+            IList<OnYourDataContextProperty> includeContexts = default;
+            OnYourDataAuthenticationOptions authentication = default;
             Uri endpoint = default;
             string indexName = default;
-            DataSourceAuthentication authentication = default;
-            DataSourceFieldMappings fieldsMapping = default;
-            DataSourceQueryType? queryType = default;
+            AzureSearchIndexFieldMappingOptions fieldsMapping = default;
+            AzureSearchQueryType? queryType = default;
             string semanticConfiguration = default;
             string filter = default;
-            DataSourceVectorizer embeddingDependency = default;
+            OnYourDataVectorizationSource embeddingDependency = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -207,14 +202,23 @@ internal static InternalAzureSearchChatDataSourceParameters DeserializeInternalA
                     {
                         continue;
                     }
-                    List<string> array = new List<string>();
+                    List<OnYourDataContextProperty> array = new List<OnYourDataContextProperty>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(item.GetString());
+                        array.Add(new OnYourDataContextProperty(item.GetString()));
                     }
                     includeContexts = array;
                     continue;
                 }
+                if (property.NameEquals("authentication"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    authentication = OnYourDataAuthenticationOptions.DeserializeOnYourDataAuthenticationOptions(property.Value, options);
+                    continue;
+                }
                 if (property.NameEquals("endpoint"u8))
                 {
                     endpoint = new Uri(property.Value.GetString());
@@ -225,18 +229,13 @@ internal static InternalAzureSearchChatDataSourceParameters DeserializeInternalA
                     indexName = property.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("authentication"u8))
-                {
-                    authentication = DataSourceAuthentication.DeserializeDataSourceAuthentication(property.Value, options);
-                    continue;
-                }
                 if (property.NameEquals("fields_mapping"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    fieldsMapping = DataSourceFieldMappings.DeserializeDataSourceFieldMappings(property.Value, options);
+                    fieldsMapping = AzureSearchIndexFieldMappingOptions.DeserializeAzureSearchIndexFieldMappingOptions(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("query_type"u8))
@@ -245,7 +244,7 @@ internal static InternalAzureSearchChatDataSourceParameters DeserializeInternalA
                     {
                         continue;
                     }
-                    queryType = new DataSourceQueryType(property.Value.GetString());
+                    queryType = new AzureSearchQueryType(property.Value.GetString());
                     continue;
                 }
                 if (property.NameEquals("semantic_configuration"u8))
@@ -264,26 +263,25 @@ internal static InternalAzureSearchChatDataSourceParameters DeserializeInternalA
                     {
                         continue;
                     }
-                    embeddingDependency = DataSourceVectorizer.DeserializeDataSourceVectorizer(property.Value, options);
+                    embeddingDependency = OnYourDataVectorizationSource.DeserializeOnYourDataVectorizationSource(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureSearchChatDataSourceParameters(
+            return new AzureSearchChatExtensionParameters(
                 topNDocuments,
                 inScope,
                 strictness,
                 maxSearchQueries,
                 allowPartialResult,
-                includeContexts ?? new ChangeTrackingList<string>(),
+                includeContexts ?? new ChangeTrackingList<OnYourDataContextProperty>(),
+                authentication,
                 endpoint,
                 indexName,
-                authentication,
                 fieldsMapping,
                 queryType,
                 semanticConfiguration,
@@ -292,50 +290,51 @@ internal static InternalAzureSearchChatDataSourceParameters DeserializeInternalA
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<InternalAzureSearchChatDataSourceParameters>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<AzureSearchChatExtensionParameters>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureSearchChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(InternalAzureSearchChatDataSourceParameters)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(AzureSearchChatExtensionParameters)} does not support writing '{options.Format}' format.");
             }
         }
 
-        InternalAzureSearchChatDataSourceParameters IPersistableModel<InternalAzureSearchChatDataSourceParameters>.Create(BinaryData data, ModelReaderWriterOptions options)
+        AzureSearchChatExtensionParameters IPersistableModel<AzureSearchChatExtensionParameters>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureSearchChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureSearchChatDataSourceParameters(document.RootElement, options);
+                        return DeserializeAzureSearchChatExtensionParameters(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(InternalAzureSearchChatDataSourceParameters)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(AzureSearchChatExtensionParameters)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<InternalAzureSearchChatDataSourceParameters>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<AzureSearchChatExtensionParameters>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static InternalAzureSearchChatDataSourceParameters FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureSearchChatExtensionParameters FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureSearchChatDataSourceParameters(document.RootElement);
+            return DeserializeAzureSearchChatExtensionParameters(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatExtensionParameters.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatExtensionParameters.cs
new file mode 100644
index 000000000000..ad1430d18c2f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchChatExtensionParameters.cs
@@ -0,0 +1,167 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Parameters for Azure Cognitive Search when used as an Azure OpenAI chat extension. The supported authentication types are APIKey, SystemAssignedManagedIdentity and UserAssignedManagedIdentity. </summary>
+    public partial class AzureSearchChatExtensionParameters
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureSearchChatExtensionParameters"/>. </summary>
+        /// <param name="searchEndpoint"> The absolute endpoint path for the Azure Cognitive Search resource to use. </param>
+        /// <param name="indexName"> The name of the index to use as available in the referenced Azure Cognitive Search resource. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="searchEndpoint"/> or <paramref name="indexName"/> is null. </exception>
+        public AzureSearchChatExtensionParameters(Uri searchEndpoint, string indexName)
+        {
+            Argument.AssertNotNull(searchEndpoint, nameof(searchEndpoint));
+            Argument.AssertNotNull(indexName, nameof(indexName));
+
+            IncludeContexts = new ChangeTrackingList<OnYourDataContextProperty>();
+            SearchEndpoint = searchEndpoint;
+            IndexName = indexName;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureSearchChatExtensionParameters"/>. </summary>
+        /// <param name="documentCount"> The configured top number of documents to feature for the configured query. </param>
+        /// <param name="shouldRestrictResultScope"> Whether queries should be restricted to use of indexed data. </param>
+        /// <param name="strictness"> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </param>
+        /// <param name="maxSearchQueries">
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </param>
+        /// <param name="allowPartialResult">
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </param>
+        /// <param name="includeContexts"> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </param>
+        /// <param name="authentication">
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// Please note <see cref="OnYourDataAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataAccessTokenAuthenticationOptions"/>, <see cref="OnYourDataApiKeyAuthenticationOptions"/>, <see cref="OnYourDataConnectionStringAuthenticationOptions"/>, <see cref="OnYourDataEncodedApiKeyAuthenticationOptions"/>, <see cref="OnYourDataKeyAndKeyIdAuthenticationOptions"/>, <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>, <see cref="OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> and <see cref="OnYourDataUsernameAndPasswordAuthenticationOptions"/>.
+        /// </param>
+        /// <param name="searchEndpoint"> The absolute endpoint path for the Azure Cognitive Search resource to use. </param>
+        /// <param name="indexName"> The name of the index to use as available in the referenced Azure Cognitive Search resource. </param>
+        /// <param name="fieldMappingOptions"> Customized field mapping behavior to use when interacting with the search index. </param>
+        /// <param name="queryType"> The query type to use with Azure Cognitive Search. </param>
+        /// <param name="semanticConfiguration"> The additional semantic configuration for the query. </param>
+        /// <param name="filter"> Search filter. </param>
+        /// <param name="embeddingDependency">
+        /// The embedding dependency for vector search.
+        /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OnYourDataModelIdVectorizationSource"/>.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AzureSearchChatExtensionParameters(int? documentCount, bool? shouldRestrictResultScope, int? strictness, int? maxSearchQueries, bool? allowPartialResult, IList<OnYourDataContextProperty> includeContexts, OnYourDataAuthenticationOptions authentication, Uri searchEndpoint, string indexName, AzureSearchIndexFieldMappingOptions fieldMappingOptions, AzureSearchQueryType? queryType, string semanticConfiguration, string filter, OnYourDataVectorizationSource embeddingDependency, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            DocumentCount = documentCount;
+            ShouldRestrictResultScope = shouldRestrictResultScope;
+            Strictness = strictness;
+            MaxSearchQueries = maxSearchQueries;
+            AllowPartialResult = allowPartialResult;
+            IncludeContexts = includeContexts;
+            Authentication = authentication;
+            SearchEndpoint = searchEndpoint;
+            IndexName = indexName;
+            FieldMappingOptions = fieldMappingOptions;
+            QueryType = queryType;
+            SemanticConfiguration = semanticConfiguration;
+            Filter = filter;
+            EmbeddingDependency = embeddingDependency;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureSearchChatExtensionParameters"/> for deserialization. </summary>
+        internal AzureSearchChatExtensionParameters()
+        {
+        }
+
+        /// <summary> The configured top number of documents to feature for the configured query. </summary>
+        public int? DocumentCount { get; set; }
+        /// <summary> Whether queries should be restricted to use of indexed data. </summary>
+        public bool? ShouldRestrictResultScope { get; set; }
+        /// <summary> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </summary>
+        public int? Strictness { get; set; }
+        /// <summary>
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </summary>
+        public int? MaxSearchQueries { get; set; }
+        /// <summary>
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </summary>
+        public bool? AllowPartialResult { get; set; }
+        /// <summary> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </summary>
+        public IList<OnYourDataContextProperty> IncludeContexts { get; }
+        /// <summary>
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// Please note <see cref="OnYourDataAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataAccessTokenAuthenticationOptions"/>, <see cref="OnYourDataApiKeyAuthenticationOptions"/>, <see cref="OnYourDataConnectionStringAuthenticationOptions"/>, <see cref="OnYourDataEncodedApiKeyAuthenticationOptions"/>, <see cref="OnYourDataKeyAndKeyIdAuthenticationOptions"/>, <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>, <see cref="OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> and <see cref="OnYourDataUsernameAndPasswordAuthenticationOptions"/>.
+        /// </summary>
+        public OnYourDataAuthenticationOptions Authentication { get; set; }
+        /// <summary> The absolute endpoint path for the Azure Cognitive Search resource to use. </summary>
+        public Uri SearchEndpoint { get; }
+        /// <summary> The name of the index to use as available in the referenced Azure Cognitive Search resource. </summary>
+        public string IndexName { get; }
+        /// <summary> Customized field mapping behavior to use when interacting with the search index. </summary>
+        public AzureSearchIndexFieldMappingOptions FieldMappingOptions { get; set; }
+        /// <summary> The query type to use with Azure Cognitive Search. </summary>
+        public AzureSearchQueryType? QueryType { get; set; }
+        /// <summary> The additional semantic configuration for the query. </summary>
+        public string SemanticConfiguration { get; set; }
+        /// <summary> Search filter. </summary>
+        public string Filter { get; set; }
+        /// <summary>
+        /// The embedding dependency for vector search.
+        /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OnYourDataModelIdVectorizationSource"/>.
+        /// </summary>
+        public OnYourDataVectorizationSource EmbeddingDependency { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceFieldMappings.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchIndexFieldMappingOptions.Serialization.cs
similarity index 66%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceFieldMappings.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchIndexFieldMappingOptions.Serialization.cs
index 9daa6c711873..920c9859bc18 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceFieldMappings.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchIndexFieldMappingOptions.Serialization.cs
@@ -1,42 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI
 {
-    public partial class DataSourceFieldMappings : IJsonModel<DataSourceFieldMappings>
+    public partial class AzureSearchIndexFieldMappingOptions : IUtf8JsonSerializable, IJsonModel<AzureSearchIndexFieldMappingOptions>
     {
-        void IJsonModel<DataSourceFieldMappings>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureSearchIndexFieldMappingOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureSearchIndexFieldMappingOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceFieldMappings>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchIndexFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DataSourceFieldMappings)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(AzureSearchIndexFieldMappingOptions)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("title_field") != true && Optional.IsDefined(TitleFieldName))
+            if (Optional.IsDefined(TitleFieldName))
             {
                 writer.WritePropertyName("title_field"u8);
                 writer.WriteStringValue(TitleFieldName);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("url_field") != true && Optional.IsDefined(UrlFieldName))
+            if (Optional.IsDefined(UrlFieldName))
             {
                 writer.WritePropertyName("url_field"u8);
                 writer.WriteStringValue(UrlFieldName);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("filepath_field") != true && Optional.IsDefined(FilePathFieldName))
+            if (Optional.IsDefined(FilepathFieldName))
             {
                 writer.WritePropertyName("filepath_field"u8);
-                writer.WriteStringValue(FilePathFieldName);
+                writer.WriteStringValue(FilepathFieldName);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("content_fields") != true && Optional.IsCollectionDefined(ContentFieldNames))
+            if (Optional.IsCollectionDefined(ContentFieldNames))
             {
                 writer.WritePropertyName("content_fields"u8);
                 writer.WriteStartArray();
@@ -46,12 +51,12 @@ void IJsonModel<DataSourceFieldMappings>.Write(Utf8JsonWriter writer, ModelReade
                 }
                 writer.WriteEndArray();
             }
-            if (SerializedAdditionalRawData?.ContainsKey("content_fields_separator") != true && Optional.IsDefined(ContentFieldSeparator))
+            if (Optional.IsDefined(ContentFieldSeparator))
             {
                 writer.WritePropertyName("content_fields_separator"u8);
                 writer.WriteStringValue(ContentFieldSeparator);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("vector_fields") != true && Optional.IsCollectionDefined(VectorFieldNames))
+            if (Optional.IsCollectionDefined(VectorFieldNames))
             {
                 writer.WritePropertyName("vector_fields"u8);
                 writer.WriteStartArray();
@@ -61,7 +66,7 @@ void IJsonModel<DataSourceFieldMappings>.Write(Utf8JsonWriter writer, ModelReade
                 }
                 writer.WriteEndArray();
             }
-            if (SerializedAdditionalRawData?.ContainsKey("image_vector_fields") != true && Optional.IsCollectionDefined(ImageVectorFieldNames))
+            if (Optional.IsCollectionDefined(ImageVectorFieldNames))
             {
                 writer.WritePropertyName("image_vector_fields"u8);
                 writer.WriteStartArray();
@@ -71,14 +76,10 @@ void IJsonModel<DataSourceFieldMappings>.Write(Utf8JsonWriter writer, ModelReade
                 }
                 writer.WriteEndArray();
             }
-            if (SerializedAdditionalRawData != null)
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -93,19 +94,19 @@ void IJsonModel<DataSourceFieldMappings>.Write(Utf8JsonWriter writer, ModelReade
             writer.WriteEndObject();
         }
 
-        DataSourceFieldMappings IJsonModel<DataSourceFieldMappings>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        AzureSearchIndexFieldMappingOptions IJsonModel<AzureSearchIndexFieldMappingOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceFieldMappings>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchIndexFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DataSourceFieldMappings)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(AzureSearchIndexFieldMappingOptions)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDataSourceFieldMappings(document.RootElement, options);
+            return DeserializeAzureSearchIndexFieldMappingOptions(document.RootElement, options);
         }
 
-        internal static DataSourceFieldMappings DeserializeDataSourceFieldMappings(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static AzureSearchIndexFieldMappingOptions DeserializeAzureSearchIndexFieldMappingOptions(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -188,12 +189,11 @@ internal static DataSourceFieldMappings DeserializeDataSourceFieldMappings(JsonE
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DataSourceFieldMappings(
+            return new AzureSearchIndexFieldMappingOptions(
                 titleField,
                 urlField,
                 filepathField,
@@ -204,49 +204,51 @@ internal static DataSourceFieldMappings DeserializeDataSourceFieldMappings(JsonE
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DataSourceFieldMappings>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<AzureSearchIndexFieldMappingOptions>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceFieldMappings>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchIndexFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(DataSourceFieldMappings)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(AzureSearchIndexFieldMappingOptions)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DataSourceFieldMappings IPersistableModel<DataSourceFieldMappings>.Create(BinaryData data, ModelReaderWriterOptions options)
+        AzureSearchIndexFieldMappingOptions IPersistableModel<AzureSearchIndexFieldMappingOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceFieldMappings>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<AzureSearchIndexFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDataSourceFieldMappings(document.RootElement, options);
+                        return DeserializeAzureSearchIndexFieldMappingOptions(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DataSourceFieldMappings)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(AzureSearchIndexFieldMappingOptions)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DataSourceFieldMappings>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<AzureSearchIndexFieldMappingOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static DataSourceFieldMappings FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static AzureSearchIndexFieldMappingOptions FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDataSourceFieldMappings(document.RootElement);
+            return DeserializeAzureSearchIndexFieldMappingOptions(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchIndexFieldMappingOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchIndexFieldMappingOptions.cs
new file mode 100644
index 000000000000..cd659dda5d7f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchIndexFieldMappingOptions.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Optional settings to control how fields are processed when using a configured Azure Search resource. </summary>
+    public partial class AzureSearchIndexFieldMappingOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="AzureSearchIndexFieldMappingOptions"/>. </summary>
+        public AzureSearchIndexFieldMappingOptions()
+        {
+            ContentFieldNames = new ChangeTrackingList<string>();
+            VectorFieldNames = new ChangeTrackingList<string>();
+            ImageVectorFieldNames = new ChangeTrackingList<string>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="AzureSearchIndexFieldMappingOptions"/>. </summary>
+        /// <param name="titleFieldName"> The name of the index field to use as a title. </param>
+        /// <param name="urlFieldName"> The name of the index field to use as a URL. </param>
+        /// <param name="filepathFieldName"> The name of the index field to use as a filepath. </param>
+        /// <param name="contentFieldNames"> The names of index fields that should be treated as content. </param>
+        /// <param name="contentFieldSeparator"> The separator pattern that content fields should use. </param>
+        /// <param name="vectorFieldNames"> The names of fields that represent vector data. </param>
+        /// <param name="imageVectorFieldNames"> The names of fields that represent image vector data. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal AzureSearchIndexFieldMappingOptions(string titleFieldName, string urlFieldName, string filepathFieldName, IList<string> contentFieldNames, string contentFieldSeparator, IList<string> vectorFieldNames, IList<string> imageVectorFieldNames, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            TitleFieldName = titleFieldName;
+            UrlFieldName = urlFieldName;
+            FilepathFieldName = filepathFieldName;
+            ContentFieldNames = contentFieldNames;
+            ContentFieldSeparator = contentFieldSeparator;
+            VectorFieldNames = vectorFieldNames;
+            ImageVectorFieldNames = imageVectorFieldNames;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The name of the index field to use as a title. </summary>
+        public string TitleFieldName { get; set; }
+        /// <summary> The name of the index field to use as a URL. </summary>
+        public string UrlFieldName { get; set; }
+        /// <summary> The name of the index field to use as a filepath. </summary>
+        public string FilepathFieldName { get; set; }
+        /// <summary> The names of index fields that should be treated as content. </summary>
+        public IList<string> ContentFieldNames { get; }
+        /// <summary> The separator pattern that content fields should use. </summary>
+        public string ContentFieldSeparator { get; set; }
+        /// <summary> The names of fields that represent vector data. </summary>
+        public IList<string> VectorFieldNames { get; }
+        /// <summary> The names of fields that represent image vector data. </summary>
+        public IList<string> ImageVectorFieldNames { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchQueryType.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchQueryType.cs
new file mode 100644
index 000000000000..98b220dec5f2
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/AzureSearchQueryType.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The type of Azure Search retrieval query that should be executed when using it as an Azure OpenAI chat extension. </summary>
+    public readonly partial struct AzureSearchQueryType : IEquatable<AzureSearchQueryType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="AzureSearchQueryType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public AzureSearchQueryType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string SimpleValue = "simple";
+        private const string SemanticValue = "semantic";
+        private const string VectorValue = "vector";
+        private const string VectorSimpleHybridValue = "vector_simple_hybrid";
+        private const string VectorSemanticHybridValue = "vector_semantic_hybrid";
+
+        /// <summary> Represents the default, simple query parser. </summary>
+        public static AzureSearchQueryType Simple { get; } = new AzureSearchQueryType(SimpleValue);
+        /// <summary> Represents the semantic query parser for advanced semantic modeling. </summary>
+        public static AzureSearchQueryType Semantic { get; } = new AzureSearchQueryType(SemanticValue);
+        /// <summary> Represents vector search over computed data. </summary>
+        public static AzureSearchQueryType Vector { get; } = new AzureSearchQueryType(VectorValue);
+        /// <summary> Represents a combination of the simple query strategy with vector data. </summary>
+        public static AzureSearchQueryType VectorSimpleHybrid { get; } = new AzureSearchQueryType(VectorSimpleHybridValue);
+        /// <summary> Represents a combination of semantic search and vector data querying. </summary>
+        public static AzureSearchQueryType VectorSemanticHybrid { get; } = new AzureSearchQueryType(VectorSemanticHybridValue);
+        /// <summary> Determines if two <see cref="AzureSearchQueryType"/> values are the same. </summary>
+        public static bool operator ==(AzureSearchQueryType left, AzureSearchQueryType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="AzureSearchQueryType"/> values are not the same. </summary>
+        public static bool operator !=(AzureSearchQueryType left, AzureSearchQueryType right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="AzureSearchQueryType"/>. </summary>
+        public static implicit operator AzureSearchQueryType(string value) => new AzureSearchQueryType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is AzureSearchQueryType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(AzureSearchQueryType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Batch.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Batch.Serialization.cs
new file mode 100644
index 000000000000..79d6829b5c41
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Batch.Serialization.cs
@@ -0,0 +1,422 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class Batch : IUtf8JsonSerializable, IJsonModel<OpenAI.Batch>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OpenAI.Batch>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OpenAI.Batch>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAI.Batch>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OpenAI.Batch)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("object"u8);
+            writer.WriteStringValue(Object.ToString());
+            if (Optional.IsDefined(Endpoint))
+            {
+                writer.WritePropertyName("endpoint"u8);
+                writer.WriteStringValue(Endpoint);
+            }
+            if (Optional.IsDefined(Errors))
+            {
+                writer.WritePropertyName("errors"u8);
+                writer.WriteObjectValue(Errors, options);
+            }
+            writer.WritePropertyName("input_file_id"u8);
+            writer.WriteStringValue(InputFileId);
+            if (Optional.IsDefined(CompletionWindow))
+            {
+                writer.WritePropertyName("completion_window"u8);
+                writer.WriteStringValue(CompletionWindow);
+            }
+            if (Optional.IsDefined(Status))
+            {
+                writer.WritePropertyName("status"u8);
+                writer.WriteStringValue(Status.Value.ToString());
+            }
+            if (Optional.IsDefined(OutputFileId))
+            {
+                writer.WritePropertyName("output_file_id"u8);
+                writer.WriteStringValue(OutputFileId);
+            }
+            if (Optional.IsDefined(ErrorFileId))
+            {
+                writer.WritePropertyName("error_file_id"u8);
+                writer.WriteStringValue(ErrorFileId);
+            }
+            if (Optional.IsDefined(CreatedAt))
+            {
+                writer.WritePropertyName("created_at"u8);
+                writer.WriteNumberValue(CreatedAt.Value, "U");
+            }
+            if (Optional.IsDefined(InProgressAt))
+            {
+                writer.WritePropertyName("in_progress_at"u8);
+                writer.WriteNumberValue(InProgressAt.Value, "U");
+            }
+            if (Optional.IsDefined(ExpiresAt))
+            {
+                writer.WritePropertyName("expires_at"u8);
+                writer.WriteNumberValue(ExpiresAt.Value, "U");
+            }
+            if (Optional.IsDefined(FinalizingAt))
+            {
+                writer.WritePropertyName("finalizing_at"u8);
+                writer.WriteNumberValue(FinalizingAt.Value, "U");
+            }
+            if (Optional.IsDefined(CompletedAt))
+            {
+                writer.WritePropertyName("completed_at"u8);
+                writer.WriteNumberValue(CompletedAt.Value, "U");
+            }
+            if (Optional.IsDefined(FailedAt))
+            {
+                writer.WritePropertyName("failed_at"u8);
+                writer.WriteNumberValue(FailedAt.Value, "U");
+            }
+            if (Optional.IsDefined(ExpiredAt))
+            {
+                writer.WritePropertyName("expired_at"u8);
+                writer.WriteNumberValue(ExpiredAt.Value, "U");
+            }
+            if (Optional.IsDefined(CancellingAt))
+            {
+                writer.WritePropertyName("cancelling_at"u8);
+                writer.WriteNumberValue(CancellingAt.Value, "U");
+            }
+            if (Optional.IsDefined(CancelledAt))
+            {
+                writer.WritePropertyName("cancelled_at"u8);
+                writer.WriteNumberValue(CancelledAt.Value, "U");
+            }
+            if (Optional.IsDefined(RequestCounts))
+            {
+                writer.WritePropertyName("request_counts"u8);
+                writer.WriteObjectValue(RequestCounts, options);
+            }
+            if (Optional.IsCollectionDefined(Metadata))
+            {
+                writer.WritePropertyName("metadata"u8);
+                writer.WriteStartObject();
+                foreach (var item in Metadata)
+                {
+                    writer.WritePropertyName(item.Key);
+                    writer.WriteStringValue(item.Value);
+                }
+                writer.WriteEndObject();
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OpenAI.Batch IJsonModel<OpenAI.Batch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAI.Batch>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OpenAI.Batch)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return OpenAI.Batch.DeserializeBatch(document.RootElement, options);
+        }
+
+        internal static OpenAI.Batch DeserializeBatch(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string id = default;
+            BatchObject @object = default;
+            string endpoint = default;
+            BatchErrorList errors = default;
+            string inputFileId = default;
+            string completionWindow = default;
+            BatchStatus? status = default;
+            string outputFileId = default;
+            string errorFileId = default;
+            DateTimeOffset? createdAt = default;
+            DateTimeOffset? inProgressAt = default;
+            DateTimeOffset? expiresAt = default;
+            DateTimeOffset? finalizingAt = default;
+            DateTimeOffset? completedAt = default;
+            DateTimeOffset? failedAt = default;
+            DateTimeOffset? expiredAt = default;
+            DateTimeOffset? cancellingAt = default;
+            DateTimeOffset? cancelledAt = default;
+            BatchRequestCounts requestCounts = default;
+            IReadOnlyDictionary<string, string> metadata = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("object"u8))
+                {
+                    @object = new BatchObject(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("endpoint"u8))
+                {
+                    endpoint = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("errors"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    errors = BatchErrorList.DeserializeBatchErrorList(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("input_file_id"u8))
+                {
+                    inputFileId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("completion_window"u8))
+                {
+                    completionWindow = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("status"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    status = new BatchStatus(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("output_file_id"u8))
+                {
+                    outputFileId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("error_file_id"u8))
+                {
+                    errorFileId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("created_at"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    createdAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("in_progress_at"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    inProgressAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("expires_at"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    expiresAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("finalizing_at"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    finalizingAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("completed_at"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    completedAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("failed_at"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    failedAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("expired_at"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    expiredAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("cancelling_at"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    cancellingAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("cancelled_at"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    cancelledAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("request_counts"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    requestCounts = BatchRequestCounts.DeserializeBatchRequestCounts(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("metadata"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
+                    foreach (var property0 in property.Value.EnumerateObject())
+                    {
+                        dictionary.Add(property0.Name, property0.Value.GetString());
+                    }
+                    metadata = dictionary;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OpenAI.Batch(
+                id,
+                @object,
+                endpoint,
+                errors,
+                inputFileId,
+                completionWindow,
+                status,
+                outputFileId,
+                errorFileId,
+                createdAt,
+                inProgressAt,
+                expiresAt,
+                finalizingAt,
+                completedAt,
+                failedAt,
+                expiredAt,
+                cancellingAt,
+                cancelledAt,
+                requestCounts,
+                metadata ?? new ChangeTrackingDictionary<string, string>(),
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<OpenAI.Batch>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAI.Batch>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OpenAI.Batch)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OpenAI.Batch IPersistableModel<OpenAI.Batch>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAI.Batch>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return OpenAI.Batch.DeserializeBatch(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OpenAI.Batch)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OpenAI.Batch>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static OpenAI.Batch FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return OpenAI.Batch.DeserializeBatch(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<OpenAI.Batch>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Batch.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Batch.cs
new file mode 100644
index 000000000000..6bed6d1a92f9
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Batch.cs
@@ -0,0 +1,156 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The Batch object. </summary>
+    internal partial class Batch
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.Batch"/>. </summary>
+        /// <param name="id"> The id assigned to the Batch. </param>
+        /// <param name="inputFileId"> The ID of the input file for the batch. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> or <paramref name="inputFileId"/> is null. </exception>
+        internal Batch(string id, string inputFileId)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+            Argument.AssertNotNull(inputFileId, nameof(inputFileId));
+
+            Id = id;
+            InputFileId = inputFileId;
+            Metadata = new ChangeTrackingDictionary<string, string>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.Batch"/>. </summary>
+        /// <param name="id"> The id assigned to the Batch. </param>
+        /// <param name="object"> The object type, which is always `batch`. </param>
+        /// <param name="endpoint"> The OpenAI API endpoint used by the batch. </param>
+        /// <param name="errors"> The list of Batch errors. </param>
+        /// <param name="inputFileId"> The ID of the input file for the batch. </param>
+        /// <param name="completionWindow"> The time frame within which the batch should be processed. </param>
+        /// <param name="status"> The current status of the batch. </param>
+        /// <param name="outputFileId"> The ID of the file containing the outputs of successfully executed requests. </param>
+        /// <param name="errorFileId"> The ID of the file containing the outputs of requests with errors. </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the batch was created. </param>
+        /// <param name="inProgressAt"> The Unix timestamp (in seconds) for when the batch started processing. </param>
+        /// <param name="expiresAt"> The Unix timestamp (in seconds) for when the batch will expire. </param>
+        /// <param name="finalizingAt"> The Unix timestamp (in seconds) for when the batch started finalizing. </param>
+        /// <param name="completedAt"> The Unix timestamp (in seconds) for when the batch was completed. </param>
+        /// <param name="failedAt"> The Unix timestamp (in seconds) for when the batch failed. </param>
+        /// <param name="expiredAt"> The Unix timestamp (in seconds) for when the batch expired. </param>
+        /// <param name="cancellingAt"> The Unix timestamp (in seconds) for when the batch started cancelling. </param>
+        /// <param name="cancelledAt"> The Unix timestamp (in seconds) for when the batch was cancelled. </param>
+        /// <param name="requestCounts"> The request counts for different statuses within the batch. </param>
+        /// <param name="metadata"> A set of key-value pairs that can be attached to the batch. This can be useful for storing additional information about the batch in a structured format. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal Batch(string id, BatchObject @object, string endpoint, BatchErrorList errors, string inputFileId, string completionWindow, BatchStatus? status, string outputFileId, string errorFileId, DateTimeOffset? createdAt, DateTimeOffset? inProgressAt, DateTimeOffset? expiresAt, DateTimeOffset? finalizingAt, DateTimeOffset? completedAt, DateTimeOffset? failedAt, DateTimeOffset? expiredAt, DateTimeOffset? cancellingAt, DateTimeOffset? cancelledAt, BatchRequestCounts requestCounts, IReadOnlyDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            Object = @object;
+            Endpoint = endpoint;
+            Errors = errors;
+            InputFileId = inputFileId;
+            CompletionWindow = completionWindow;
+            Status = status;
+            OutputFileId = outputFileId;
+            ErrorFileId = errorFileId;
+            CreatedAt = createdAt;
+            InProgressAt = inProgressAt;
+            ExpiresAt = expiresAt;
+            FinalizingAt = finalizingAt;
+            CompletedAt = completedAt;
+            FailedAt = failedAt;
+            ExpiredAt = expiredAt;
+            CancellingAt = cancellingAt;
+            CancelledAt = cancelledAt;
+            RequestCounts = requestCounts;
+            Metadata = metadata;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.Batch"/> for deserialization. </summary>
+        internal Batch()
+        {
+        }
+
+        /// <summary> The id assigned to the Batch. </summary>
+        public string Id { get; }
+        /// <summary> The object type, which is always `batch`. </summary>
+        public BatchObject Object { get; } = BatchObject.Batch;
+
+        /// <summary> The OpenAI API endpoint used by the batch. </summary>
+        public string Endpoint { get; }
+        /// <summary> The list of Batch errors. </summary>
+        public BatchErrorList Errors { get; }
+        /// <summary> The ID of the input file for the batch. </summary>
+        public string InputFileId { get; }
+        /// <summary> The time frame within which the batch should be processed. </summary>
+        public string CompletionWindow { get; }
+        /// <summary> The current status of the batch. </summary>
+        public BatchStatus? Status { get; }
+        /// <summary> The ID of the file containing the outputs of successfully executed requests. </summary>
+        public string OutputFileId { get; }
+        /// <summary> The ID of the file containing the outputs of requests with errors. </summary>
+        public string ErrorFileId { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the batch was created. </summary>
+        public DateTimeOffset? CreatedAt { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the batch started processing. </summary>
+        public DateTimeOffset? InProgressAt { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the batch will expire. </summary>
+        public DateTimeOffset? ExpiresAt { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the batch started finalizing. </summary>
+        public DateTimeOffset? FinalizingAt { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the batch was completed. </summary>
+        public DateTimeOffset? CompletedAt { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the batch failed. </summary>
+        public DateTimeOffset? FailedAt { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the batch expired. </summary>
+        public DateTimeOffset? ExpiredAt { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the batch started cancelling. </summary>
+        public DateTimeOffset? CancellingAt { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the batch was cancelled. </summary>
+        public DateTimeOffset? CancelledAt { get; }
+        /// <summary> The request counts for different statuses within the batch. </summary>
+        public BatchRequestCounts RequestCounts { get; }
+        /// <summary> A set of key-value pairs that can be attached to the batch. This can be useful for storing additional information about the batch in a structured format. </summary>
+        public IReadOnlyDictionary<string, string> Metadata { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchCreateRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchCreateRequest.Serialization.cs
new file mode 100644
index 000000000000..0c22a90dc257
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchCreateRequest.Serialization.cs
@@ -0,0 +1,177 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class BatchCreateRequest : IUtf8JsonSerializable, IJsonModel<BatchCreateRequest>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<BatchCreateRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<BatchCreateRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchCreateRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(BatchCreateRequest)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("endpoint"u8);
+            writer.WriteStringValue(Endpoint);
+            writer.WritePropertyName("input_file_id"u8);
+            writer.WriteStringValue(InputFileId);
+            writer.WritePropertyName("completion_window"u8);
+            writer.WriteStringValue(CompletionWindow);
+            if (Optional.IsCollectionDefined(Metadata))
+            {
+                writer.WritePropertyName("metadata"u8);
+                writer.WriteStartObject();
+                foreach (var item in Metadata)
+                {
+                    writer.WritePropertyName(item.Key);
+                    writer.WriteStringValue(item.Value);
+                }
+                writer.WriteEndObject();
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        BatchCreateRequest IJsonModel<BatchCreateRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchCreateRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(BatchCreateRequest)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeBatchCreateRequest(document.RootElement, options);
+        }
+
+        internal static BatchCreateRequest DeserializeBatchCreateRequest(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string endpoint = default;
+            string inputFileId = default;
+            string completionWindow = default;
+            IDictionary<string, string> metadata = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("endpoint"u8))
+                {
+                    endpoint = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("input_file_id"u8))
+                {
+                    inputFileId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("completion_window"u8))
+                {
+                    completionWindow = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("metadata"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
+                    foreach (var property0 in property.Value.EnumerateObject())
+                    {
+                        dictionary.Add(property0.Name, property0.Value.GetString());
+                    }
+                    metadata = dictionary;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new BatchCreateRequest(endpoint, inputFileId, completionWindow, metadata ?? new ChangeTrackingDictionary<string, string>(), serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<BatchCreateRequest>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchCreateRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(BatchCreateRequest)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        BatchCreateRequest IPersistableModel<BatchCreateRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchCreateRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeBatchCreateRequest(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(BatchCreateRequest)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<BatchCreateRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static BatchCreateRequest FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeBatchCreateRequest(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchCreateRequest.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchCreateRequest.cs
new file mode 100644
index 000000000000..b041ee731672
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchCreateRequest.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Defines the request to create a batch. </summary>
+    public partial class BatchCreateRequest
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="BatchCreateRequest"/>. </summary>
+        /// <param name="endpoint"> The API endpoint used by the batch. </param>
+        /// <param name="inputFileId"> The ID of the input file for the batch. </param>
+        /// <param name="completionWindow"> The time frame within which the batch should be processed. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/>, <paramref name="inputFileId"/> or <paramref name="completionWindow"/> is null. </exception>
+        public BatchCreateRequest(string endpoint, string inputFileId, string completionWindow)
+        {
+            Argument.AssertNotNull(endpoint, nameof(endpoint));
+            Argument.AssertNotNull(inputFileId, nameof(inputFileId));
+            Argument.AssertNotNull(completionWindow, nameof(completionWindow));
+
+            Endpoint = endpoint;
+            InputFileId = inputFileId;
+            CompletionWindow = completionWindow;
+            Metadata = new ChangeTrackingDictionary<string, string>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="BatchCreateRequest"/>. </summary>
+        /// <param name="endpoint"> The API endpoint used by the batch. </param>
+        /// <param name="inputFileId"> The ID of the input file for the batch. </param>
+        /// <param name="completionWindow"> The time frame within which the batch should be processed. </param>
+        /// <param name="metadata"> A set of key-value pairs that can be attached to the batch. This can be useful for storing additional information about the batch in a structured format. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal BatchCreateRequest(string endpoint, string inputFileId, string completionWindow, IDictionary<string, string> metadata, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Endpoint = endpoint;
+            InputFileId = inputFileId;
+            CompletionWindow = completionWindow;
+            Metadata = metadata;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="BatchCreateRequest"/> for deserialization. </summary>
+        internal BatchCreateRequest()
+        {
+        }
+
+        /// <summary> The API endpoint used by the batch. </summary>
+        public string Endpoint { get; }
+        /// <summary> The ID of the input file for the batch. </summary>
+        public string InputFileId { get; }
+        /// <summary> The time frame within which the batch should be processed. </summary>
+        public string CompletionWindow { get; }
+        /// <summary> A set of key-value pairs that can be attached to the batch. This can be useful for storing additional information about the batch in a structured format. </summary>
+        public IDictionary<string, string> Metadata { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorDatum.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorDatum.Serialization.cs
new file mode 100644
index 000000000000..2927203aeba0
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorDatum.Serialization.cs
@@ -0,0 +1,175 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class BatchErrorDatum : IUtf8JsonSerializable, IJsonModel<BatchErrorDatum>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<BatchErrorDatum>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<BatchErrorDatum>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchErrorDatum>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(BatchErrorDatum)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Code))
+            {
+                writer.WritePropertyName("code"u8);
+                writer.WriteStringValue(Code);
+            }
+            if (Optional.IsDefined(Message))
+            {
+                writer.WritePropertyName("message"u8);
+                writer.WriteStringValue(Message);
+            }
+            if (Optional.IsDefined(Param))
+            {
+                writer.WritePropertyName("param"u8);
+                writer.WriteStringValue(Param);
+            }
+            if (Optional.IsDefined(Line))
+            {
+                writer.WritePropertyName("line"u8);
+                writer.WriteNumberValue(Line.Value);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        BatchErrorDatum IJsonModel<BatchErrorDatum>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchErrorDatum>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(BatchErrorDatum)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeBatchErrorDatum(document.RootElement, options);
+        }
+
+        internal static BatchErrorDatum DeserializeBatchErrorDatum(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string code = default;
+            string message = default;
+            string param = default;
+            int? line = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("code"u8))
+                {
+                    code = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("message"u8))
+                {
+                    message = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("param"u8))
+                {
+                    param = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("line"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    line = property.Value.GetInt32();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new BatchErrorDatum(code, message, param, line, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<BatchErrorDatum>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchErrorDatum>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(BatchErrorDatum)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        BatchErrorDatum IPersistableModel<BatchErrorDatum>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchErrorDatum>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeBatchErrorDatum(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(BatchErrorDatum)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<BatchErrorDatum>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static BatchErrorDatum FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeBatchErrorDatum(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorDatum.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorDatum.cs
new file mode 100644
index 000000000000..456d267b86e9
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorDatum.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A Datum containing information about a Batch Error. </summary>
+    internal partial class BatchErrorDatum
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="BatchErrorDatum"/>. </summary>
+        internal BatchErrorDatum()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="BatchErrorDatum"/>. </summary>
+        /// <param name="code"> An error code identifying the error type. </param>
+        /// <param name="message"> A human-readable message providing more details about the error. </param>
+        /// <param name="param"> The name of the parameter that caused the error, if applicable. </param>
+        /// <param name="line"> The line number of the input file where the error occurred, if applicable. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal BatchErrorDatum(string code, string message, string param, int? line, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Code = code;
+            Message = message;
+            Param = param;
+            Line = line;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> An error code identifying the error type. </summary>
+        public string Code { get; }
+        /// <summary> A human-readable message providing more details about the error. </summary>
+        public string Message { get; }
+        /// <summary> The name of the parameter that caused the error, if applicable. </summary>
+        public string Param { get; }
+        /// <summary> The line number of the input file where the error occurred, if applicable. </summary>
+        public int? Line { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorList.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorList.Serialization.cs
new file mode 100644
index 000000000000..284fb6d99917
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorList.Serialization.cs
@@ -0,0 +1,160 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class BatchErrorList : IUtf8JsonSerializable, IJsonModel<BatchErrorList>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<BatchErrorList>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<BatchErrorList>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchErrorList>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(BatchErrorList)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("object"u8);
+            writer.WriteStringValue(Object.ToString());
+            if (Optional.IsCollectionDefined(Data))
+            {
+                writer.WritePropertyName("data"u8);
+                writer.WriteStartArray();
+                foreach (var item in Data)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        BatchErrorList IJsonModel<BatchErrorList>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchErrorList>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(BatchErrorList)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeBatchErrorList(document.RootElement, options);
+        }
+
+        internal static BatchErrorList DeserializeBatchErrorList(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            BatchErrorListObject @object = default;
+            IReadOnlyList<BatchErrorDatum> data = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("object"u8))
+                {
+                    @object = new BatchErrorListObject(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("data"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<BatchErrorDatum> array = new List<BatchErrorDatum>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(BatchErrorDatum.DeserializeBatchErrorDatum(item, options));
+                    }
+                    data = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new BatchErrorList(@object, data ?? new ChangeTrackingList<BatchErrorDatum>(), serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<BatchErrorList>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchErrorList>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(BatchErrorList)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        BatchErrorList IPersistableModel<BatchErrorList>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchErrorList>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeBatchErrorList(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(BatchErrorList)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<BatchErrorList>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static BatchErrorList FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeBatchErrorList(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorList.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorList.cs
new file mode 100644
index 000000000000..29f92fdc83cf
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorList.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A list of Batch errors. </summary>
+    internal partial class BatchErrorList
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="BatchErrorList"/>. </summary>
+        internal BatchErrorList()
+        {
+            Data = new ChangeTrackingList<BatchErrorDatum>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="BatchErrorList"/>. </summary>
+        /// <param name="object"> The object type, which is always `list`. </param>
+        /// <param name="data"> The list of Batch error data. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal BatchErrorList(BatchErrorListObject @object, IReadOnlyList<BatchErrorDatum> data, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Object = @object;
+            Data = data;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The object type, which is always `list`. </summary>
+        public BatchErrorListObject Object { get; } = BatchErrorListObject.List;
+
+        /// <summary> The list of Batch error data. </summary>
+        public IReadOnlyList<BatchErrorDatum> Data { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorListObject.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorListObject.cs
new file mode 100644
index 000000000000..55ccfecd62da
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchErrorListObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The BatchErrorList_object. </summary>
+    internal readonly partial struct BatchErrorListObject : IEquatable<BatchErrorListObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="BatchErrorListObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public BatchErrorListObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ListValue = "list";
+
+        /// <summary> list. </summary>
+        public static BatchErrorListObject List { get; } = new BatchErrorListObject(ListValue);
+        /// <summary> Determines if two <see cref="BatchErrorListObject"/> values are the same. </summary>
+        public static bool operator ==(BatchErrorListObject left, BatchErrorListObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="BatchErrorListObject"/> values are not the same. </summary>
+        public static bool operator !=(BatchErrorListObject left, BatchErrorListObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="BatchErrorListObject"/>. </summary>
+        public static implicit operator BatchErrorListObject(string value) => new BatchErrorListObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is BatchErrorListObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(BatchErrorListObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchObject.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchObject.cs
new file mode 100644
index 000000000000..7d9b06bdf500
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The Batch_object. </summary>
+    internal readonly partial struct BatchObject : IEquatable<BatchObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="BatchObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public BatchObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string BatchValue = "batch";
+
+        /// <summary> batch. </summary>
+        public static BatchObject Batch { get; } = new BatchObject(BatchValue);
+        /// <summary> Determines if two <see cref="BatchObject"/> values are the same. </summary>
+        public static bool operator ==(BatchObject left, BatchObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="BatchObject"/> values are not the same. </summary>
+        public static bool operator !=(BatchObject left, BatchObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="BatchObject"/>. </summary>
+        public static implicit operator BatchObject(string value) => new BatchObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is BatchObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(BatchObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchRequestCounts.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchRequestCounts.Serialization.cs
new file mode 100644
index 000000000000..1c6ab637fa8f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchRequestCounts.Serialization.cs
@@ -0,0 +1,172 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class BatchRequestCounts : IUtf8JsonSerializable, IJsonModel<BatchRequestCounts>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<BatchRequestCounts>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<BatchRequestCounts>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchRequestCounts>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(BatchRequestCounts)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Total))
+            {
+                writer.WritePropertyName("total"u8);
+                writer.WriteNumberValue(Total.Value);
+            }
+            if (Optional.IsDefined(Completed))
+            {
+                writer.WritePropertyName("completed"u8);
+                writer.WriteNumberValue(Completed.Value);
+            }
+            if (Optional.IsDefined(Failed))
+            {
+                writer.WritePropertyName("failed"u8);
+                writer.WriteNumberValue(Failed.Value);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        BatchRequestCounts IJsonModel<BatchRequestCounts>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchRequestCounts>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(BatchRequestCounts)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeBatchRequestCounts(document.RootElement, options);
+        }
+
+        internal static BatchRequestCounts DeserializeBatchRequestCounts(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            int? total = default;
+            int? completed = default;
+            int? failed = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("total"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    total = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("completed"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    completed = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("failed"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    failed = property.Value.GetInt32();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new BatchRequestCounts(total, completed, failed, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<BatchRequestCounts>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchRequestCounts>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(BatchRequestCounts)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        BatchRequestCounts IPersistableModel<BatchRequestCounts>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<BatchRequestCounts>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeBatchRequestCounts(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(BatchRequestCounts)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<BatchRequestCounts>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static BatchRequestCounts FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeBatchRequestCounts(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchRequestCounts.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchRequestCounts.cs
new file mode 100644
index 000000000000..014a428c108f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchRequestCounts.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The BatchRequestCounts. </summary>
+    internal partial class BatchRequestCounts
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="BatchRequestCounts"/>. </summary>
+        internal BatchRequestCounts()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="BatchRequestCounts"/>. </summary>
+        /// <param name="total"> Total number of requests in the batch. </param>
+        /// <param name="completed"> Number of requests that have been completed successfully. </param>
+        /// <param name="failed"> Number of requests that have failed. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal BatchRequestCounts(int? total, int? completed, int? failed, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Total = total;
+            Completed = completed;
+            Failed = failed;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Total number of requests in the batch. </summary>
+        public int? Total { get; }
+        /// <summary> Number of requests that have been completed successfully. </summary>
+        public int? Completed { get; }
+        /// <summary> Number of requests that have failed. </summary>
+        public int? Failed { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchStatus.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchStatus.cs
new file mode 100644
index 000000000000..421a0f16f186
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/BatchStatus.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The status of a batch. </summary>
+    internal readonly partial struct BatchStatus : IEquatable<BatchStatus>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="BatchStatus"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public BatchStatus(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ValidatingValue = "validating";
+        private const string FailedValue = "failed";
+        private const string InProgressValue = "in_progress";
+        private const string FinalizingValue = "finalizing";
+        private const string CompletedValue = "completed";
+        private const string ExpiredValue = "expired";
+        private const string CancellingValue = "cancelling";
+        private const string CancelledValue = "cancelled";
+
+        /// <summary> The input file is being validated before the batch can begin. </summary>
+        public static BatchStatus Validating { get; } = new BatchStatus(ValidatingValue);
+        /// <summary> The input file has failed the validation process. </summary>
+        public static BatchStatus Failed { get; } = new BatchStatus(FailedValue);
+        /// <summary> The input file was successfully validated and the batch is currently being executed. </summary>
+        public static BatchStatus InProgress { get; } = new BatchStatus(InProgressValue);
+        /// <summary> The batch has completed and the results are being prepared. </summary>
+        public static BatchStatus Finalizing { get; } = new BatchStatus(FinalizingValue);
+        /// <summary> The batch has been completed and the results are ready. </summary>
+        public static BatchStatus Completed { get; } = new BatchStatus(CompletedValue);
+        /// <summary> The batch was not able to complete within the 24-hour time window. </summary>
+        public static BatchStatus Expired { get; } = new BatchStatus(ExpiredValue);
+        /// <summary> Cancellation of the batch has been initiated. </summary>
+        public static BatchStatus Cancelling { get; } = new BatchStatus(CancellingValue);
+        /// <summary> The batch was cancelled. </summary>
+        public static BatchStatus Cancelled { get; } = new BatchStatus(CancelledValue);
+        /// <summary> Determines if two <see cref="BatchStatus"/> values are the same. </summary>
+        public static bool operator ==(BatchStatus left, BatchStatus right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="BatchStatus"/> values are not the same. </summary>
+        public static bool operator !=(BatchStatus left, BatchStatus right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="BatchStatus"/>. </summary>
+        public static implicit operator BatchStatus(string value) => new BatchStatus(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is BatchStatus other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(BatchStatus other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatChoice.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatChoice.Serialization.cs
new file mode 100644
index 000000000000..6deefb3ba214
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatChoice.Serialization.cs
@@ -0,0 +1,243 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatChoice : IUtf8JsonSerializable, IJsonModel<ChatChoice>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatChoice>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatChoice>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatChoice>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatChoice)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Message))
+            {
+                writer.WritePropertyName("message"u8);
+                writer.WriteObjectValue(Message, options);
+            }
+            if (LogProbabilityInfo != null)
+            {
+                writer.WritePropertyName("logprobs"u8);
+                writer.WriteObjectValue(LogProbabilityInfo, options);
+            }
+            else
+            {
+                writer.WriteNull("logprobs");
+            }
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            if (FinishReason != null)
+            {
+                writer.WritePropertyName("finish_reason"u8);
+                writer.WriteStringValue(FinishReason.Value.ToString());
+            }
+            else
+            {
+                writer.WriteNull("finish_reason");
+            }
+            if (Optional.IsDefined(InternalStreamingDeltaMessage))
+            {
+                writer.WritePropertyName("delta"u8);
+                writer.WriteObjectValue(InternalStreamingDeltaMessage, options);
+            }
+            if (Optional.IsDefined(ContentFilterResults))
+            {
+                writer.WritePropertyName("content_filter_results"u8);
+                writer.WriteObjectValue(ContentFilterResults, options);
+            }
+            if (Optional.IsDefined(Enhancements))
+            {
+                writer.WritePropertyName("enhancements"u8);
+                writer.WriteObjectValue(Enhancements, options);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatChoice IJsonModel<ChatChoice>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatChoice>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatChoice)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatChoice(document.RootElement, options);
+        }
+
+        internal static ChatChoice DeserializeChatChoice(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            ChatResponseMessage message = default;
+            ChatChoiceLogProbabilityInfo logprobs = default;
+            int index = default;
+            CompletionsFinishReason? finishReason = default;
+            ChatResponseMessage delta = default;
+            ContentFilterResultsForChoice contentFilterResults = default;
+            AzureChatEnhancements enhancements = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("message"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    message = ChatResponseMessage.DeserializeChatResponseMessage(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("logprobs"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        logprobs = null;
+                        continue;
+                    }
+                    logprobs = ChatChoiceLogProbabilityInfo.DeserializeChatChoiceLogProbabilityInfo(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("finish_reason"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        finishReason = null;
+                        continue;
+                    }
+                    finishReason = new CompletionsFinishReason(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("delta"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    delta = ChatResponseMessage.DeserializeChatResponseMessage(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("content_filter_results"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    contentFilterResults = ContentFilterResultsForChoice.DeserializeContentFilterResultsForChoice(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("enhancements"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    enhancements = AzureChatEnhancements.DeserializeAzureChatEnhancements(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatChoice(
+                message,
+                logprobs,
+                index,
+                finishReason,
+                delta,
+                contentFilterResults,
+                enhancements,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatChoice>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatChoice>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatChoice)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatChoice IPersistableModel<ChatChoice>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatChoice>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatChoice(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatChoice)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatChoice>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatChoice FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatChoice(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatChoice.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatChoice.cs
new file mode 100644
index 000000000000..4e85fb934a30
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatChoice.cs
@@ -0,0 +1,120 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// The representation of a single prompt completion as part of an overall chat completions request.
+    /// Generally, `n` choices are generated per provided prompt with a default value of 1.
+    /// Token limits and other settings may limit the number of choices generated.
+    /// </summary>
+    public partial class ChatChoice
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatChoice"/>. </summary>
+        /// <param name="logProbabilityInfo"> The log probability information for this choice, as enabled via the 'logprobs' request option. </param>
+        /// <param name="index"> The ordered index associated with this chat completions choice. </param>
+        /// <param name="finishReason"> The reason that this chat completions choice completed its generated. </param>
+        internal ChatChoice(ChatChoiceLogProbabilityInfo logProbabilityInfo, int index, CompletionsFinishReason? finishReason)
+        {
+            LogProbabilityInfo = logProbabilityInfo;
+            Index = index;
+            FinishReason = finishReason;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatChoice"/>. </summary>
+        /// <param name="message"> The chat message for a given chat completions prompt. </param>
+        /// <param name="logProbabilityInfo"> The log probability information for this choice, as enabled via the 'logprobs' request option. </param>
+        /// <param name="index"> The ordered index associated with this chat completions choice. </param>
+        /// <param name="finishReason"> The reason that this chat completions choice completed its generated. </param>
+        /// <param name="internalStreamingDeltaMessage"> The delta message content for a streaming response. </param>
+        /// <param name="contentFilterResults">
+        /// Information about the content filtering category (hate, sexual, violence, self_harm), if it
+        /// has been detected, as well as the severity level (very_low, low, medium, high-scale that
+        /// determines the intensity and risk level of harmful content) and if it has been filtered or not.
+        /// </param>
+        /// <param name="enhancements">
+        /// Represents the output results of Azure OpenAI enhancements to chat completions, as configured via the matching input
+        /// provided in the request. This supplementary information is only available when using Azure OpenAI and only when the
+        /// request is configured to use enhancements.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatChoice(ChatResponseMessage message, ChatChoiceLogProbabilityInfo logProbabilityInfo, int index, CompletionsFinishReason? finishReason, ChatResponseMessage internalStreamingDeltaMessage, ContentFilterResultsForChoice contentFilterResults, AzureChatEnhancements enhancements, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Message = message;
+            LogProbabilityInfo = logProbabilityInfo;
+            Index = index;
+            FinishReason = finishReason;
+            InternalStreamingDeltaMessage = internalStreamingDeltaMessage;
+            ContentFilterResults = contentFilterResults;
+            Enhancements = enhancements;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatChoice"/> for deserialization. </summary>
+        internal ChatChoice()
+        {
+        }
+
+        /// <summary> The chat message for a given chat completions prompt. </summary>
+        public ChatResponseMessage Message { get; }
+        /// <summary> The log probability information for this choice, as enabled via the 'logprobs' request option. </summary>
+        public ChatChoiceLogProbabilityInfo LogProbabilityInfo { get; }
+        /// <summary> The ordered index associated with this chat completions choice. </summary>
+        public int Index { get; }
+        /// <summary> The reason that this chat completions choice completed its generated. </summary>
+        public CompletionsFinishReason? FinishReason { get; }
+        /// <summary> The delta message content for a streaming response. </summary>
+        public ChatResponseMessage InternalStreamingDeltaMessage { get; }
+        /// <summary>
+        /// Information about the content filtering category (hate, sexual, violence, self_harm), if it
+        /// has been detected, as well as the severity level (very_low, low, medium, high-scale that
+        /// determines the intensity and risk level of harmful content) and if it has been filtered or not.
+        /// </summary>
+        public ContentFilterResultsForChoice ContentFilterResults { get; }
+        /// <summary>
+        /// Represents the output results of Azure OpenAI enhancements to chat completions, as configured via the matching input
+        /// provided in the request. This supplementary information is only available when using Azure OpenAI and only when the
+        /// request is configured to use enhancements.
+        /// </summary>
+        public AzureChatEnhancements Enhancements { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatChoiceLogProbabilityInfo.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatChoiceLogProbabilityInfo.Serialization.cs
new file mode 100644
index 000000000000..279e4fa7bd7c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatChoiceLogProbabilityInfo.Serialization.cs
@@ -0,0 +1,187 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatChoiceLogProbabilityInfo : IUtf8JsonSerializable, IJsonModel<ChatChoiceLogProbabilityInfo>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatChoiceLogProbabilityInfo>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatChoiceLogProbabilityInfo>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatChoiceLogProbabilityInfo>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatChoiceLogProbabilityInfo)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (TokenLogProbabilityResults != null && Optional.IsCollectionDefined(TokenLogProbabilityResults))
+            {
+                writer.WritePropertyName("content"u8);
+                writer.WriteStartArray();
+                foreach (var item in TokenLogProbabilityResults)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            else
+            {
+                writer.WriteNull("content");
+            }
+            if (Refusal != null && Optional.IsCollectionDefined(Refusal))
+            {
+                writer.WritePropertyName("refusal"u8);
+                writer.WriteStartArray();
+                foreach (var item in Refusal)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            else
+            {
+                writer.WriteNull("refusal");
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatChoiceLogProbabilityInfo IJsonModel<ChatChoiceLogProbabilityInfo>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatChoiceLogProbabilityInfo>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatChoiceLogProbabilityInfo)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatChoiceLogProbabilityInfo(document.RootElement, options);
+        }
+
+        internal static ChatChoiceLogProbabilityInfo DeserializeChatChoiceLogProbabilityInfo(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IReadOnlyList<ChatTokenLogProbabilityResult> content = default;
+            IReadOnlyList<ChatTokenLogProbabilityResult> refusal = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("content"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        content = new ChangeTrackingList<ChatTokenLogProbabilityResult>();
+                        continue;
+                    }
+                    List<ChatTokenLogProbabilityResult> array = new List<ChatTokenLogProbabilityResult>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(ChatTokenLogProbabilityResult.DeserializeChatTokenLogProbabilityResult(item, options));
+                    }
+                    content = array;
+                    continue;
+                }
+                if (property.NameEquals("refusal"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        refusal = new ChangeTrackingList<ChatTokenLogProbabilityResult>();
+                        continue;
+                    }
+                    List<ChatTokenLogProbabilityResult> array = new List<ChatTokenLogProbabilityResult>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(ChatTokenLogProbabilityResult.DeserializeChatTokenLogProbabilityResult(item, options));
+                    }
+                    refusal = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatChoiceLogProbabilityInfo(content, refusal, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatChoiceLogProbabilityInfo>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatChoiceLogProbabilityInfo>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatChoiceLogProbabilityInfo)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatChoiceLogProbabilityInfo IPersistableModel<ChatChoiceLogProbabilityInfo>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatChoiceLogProbabilityInfo>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatChoiceLogProbabilityInfo(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatChoiceLogProbabilityInfo)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatChoiceLogProbabilityInfo>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatChoiceLogProbabilityInfo FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatChoiceLogProbabilityInfo(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatChoiceLogProbabilityInfo.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatChoiceLogProbabilityInfo.cs
new file mode 100644
index 000000000000..f2343104bd0a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatChoiceLogProbabilityInfo.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Log probability information for a choice, as requested via 'logprobs' and 'top_logprobs'. </summary>
+    public partial class ChatChoiceLogProbabilityInfo
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatChoiceLogProbabilityInfo"/>. </summary>
+        /// <param name="tokenLogProbabilityResults"> The list of log probability information entries for the choice's message content tokens, as requested via the 'logprobs' option. </param>
+        /// <param name="refusal"> The list of log probability information entries for the choice's message refusal message tokens, as requested via the 'logprobs' option. </param>
+        internal ChatChoiceLogProbabilityInfo(IEnumerable<ChatTokenLogProbabilityResult> tokenLogProbabilityResults, IEnumerable<ChatTokenLogProbabilityResult> refusal)
+        {
+            TokenLogProbabilityResults = tokenLogProbabilityResults?.ToList();
+            Refusal = refusal?.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatChoiceLogProbabilityInfo"/>. </summary>
+        /// <param name="tokenLogProbabilityResults"> The list of log probability information entries for the choice's message content tokens, as requested via the 'logprobs' option. </param>
+        /// <param name="refusal"> The list of log probability information entries for the choice's message refusal message tokens, as requested via the 'logprobs' option. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatChoiceLogProbabilityInfo(IReadOnlyList<ChatTokenLogProbabilityResult> tokenLogProbabilityResults, IReadOnlyList<ChatTokenLogProbabilityResult> refusal, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            TokenLogProbabilityResults = tokenLogProbabilityResults;
+            Refusal = refusal;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatChoiceLogProbabilityInfo"/> for deserialization. </summary>
+        internal ChatChoiceLogProbabilityInfo()
+        {
+        }
+
+        /// <summary> The list of log probability information entries for the choice's message content tokens, as requested via the 'logprobs' option. </summary>
+        public IReadOnlyList<ChatTokenLogProbabilityResult> TokenLogProbabilityResults { get; }
+        /// <summary> The list of log probability information entries for the choice's message refusal message tokens, as requested via the 'logprobs' option. </summary>
+        public IReadOnlyList<ChatTokenLogProbabilityResult> Refusal { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionStreamOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionStreamOptions.Serialization.cs
new file mode 100644
index 000000000000..568fdd061570
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionStreamOptions.Serialization.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatCompletionStreamOptions : IUtf8JsonSerializable, IJsonModel<ChatCompletionStreamOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionStreamOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionStreamOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionStreamOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionStreamOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(IncludeUsage))
+            {
+                writer.WritePropertyName("include_usage"u8);
+                writer.WriteBooleanValue(IncludeUsage.Value);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionStreamOptions IJsonModel<ChatCompletionStreamOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionStreamOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionStreamOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionStreamOptions(document.RootElement, options);
+        }
+
+        internal static ChatCompletionStreamOptions DeserializeChatCompletionStreamOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            bool? includeUsage = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("include_usage"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    includeUsage = property.Value.GetBoolean();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatCompletionStreamOptions(includeUsage, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionStreamOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionStreamOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionStreamOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionStreamOptions IPersistableModel<ChatCompletionStreamOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionStreamOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionStreamOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionStreamOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionStreamOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatCompletionStreamOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionStreamOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionStreamOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionStreamOptions.cs
new file mode 100644
index 000000000000..2dba2eb70309
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionStreamOptions.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Options for streaming response. Only set this when you set `stream: true`. </summary>
+    public partial class ChatCompletionStreamOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionStreamOptions"/>. </summary>
+        public ChatCompletionStreamOptions()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionStreamOptions"/>. </summary>
+        /// <param name="includeUsage"> If set, an additional chunk will be streamed before the `data: [DONE]` message. The `usage` field on this chunk shows the token usage statistics for the entire request, and the `choices` field will always be an empty array. All other chunks will also include a `usage` field, but with a null value. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatCompletionStreamOptions(bool? includeUsage, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            IncludeUsage = includeUsage;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> If set, an additional chunk will be streamed before the `data: [DONE]` message. The `usage` field on this chunk shows the token usage statistics for the entire request, and the `choices` field will always be an empty array. All other chunks will also include a `usage` field, but with a null value. </summary>
+        public bool? IncludeUsage { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletions.Serialization.cs
new file mode 100644
index 000000000000..925fb3ca69c6
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletions.Serialization.cs
@@ -0,0 +1,224 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatCompletions : IUtf8JsonSerializable, IJsonModel<ChatCompletions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("created"u8);
+            writer.WriteNumberValue(Created, "U");
+            writer.WritePropertyName("choices"u8);
+            writer.WriteStartArray();
+            foreach (var item in Choices)
+            {
+                writer.WriteObjectValue(item, options);
+            }
+            writer.WriteEndArray();
+            if (Optional.IsDefined(Model))
+            {
+                writer.WritePropertyName("model"u8);
+                writer.WriteStringValue(Model);
+            }
+            if (Optional.IsCollectionDefined(PromptFilterResults))
+            {
+                writer.WritePropertyName("prompt_filter_results"u8);
+                writer.WriteStartArray();
+                foreach (var item in PromptFilterResults)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsDefined(SystemFingerprint))
+            {
+                writer.WritePropertyName("system_fingerprint"u8);
+                writer.WriteStringValue(SystemFingerprint);
+            }
+            writer.WritePropertyName("usage"u8);
+            writer.WriteObjectValue(Usage, options);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletions IJsonModel<ChatCompletions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletions(document.RootElement, options);
+        }
+
+        internal static ChatCompletions DeserializeChatCompletions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string id = default;
+            DateTimeOffset created = default;
+            IReadOnlyList<ChatChoice> choices = default;
+            string model = default;
+            IReadOnlyList<ContentFilterResultsForPrompt> promptFilterResults = default;
+            string systemFingerprint = default;
+            CompletionsUsage usage = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("created"u8))
+                {
+                    created = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("choices"u8))
+                {
+                    List<ChatChoice> array = new List<ChatChoice>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(ChatChoice.DeserializeChatChoice(item, options));
+                    }
+                    choices = array;
+                    continue;
+                }
+                if (property.NameEquals("model"u8))
+                {
+                    model = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("prompt_filter_results"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<ContentFilterResultsForPrompt> array = new List<ContentFilterResultsForPrompt>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(ContentFilterResultsForPrompt.DeserializeContentFilterResultsForPrompt(item, options));
+                    }
+                    promptFilterResults = array;
+                    continue;
+                }
+                if (property.NameEquals("system_fingerprint"u8))
+                {
+                    systemFingerprint = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("usage"u8))
+                {
+                    usage = CompletionsUsage.DeserializeCompletionsUsage(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatCompletions(
+                id,
+                created,
+                choices,
+                model,
+                promptFilterResults ?? new ChangeTrackingList<ContentFilterResultsForPrompt>(),
+                systemFingerprint,
+                usage,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatCompletions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletions IPersistableModel<ChatCompletions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatCompletions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletions.cs
new file mode 100644
index 000000000000..e50eb5c47d75
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletions.cs
@@ -0,0 +1,146 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// Representation of the response data from a chat completions request.
+    /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+    /// provided prompt data.
+    /// </summary>
+    public partial class ChatCompletions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletions"/>. </summary>
+        /// <param name="id"> A unique identifier associated with this chat completions response. </param>
+        /// <param name="created">
+        /// The first timestamp associated with generation activity for this completions response,
+        /// represented as seconds since the beginning of the Unix epoch of 00:00 on 1 Jan 1970.
+        /// </param>
+        /// <param name="choices">
+        /// The collection of completions choices associated with this completions response.
+        /// Generally, `n` choices are generated per provided prompt with a default value of 1.
+        /// Token limits and other settings may limit the number of choices generated.
+        /// </param>
+        /// <param name="usage"> Usage information for tokens processed and generated as part of this completions operation. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/>, <paramref name="choices"/> or <paramref name="usage"/> is null. </exception>
+        internal ChatCompletions(string id, DateTimeOffset created, IEnumerable<ChatChoice> choices, CompletionsUsage usage)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+            Argument.AssertNotNull(choices, nameof(choices));
+            Argument.AssertNotNull(usage, nameof(usage));
+
+            Id = id;
+            Created = created;
+            Choices = choices.ToList();
+            PromptFilterResults = new ChangeTrackingList<ContentFilterResultsForPrompt>();
+            Usage = usage;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletions"/>. </summary>
+        /// <param name="id"> A unique identifier associated with this chat completions response. </param>
+        /// <param name="created">
+        /// The first timestamp associated with generation activity for this completions response,
+        /// represented as seconds since the beginning of the Unix epoch of 00:00 on 1 Jan 1970.
+        /// </param>
+        /// <param name="choices">
+        /// The collection of completions choices associated with this completions response.
+        /// Generally, `n` choices are generated per provided prompt with a default value of 1.
+        /// Token limits and other settings may limit the number of choices generated.
+        /// </param>
+        /// <param name="model"> The model name used for this completions request. </param>
+        /// <param name="promptFilterResults">
+        /// Content filtering results for zero or more prompts in the request. In a streaming request,
+        /// results for different prompts may arrive at different times or in different orders.
+        /// </param>
+        /// <param name="systemFingerprint">
+        /// Can be used in conjunction with the `seed` request parameter to understand when backend changes have been made that
+        /// might impact determinism.
+        /// </param>
+        /// <param name="usage"> Usage information for tokens processed and generated as part of this completions operation. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatCompletions(string id, DateTimeOffset created, IReadOnlyList<ChatChoice> choices, string model, IReadOnlyList<ContentFilterResultsForPrompt> promptFilterResults, string systemFingerprint, CompletionsUsage usage, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            Created = created;
+            Choices = choices;
+            Model = model;
+            PromptFilterResults = promptFilterResults;
+            SystemFingerprint = systemFingerprint;
+            Usage = usage;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletions"/> for deserialization. </summary>
+        internal ChatCompletions()
+        {
+        }
+
+        /// <summary> A unique identifier associated with this chat completions response. </summary>
+        public string Id { get; }
+        /// <summary>
+        /// The first timestamp associated with generation activity for this completions response,
+        /// represented as seconds since the beginning of the Unix epoch of 00:00 on 1 Jan 1970.
+        /// </summary>
+        public DateTimeOffset Created { get; }
+        /// <summary>
+        /// The collection of completions choices associated with this completions response.
+        /// Generally, `n` choices are generated per provided prompt with a default value of 1.
+        /// Token limits and other settings may limit the number of choices generated.
+        /// </summary>
+        public IReadOnlyList<ChatChoice> Choices { get; }
+        /// <summary> The model name used for this completions request. </summary>
+        public string Model { get; }
+        /// <summary>
+        /// Content filtering results for zero or more prompts in the request. In a streaming request,
+        /// results for different prompts may arrive at different times or in different orders.
+        /// </summary>
+        public IReadOnlyList<ContentFilterResultsForPrompt> PromptFilterResults { get; }
+        /// <summary>
+        /// Can be used in conjunction with the `seed` request parameter to understand when backend changes have been made that
+        /// might impact determinism.
+        /// </summary>
+        public string SystemFingerprint { get; }
+        /// <summary> Usage information for tokens processed and generated as part of this completions operation. </summary>
+        public CompletionsUsage Usage { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolCall.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolCall.Serialization.cs
new file mode 100644
index 000000000000..b7ee9e7b8f91
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolCall.Serialization.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatCompletionsFunctionToolCall : IUtf8JsonSerializable, IJsonModel<ChatCompletionsFunctionToolCall>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsFunctionToolCall>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsFunctionToolCall>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolCall)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("function"u8);
+            writer.WriteObjectValue(Function, options);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsFunctionToolCall IJsonModel<ChatCompletionsFunctionToolCall>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolCall)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsFunctionToolCall(document.RootElement, options);
+        }
+
+        internal static ChatCompletionsFunctionToolCall DeserializeChatCompletionsFunctionToolCall(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            FunctionCall function = default;
+            string type = default;
+            string id = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("function"u8))
+                {
+                    function = FunctionCall.DeserializeFunctionCall(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatCompletionsFunctionToolCall(type, id, serializedAdditionalRawData, function);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsFunctionToolCall>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolCall)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsFunctionToolCall IPersistableModel<ChatCompletionsFunctionToolCall>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsFunctionToolCall(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolCall)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsFunctionToolCall>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new ChatCompletionsFunctionToolCall FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionsFunctionToolCall(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolCall.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolCall.cs
new file mode 100644
index 000000000000..97a6d2211fd9
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolCall.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// A tool call to a function tool, issued by the model in evaluation of a configured function tool, that represents
+    /// a function invocation needed for a subsequent chat completions request to resolve.
+    /// </summary>
+    public partial class ChatCompletionsFunctionToolCall : ChatCompletionsToolCall
+    {
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolCall"/>. </summary>
+        /// <param name="id"> The ID of the tool call. </param>
+        /// <param name="function"> The details of the function invocation requested by the tool call. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> or <paramref name="function"/> is null. </exception>
+        public ChatCompletionsFunctionToolCall(string id, FunctionCall function) : base(id)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+            Argument.AssertNotNull(function, nameof(function));
+
+            Type = "function";
+            Function = function;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolCall"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="id"> The ID of the tool call. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="function"> The details of the function invocation requested by the tool call. </param>
+        internal ChatCompletionsFunctionToolCall(string type, string id, IDictionary<string, BinaryData> serializedAdditionalRawData, FunctionCall function) : base(type, id, serializedAdditionalRawData)
+        {
+            Function = function;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolCall"/> for deserialization. </summary>
+        internal ChatCompletionsFunctionToolCall()
+        {
+        }
+
+        /// <summary> The details of the function invocation requested by the tool call. </summary>
+        public FunctionCall Function { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolDefinition.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolDefinition.Serialization.cs
new file mode 100644
index 000000000000..49de20793814
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolDefinition.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatCompletionsFunctionToolDefinition : IUtf8JsonSerializable, IJsonModel<ChatCompletionsFunctionToolDefinition>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsFunctionToolDefinition>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsFunctionToolDefinition>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolDefinition)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("function"u8);
+            writer.WriteObjectValue(Function, options);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsFunctionToolDefinition IJsonModel<ChatCompletionsFunctionToolDefinition>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolDefinition)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsFunctionToolDefinition(document.RootElement, options);
+        }
+
+        internal static ChatCompletionsFunctionToolDefinition DeserializeChatCompletionsFunctionToolDefinition(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            ChatCompletionsFunctionToolDefinitionFunction function = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("function"u8))
+                {
+                    function = ChatCompletionsFunctionToolDefinitionFunction.DeserializeChatCompletionsFunctionToolDefinitionFunction(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatCompletionsFunctionToolDefinition(type, serializedAdditionalRawData, function);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsFunctionToolDefinition>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolDefinition)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsFunctionToolDefinition IPersistableModel<ChatCompletionsFunctionToolDefinition>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsFunctionToolDefinition(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolDefinition)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsFunctionToolDefinition>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new ChatCompletionsFunctionToolDefinition FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionsFunctionToolDefinition(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolDefinition.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolDefinition.cs
new file mode 100644
index 000000000000..7b1881366a9b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolDefinition.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The definition information for a chat completions function tool that can call a function in response to a tool call. </summary>
+    public partial class ChatCompletionsFunctionToolDefinition : ChatCompletionsToolDefinition
+    {
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolDefinition"/>. </summary>
+        /// <param name="function"> The function definition details for the function tool. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="function"/> is null. </exception>
+        public ChatCompletionsFunctionToolDefinition(ChatCompletionsFunctionToolDefinitionFunction function)
+        {
+            Argument.AssertNotNull(function, nameof(function));
+
+            Type = "function";
+            Function = function;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolDefinition"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="function"> The function definition details for the function tool. </param>
+        internal ChatCompletionsFunctionToolDefinition(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, ChatCompletionsFunctionToolDefinitionFunction function) : base(type, serializedAdditionalRawData)
+        {
+            Function = function;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolDefinition"/> for deserialization. </summary>
+        internal ChatCompletionsFunctionToolDefinition()
+        {
+        }
+
+        /// <summary> The function definition details for the function tool. </summary>
+        public ChatCompletionsFunctionToolDefinitionFunction Function { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolDefinitionFunction.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolDefinitionFunction.Serialization.cs
new file mode 100644
index 000000000000..3875fa6c7c08
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolDefinitionFunction.Serialization.cs
@@ -0,0 +1,191 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatCompletionsFunctionToolDefinitionFunction : IUtf8JsonSerializable, IJsonModel<ChatCompletionsFunctionToolDefinitionFunction>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsFunctionToolDefinitionFunction>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsFunctionToolDefinitionFunction>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolDefinitionFunction>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolDefinitionFunction)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Description))
+            {
+                writer.WritePropertyName("description"u8);
+                writer.WriteStringValue(Description);
+            }
+            writer.WritePropertyName("name"u8);
+            writer.WriteStringValue(Name);
+            if (Optional.IsDefined(Parameters))
+            {
+                writer.WritePropertyName("parameters"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(Parameters);
+#else
+                using (JsonDocument document = JsonDocument.Parse(Parameters))
+                {
+                    JsonSerializer.Serialize(writer, document.RootElement);
+                }
+#endif
+            }
+            if (Optional.IsDefined(Strict))
+            {
+                if (Strict != null)
+                {
+                    writer.WritePropertyName("strict"u8);
+                    writer.WriteBooleanValue(Strict.Value);
+                }
+                else
+                {
+                    writer.WriteNull("strict");
+                }
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsFunctionToolDefinitionFunction IJsonModel<ChatCompletionsFunctionToolDefinitionFunction>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolDefinitionFunction>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolDefinitionFunction)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsFunctionToolDefinitionFunction(document.RootElement, options);
+        }
+
+        internal static ChatCompletionsFunctionToolDefinitionFunction DeserializeChatCompletionsFunctionToolDefinitionFunction(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string description = default;
+            string name = default;
+            BinaryData parameters = default;
+            bool? strict = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("description"u8))
+                {
+                    description = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("name"u8))
+                {
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("parameters"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    parameters = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
+                if (property.NameEquals("strict"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        strict = null;
+                        continue;
+                    }
+                    strict = property.Value.GetBoolean();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatCompletionsFunctionToolDefinitionFunction(description, name, parameters, strict, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsFunctionToolDefinitionFunction>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolDefinitionFunction>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolDefinitionFunction)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsFunctionToolDefinitionFunction IPersistableModel<ChatCompletionsFunctionToolDefinitionFunction>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolDefinitionFunction>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsFunctionToolDefinitionFunction(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolDefinitionFunction)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsFunctionToolDefinitionFunction>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatCompletionsFunctionToolDefinitionFunction FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionsFunctionToolDefinitionFunction(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolDefinitionFunction.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolDefinitionFunction.cs
new file mode 100644
index 000000000000..03c565925bbd
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolDefinitionFunction.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The ChatCompletionsFunctionToolDefinitionFunction. </summary>
+    public partial class ChatCompletionsFunctionToolDefinitionFunction
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolDefinitionFunction"/>. </summary>
+        /// <param name="name"> The name of the function to be called. Must be a-z, A-Z, 0-9, or contain underscores and dashes, with a maximum length of 64. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
+        public ChatCompletionsFunctionToolDefinitionFunction(string name)
+        {
+            Argument.AssertNotNull(name, nameof(name));
+
+            Name = name;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolDefinitionFunction"/>. </summary>
+        /// <param name="description"> A description of what the function does, used by the model to choose when and how to call the function. </param>
+        /// <param name="name"> The name of the function to be called. Must be a-z, A-Z, 0-9, or contain underscores and dashes, with a maximum length of 64. </param>
+        /// <param name="parameters"></param>
+        /// <param name="strict"> Whether to enable strict schema adherence when generating the function call. If set to true, the model will follow the exact schema defined in the `parameters` field. Only a subset of JSON Schema is supported when `strict` is `true`. Learn more about Structured Outputs in the [function calling guide](docs/guides/function-calling). </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatCompletionsFunctionToolDefinitionFunction(string description, string name, BinaryData parameters, bool? strict, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Description = description;
+            Name = name;
+            Parameters = parameters;
+            Strict = strict;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolDefinitionFunction"/> for deserialization. </summary>
+        internal ChatCompletionsFunctionToolDefinitionFunction()
+        {
+        }
+
+        /// <summary> A description of what the function does, used by the model to choose when and how to call the function. </summary>
+        public string Description { get; set; }
+        /// <summary> The name of the function to be called. Must be a-z, A-Z, 0-9, or contain underscores and dashes, with a maximum length of 64. </summary>
+        public string Name { get; }
+        /// <summary>
+        /// Gets or sets the parameters
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData Parameters { get; set; }
+        /// <summary> Whether to enable strict schema adherence when generating the function call. If set to true, the model will follow the exact schema defined in the `parameters` field. Only a subset of JSON Schema is supported when `strict` is `true`. Learn more about Structured Outputs in the [function calling guide](docs/guides/function-calling). </summary>
+        public bool? Strict { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolSelection.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolSelection.Serialization.cs
new file mode 100644
index 000000000000..cde742459bf0
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolSelection.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatCompletionsFunctionToolSelection : IUtf8JsonSerializable, IJsonModel<ChatCompletionsFunctionToolSelection>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsFunctionToolSelection>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsFunctionToolSelection>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolSelection)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("name"u8);
+            writer.WriteStringValue(Name);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsFunctionToolSelection IJsonModel<ChatCompletionsFunctionToolSelection>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolSelection)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsFunctionToolSelection(document.RootElement, options);
+        }
+
+        internal static ChatCompletionsFunctionToolSelection DeserializeChatCompletionsFunctionToolSelection(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string name = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("name"u8))
+                {
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatCompletionsFunctionToolSelection(name, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsFunctionToolSelection>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolSelection)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsFunctionToolSelection IPersistableModel<ChatCompletionsFunctionToolSelection>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsFunctionToolSelection(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolSelection)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsFunctionToolSelection>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatCompletionsFunctionToolSelection FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionsFunctionToolSelection(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateAssistantFileRequest.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolSelection.cs
similarity index 65%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateAssistantFileRequest.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolSelection.cs
index 5a1af0cc4664..419c61a67c34 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateAssistantFileRequest.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsFunctionToolSelection.cs
@@ -8,10 +8,10 @@
 using System;
 using System.Collections.Generic;
 
-namespace Azure.AI.OpenAI.Assistants
+namespace Azure.AI.OpenAI
 {
-    /// <summary> The CreateAssistantFileRequest. </summary>
-    internal partial class CreateAssistantFileRequest
+    /// <summary> A tool selection of a specific, named function tool that will limit chat completions to using the named function. </summary>
+    public partial class ChatCompletionsFunctionToolSelection
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,31 +45,31 @@ internal partial class CreateAssistantFileRequest
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="CreateAssistantFileRequest"/>. </summary>
-        /// <param name="fileId"> The ID of the previously uploaded file to attach. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
-        internal CreateAssistantFileRequest(string fileId)
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolSelection"/>. </summary>
+        /// <param name="name"> The name of the function that should be called. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
+        public ChatCompletionsFunctionToolSelection(string name)
         {
-            Argument.AssertNotNull(fileId, nameof(fileId));
+            Argument.AssertNotNull(name, nameof(name));
 
-            FileId = fileId;
+            Name = name;
         }
 
-        /// <summary> Initializes a new instance of <see cref="CreateAssistantFileRequest"/>. </summary>
-        /// <param name="fileId"> The ID of the previously uploaded file to attach. </param>
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolSelection"/>. </summary>
+        /// <param name="name"> The name of the function that should be called. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal CreateAssistantFileRequest(string fileId, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal ChatCompletionsFunctionToolSelection(string name, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
-            FileId = fileId;
+            Name = name;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="CreateAssistantFileRequest"/> for deserialization. </summary>
-        internal CreateAssistantFileRequest()
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolSelection"/> for deserialization. </summary>
+        internal ChatCompletionsFunctionToolSelection()
         {
         }
 
-        /// <summary> The ID of the previously uploaded file to attach. </summary>
-        public string FileId { get; }
+        /// <summary> The name of the function that should be called. </summary>
+        public string Name { get; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonResponseFormat.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonResponseFormat.Serialization.cs
new file mode 100644
index 000000000000..86d957dcbc92
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonResponseFormat.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatCompletionsJsonResponseFormat : IUtf8JsonSerializable, IJsonModel<ChatCompletionsJsonResponseFormat>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsJsonResponseFormat>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsJsonResponseFormat>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsJsonResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsJsonResponseFormat)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsJsonResponseFormat IJsonModel<ChatCompletionsJsonResponseFormat>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsJsonResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsJsonResponseFormat)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsJsonResponseFormat(document.RootElement, options);
+        }
+
+        internal static ChatCompletionsJsonResponseFormat DeserializeChatCompletionsJsonResponseFormat(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatCompletionsJsonResponseFormat(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsJsonResponseFormat>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsJsonResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsJsonResponseFormat)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsJsonResponseFormat IPersistableModel<ChatCompletionsJsonResponseFormat>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsJsonResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsJsonResponseFormat(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsJsonResponseFormat)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsJsonResponseFormat>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new ChatCompletionsJsonResponseFormat FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionsJsonResponseFormat(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonResponseFormat.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonResponseFormat.cs
new file mode 100644
index 000000000000..f38d98e6fbd6
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonResponseFormat.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A response format for Chat Completions that restricts responses to emitting valid JSON objects. </summary>
+    public partial class ChatCompletionsJsonResponseFormat : ChatCompletionsResponseFormat
+    {
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsJsonResponseFormat"/>. </summary>
+        public ChatCompletionsJsonResponseFormat()
+        {
+            Type = "json_object";
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsJsonResponseFormat"/>. </summary>
+        /// <param name="type"> The discriminated type for the response format. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatCompletionsJsonResponseFormat(string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonSchemaResponseFormat.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonSchemaResponseFormat.Serialization.cs
new file mode 100644
index 000000000000..7d7884fc0d8b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonSchemaResponseFormat.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatCompletionsJsonSchemaResponseFormat : IUtf8JsonSerializable, IJsonModel<ChatCompletionsJsonSchemaResponseFormat>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsJsonSchemaResponseFormat>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsJsonSchemaResponseFormat>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsJsonSchemaResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsJsonSchemaResponseFormat)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("json_schema"u8);
+            writer.WriteObjectValue(JsonSchema, options);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsJsonSchemaResponseFormat IJsonModel<ChatCompletionsJsonSchemaResponseFormat>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsJsonSchemaResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsJsonSchemaResponseFormat)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsJsonSchemaResponseFormat(document.RootElement, options);
+        }
+
+        internal static ChatCompletionsJsonSchemaResponseFormat DeserializeChatCompletionsJsonSchemaResponseFormat(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            ChatCompletionsJsonSchemaResponseFormatJsonSchema jsonSchema = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("json_schema"u8))
+                {
+                    jsonSchema = ChatCompletionsJsonSchemaResponseFormatJsonSchema.DeserializeChatCompletionsJsonSchemaResponseFormatJsonSchema(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatCompletionsJsonSchemaResponseFormat(type, serializedAdditionalRawData, jsonSchema);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsJsonSchemaResponseFormat>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsJsonSchemaResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsJsonSchemaResponseFormat)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsJsonSchemaResponseFormat IPersistableModel<ChatCompletionsJsonSchemaResponseFormat>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsJsonSchemaResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsJsonSchemaResponseFormat(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsJsonSchemaResponseFormat)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsJsonSchemaResponseFormat>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new ChatCompletionsJsonSchemaResponseFormat FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionsJsonSchemaResponseFormat(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonSchemaResponseFormat.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonSchemaResponseFormat.cs
new file mode 100644
index 000000000000..9892e885aba7
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonSchemaResponseFormat.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// A response format for Chat Completions that restricts responses to emitting JSON that conforms to a provided JSON
+    /// Schema for Structured Outputs.
+    /// </summary>
+    public partial class ChatCompletionsJsonSchemaResponseFormat : ChatCompletionsResponseFormat
+    {
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsJsonSchemaResponseFormat"/>. </summary>
+        /// <param name="jsonSchema"></param>
+        /// <exception cref="ArgumentNullException"> <paramref name="jsonSchema"/> is null. </exception>
+        public ChatCompletionsJsonSchemaResponseFormat(ChatCompletionsJsonSchemaResponseFormatJsonSchema jsonSchema)
+        {
+            Argument.AssertNotNull(jsonSchema, nameof(jsonSchema));
+
+            Type = "json_schema";
+            JsonSchema = jsonSchema;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsJsonSchemaResponseFormat"/>. </summary>
+        /// <param name="type"> The discriminated type for the response format. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="jsonSchema"></param>
+        internal ChatCompletionsJsonSchemaResponseFormat(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, ChatCompletionsJsonSchemaResponseFormatJsonSchema jsonSchema) : base(type, serializedAdditionalRawData)
+        {
+            JsonSchema = jsonSchema;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsJsonSchemaResponseFormat"/> for deserialization. </summary>
+        internal ChatCompletionsJsonSchemaResponseFormat()
+        {
+        }
+
+        /// <summary> Gets the json schema. </summary>
+        public ChatCompletionsJsonSchemaResponseFormatJsonSchema JsonSchema { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonSchemaResponseFormatJsonSchema.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonSchemaResponseFormatJsonSchema.Serialization.cs
new file mode 100644
index 000000000000..c9dc99ddcff4
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonSchemaResponseFormatJsonSchema.Serialization.cs
@@ -0,0 +1,191 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatCompletionsJsonSchemaResponseFormatJsonSchema : IUtf8JsonSerializable, IJsonModel<ChatCompletionsJsonSchemaResponseFormatJsonSchema>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsJsonSchemaResponseFormatJsonSchema>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsJsonSchemaResponseFormatJsonSchema>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsJsonSchemaResponseFormatJsonSchema>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsJsonSchemaResponseFormatJsonSchema)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Description))
+            {
+                writer.WritePropertyName("description"u8);
+                writer.WriteStringValue(Description);
+            }
+            writer.WritePropertyName("name"u8);
+            writer.WriteStringValue(Name);
+            if (Optional.IsDefined(Schema))
+            {
+                writer.WritePropertyName("schema"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(Schema);
+#else
+                using (JsonDocument document = JsonDocument.Parse(Schema))
+                {
+                    JsonSerializer.Serialize(writer, document.RootElement);
+                }
+#endif
+            }
+            if (Optional.IsDefined(Strict))
+            {
+                if (Strict != null)
+                {
+                    writer.WritePropertyName("strict"u8);
+                    writer.WriteBooleanValue(Strict.Value);
+                }
+                else
+                {
+                    writer.WriteNull("strict");
+                }
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsJsonSchemaResponseFormatJsonSchema IJsonModel<ChatCompletionsJsonSchemaResponseFormatJsonSchema>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsJsonSchemaResponseFormatJsonSchema>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsJsonSchemaResponseFormatJsonSchema)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsJsonSchemaResponseFormatJsonSchema(document.RootElement, options);
+        }
+
+        internal static ChatCompletionsJsonSchemaResponseFormatJsonSchema DeserializeChatCompletionsJsonSchemaResponseFormatJsonSchema(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string description = default;
+            string name = default;
+            BinaryData schema = default;
+            bool? strict = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("description"u8))
+                {
+                    description = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("name"u8))
+                {
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("schema"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    schema = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
+                if (property.NameEquals("strict"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        strict = null;
+                        continue;
+                    }
+                    strict = property.Value.GetBoolean();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatCompletionsJsonSchemaResponseFormatJsonSchema(description, name, schema, strict, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsJsonSchemaResponseFormatJsonSchema>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsJsonSchemaResponseFormatJsonSchema>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsJsonSchemaResponseFormatJsonSchema)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsJsonSchemaResponseFormatJsonSchema IPersistableModel<ChatCompletionsJsonSchemaResponseFormatJsonSchema>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsJsonSchemaResponseFormatJsonSchema>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsJsonSchemaResponseFormatJsonSchema(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsJsonSchemaResponseFormatJsonSchema)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsJsonSchemaResponseFormatJsonSchema>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatCompletionsJsonSchemaResponseFormatJsonSchema FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionsJsonSchemaResponseFormatJsonSchema(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonSchemaResponseFormatJsonSchema.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonSchemaResponseFormatJsonSchema.cs
new file mode 100644
index 000000000000..344920808c8c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsJsonSchemaResponseFormatJsonSchema.cs
@@ -0,0 +1,116 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The ChatCompletionsJsonSchemaResponseFormatJsonSchema. </summary>
+    public partial class ChatCompletionsJsonSchemaResponseFormatJsonSchema
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsJsonSchemaResponseFormatJsonSchema"/>. </summary>
+        /// <param name="name"> The name of the response format. Must be a-z, A-Z, 0-9, or contain underscores and dashes, with a maximum length of 64. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
+        public ChatCompletionsJsonSchemaResponseFormatJsonSchema(string name)
+        {
+            Argument.AssertNotNull(name, nameof(name));
+
+            Name = name;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsJsonSchemaResponseFormatJsonSchema"/>. </summary>
+        /// <param name="description"> A description of what the response format is for, used by the model to determine how to respond in the format. </param>
+        /// <param name="name"> The name of the response format. Must be a-z, A-Z, 0-9, or contain underscores and dashes, with a maximum length of 64. </param>
+        /// <param name="schema"></param>
+        /// <param name="strict"> Whether to enable strict schema adherence when generating the output. If set to true, the model will always follow the exact schema defined in the `schema` field. Only a subset of JSON Schema is supported when `strict` is `true`. To learn more, read the [Structured Outputs guide](/docs/guides/structured-outputs). </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatCompletionsJsonSchemaResponseFormatJsonSchema(string description, string name, BinaryData schema, bool? strict, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Description = description;
+            Name = name;
+            Schema = schema;
+            Strict = strict;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsJsonSchemaResponseFormatJsonSchema"/> for deserialization. </summary>
+        internal ChatCompletionsJsonSchemaResponseFormatJsonSchema()
+        {
+        }
+
+        /// <summary> A description of what the response format is for, used by the model to determine how to respond in the format. </summary>
+        public string Description { get; set; }
+        /// <summary> The name of the response format. Must be a-z, A-Z, 0-9, or contain underscores and dashes, with a maximum length of 64. </summary>
+        public string Name { get; }
+        /// <summary>
+        /// Gets or sets the schema
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData Schema { get; set; }
+        /// <summary> Whether to enable strict schema adherence when generating the output. If set to true, the model will always follow the exact schema defined in the `schema` field. Only a subset of JSON Schema is supported when `strict` is `true`. To learn more, read the [Structured Outputs guide](/docs/guides/structured-outputs). </summary>
+        public bool? Strict { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsNamedFunctionToolSelection.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsNamedFunctionToolSelection.Serialization.cs
new file mode 100644
index 000000000000..78497714b92d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsNamedFunctionToolSelection.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatCompletionsNamedFunctionToolSelection : IUtf8JsonSerializable, IJsonModel<ChatCompletionsNamedFunctionToolSelection>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsNamedFunctionToolSelection>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsNamedFunctionToolSelection>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedFunctionToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsNamedFunctionToolSelection)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("function"u8);
+            writer.WriteObjectValue(Function, options);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsNamedFunctionToolSelection IJsonModel<ChatCompletionsNamedFunctionToolSelection>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedFunctionToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsNamedFunctionToolSelection)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsNamedFunctionToolSelection(document.RootElement, options);
+        }
+
+        internal static ChatCompletionsNamedFunctionToolSelection DeserializeChatCompletionsNamedFunctionToolSelection(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            ChatCompletionsFunctionToolSelection function = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("function"u8))
+                {
+                    function = ChatCompletionsFunctionToolSelection.DeserializeChatCompletionsFunctionToolSelection(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatCompletionsNamedFunctionToolSelection(type, serializedAdditionalRawData, function);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsNamedFunctionToolSelection>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedFunctionToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsNamedFunctionToolSelection)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsNamedFunctionToolSelection IPersistableModel<ChatCompletionsNamedFunctionToolSelection>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedFunctionToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsNamedFunctionToolSelection(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsNamedFunctionToolSelection)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsNamedFunctionToolSelection>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new ChatCompletionsNamedFunctionToolSelection FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionsNamedFunctionToolSelection(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsNamedFunctionToolSelection.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsNamedFunctionToolSelection.cs
new file mode 100644
index 000000000000..2645a6e5ad04
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsNamedFunctionToolSelection.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A tool selection of a specific, named function tool that will limit chat completions to using the named function. </summary>
+    public partial class ChatCompletionsNamedFunctionToolSelection : ChatCompletionsNamedToolSelection
+    {
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsNamedFunctionToolSelection"/>. </summary>
+        /// <param name="function"> The function that should be called. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="function"/> is null. </exception>
+        public ChatCompletionsNamedFunctionToolSelection(ChatCompletionsFunctionToolSelection function)
+        {
+            Argument.AssertNotNull(function, nameof(function));
+
+            Type = "function";
+            Function = function;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsNamedFunctionToolSelection"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="function"> The function that should be called. </param>
+        internal ChatCompletionsNamedFunctionToolSelection(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, ChatCompletionsFunctionToolSelection function) : base(type, serializedAdditionalRawData)
+        {
+            Function = function;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsNamedFunctionToolSelection"/> for deserialization. </summary>
+        internal ChatCompletionsNamedFunctionToolSelection()
+        {
+        }
+
+        /// <summary> The function that should be called. </summary>
+        public ChatCompletionsFunctionToolSelection Function { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsNamedToolSelection.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsNamedToolSelection.Serialization.cs
new file mode 100644
index 000000000000..b9837419a4fa
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsNamedToolSelection.Serialization.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    [PersistableModelProxy(typeof(UnknownChatCompletionsNamedToolSelection))]
+    public partial class ChatCompletionsNamedToolSelection : IUtf8JsonSerializable, IJsonModel<ChatCompletionsNamedToolSelection>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsNamedToolSelection>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsNamedToolSelection>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsNamedToolSelection)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsNamedToolSelection IJsonModel<ChatCompletionsNamedToolSelection>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsNamedToolSelection)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsNamedToolSelection(document.RootElement, options);
+        }
+
+        internal static ChatCompletionsNamedToolSelection DeserializeChatCompletionsNamedToolSelection(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "function": return ChatCompletionsNamedFunctionToolSelection.DeserializeChatCompletionsNamedFunctionToolSelection(element, options);
+                }
+            }
+            return UnknownChatCompletionsNamedToolSelection.DeserializeUnknownChatCompletionsNamedToolSelection(element, options);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsNamedToolSelection>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsNamedToolSelection)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsNamedToolSelection IPersistableModel<ChatCompletionsNamedToolSelection>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsNamedToolSelection(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsNamedToolSelection)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsNamedToolSelection>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatCompletionsNamedToolSelection FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionsNamedToolSelection(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatDataSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsNamedToolSelection.cs
similarity index 55%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/ChatDataSource.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsNamedToolSelection.cs
index 35988a26e719..b25ed8fab461 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatDataSource.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsNamedToolSelection.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -5,17 +8,14 @@
 using System;
 using System.Collections.Generic;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI
 {
     /// <summary>
-    /// A representation of configuration data for a single Azure OpenAI chat data source.
-    /// This will be used by a chat completions request that should use Azure OpenAI chat extensions to augment the
-    /// response behavior.
-    /// The use of this configuration is compatible only with Azure OpenAI.
-    /// Please note <see cref="ChatDataSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
-    /// The available derived classes include <see cref="CosmosChatDataSource"/>, <see cref="AzureSearchChatDataSource"/>, <see cref="ElasticsearchChatDataSource"/>, <see cref="MongoDBChatDataSource"/> and <see cref="PineconeChatDataSource"/>.
+    /// An abstract representation of an explicit, named tool selection to use for a chat completions request.
+    /// Please note <see cref="ChatCompletionsNamedToolSelection"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="ChatCompletionsNamedFunctionToolSelection"/>.
     /// </summary>
-    public abstract partial class ChatDataSource
+    public abstract partial class ChatCompletionsNamedToolSelection
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -47,22 +47,23 @@ public abstract partial class ChatDataSource
         /// </list>
         /// </para>
         /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="ChatDataSource"/>. </summary>
-        protected ChatDataSource()
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsNamedToolSelection"/>. </summary>
+        protected ChatCompletionsNamedToolSelection()
         {
         }
 
-        /// <summary> Initializes a new instance of <see cref="ChatDataSource"/>. </summary>
-        /// <param name="type"> The differentiating type identifier for the data source. </param>
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsNamedToolSelection"/>. </summary>
+        /// <param name="type"> The object type. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ChatDataSource(string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal ChatCompletionsNamedToolSelection(string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Type = type;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> The differentiating type identifier for the data source. </summary>
+        /// <summary> The object type. </summary>
         internal string Type { get; set; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsOptions.Serialization.cs
new file mode 100644
index 000000000000..f6ce6ccd083f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsOptions.Serialization.cs
@@ -0,0 +1,612 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatCompletionsOptions : IUtf8JsonSerializable, IJsonModel<ChatCompletionsOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("messages"u8);
+            writer.WriteStartArray();
+            foreach (var item in Messages)
+            {
+                writer.WriteObjectValue(item, options);
+            }
+            writer.WriteEndArray();
+            if (Optional.IsCollectionDefined(Functions))
+            {
+                writer.WritePropertyName("functions"u8);
+                writer.WriteStartArray();
+                foreach (var item in Functions)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsDefined(FunctionCall))
+            {
+                writer.WritePropertyName("function_call"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(FunctionCall);
+#else
+                using (JsonDocument document = JsonDocument.Parse(FunctionCall))
+                {
+                    JsonSerializer.Serialize(writer, document.RootElement);
+                }
+#endif
+            }
+            if (Optional.IsDefined(MaxTokens))
+            {
+                writer.WritePropertyName("max_tokens"u8);
+                writer.WriteNumberValue(MaxTokens.Value);
+            }
+            if (Optional.IsDefined(MaxCompletionTokens))
+            {
+                writer.WritePropertyName("max_completion_tokens"u8);
+                writer.WriteNumberValue(MaxCompletionTokens.Value);
+            }
+            if (Optional.IsDefined(Temperature))
+            {
+                writer.WritePropertyName("temperature"u8);
+                writer.WriteNumberValue(Temperature.Value);
+            }
+            if (Optional.IsDefined(NucleusSamplingFactor))
+            {
+                writer.WritePropertyName("top_p"u8);
+                writer.WriteNumberValue(NucleusSamplingFactor.Value);
+            }
+            if (Optional.IsCollectionDefined(TokenSelectionBiases))
+            {
+                writer.WritePropertyName("logit_bias"u8);
+                writer.WriteStartObject();
+                foreach (var item in TokenSelectionBiases)
+                {
+                    writer.WritePropertyName(item.Key);
+                    writer.WriteNumberValue(item.Value);
+                }
+                writer.WriteEndObject();
+            }
+            if (Optional.IsDefined(User))
+            {
+                writer.WritePropertyName("user"u8);
+                writer.WriteStringValue(User);
+            }
+            if (Optional.IsDefined(ChoiceCount))
+            {
+                writer.WritePropertyName("n"u8);
+                writer.WriteNumberValue(ChoiceCount.Value);
+            }
+            if (Optional.IsCollectionDefined(StopSequences))
+            {
+                writer.WritePropertyName("stop"u8);
+                writer.WriteStartArray();
+                foreach (var item in StopSequences)
+                {
+                    writer.WriteStringValue(item);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsDefined(PresencePenalty))
+            {
+                writer.WritePropertyName("presence_penalty"u8);
+                writer.WriteNumberValue(PresencePenalty.Value);
+            }
+            if (Optional.IsDefined(FrequencyPenalty))
+            {
+                writer.WritePropertyName("frequency_penalty"u8);
+                writer.WriteNumberValue(FrequencyPenalty.Value);
+            }
+            if (Optional.IsDefined(InternalShouldStreamResponse))
+            {
+                writer.WritePropertyName("stream"u8);
+                writer.WriteBooleanValue(InternalShouldStreamResponse.Value);
+            }
+            if (Optional.IsDefined(StreamOptions))
+            {
+                if (StreamOptions != null)
+                {
+                    writer.WritePropertyName("stream_options"u8);
+                    writer.WriteObjectValue(StreamOptions, options);
+                }
+                else
+                {
+                    writer.WriteNull("stream_options");
+                }
+            }
+            if (Optional.IsDefined(DeploymentName))
+            {
+                writer.WritePropertyName("model"u8);
+                writer.WriteStringValue(DeploymentName);
+            }
+            if (Optional.IsCollectionDefined(InternalAzureExtensionsDataSources))
+            {
+                writer.WritePropertyName("data_sources"u8);
+                writer.WriteStartArray();
+                foreach (var item in InternalAzureExtensionsDataSources)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsDefined(Enhancements))
+            {
+                writer.WritePropertyName("enhancements"u8);
+                writer.WriteObjectValue(Enhancements, options);
+            }
+            if (Optional.IsDefined(Seed))
+            {
+                writer.WritePropertyName("seed"u8);
+                writer.WriteNumberValue(Seed.Value);
+            }
+            if (Optional.IsDefined(EnableLogProbabilities))
+            {
+                if (EnableLogProbabilities != null)
+                {
+                    writer.WritePropertyName("logprobs"u8);
+                    writer.WriteBooleanValue(EnableLogProbabilities.Value);
+                }
+                else
+                {
+                    writer.WriteNull("logprobs");
+                }
+            }
+            if (Optional.IsDefined(LogProbabilitiesPerToken))
+            {
+                if (LogProbabilitiesPerToken != null)
+                {
+                    writer.WritePropertyName("top_logprobs"u8);
+                    writer.WriteNumberValue(LogProbabilitiesPerToken.Value);
+                }
+                else
+                {
+                    writer.WriteNull("top_logprobs");
+                }
+            }
+            if (Optional.IsDefined(ResponseFormat))
+            {
+                writer.WritePropertyName("response_format"u8);
+                writer.WriteObjectValue(ResponseFormat, options);
+            }
+            if (Optional.IsCollectionDefined(Tools))
+            {
+                writer.WritePropertyName("tools"u8);
+                writer.WriteStartArray();
+                foreach (var item in Tools)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsDefined(ToolChoice))
+            {
+                writer.WritePropertyName("tool_choice"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(ToolChoice);
+#else
+                using (JsonDocument document = JsonDocument.Parse(ToolChoice))
+                {
+                    JsonSerializer.Serialize(writer, document.RootElement);
+                }
+#endif
+            }
+            if (Optional.IsDefined(ParallelToolCalls))
+            {
+                writer.WritePropertyName("parallel_tool_calls"u8);
+                writer.WriteBooleanValue(ParallelToolCalls.Value);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsOptions IJsonModel<ChatCompletionsOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsOptions(document.RootElement, options);
+        }
+
+        internal static ChatCompletionsOptions DeserializeChatCompletionsOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IList<ChatRequestMessage> messages = default;
+            IList<FunctionDefinition> functions = default;
+            BinaryData functionCall = default;
+            int? maxTokens = default;
+            int? maxCompletionTokens = default;
+            float? temperature = default;
+            float? topP = default;
+            IDictionary<string, int> logitBias = default;
+            string user = default;
+            int? n = default;
+            IList<string> stop = default;
+            float? presencePenalty = default;
+            float? frequencyPenalty = default;
+            bool? stream = default;
+            ChatCompletionStreamOptions streamOptions = default;
+            string model = default;
+            IList<AzureChatExtensionConfiguration> dataSources = default;
+            AzureChatEnhancementConfiguration enhancements = default;
+            long? seed = default;
+            bool? logprobs = default;
+            int? topLogprobs = default;
+            ChatCompletionsResponseFormat responseFormat = default;
+            IList<ChatCompletionsToolDefinition> tools = default;
+            BinaryData toolChoice = default;
+            bool? parallelToolCalls = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("messages"u8))
+                {
+                    List<ChatRequestMessage> array = new List<ChatRequestMessage>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(ChatRequestMessage.DeserializeChatRequestMessage(item, options));
+                    }
+                    messages = array;
+                    continue;
+                }
+                if (property.NameEquals("functions"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<FunctionDefinition> array = new List<FunctionDefinition>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(FunctionDefinition.DeserializeFunctionDefinition(item, options));
+                    }
+                    functions = array;
+                    continue;
+                }
+                if (property.NameEquals("function_call"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    functionCall = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
+                if (property.NameEquals("max_tokens"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    maxTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("max_completion_tokens"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    maxCompletionTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("temperature"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    temperature = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("top_p"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    topP = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("logit_bias"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    Dictionary<string, int> dictionary = new Dictionary<string, int>();
+                    foreach (var property0 in property.Value.EnumerateObject())
+                    {
+                        dictionary.Add(property0.Name, property0.Value.GetInt32());
+                    }
+                    logitBias = dictionary;
+                    continue;
+                }
+                if (property.NameEquals("user"u8))
+                {
+                    user = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("n"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    n = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("stop"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    stop = array;
+                    continue;
+                }
+                if (property.NameEquals("presence_penalty"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    presencePenalty = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("frequency_penalty"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    frequencyPenalty = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("stream"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    stream = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("stream_options"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        streamOptions = null;
+                        continue;
+                    }
+                    streamOptions = ChatCompletionStreamOptions.DeserializeChatCompletionStreamOptions(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("model"u8))
+                {
+                    model = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("data_sources"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<AzureChatExtensionConfiguration> array = new List<AzureChatExtensionConfiguration>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(AzureChatExtensionConfiguration.DeserializeAzureChatExtensionConfiguration(item, options));
+                    }
+                    dataSources = array;
+                    continue;
+                }
+                if (property.NameEquals("enhancements"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    enhancements = AzureChatEnhancementConfiguration.DeserializeAzureChatEnhancementConfiguration(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("seed"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    seed = property.Value.GetInt64();
+                    continue;
+                }
+                if (property.NameEquals("logprobs"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        logprobs = null;
+                        continue;
+                    }
+                    logprobs = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("top_logprobs"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        topLogprobs = null;
+                        continue;
+                    }
+                    topLogprobs = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("response_format"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    responseFormat = ChatCompletionsResponseFormat.DeserializeChatCompletionsResponseFormat(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("tools"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<ChatCompletionsToolDefinition> array = new List<ChatCompletionsToolDefinition>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(ChatCompletionsToolDefinition.DeserializeChatCompletionsToolDefinition(item, options));
+                    }
+                    tools = array;
+                    continue;
+                }
+                if (property.NameEquals("tool_choice"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    toolChoice = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
+                if (property.NameEquals("parallel_tool_calls"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    parallelToolCalls = property.Value.GetBoolean();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatCompletionsOptions(
+                messages,
+                functions ?? new ChangeTrackingList<FunctionDefinition>(),
+                functionCall,
+                maxTokens,
+                maxCompletionTokens,
+                temperature,
+                topP,
+                logitBias ?? new ChangeTrackingDictionary<string, int>(),
+                user,
+                n,
+                stop ?? new ChangeTrackingList<string>(),
+                presencePenalty,
+                frequencyPenalty,
+                stream,
+                streamOptions,
+                model,
+                dataSources ?? new ChangeTrackingList<AzureChatExtensionConfiguration>(),
+                enhancements,
+                seed,
+                logprobs,
+                topLogprobs,
+                responseFormat,
+                tools ?? new ChangeTrackingList<ChatCompletionsToolDefinition>(),
+                toolChoice,
+                parallelToolCalls,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsOptions IPersistableModel<ChatCompletionsOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatCompletionsOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionsOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsOptions.cs
new file mode 100644
index 000000000000..3d1ebd1135d1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsOptions.cs
@@ -0,0 +1,414 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// The configuration information for a chat completions request.
+    /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+    /// provided prompt data.
+    /// </summary>
+    public partial class ChatCompletionsOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsOptions"/>. </summary>
+        /// <param name="messages">
+        /// The collection of context messages associated with this chat completions request.
+        /// Typical usage begins with a chat message for the System role that provides instructions for
+        /// the behavior of the assistant, followed by alternating messages between the User and
+        /// Assistant roles.
+        /// Please note <see cref="ChatRequestMessage"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="ChatRequestAssistantMessage"/>, <see cref="ChatRequestFunctionMessage"/>, <see cref="ChatRequestSystemMessage"/>, <see cref="ChatRequestToolMessage"/> and <see cref="ChatRequestUserMessage"/>.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="messages"/> is null. </exception>
+        public ChatCompletionsOptions(IEnumerable<ChatRequestMessage> messages)
+        {
+            Argument.AssertNotNull(messages, nameof(messages));
+
+            Messages = messages.ToList();
+            Functions = new ChangeTrackingList<FunctionDefinition>();
+            TokenSelectionBiases = new ChangeTrackingDictionary<string, int>();
+            StopSequences = new ChangeTrackingList<string>();
+            InternalAzureExtensionsDataSources = new ChangeTrackingList<AzureChatExtensionConfiguration>();
+            Tools = new ChangeTrackingList<ChatCompletionsToolDefinition>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsOptions"/>. </summary>
+        /// <param name="messages">
+        /// The collection of context messages associated with this chat completions request.
+        /// Typical usage begins with a chat message for the System role that provides instructions for
+        /// the behavior of the assistant, followed by alternating messages between the User and
+        /// Assistant roles.
+        /// Please note <see cref="ChatRequestMessage"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="ChatRequestAssistantMessage"/>, <see cref="ChatRequestFunctionMessage"/>, <see cref="ChatRequestSystemMessage"/>, <see cref="ChatRequestToolMessage"/> and <see cref="ChatRequestUserMessage"/>.
+        /// </param>
+        /// <param name="functions"> A list of functions the model may generate JSON inputs for. </param>
+        /// <param name="functionCall">
+        /// Controls how the model responds to function calls. "none" means the model does not call a function,
+        /// and responds to the end-user. "auto" means the model can pick between an end-user or calling a function.
+        ///  Specifying a particular function via `{"name": "my_function"}` forces the model to call that function.
+        ///  "none" is the default when no functions are present. "auto" is the default if functions are present.
+        /// </param>
+        /// <param name="maxTokens">
+        /// The maximum number of tokens allowed for the generated answer. By default, the number of tokens the model can return will be (4096 - prompt tokens).
+        ///
+        /// This value is now deprecated in favor of `max_completion_tokens`, and is not compatible with o1 series models.
+        /// </param>
+        /// <param name="maxCompletionTokens"> An upper bound for the number of tokens that can be generated for a completion, including visible output tokens and reasoning tokens. </param>
+        /// <param name="temperature">
+        /// The sampling temperature to use that controls the apparent creativity of generated completions.
+        /// Higher values will make output more random while lower values will make results more focused
+        /// and deterministic.
+        /// It is not recommended to modify temperature and top_p for the same completions request as the
+        /// interaction of these two settings is difficult to predict.
+        /// </param>
+        /// <param name="nucleusSamplingFactor">
+        /// An alternative to sampling with temperature called nucleus sampling. This value causes the
+        /// model to consider the results of tokens with the provided probability mass. As an example, a
+        /// value of 0.15 will cause only the tokens comprising the top 15% of probability mass to be
+        /// considered.
+        /// It is not recommended to modify temperature and top_p for the same completions request as the
+        /// interaction of these two settings is difficult to predict.
+        /// </param>
+        /// <param name="tokenSelectionBiases">
+        /// A map between GPT token IDs and bias scores that influences the probability of specific tokens
+        /// appearing in a completions response. Token IDs are computed via external tokenizer tools, while
+        /// bias scores reside in the range of -100 to 100 with minimum and maximum values corresponding to
+        /// a full ban or exclusive selection of a token, respectively. The exact behavior of a given bias
+        /// score varies by model.
+        /// </param>
+        /// <param name="user">
+        /// An identifier for the caller or end user of the operation. This may be used for tracking
+        /// or rate-limiting purposes.
+        /// </param>
+        /// <param name="choiceCount">
+        /// The number of chat completions choices that should be generated for a chat completions
+        /// response.
+        /// Because this setting can generate many completions, it may quickly consume your token quota.
+        /// Use carefully and ensure reasonable settings for max_tokens and stop.
+        /// </param>
+        /// <param name="stopSequences"> A collection of textual sequences that will end completions generation. </param>
+        /// <param name="presencePenalty">
+        /// A value that influences the probability of generated tokens appearing based on their existing
+        /// presence in generated text.
+        /// Positive values will make tokens less likely to appear when they already exist and increase the
+        /// model's likelihood to output new topics.
+        /// </param>
+        /// <param name="frequencyPenalty">
+        /// A value that influences the probability of generated tokens appearing based on their cumulative
+        /// frequency in generated text.
+        /// Positive values will make tokens less likely to appear as their frequency increases and
+        /// decrease the likelihood of the model repeating the same statements verbatim.
+        /// </param>
+        /// <param name="internalShouldStreamResponse"> A value indicating whether chat completions should be streamed for this request. </param>
+        /// <param name="streamOptions"> Options for streaming response. Only set this when you set `stream: true`. </param>
+        /// <param name="deploymentName">
+        /// The model name to provide as part of this completions request.
+        /// Not applicable to Azure OpenAI, where deployment information should be included in the Azure
+        /// resource URI that's connected to.
+        /// </param>
+        /// <param name="internalAzureExtensionsDataSources">
+        ///   The configuration entries for Azure OpenAI chat extensions that use them.
+        ///   This additional specification is only compatible with Azure OpenAI.
+        /// Please note <see cref="AzureChatExtensionConfiguration"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="AzureCosmosDBChatExtensionConfiguration"/>, <see cref="AzureSearchChatExtensionConfiguration"/>, <see cref="ElasticsearchChatExtensionConfiguration"/>, <see cref="MongoDBChatExtensionConfiguration"/> and <see cref="PineconeChatExtensionConfiguration"/>.
+        /// </param>
+        /// <param name="enhancements"> If provided, the configuration options for available Azure OpenAI chat enhancements. </param>
+        /// <param name="seed">
+        /// If specified, the system will make a best effort to sample deterministically such that repeated requests with the
+        /// same seed and parameters should return the same result. Determinism is not guaranteed, and you should refer to the
+        /// system_fingerprint response parameter to monitor changes in the backend."
+        /// </param>
+        /// <param name="enableLogProbabilities"> Whether to return log probabilities of the output tokens or not. If true, returns the log probabilities of each output token returned in the `content` of `message`. This option is currently not available on the `gpt-4-vision-preview` model. </param>
+        /// <param name="logProbabilitiesPerToken"> An integer between 0 and 5 specifying the number of most likely tokens to return at each token position, each with an associated log probability. `logprobs` must be set to `true` if this parameter is used. </param>
+        /// <param name="responseFormat">
+        /// An object specifying the format that the model must output. Used to enable JSON mode.
+        /// Please note <see cref="ChatCompletionsResponseFormat"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="ChatCompletionsJsonResponseFormat"/>, <see cref="ChatCompletionsJsonSchemaResponseFormat"/> and <see cref="ChatCompletionsTextResponseFormat"/>.
+        /// </param>
+        /// <param name="tools">
+        /// The available tool definitions that the chat completions request can use, including caller-defined functions.
+        /// Please note <see cref="ChatCompletionsToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="ChatCompletionsFunctionToolDefinition"/>.
+        /// </param>
+        /// <param name="toolChoice"> If specified, the model will configure which of the provided tools it can use for the chat completions response. </param>
+        /// <param name="parallelToolCalls"> Whether to enable parallel function calling during tool use. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatCompletionsOptions(IList<ChatRequestMessage> messages, IList<FunctionDefinition> functions, BinaryData functionCall, int? maxTokens, int? maxCompletionTokens, float? temperature, float? nucleusSamplingFactor, IDictionary<string, int> tokenSelectionBiases, string user, int? choiceCount, IList<string> stopSequences, float? presencePenalty, float? frequencyPenalty, bool? internalShouldStreamResponse, ChatCompletionStreamOptions streamOptions, string deploymentName, IList<AzureChatExtensionConfiguration> internalAzureExtensionsDataSources, AzureChatEnhancementConfiguration enhancements, long? seed, bool? enableLogProbabilities, int? logProbabilitiesPerToken, ChatCompletionsResponseFormat responseFormat, IList<ChatCompletionsToolDefinition> tools, BinaryData toolChoice, bool? parallelToolCalls, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Messages = messages;
+            Functions = functions;
+            FunctionCall = functionCall;
+            MaxTokens = maxTokens;
+            MaxCompletionTokens = maxCompletionTokens;
+            Temperature = temperature;
+            NucleusSamplingFactor = nucleusSamplingFactor;
+            TokenSelectionBiases = tokenSelectionBiases;
+            User = user;
+            ChoiceCount = choiceCount;
+            StopSequences = stopSequences;
+            PresencePenalty = presencePenalty;
+            FrequencyPenalty = frequencyPenalty;
+            InternalShouldStreamResponse = internalShouldStreamResponse;
+            StreamOptions = streamOptions;
+            DeploymentName = deploymentName;
+            InternalAzureExtensionsDataSources = internalAzureExtensionsDataSources;
+            Enhancements = enhancements;
+            Seed = seed;
+            EnableLogProbabilities = enableLogProbabilities;
+            LogProbabilitiesPerToken = logProbabilitiesPerToken;
+            ResponseFormat = responseFormat;
+            Tools = tools;
+            ToolChoice = toolChoice;
+            ParallelToolCalls = parallelToolCalls;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsOptions"/> for deserialization. </summary>
+        internal ChatCompletionsOptions()
+        {
+        }
+
+        /// <summary>
+        /// The collection of context messages associated with this chat completions request.
+        /// Typical usage begins with a chat message for the System role that provides instructions for
+        /// the behavior of the assistant, followed by alternating messages between the User and
+        /// Assistant roles.
+        /// Please note <see cref="ChatRequestMessage"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="ChatRequestAssistantMessage"/>, <see cref="ChatRequestFunctionMessage"/>, <see cref="ChatRequestSystemMessage"/>, <see cref="ChatRequestToolMessage"/> and <see cref="ChatRequestUserMessage"/>.
+        /// </summary>
+        public IList<ChatRequestMessage> Messages { get; }
+        /// <summary> A list of functions the model may generate JSON inputs for. </summary>
+        public IList<FunctionDefinition> Functions { get; }
+        /// <summary>
+        /// Controls how the model responds to function calls. "none" means the model does not call a function,
+        /// and responds to the end-user. "auto" means the model can pick between an end-user or calling a function.
+        ///  Specifying a particular function via `{"name": "my_function"}` forces the model to call that function.
+        ///  "none" is the default when no functions are present. "auto" is the default if functions are present.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="FunctionCallPreset"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="FunctionName"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData FunctionCall { get; set; }
+        /// <summary>
+        /// The maximum number of tokens allowed for the generated answer. By default, the number of tokens the model can return will be (4096 - prompt tokens).
+        ///
+        /// This value is now deprecated in favor of `max_completion_tokens`, and is not compatible with o1 series models.
+        /// </summary>
+        public int? MaxTokens { get; set; }
+        /// <summary> An upper bound for the number of tokens that can be generated for a completion, including visible output tokens and reasoning tokens. </summary>
+        public int? MaxCompletionTokens { get; set; }
+        /// <summary>
+        /// The sampling temperature to use that controls the apparent creativity of generated completions.
+        /// Higher values will make output more random while lower values will make results more focused
+        /// and deterministic.
+        /// It is not recommended to modify temperature and top_p for the same completions request as the
+        /// interaction of these two settings is difficult to predict.
+        /// </summary>
+        public float? Temperature { get; set; }
+        /// <summary>
+        /// An alternative to sampling with temperature called nucleus sampling. This value causes the
+        /// model to consider the results of tokens with the provided probability mass. As an example, a
+        /// value of 0.15 will cause only the tokens comprising the top 15% of probability mass to be
+        /// considered.
+        /// It is not recommended to modify temperature and top_p for the same completions request as the
+        /// interaction of these two settings is difficult to predict.
+        /// </summary>
+        public float? NucleusSamplingFactor { get; set; }
+        /// <summary>
+        /// A map between GPT token IDs and bias scores that influences the probability of specific tokens
+        /// appearing in a completions response. Token IDs are computed via external tokenizer tools, while
+        /// bias scores reside in the range of -100 to 100 with minimum and maximum values corresponding to
+        /// a full ban or exclusive selection of a token, respectively. The exact behavior of a given bias
+        /// score varies by model.
+        /// </summary>
+        public IDictionary<string, int> TokenSelectionBiases { get; }
+        /// <summary>
+        /// An identifier for the caller or end user of the operation. This may be used for tracking
+        /// or rate-limiting purposes.
+        /// </summary>
+        public string User { get; set; }
+        /// <summary>
+        /// The number of chat completions choices that should be generated for a chat completions
+        /// response.
+        /// Because this setting can generate many completions, it may quickly consume your token quota.
+        /// Use carefully and ensure reasonable settings for max_tokens and stop.
+        /// </summary>
+        public int? ChoiceCount { get; set; }
+        /// <summary> A collection of textual sequences that will end completions generation. </summary>
+        public IList<string> StopSequences { get; }
+        /// <summary>
+        /// A value that influences the probability of generated tokens appearing based on their existing
+        /// presence in generated text.
+        /// Positive values will make tokens less likely to appear when they already exist and increase the
+        /// model's likelihood to output new topics.
+        /// </summary>
+        public float? PresencePenalty { get; set; }
+        /// <summary>
+        /// A value that influences the probability of generated tokens appearing based on their cumulative
+        /// frequency in generated text.
+        /// Positive values will make tokens less likely to appear as their frequency increases and
+        /// decrease the likelihood of the model repeating the same statements verbatim.
+        /// </summary>
+        public float? FrequencyPenalty { get; set; }
+        /// <summary> A value indicating whether chat completions should be streamed for this request. </summary>
+        public bool? InternalShouldStreamResponse { get; set; }
+        /// <summary> Options for streaming response. Only set this when you set `stream: true`. </summary>
+        public ChatCompletionStreamOptions StreamOptions { get; set; }
+        /// <summary>
+        /// The model name to provide as part of this completions request.
+        /// Not applicable to Azure OpenAI, where deployment information should be included in the Azure
+        /// resource URI that's connected to.
+        /// </summary>
+        public string DeploymentName { get; set; }
+        /// <summary>
+        ///   The configuration entries for Azure OpenAI chat extensions that use them.
+        ///   This additional specification is only compatible with Azure OpenAI.
+        /// Please note <see cref="AzureChatExtensionConfiguration"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="AzureCosmosDBChatExtensionConfiguration"/>, <see cref="AzureSearchChatExtensionConfiguration"/>, <see cref="ElasticsearchChatExtensionConfiguration"/>, <see cref="MongoDBChatExtensionConfiguration"/> and <see cref="PineconeChatExtensionConfiguration"/>.
+        /// </summary>
+        public IList<AzureChatExtensionConfiguration> InternalAzureExtensionsDataSources { get; }
+        /// <summary> If provided, the configuration options for available Azure OpenAI chat enhancements. </summary>
+        public AzureChatEnhancementConfiguration Enhancements { get; set; }
+        /// <summary>
+        /// If specified, the system will make a best effort to sample deterministically such that repeated requests with the
+        /// same seed and parameters should return the same result. Determinism is not guaranteed, and you should refer to the
+        /// system_fingerprint response parameter to monitor changes in the backend."
+        /// </summary>
+        public long? Seed { get; set; }
+        /// <summary> Whether to return log probabilities of the output tokens or not. If true, returns the log probabilities of each output token returned in the `content` of `message`. This option is currently not available on the `gpt-4-vision-preview` model. </summary>
+        public bool? EnableLogProbabilities { get; set; }
+        /// <summary> An integer between 0 and 5 specifying the number of most likely tokens to return at each token position, each with an associated log probability. `logprobs` must be set to `true` if this parameter is used. </summary>
+        public int? LogProbabilitiesPerToken { get; set; }
+        /// <summary>
+        /// An object specifying the format that the model must output. Used to enable JSON mode.
+        /// Please note <see cref="ChatCompletionsResponseFormat"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="ChatCompletionsJsonResponseFormat"/>, <see cref="ChatCompletionsJsonSchemaResponseFormat"/> and <see cref="ChatCompletionsTextResponseFormat"/>.
+        /// </summary>
+        public ChatCompletionsResponseFormat ResponseFormat { get; set; }
+        /// <summary>
+        /// The available tool definitions that the chat completions request can use, including caller-defined functions.
+        /// Please note <see cref="ChatCompletionsToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="ChatCompletionsFunctionToolDefinition"/>.
+        /// </summary>
+        public IList<ChatCompletionsToolDefinition> Tools { get; }
+        /// <summary>
+        /// If specified, the model will configure which of the provided tools it can use for the chat completions response.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="ChatCompletionsToolSelectionPreset"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="ChatCompletionsNamedToolSelection"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData ToolChoice { get; set; }
+        /// <summary> Whether to enable parallel function calling during tool use. </summary>
+        public bool? ParallelToolCalls { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsResponseFormat.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsResponseFormat.Serialization.cs
new file mode 100644
index 000000000000..8f973150e68e
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsResponseFormat.Serialization.cs
@@ -0,0 +1,128 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    [PersistableModelProxy(typeof(UnknownChatCompletionsResponseFormat))]
+    public partial class ChatCompletionsResponseFormat : IUtf8JsonSerializable, IJsonModel<ChatCompletionsResponseFormat>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsResponseFormat>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsResponseFormat>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsResponseFormat)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsResponseFormat IJsonModel<ChatCompletionsResponseFormat>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsResponseFormat)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsResponseFormat(document.RootElement, options);
+        }
+
+        internal static ChatCompletionsResponseFormat DeserializeChatCompletionsResponseFormat(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "json_object": return ChatCompletionsJsonResponseFormat.DeserializeChatCompletionsJsonResponseFormat(element, options);
+                    case "json_schema": return ChatCompletionsJsonSchemaResponseFormat.DeserializeChatCompletionsJsonSchemaResponseFormat(element, options);
+                    case "text": return ChatCompletionsTextResponseFormat.DeserializeChatCompletionsTextResponseFormat(element, options);
+                }
+            }
+            return UnknownChatCompletionsResponseFormat.DeserializeUnknownChatCompletionsResponseFormat(element, options);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsResponseFormat>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsResponseFormat)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsResponseFormat IPersistableModel<ChatCompletionsResponseFormat>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsResponseFormat(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsResponseFormat)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsResponseFormat>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatCompletionsResponseFormat FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionsResponseFormat(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsResponseFormat.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsResponseFormat.cs
new file mode 100644
index 000000000000..43211d2ed3cb
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsResponseFormat.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// An abstract representation of a response format configuration usable by Chat Completions. Can be used to enable JSON
+    /// mode.
+    /// Please note <see cref="ChatCompletionsResponseFormat"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="ChatCompletionsJsonResponseFormat"/>, <see cref="ChatCompletionsJsonSchemaResponseFormat"/> and <see cref="ChatCompletionsTextResponseFormat"/>.
+    /// </summary>
+    public abstract partial class ChatCompletionsResponseFormat
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsResponseFormat"/>. </summary>
+        protected ChatCompletionsResponseFormat()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsResponseFormat"/>. </summary>
+        /// <param name="type"> The discriminated type for the response format. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatCompletionsResponseFormat(string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Type = type;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The discriminated type for the response format. </summary>
+        internal string Type { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsTextResponseFormat.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsTextResponseFormat.Serialization.cs
new file mode 100644
index 000000000000..d02053e70918
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsTextResponseFormat.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatCompletionsTextResponseFormat : IUtf8JsonSerializable, IJsonModel<ChatCompletionsTextResponseFormat>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsTextResponseFormat>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsTextResponseFormat>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsTextResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsTextResponseFormat)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsTextResponseFormat IJsonModel<ChatCompletionsTextResponseFormat>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsTextResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsTextResponseFormat)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsTextResponseFormat(document.RootElement, options);
+        }
+
+        internal static ChatCompletionsTextResponseFormat DeserializeChatCompletionsTextResponseFormat(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatCompletionsTextResponseFormat(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsTextResponseFormat>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsTextResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsTextResponseFormat)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsTextResponseFormat IPersistableModel<ChatCompletionsTextResponseFormat>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsTextResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsTextResponseFormat(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsTextResponseFormat)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsTextResponseFormat>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new ChatCompletionsTextResponseFormat FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionsTextResponseFormat(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsTextResponseFormat.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsTextResponseFormat.cs
new file mode 100644
index 000000000000..d1bf93c195ba
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsTextResponseFormat.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// The standard Chat Completions response format that can freely generate text and is not guaranteed to produce response
+    /// content that adheres to a specific schema.
+    /// </summary>
+    public partial class ChatCompletionsTextResponseFormat : ChatCompletionsResponseFormat
+    {
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsTextResponseFormat"/>. </summary>
+        public ChatCompletionsTextResponseFormat()
+        {
+            Type = "text";
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsTextResponseFormat"/>. </summary>
+        /// <param name="type"> The discriminated type for the response format. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatCompletionsTextResponseFormat(string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolCall.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolCall.Serialization.cs
new file mode 100644
index 000000000000..2f22962c93e7
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolCall.Serialization.cs
@@ -0,0 +1,128 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    [PersistableModelProxy(typeof(UnknownChatCompletionsToolCall))]
+    public partial class ChatCompletionsToolCall : IUtf8JsonSerializable, IJsonModel<ChatCompletionsToolCall>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsToolCall>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsToolCall>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsToolCall)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsToolCall IJsonModel<ChatCompletionsToolCall>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsToolCall)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsToolCall(document.RootElement, options);
+        }
+
+        internal static ChatCompletionsToolCall DeserializeChatCompletionsToolCall(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "function": return ChatCompletionsFunctionToolCall.DeserializeChatCompletionsFunctionToolCall(element, options);
+                }
+            }
+            return UnknownChatCompletionsToolCall.DeserializeUnknownChatCompletionsToolCall(element, options);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsToolCall>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsToolCall)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsToolCall IPersistableModel<ChatCompletionsToolCall>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsToolCall(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsToolCall)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsToolCall>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatCompletionsToolCall FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionsToolCall(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolCall.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolCall.cs
new file mode 100644
index 000000000000..a6de3a467520
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolCall.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// An abstract representation of a tool call that must be resolved in a subsequent request to perform the requested
+    /// chat completion.
+    /// Please note <see cref="ChatCompletionsToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="ChatCompletionsFunctionToolCall"/>.
+    /// </summary>
+    public abstract partial class ChatCompletionsToolCall
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsToolCall"/>. </summary>
+        /// <param name="id"> The ID of the tool call. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
+        protected ChatCompletionsToolCall(string id)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+
+            Id = id;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsToolCall"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="id"> The ID of the tool call. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatCompletionsToolCall(string type, string id, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Type = type;
+            Id = id;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsToolCall"/> for deserialization. </summary>
+        internal ChatCompletionsToolCall()
+        {
+        }
+
+        /// <summary> The object type. </summary>
+        internal string Type { get; set; }
+        /// <summary> The ID of the tool call. </summary>
+        public string Id { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolDefinition.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolDefinition.Serialization.cs
new file mode 100644
index 000000000000..d084f95cff6e
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolDefinition.Serialization.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    [PersistableModelProxy(typeof(UnknownChatCompletionsToolDefinition))]
+    public partial class ChatCompletionsToolDefinition : IUtf8JsonSerializable, IJsonModel<ChatCompletionsToolDefinition>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsToolDefinition>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsToolDefinition>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsToolDefinition)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsToolDefinition IJsonModel<ChatCompletionsToolDefinition>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsToolDefinition)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsToolDefinition(document.RootElement, options);
+        }
+
+        internal static ChatCompletionsToolDefinition DeserializeChatCompletionsToolDefinition(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "function": return ChatCompletionsFunctionToolDefinition.DeserializeChatCompletionsFunctionToolDefinition(element, options);
+                }
+            }
+            return UnknownChatCompletionsToolDefinition.DeserializeUnknownChatCompletionsToolDefinition(element, options);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsToolDefinition>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsToolDefinition)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsToolDefinition IPersistableModel<ChatCompletionsToolDefinition>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsToolDefinition(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsToolDefinition)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsToolDefinition>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatCompletionsToolDefinition FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatCompletionsToolDefinition(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceAuthentication.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolDefinition.cs
similarity index 56%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceAuthentication.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolDefinition.cs
index 60914d91a96c..712c79c1aeb9 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceAuthentication.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolDefinition.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -5,13 +8,14 @@
 using System;
 using System.Collections.Generic;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI
 {
     /// <summary>
-    /// The AzureChatDataSourceAuthenticationOptions.
-    /// Please note <see cref="DataSourceAuthentication"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
+    /// An abstract representation of a tool that can be used by the model to improve a chat completions response.
+    /// Please note <see cref="ChatCompletionsToolDefinition"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="ChatCompletionsFunctionToolDefinition"/>.
     /// </summary>
-    public abstract partial class DataSourceAuthentication
+    public abstract partial class ChatCompletionsToolDefinition
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -43,22 +47,23 @@ public abstract partial class DataSourceAuthentication
         /// </list>
         /// </para>
         /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="DataSourceAuthentication"/>. </summary>
-        protected DataSourceAuthentication()
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsToolDefinition"/>. </summary>
+        protected ChatCompletionsToolDefinition()
         {
         }
 
-        /// <summary> Initializes a new instance of <see cref="DataSourceAuthentication"/>. </summary>
-        /// <param name="type"> Discriminator. </param>
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsToolDefinition"/>. </summary>
+        /// <param name="type"> The object type. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DataSourceAuthentication(string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal ChatCompletionsToolDefinition(string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Type = type;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Discriminator. </summary>
+        /// <summary> The object type. </summary>
         internal string Type { get; set; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolSelectionPreset.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolSelectionPreset.cs
new file mode 100644
index 000000000000..9916c3d6a74b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatCompletionsToolSelectionPreset.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Represents a generic policy for how a chat completions tool may be selected. </summary>
+    public readonly partial struct ChatCompletionsToolSelectionPreset : IEquatable<ChatCompletionsToolSelectionPreset>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsToolSelectionPreset"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ChatCompletionsToolSelectionPreset(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string AutoValue = "auto";
+        private const string NoneValue = "none";
+        private const string RequiredValue = "required";
+
+        /// <summary>
+        /// Specifies that the model may either use any of the tools provided in this chat completions request or
+        /// instead return a standard chat completions response as if no tools were provided.
+        /// </summary>
+        public static ChatCompletionsToolSelectionPreset Auto { get; } = new ChatCompletionsToolSelectionPreset(AutoValue);
+        /// <summary>
+        /// Specifies that the model should not respond with a tool call and should instead provide a standard chat
+        /// completions response. Response content may still be influenced by the provided tool definitions.
+        /// </summary>
+        public static ChatCompletionsToolSelectionPreset None { get; } = new ChatCompletionsToolSelectionPreset(NoneValue);
+        /// <summary> Specifies that the model must call one or more tools. </summary>
+        public static ChatCompletionsToolSelectionPreset Required { get; } = new ChatCompletionsToolSelectionPreset(RequiredValue);
+        /// <summary> Determines if two <see cref="ChatCompletionsToolSelectionPreset"/> values are the same. </summary>
+        public static bool operator ==(ChatCompletionsToolSelectionPreset left, ChatCompletionsToolSelectionPreset right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ChatCompletionsToolSelectionPreset"/> values are not the same. </summary>
+        public static bool operator !=(ChatCompletionsToolSelectionPreset left, ChatCompletionsToolSelectionPreset right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ChatCompletionsToolSelectionPreset"/>. </summary>
+        public static implicit operator ChatCompletionsToolSelectionPreset(string value) => new ChatCompletionsToolSelectionPreset(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ChatCompletionsToolSelectionPreset other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ChatCompletionsToolSelectionPreset other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatDataSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatDataSource.Serialization.cs
deleted file mode 100644
index 78dc642677f4..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatDataSource.Serialization.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    [PersistableModelProxy(typeof(InternalUnknownAzureChatDataSource))]
-    public partial class ChatDataSource : IJsonModel<ChatDataSource>
-    {
-        void IJsonModel<ChatDataSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ChatDataSource)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        ChatDataSource IJsonModel<ChatDataSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ChatDataSource)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeChatDataSource(document.RootElement, options);
-        }
-
-        internal static ChatDataSource DeserializeChatDataSource(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            if (element.TryGetProperty("type", out JsonElement discriminator))
-            {
-                switch (discriminator.GetString())
-                {
-                    case "azure_cosmos_db": return CosmosChatDataSource.DeserializeCosmosChatDataSource(element, options);
-                    case "azure_search": return AzureSearchChatDataSource.DeserializeAzureSearchChatDataSource(element, options);
-                    case "elasticsearch": return ElasticsearchChatDataSource.DeserializeElasticsearchChatDataSource(element, options);
-                    case "mongo_db": return MongoDBChatDataSource.DeserializeMongoDBChatDataSource(element, options);
-                    case "pinecone": return PineconeChatDataSource.DeserializePineconeChatDataSource(element, options);
-                }
-            }
-            return InternalUnknownAzureChatDataSource.DeserializeInternalUnknownAzureChatDataSource(element, options);
-        }
-
-        BinaryData IPersistableModel<ChatDataSource>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ChatDataSource)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ChatDataSource IPersistableModel<ChatDataSource>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeChatDataSource(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ChatDataSource)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ChatDataSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static ChatDataSource FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeChatDataSource(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatDocumentFilterReason.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatDocumentFilterReason.cs
deleted file mode 100644
index 798da3e6725d..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatDocumentFilterReason.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The AzureChatMessageContextAllRetrievedDocumentsFilterReason. </summary>
-    public readonly partial struct ChatDocumentFilterReason : IEquatable<ChatDocumentFilterReason>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="ChatDocumentFilterReason"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public ChatDocumentFilterReason(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string ScoreValue = "score";
-        private const string RerankValue = "rerank";
-
-        /// <summary> score. </summary>
-        public static ChatDocumentFilterReason Score { get; } = new ChatDocumentFilterReason(ScoreValue);
-        /// <summary> rerank. </summary>
-        public static ChatDocumentFilterReason Rerank { get; } = new ChatDocumentFilterReason(RerankValue);
-        /// <summary> Determines if two <see cref="ChatDocumentFilterReason"/> values are the same. </summary>
-        public static bool operator ==(ChatDocumentFilterReason left, ChatDocumentFilterReason right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="ChatDocumentFilterReason"/> values are not the same. </summary>
-        public static bool operator !=(ChatDocumentFilterReason left, ChatDocumentFilterReason right) => !left.Equals(right);
-        /// <summary> Converts a string to a <see cref="ChatDocumentFilterReason"/>. </summary>
-        public static implicit operator ChatDocumentFilterReason(string value) => new ChatDocumentFilterReason(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is ChatDocumentFilterReason other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(ChatDocumentFilterReason other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageContentItem.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageContentItem.Serialization.cs
new file mode 100644
index 000000000000..606882908417
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageContentItem.Serialization.cs
@@ -0,0 +1,128 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    [PersistableModelProxy(typeof(UnknownChatMessageContentItem))]
+    public partial class ChatMessageContentItem : IUtf8JsonSerializable, IJsonModel<ChatMessageContentItem>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatMessageContentItem>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatMessageContentItem>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageContentItem>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatMessageContentItem)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatMessageContentItem IJsonModel<ChatMessageContentItem>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageContentItem>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatMessageContentItem)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatMessageContentItem(document.RootElement, options);
+        }
+
+        internal static ChatMessageContentItem DeserializeChatMessageContentItem(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "image_url": return ChatMessageImageContentItem.DeserializeChatMessageImageContentItem(element, options);
+                    case "refusal": return ChatMessageRefusalContentItem.DeserializeChatMessageRefusalContentItem(element, options);
+                    case "text": return ChatMessageTextContentItem.DeserializeChatMessageTextContentItem(element, options);
+                }
+            }
+            return UnknownChatMessageContentItem.DeserializeUnknownChatMessageContentItem(element, options);
+        }
+
+        BinaryData IPersistableModel<ChatMessageContentItem>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageContentItem>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatMessageContentItem)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatMessageContentItem IPersistableModel<ChatMessageContentItem>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageContentItem>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatMessageContentItem(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatMessageContentItem)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatMessageContentItem>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatMessageContentItem FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatMessageContentItem(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageContentItem.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageContentItem.cs
new file mode 100644
index 000000000000..40a3f4f1679c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageContentItem.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// An abstract representation of a structured content item within a chat message.
+    /// Please note <see cref="ChatMessageContentItem"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="ChatMessageImageContentItem"/>, <see cref="ChatMessageRefusalContentItem"/> and <see cref="ChatMessageTextContentItem"/>.
+    /// </summary>
+    public abstract partial class ChatMessageContentItem
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatMessageContentItem"/>. </summary>
+        protected ChatMessageContentItem()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatMessageContentItem"/>. </summary>
+        /// <param name="type"> The discriminated object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatMessageContentItem(string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Type = type;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The discriminated object type. </summary>
+        internal string Type { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageContext.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageContext.Serialization.cs
deleted file mode 100644
index 7d8cab801548..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageContext.Serialization.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    public partial class ChatMessageContext : IJsonModel<ChatMessageContext>
-    {
-        void IJsonModel<ChatMessageContext>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageContext>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ChatMessageContext)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("intent") != true && Optional.IsDefined(Intent))
-            {
-                writer.WritePropertyName("intent"u8);
-                writer.WriteStringValue(Intent);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("citations") != true && Optional.IsCollectionDefined(Citations))
-            {
-                writer.WritePropertyName("citations"u8);
-                writer.WriteStartArray();
-                foreach (var item in Citations)
-                {
-                    writer.WriteObjectValue(item, options);
-                }
-                writer.WriteEndArray();
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("all_retrieved_documents") != true && Optional.IsDefined(RetrievedDocuments))
-            {
-                writer.WritePropertyName("all_retrieved_documents"u8);
-                writer.WriteObjectValue<ChatRetrievedDocument>(RetrievedDocuments, options);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        ChatMessageContext IJsonModel<ChatMessageContext>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageContext>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ChatMessageContext)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeChatMessageContext(document.RootElement, options);
-        }
-
-        internal static ChatMessageContext DeserializeChatMessageContext(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string intent = default;
-            IReadOnlyList<ChatCitation> citations = default;
-            ChatRetrievedDocument allRetrievedDocuments = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("intent"u8))
-                {
-                    intent = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("citations"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<ChatCitation> array = new List<ChatCitation>();
-                    foreach (var item in property.Value.EnumerateArray())
-                    {
-                        array.Add(ChatCitation.DeserializeChatCitation(item, options));
-                    }
-                    citations = array;
-                    continue;
-                }
-                if (property.NameEquals("all_retrieved_documents"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    allRetrievedDocuments = ChatRetrievedDocument.DeserializeChatRetrievedDocument(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ChatMessageContext(intent, citations ?? new ChangeTrackingList<ChatCitation>(), allRetrievedDocuments, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ChatMessageContext>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageContext>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ChatMessageContext)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ChatMessageContext IPersistableModel<ChatMessageContext>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageContext>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeChatMessageContext(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ChatMessageContext)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ChatMessageContext>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static ChatMessageContext FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeChatMessageContext(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageContext.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageContext.cs
deleted file mode 100644
index 7a117a45cbe4..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageContext.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary>
-    /// An additional property, added to chat completion response messages, produced by the Azure OpenAI service when using
-    /// extension behavior. This includes intent and citation information from the On Your Data feature.
-    /// </summary>
-    public partial class ChatMessageContext
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="ChatMessageContext"/>. </summary>
-        internal ChatMessageContext()
-        {
-            Citations = new ChangeTrackingList<ChatCitation>();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ChatMessageContext"/>. </summary>
-        /// <param name="intent"> The detected intent from the chat history, which is used to carry conversation context between interactions. </param>
-        /// <param name="citations"> The citations produced by the data retrieval. </param>
-        /// <param name="retrievedDocuments"> Summary information about documents retrieved by the data retrieval operation. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ChatMessageContext(string intent, IReadOnlyList<ChatCitation> citations, ChatRetrievedDocument retrievedDocuments, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Intent = intent;
-            Citations = citations;
-            RetrievedDocuments = retrievedDocuments;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The detected intent from the chat history, which is used to carry conversation context between interactions. </summary>
-        public string Intent { get; }
-        /// <summary> The citations produced by the data retrieval. </summary>
-        public IReadOnlyList<ChatCitation> Citations { get; }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageContentItem.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageContentItem.Serialization.cs
new file mode 100644
index 000000000000..d36671902ae9
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageContentItem.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatMessageImageContentItem : IUtf8JsonSerializable, IJsonModel<ChatMessageImageContentItem>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatMessageImageContentItem>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatMessageImageContentItem>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageImageContentItem>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatMessageImageContentItem)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("image_url"u8);
+            writer.WriteObjectValue(ImageUrl, options);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatMessageImageContentItem IJsonModel<ChatMessageImageContentItem>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageImageContentItem>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatMessageImageContentItem)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatMessageImageContentItem(document.RootElement, options);
+        }
+
+        internal static ChatMessageImageContentItem DeserializeChatMessageImageContentItem(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            ChatMessageImageUrl imageUrl = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("image_url"u8))
+                {
+                    imageUrl = ChatMessageImageUrl.DeserializeChatMessageImageUrl(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatMessageImageContentItem(type, serializedAdditionalRawData, imageUrl);
+        }
+
+        BinaryData IPersistableModel<ChatMessageImageContentItem>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageImageContentItem>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatMessageImageContentItem)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatMessageImageContentItem IPersistableModel<ChatMessageImageContentItem>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageImageContentItem>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatMessageImageContentItem(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatMessageImageContentItem)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatMessageImageContentItem>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new ChatMessageImageContentItem FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatMessageImageContentItem(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageContentItem.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageContentItem.cs
new file mode 100644
index 000000000000..69aaa3ec3cea
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageContentItem.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A structured chat content item containing an image reference. </summary>
+    public partial class ChatMessageImageContentItem : ChatMessageContentItem
+    {
+        /// <summary> Initializes a new instance of <see cref="ChatMessageImageContentItem"/>. </summary>
+        /// <param name="imageUrl"> An internet location, which must be accessible to the model,from which the image may be retrieved. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="imageUrl"/> is null. </exception>
+        public ChatMessageImageContentItem(ChatMessageImageUrl imageUrl)
+        {
+            Argument.AssertNotNull(imageUrl, nameof(imageUrl));
+
+            Type = "image_url";
+            ImageUrl = imageUrl;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatMessageImageContentItem"/>. </summary>
+        /// <param name="type"> The discriminated object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="imageUrl"> An internet location, which must be accessible to the model,from which the image may be retrieved. </param>
+        internal ChatMessageImageContentItem(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, ChatMessageImageUrl imageUrl) : base(type, serializedAdditionalRawData)
+        {
+            ImageUrl = imageUrl;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatMessageImageContentItem"/> for deserialization. </summary>
+        internal ChatMessageImageContentItem()
+        {
+        }
+
+        /// <summary> An internet location, which must be accessible to the model,from which the image may be retrieved. </summary>
+        public ChatMessageImageUrl ImageUrl { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageDetailLevel.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageDetailLevel.cs
new file mode 100644
index 000000000000..bc0649288b24
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageDetailLevel.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A representation of the possible image detail levels for image-based chat completions message content. </summary>
+    public readonly partial struct ChatMessageImageDetailLevel : IEquatable<ChatMessageImageDetailLevel>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ChatMessageImageDetailLevel"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ChatMessageImageDetailLevel(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string AutoValue = "auto";
+        private const string LowValue = "low";
+        private const string HighValue = "high";
+
+        /// <summary> Specifies that the model should determine which detail level to apply using heuristics like image size. </summary>
+        public static ChatMessageImageDetailLevel Auto { get; } = new ChatMessageImageDetailLevel(AutoValue);
+        /// <summary>
+        /// Specifies that image evaluation should be constrained to the 'low-res' model that may be faster and consume fewer
+        /// tokens but may also be less accurate for highly detailed images.
+        /// </summary>
+        public static ChatMessageImageDetailLevel Low { get; } = new ChatMessageImageDetailLevel(LowValue);
+        /// <summary>
+        /// Specifies that image evaluation should enable the 'high-res' model that may be more accurate for highly detailed
+        /// images but may also be slower and consume more tokens.
+        /// </summary>
+        public static ChatMessageImageDetailLevel High { get; } = new ChatMessageImageDetailLevel(HighValue);
+        /// <summary> Determines if two <see cref="ChatMessageImageDetailLevel"/> values are the same. </summary>
+        public static bool operator ==(ChatMessageImageDetailLevel left, ChatMessageImageDetailLevel right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ChatMessageImageDetailLevel"/> values are not the same. </summary>
+        public static bool operator !=(ChatMessageImageDetailLevel left, ChatMessageImageDetailLevel right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ChatMessageImageDetailLevel"/>. </summary>
+        public static implicit operator ChatMessageImageDetailLevel(string value) => new ChatMessageImageDetailLevel(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ChatMessageImageDetailLevel other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ChatMessageImageDetailLevel other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageUrl.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageUrl.Serialization.cs
new file mode 100644
index 000000000000..30b9e1fe377f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageUrl.Serialization.cs
@@ -0,0 +1,150 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatMessageImageUrl : IUtf8JsonSerializable, IJsonModel<ChatMessageImageUrl>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatMessageImageUrl>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatMessageImageUrl>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageImageUrl>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatMessageImageUrl)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("url"u8);
+            writer.WriteStringValue(Url.AbsoluteUri);
+            if (Optional.IsDefined(Detail))
+            {
+                writer.WritePropertyName("detail"u8);
+                writer.WriteStringValue(Detail.Value.ToString());
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatMessageImageUrl IJsonModel<ChatMessageImageUrl>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageImageUrl>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatMessageImageUrl)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatMessageImageUrl(document.RootElement, options);
+        }
+
+        internal static ChatMessageImageUrl DeserializeChatMessageImageUrl(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            Uri url = default;
+            ChatMessageImageDetailLevel? detail = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("url"u8))
+                {
+                    url = new Uri(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("detail"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    detail = new ChatMessageImageDetailLevel(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatMessageImageUrl(url, detail, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatMessageImageUrl>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageImageUrl>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatMessageImageUrl)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatMessageImageUrl IPersistableModel<ChatMessageImageUrl>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageImageUrl>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatMessageImageUrl(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatMessageImageUrl)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatMessageImageUrl>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatMessageImageUrl FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatMessageImageUrl(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageUrl.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageUrl.cs
new file mode 100644
index 000000000000..ccccaecc34cb
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageImageUrl.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> An internet location from which the model may retrieve an image. </summary>
+    public partial class ChatMessageImageUrl
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatMessageImageUrl"/>. </summary>
+        /// <param name="url"> The URL of the image. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="url"/> is null. </exception>
+        public ChatMessageImageUrl(Uri url)
+        {
+            Argument.AssertNotNull(url, nameof(url));
+
+            Url = url;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatMessageImageUrl"/>. </summary>
+        /// <param name="url"> The URL of the image. </param>
+        /// <param name="detail">
+        /// The evaluation quality setting to use, which controls relative prioritization of speed, token consumption, and
+        /// accuracy.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatMessageImageUrl(Uri url, ChatMessageImageDetailLevel? detail, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Url = url;
+            Detail = detail;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatMessageImageUrl"/> for deserialization. </summary>
+        internal ChatMessageImageUrl()
+        {
+        }
+
+        /// <summary> The URL of the image. </summary>
+        public Uri Url { get; }
+        /// <summary>
+        /// The evaluation quality setting to use, which controls relative prioritization of speed, token consumption, and
+        /// accuracy.
+        /// </summary>
+        public ChatMessageImageDetailLevel? Detail { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageRefusalContentItem.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageRefusalContentItem.Serialization.cs
new file mode 100644
index 000000000000..cd16b05ca749
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageRefusalContentItem.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatMessageRefusalContentItem : IUtf8JsonSerializable, IJsonModel<ChatMessageRefusalContentItem>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatMessageRefusalContentItem>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatMessageRefusalContentItem>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageRefusalContentItem>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatMessageRefusalContentItem)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("refusal"u8);
+            writer.WriteStringValue(Refusal);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatMessageRefusalContentItem IJsonModel<ChatMessageRefusalContentItem>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageRefusalContentItem>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatMessageRefusalContentItem)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatMessageRefusalContentItem(document.RootElement, options);
+        }
+
+        internal static ChatMessageRefusalContentItem DeserializeChatMessageRefusalContentItem(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string refusal = default;
+            string type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("refusal"u8))
+                {
+                    refusal = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatMessageRefusalContentItem(type, serializedAdditionalRawData, refusal);
+        }
+
+        BinaryData IPersistableModel<ChatMessageRefusalContentItem>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageRefusalContentItem>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatMessageRefusalContentItem)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatMessageRefusalContentItem IPersistableModel<ChatMessageRefusalContentItem>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageRefusalContentItem>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatMessageRefusalContentItem(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatMessageRefusalContentItem)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatMessageRefusalContentItem>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new ChatMessageRefusalContentItem FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatMessageRefusalContentItem(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageRefusalContentItem.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageRefusalContentItem.cs
new file mode 100644
index 000000000000..676b07fb5c85
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageRefusalContentItem.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A structured chat content item containing model refusal information for a structured outputs request. </summary>
+    public partial class ChatMessageRefusalContentItem : ChatMessageContentItem
+    {
+        /// <summary> Initializes a new instance of <see cref="ChatMessageRefusalContentItem"/>. </summary>
+        /// <param name="refusal"> The refusal message. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="refusal"/> is null. </exception>
+        public ChatMessageRefusalContentItem(string refusal)
+        {
+            Argument.AssertNotNull(refusal, nameof(refusal));
+
+            Type = "refusal";
+            Refusal = refusal;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatMessageRefusalContentItem"/>. </summary>
+        /// <param name="type"> The discriminated object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="refusal"> The refusal message. </param>
+        internal ChatMessageRefusalContentItem(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, string refusal) : base(type, serializedAdditionalRawData)
+        {
+            Refusal = refusal;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatMessageRefusalContentItem"/> for deserialization. </summary>
+        internal ChatMessageRefusalContentItem()
+        {
+        }
+
+        /// <summary> The refusal message. </summary>
+        public string Refusal { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateAssistantFileRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageTextContentItem.Serialization.cs
similarity index 61%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateAssistantFileRequest.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageTextContentItem.Serialization.cs
index 3abf92d075f2..d67cb537d29f 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/CreateAssistantFileRequest.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageTextContentItem.Serialization.cs
@@ -11,23 +11,25 @@
 using System.Text.Json;
 using Azure.Core;
 
-namespace Azure.AI.OpenAI.Assistants
+namespace Azure.AI.OpenAI
 {
-    internal partial class CreateAssistantFileRequest : IUtf8JsonSerializable, IJsonModel<CreateAssistantFileRequest>
+    public partial class ChatMessageTextContentItem : IUtf8JsonSerializable, IJsonModel<ChatMessageTextContentItem>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CreateAssistantFileRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatMessageTextContentItem>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<CreateAssistantFileRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<ChatMessageTextContentItem>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<CreateAssistantFileRequest>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageTextContentItem>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(CreateAssistantFileRequest)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(ChatMessageTextContentItem)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            writer.WritePropertyName("file_id"u8);
-            writer.WriteStringValue(FileId);
+            writer.WritePropertyName("text"u8);
+            writer.WriteStringValue(Text);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -46,19 +48,19 @@ void IJsonModel<CreateAssistantFileRequest>.Write(Utf8JsonWriter writer, ModelRe
             writer.WriteEndObject();
         }
 
-        CreateAssistantFileRequest IJsonModel<CreateAssistantFileRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        ChatMessageTextContentItem IJsonModel<ChatMessageTextContentItem>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<CreateAssistantFileRequest>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageTextContentItem>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(CreateAssistantFileRequest)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(ChatMessageTextContentItem)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeCreateAssistantFileRequest(document.RootElement, options);
+            return DeserializeChatMessageTextContentItem(document.RootElement, options);
         }
 
-        internal static CreateAssistantFileRequest DeserializeCreateAssistantFileRequest(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static ChatMessageTextContentItem DeserializeChatMessageTextContentItem(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -66,14 +68,20 @@ internal static CreateAssistantFileRequest DeserializeCreateAssistantFileRequest
             {
                 return null;
             }
-            string fileId = default;
+            string text = default;
+            string type = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
             {
-                if (property.NameEquals("file_id"u8))
+                if (property.NameEquals("text"u8))
                 {
-                    fileId = property.Value.GetString();
+                    text = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
@@ -82,50 +90,50 @@ internal static CreateAssistantFileRequest DeserializeCreateAssistantFileRequest
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new CreateAssistantFileRequest(fileId, serializedAdditionalRawData);
+            return new ChatMessageTextContentItem(type, serializedAdditionalRawData, text);
         }
 
-        BinaryData IPersistableModel<CreateAssistantFileRequest>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<ChatMessageTextContentItem>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<CreateAssistantFileRequest>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageTextContentItem>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(CreateAssistantFileRequest)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ChatMessageTextContentItem)} does not support writing '{options.Format}' format.");
             }
         }
 
-        CreateAssistantFileRequest IPersistableModel<CreateAssistantFileRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
+        ChatMessageTextContentItem IPersistableModel<ChatMessageTextContentItem>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<CreateAssistantFileRequest>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageTextContentItem>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeCreateAssistantFileRequest(document.RootElement, options);
+                        return DeserializeChatMessageTextContentItem(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(CreateAssistantFileRequest)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ChatMessageTextContentItem)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<CreateAssistantFileRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ChatMessageTextContentItem>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
         /// <param name="response"> The response to deserialize the model from. </param>
-        internal static CreateAssistantFileRequest FromResponse(Response response)
+        internal static new ChatMessageTextContentItem FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeCreateAssistantFileRequest(document.RootElement);
+            return DeserializeChatMessageTextContentItem(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal virtual RequestContent ToRequestContent()
+        internal override RequestContent ToRequestContent()
         {
             var content = new Utf8JsonRequestContent();
             content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageTextContentItem.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageTextContentItem.cs
new file mode 100644
index 000000000000..46f0eb167d08
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatMessageTextContentItem.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A structured chat content item containing plain text. </summary>
+    public partial class ChatMessageTextContentItem : ChatMessageContentItem
+    {
+        /// <summary> Initializes a new instance of <see cref="ChatMessageTextContentItem"/>. </summary>
+        /// <param name="text"> The content of the message. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="text"/> is null. </exception>
+        public ChatMessageTextContentItem(string text)
+        {
+            Argument.AssertNotNull(text, nameof(text));
+
+            Type = "text";
+            Text = text;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatMessageTextContentItem"/>. </summary>
+        /// <param name="type"> The discriminated object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="text"> The content of the message. </param>
+        internal ChatMessageTextContentItem(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, string text) : base(type, serializedAdditionalRawData)
+        {
+            Text = text;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatMessageTextContentItem"/> for deserialization. </summary>
+        internal ChatMessageTextContentItem()
+        {
+        }
+
+        /// <summary> The content of the message. </summary>
+        public string Text { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestAssistantMessage.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestAssistantMessage.Serialization.cs
new file mode 100644
index 000000000000..0521e4379402
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestAssistantMessage.Serialization.cs
@@ -0,0 +1,243 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatRequestAssistantMessage : IUtf8JsonSerializable, IJsonModel<ChatRequestAssistantMessage>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatRequestAssistantMessage>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatRequestAssistantMessage>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestAssistantMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatRequestAssistantMessage)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Content != null)
+            {
+                writer.WritePropertyName("content"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(Content);
+#else
+                using (JsonDocument document = JsonDocument.Parse(Content))
+                {
+                    JsonSerializer.Serialize(writer, document.RootElement);
+                }
+#endif
+            }
+            else
+            {
+                writer.WriteNull("content");
+            }
+            if (Optional.IsDefined(Name))
+            {
+                writer.WritePropertyName("name"u8);
+                writer.WriteStringValue(Name);
+            }
+            if (Optional.IsCollectionDefined(ToolCalls))
+            {
+                writer.WritePropertyName("tool_calls"u8);
+                writer.WriteStartArray();
+                foreach (var item in ToolCalls)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsDefined(FunctionCall))
+            {
+                writer.WritePropertyName("function_call"u8);
+                writer.WriteObjectValue(FunctionCall, options);
+            }
+            if (Optional.IsDefined(Refusal))
+            {
+                if (Refusal != null)
+                {
+                    writer.WritePropertyName("refusal"u8);
+                    writer.WriteStringValue(Refusal);
+                }
+                else
+                {
+                    writer.WriteNull("refusal");
+                }
+            }
+            writer.WritePropertyName("role"u8);
+            writer.WriteStringValue(Role.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatRequestAssistantMessage IJsonModel<ChatRequestAssistantMessage>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestAssistantMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatRequestAssistantMessage)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatRequestAssistantMessage(document.RootElement, options);
+        }
+
+        internal static ChatRequestAssistantMessage DeserializeChatRequestAssistantMessage(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            BinaryData content = default;
+            string name = default;
+            IList<ChatCompletionsToolCall> toolCalls = default;
+            FunctionCall functionCall = default;
+            string refusal = default;
+            ChatRole role = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("content"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        content = null;
+                        continue;
+                    }
+                    content = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
+                if (property.NameEquals("name"u8))
+                {
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("tool_calls"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<ChatCompletionsToolCall> array = new List<ChatCompletionsToolCall>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(ChatCompletionsToolCall.DeserializeChatCompletionsToolCall(item, options));
+                    }
+                    toolCalls = array;
+                    continue;
+                }
+                if (property.NameEquals("function_call"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    functionCall = FunctionCall.DeserializeFunctionCall(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("refusal"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        refusal = null;
+                        continue;
+                    }
+                    refusal = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("role"u8))
+                {
+                    role = new ChatRole(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatRequestAssistantMessage(
+                role,
+                serializedAdditionalRawData,
+                content,
+                name,
+                toolCalls ?? new ChangeTrackingList<ChatCompletionsToolCall>(),
+                functionCall,
+                refusal);
+        }
+
+        BinaryData IPersistableModel<ChatRequestAssistantMessage>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestAssistantMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatRequestAssistantMessage)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatRequestAssistantMessage IPersistableModel<ChatRequestAssistantMessage>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestAssistantMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatRequestAssistantMessage(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatRequestAssistantMessage)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatRequestAssistantMessage>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new ChatRequestAssistantMessage FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatRequestAssistantMessage(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestAssistantMessage.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestAssistantMessage.cs
new file mode 100644
index 000000000000..581014adfeed
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestAssistantMessage.cs
@@ -0,0 +1,117 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A request chat message representing response or action from the assistant. </summary>
+    public partial class ChatRequestAssistantMessage : ChatRequestMessage
+    {
+        /// <summary> Initializes a new instance of <see cref="ChatRequestAssistantMessage"/>. </summary>
+        /// <param name="content"> The content of the message. </param>
+        public ChatRequestAssistantMessage(BinaryData content)
+        {
+            Role = ChatRole.Assistant;
+            Content = content;
+            ToolCalls = new ChangeTrackingList<ChatCompletionsToolCall>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatRequestAssistantMessage"/>. </summary>
+        /// <param name="role"> The chat role associated with this message. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="content"> The content of the message. </param>
+        /// <param name="name"> An optional name for the participant. </param>
+        /// <param name="toolCalls">
+        /// The tool calls that must be resolved and have their outputs appended to subsequent input messages for the chat
+        /// completions request to resolve as configured.
+        /// Please note <see cref="ChatCompletionsToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="ChatCompletionsFunctionToolCall"/>.
+        /// </param>
+        /// <param name="functionCall">
+        /// The function call that must be resolved and have its output appended to subsequent input messages for the chat
+        /// completions request to resolve as configured.
+        /// </param>
+        /// <param name="refusal"> The refusal message by the assistant. </param>
+        internal ChatRequestAssistantMessage(ChatRole role, IDictionary<string, BinaryData> serializedAdditionalRawData, BinaryData content, string name, IList<ChatCompletionsToolCall> toolCalls, FunctionCall functionCall, string refusal) : base(role, serializedAdditionalRawData)
+        {
+            Content = content;
+            Name = name;
+            ToolCalls = toolCalls;
+            FunctionCall = functionCall;
+            Refusal = refusal;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatRequestAssistantMessage"/> for deserialization. </summary>
+        internal ChatRequestAssistantMessage()
+        {
+        }
+
+        /// <summary>
+        /// The content of the message.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="string"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="IList{T}"/> where <c>T</c> is of type <see cref="ChatMessageTextContentItem"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="IList{T}"/> where <c>T</c> is of type <see cref="ChatMessageRefusalContentItem"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData Content { get; }
+        /// <summary> An optional name for the participant. </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// The tool calls that must be resolved and have their outputs appended to subsequent input messages for the chat
+        /// completions request to resolve as configured.
+        /// Please note <see cref="ChatCompletionsToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="ChatCompletionsFunctionToolCall"/>.
+        /// </summary>
+        public IList<ChatCompletionsToolCall> ToolCalls { get; }
+        /// <summary>
+        /// The function call that must be resolved and have its output appended to subsequent input messages for the chat
+        /// completions request to resolve as configured.
+        /// </summary>
+        public FunctionCall FunctionCall { get; set; }
+        /// <summary> The refusal message by the assistant. </summary>
+        public string Refusal { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestFunctionMessage.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestFunctionMessage.Serialization.cs
new file mode 100644
index 000000000000..21f009c89ce9
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestFunctionMessage.Serialization.cs
@@ -0,0 +1,163 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatRequestFunctionMessage : IUtf8JsonSerializable, IJsonModel<ChatRequestFunctionMessage>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatRequestFunctionMessage>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatRequestFunctionMessage>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestFunctionMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatRequestFunctionMessage)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("name"u8);
+            writer.WriteStringValue(Name);
+            if (Content != null)
+            {
+                writer.WritePropertyName("content"u8);
+                writer.WriteStringValue(Content);
+            }
+            else
+            {
+                writer.WriteNull("content");
+            }
+            writer.WritePropertyName("role"u8);
+            writer.WriteStringValue(Role.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatRequestFunctionMessage IJsonModel<ChatRequestFunctionMessage>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestFunctionMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatRequestFunctionMessage)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatRequestFunctionMessage(document.RootElement, options);
+        }
+
+        internal static ChatRequestFunctionMessage DeserializeChatRequestFunctionMessage(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string name = default;
+            string content = default;
+            ChatRole role = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("name"u8))
+                {
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("content"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        content = null;
+                        continue;
+                    }
+                    content = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("role"u8))
+                {
+                    role = new ChatRole(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatRequestFunctionMessage(role, serializedAdditionalRawData, name, content);
+        }
+
+        BinaryData IPersistableModel<ChatRequestFunctionMessage>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestFunctionMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatRequestFunctionMessage)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatRequestFunctionMessage IPersistableModel<ChatRequestFunctionMessage>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestFunctionMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatRequestFunctionMessage(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatRequestFunctionMessage)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatRequestFunctionMessage>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new ChatRequestFunctionMessage FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatRequestFunctionMessage(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestFunctionMessage.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestFunctionMessage.cs
new file mode 100644
index 000000000000..a4588fc56d21
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestFunctionMessage.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A request chat message representing requested output from a configured function. </summary>
+    public partial class ChatRequestFunctionMessage : ChatRequestMessage
+    {
+        /// <summary> Initializes a new instance of <see cref="ChatRequestFunctionMessage"/>. </summary>
+        /// <param name="name"> The name of the function that was called to produce output. </param>
+        /// <param name="content"> The output of the function as requested by the function call. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
+        public ChatRequestFunctionMessage(string name, string content)
+        {
+            Argument.AssertNotNull(name, nameof(name));
+
+            Role = ChatRole.Function;
+            Name = name;
+            Content = content;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatRequestFunctionMessage"/>. </summary>
+        /// <param name="role"> The chat role associated with this message. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="name"> The name of the function that was called to produce output. </param>
+        /// <param name="content"> The output of the function as requested by the function call. </param>
+        internal ChatRequestFunctionMessage(ChatRole role, IDictionary<string, BinaryData> serializedAdditionalRawData, string name, string content) : base(role, serializedAdditionalRawData)
+        {
+            Name = name;
+            Content = content;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatRequestFunctionMessage"/> for deserialization. </summary>
+        internal ChatRequestFunctionMessage()
+        {
+        }
+
+        /// <summary> The name of the function that was called to produce output. </summary>
+        public string Name { get; }
+        /// <summary> The output of the function as requested by the function call. </summary>
+        public string Content { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestMessage.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestMessage.Serialization.cs
new file mode 100644
index 000000000000..e18a2792b837
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestMessage.Serialization.cs
@@ -0,0 +1,130 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    [PersistableModelProxy(typeof(UnknownChatRequestMessage))]
+    public partial class ChatRequestMessage : IUtf8JsonSerializable, IJsonModel<ChatRequestMessage>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatRequestMessage>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatRequestMessage>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatRequestMessage)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("role"u8);
+            writer.WriteStringValue(Role.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatRequestMessage IJsonModel<ChatRequestMessage>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatRequestMessage)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatRequestMessage(document.RootElement, options);
+        }
+
+        internal static ChatRequestMessage DeserializeChatRequestMessage(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("role", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "assistant": return ChatRequestAssistantMessage.DeserializeChatRequestAssistantMessage(element, options);
+                    case "function": return ChatRequestFunctionMessage.DeserializeChatRequestFunctionMessage(element, options);
+                    case "system": return ChatRequestSystemMessage.DeserializeChatRequestSystemMessage(element, options);
+                    case "tool": return ChatRequestToolMessage.DeserializeChatRequestToolMessage(element, options);
+                    case "user": return ChatRequestUserMessage.DeserializeChatRequestUserMessage(element, options);
+                }
+            }
+            return UnknownChatRequestMessage.DeserializeUnknownChatRequestMessage(element, options);
+        }
+
+        BinaryData IPersistableModel<ChatRequestMessage>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatRequestMessage)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatRequestMessage IPersistableModel<ChatRequestMessage>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatRequestMessage(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatRequestMessage)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatRequestMessage>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatRequestMessage FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatRequestMessage(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestMessage.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestMessage.cs
new file mode 100644
index 000000000000..31872565f53d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestMessage.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// An abstract representation of a chat message as provided in a request.
+    /// Please note <see cref="ChatRequestMessage"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="ChatRequestAssistantMessage"/>, <see cref="ChatRequestFunctionMessage"/>, <see cref="ChatRequestSystemMessage"/>, <see cref="ChatRequestToolMessage"/> and <see cref="ChatRequestUserMessage"/>.
+    /// </summary>
+    public abstract partial class ChatRequestMessage
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatRequestMessage"/>. </summary>
+        protected ChatRequestMessage()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatRequestMessage"/>. </summary>
+        /// <param name="role"> The chat role associated with this message. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatRequestMessage(ChatRole role, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Role = role;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The chat role associated with this message. </summary>
+        internal ChatRole Role { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestSystemMessage.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestSystemMessage.Serialization.cs
new file mode 100644
index 000000000000..28b22e323f38
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestSystemMessage.Serialization.cs
@@ -0,0 +1,161 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatRequestSystemMessage : IUtf8JsonSerializable, IJsonModel<ChatRequestSystemMessage>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatRequestSystemMessage>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatRequestSystemMessage>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestSystemMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatRequestSystemMessage)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("content"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(Content);
+#else
+            using (JsonDocument document = JsonDocument.Parse(Content))
+            {
+                JsonSerializer.Serialize(writer, document.RootElement);
+            }
+#endif
+            if (Optional.IsDefined(Name))
+            {
+                writer.WritePropertyName("name"u8);
+                writer.WriteStringValue(Name);
+            }
+            writer.WritePropertyName("role"u8);
+            writer.WriteStringValue(Role.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatRequestSystemMessage IJsonModel<ChatRequestSystemMessage>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestSystemMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatRequestSystemMessage)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatRequestSystemMessage(document.RootElement, options);
+        }
+
+        internal static ChatRequestSystemMessage DeserializeChatRequestSystemMessage(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            BinaryData content = default;
+            string name = default;
+            ChatRole role = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("content"u8))
+                {
+                    content = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
+                if (property.NameEquals("name"u8))
+                {
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("role"u8))
+                {
+                    role = new ChatRole(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatRequestSystemMessage(role, serializedAdditionalRawData, content, name);
+        }
+
+        BinaryData IPersistableModel<ChatRequestSystemMessage>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestSystemMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatRequestSystemMessage)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatRequestSystemMessage IPersistableModel<ChatRequestSystemMessage>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestSystemMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatRequestSystemMessage(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatRequestSystemMessage)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatRequestSystemMessage>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new ChatRequestSystemMessage FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatRequestSystemMessage(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestSystemMessage.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestSystemMessage.cs
new file mode 100644
index 000000000000..388061a2d04a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestSystemMessage.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// A request chat message containing system instructions that influence how the model will generate a chat completions
+    /// response.
+    /// </summary>
+    public partial class ChatRequestSystemMessage : ChatRequestMessage
+    {
+        /// <summary> Initializes a new instance of <see cref="ChatRequestSystemMessage"/>. </summary>
+        /// <param name="content"> The contents of the system message. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        public ChatRequestSystemMessage(BinaryData content)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            Role = ChatRole.System;
+            Content = content;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatRequestSystemMessage"/>. </summary>
+        /// <param name="role"> The chat role associated with this message. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="content"> The contents of the system message. </param>
+        /// <param name="name"> An optional name for the participant. </param>
+        internal ChatRequestSystemMessage(ChatRole role, IDictionary<string, BinaryData> serializedAdditionalRawData, BinaryData content, string name) : base(role, serializedAdditionalRawData)
+        {
+            Content = content;
+            Name = name;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatRequestSystemMessage"/> for deserialization. </summary>
+        internal ChatRequestSystemMessage()
+        {
+        }
+
+        /// <summary>
+        /// The contents of the system message.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="string"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="IList{T}"/> where <c>T</c> is of type <see cref="ChatMessageTextContentItem"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData Content { get; }
+        /// <summary> An optional name for the participant. </summary>
+        public string Name { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestToolMessage.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestToolMessage.Serialization.cs
new file mode 100644
index 000000000000..3811de06e84c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestToolMessage.Serialization.cs
@@ -0,0 +1,170 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatRequestToolMessage : IUtf8JsonSerializable, IJsonModel<ChatRequestToolMessage>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatRequestToolMessage>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatRequestToolMessage>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestToolMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatRequestToolMessage)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Content != null)
+            {
+                writer.WritePropertyName("content"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(Content);
+#else
+                using (JsonDocument document = JsonDocument.Parse(Content))
+                {
+                    JsonSerializer.Serialize(writer, document.RootElement);
+                }
+#endif
+            }
+            else
+            {
+                writer.WriteNull("content");
+            }
+            writer.WritePropertyName("tool_call_id"u8);
+            writer.WriteStringValue(ToolCallId);
+            writer.WritePropertyName("role"u8);
+            writer.WriteStringValue(Role.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatRequestToolMessage IJsonModel<ChatRequestToolMessage>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestToolMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatRequestToolMessage)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatRequestToolMessage(document.RootElement, options);
+        }
+
+        internal static ChatRequestToolMessage DeserializeChatRequestToolMessage(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            BinaryData content = default;
+            string toolCallId = default;
+            ChatRole role = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("content"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        content = null;
+                        continue;
+                    }
+                    content = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
+                if (property.NameEquals("tool_call_id"u8))
+                {
+                    toolCallId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("role"u8))
+                {
+                    role = new ChatRole(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatRequestToolMessage(role, serializedAdditionalRawData, content, toolCallId);
+        }
+
+        BinaryData IPersistableModel<ChatRequestToolMessage>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestToolMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatRequestToolMessage)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatRequestToolMessage IPersistableModel<ChatRequestToolMessage>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestToolMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatRequestToolMessage(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatRequestToolMessage)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatRequestToolMessage>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new ChatRequestToolMessage FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatRequestToolMessage(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestToolMessage.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestToolMessage.cs
new file mode 100644
index 000000000000..62ea4297b93a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestToolMessage.cs
@@ -0,0 +1,90 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A request chat message representing requested output from a configured tool. </summary>
+    public partial class ChatRequestToolMessage : ChatRequestMessage
+    {
+        /// <summary> Initializes a new instance of <see cref="ChatRequestToolMessage"/>. </summary>
+        /// <param name="content"> The content of the message. </param>
+        /// <param name="toolCallId"> The ID of the tool call resolved by the provided content. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="toolCallId"/> is null. </exception>
+        public ChatRequestToolMessage(BinaryData content, string toolCallId)
+        {
+            Argument.AssertNotNull(toolCallId, nameof(toolCallId));
+
+            Role = ChatRole.Tool;
+            Content = content;
+            ToolCallId = toolCallId;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatRequestToolMessage"/>. </summary>
+        /// <param name="role"> The chat role associated with this message. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="content"> The content of the message. </param>
+        /// <param name="toolCallId"> The ID of the tool call resolved by the provided content. </param>
+        internal ChatRequestToolMessage(ChatRole role, IDictionary<string, BinaryData> serializedAdditionalRawData, BinaryData content, string toolCallId) : base(role, serializedAdditionalRawData)
+        {
+            Content = content;
+            ToolCallId = toolCallId;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatRequestToolMessage"/> for deserialization. </summary>
+        internal ChatRequestToolMessage()
+        {
+        }
+
+        /// <summary>
+        /// The content of the message.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="string"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="IList{T}"/> where <c>T</c> is of type <see cref="ChatMessageTextContentItem"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData Content { get; }
+        /// <summary> The ID of the tool call resolved by the provided content. </summary>
+        public string ToolCallId { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestUserMessage.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestUserMessage.Serialization.cs
new file mode 100644
index 000000000000..5604566bf589
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestUserMessage.Serialization.cs
@@ -0,0 +1,161 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatRequestUserMessage : IUtf8JsonSerializable, IJsonModel<ChatRequestUserMessage>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatRequestUserMessage>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatRequestUserMessage>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestUserMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatRequestUserMessage)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("content"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(Content);
+#else
+            using (JsonDocument document = JsonDocument.Parse(Content))
+            {
+                JsonSerializer.Serialize(writer, document.RootElement);
+            }
+#endif
+            if (Optional.IsDefined(Name))
+            {
+                writer.WritePropertyName("name"u8);
+                writer.WriteStringValue(Name);
+            }
+            writer.WritePropertyName("role"u8);
+            writer.WriteStringValue(Role.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatRequestUserMessage IJsonModel<ChatRequestUserMessage>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestUserMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatRequestUserMessage)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatRequestUserMessage(document.RootElement, options);
+        }
+
+        internal static ChatRequestUserMessage DeserializeChatRequestUserMessage(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            BinaryData content = default;
+            string name = default;
+            ChatRole role = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("content"u8))
+                {
+                    content = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
+                if (property.NameEquals("name"u8))
+                {
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("role"u8))
+                {
+                    role = new ChatRole(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatRequestUserMessage(role, serializedAdditionalRawData, content, name);
+        }
+
+        BinaryData IPersistableModel<ChatRequestUserMessage>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestUserMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatRequestUserMessage)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatRequestUserMessage IPersistableModel<ChatRequestUserMessage>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestUserMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatRequestUserMessage(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatRequestUserMessage)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatRequestUserMessage>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new ChatRequestUserMessage FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatRequestUserMessage(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestUserMessage.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestUserMessage.cs
new file mode 100644
index 000000000000..8f83ff4940d1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRequestUserMessage.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A request chat message representing user input to the assistant. </summary>
+    public partial class ChatRequestUserMessage : ChatRequestMessage
+    {
+        /// <summary> Initializes a new instance of <see cref="ChatRequestUserMessage"/>. </summary>
+        /// <param name="content"> The contents of the user message, with available input types varying by selected model. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        public ChatRequestUserMessage(BinaryData content)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            Role = ChatRole.User;
+            Content = content;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatRequestUserMessage"/>. </summary>
+        /// <param name="role"> The chat role associated with this message. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="content"> The contents of the user message, with available input types varying by selected model. </param>
+        /// <param name="name"> An optional name for the participant. </param>
+        internal ChatRequestUserMessage(ChatRole role, IDictionary<string, BinaryData> serializedAdditionalRawData, BinaryData content, string name) : base(role, serializedAdditionalRawData)
+        {
+            Content = content;
+            Name = name;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatRequestUserMessage"/> for deserialization. </summary>
+        internal ChatRequestUserMessage()
+        {
+        }
+
+        /// <summary>
+        /// The contents of the user message, with available input types varying by selected model.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="string"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="IList{T}"/> where <c>T</c> is of type <see cref="ChatMessageTextContentItem"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="IList{T}"/> where <c>T</c> is of type <see cref="ChatMessageImageContentItem"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData Content { get; }
+        /// <summary> An optional name for the participant. </summary>
+        public string Name { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatResponseMessage.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatResponseMessage.Serialization.cs
new file mode 100644
index 000000000000..6295f99a759f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatResponseMessage.Serialization.cs
@@ -0,0 +1,237 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatResponseMessage : IUtf8JsonSerializable, IJsonModel<ChatResponseMessage>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatResponseMessage>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatResponseMessage>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatResponseMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatResponseMessage)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("role"u8);
+            writer.WriteStringValue(Role.ToString());
+            if (Refusal != null)
+            {
+                writer.WritePropertyName("refusal"u8);
+                writer.WriteStringValue(Refusal);
+            }
+            else
+            {
+                writer.WriteNull("refusal");
+            }
+            if (Content != null)
+            {
+                writer.WritePropertyName("content"u8);
+                writer.WriteStringValue(Content);
+            }
+            else
+            {
+                writer.WriteNull("content");
+            }
+            if (Optional.IsCollectionDefined(ToolCalls))
+            {
+                writer.WritePropertyName("tool_calls"u8);
+                writer.WriteStartArray();
+                foreach (var item in ToolCalls)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsDefined(FunctionCall))
+            {
+                writer.WritePropertyName("function_call"u8);
+                writer.WriteObjectValue(FunctionCall, options);
+            }
+            if (Optional.IsDefined(AzureExtensionsContext))
+            {
+                writer.WritePropertyName("context"u8);
+                writer.WriteObjectValue(AzureExtensionsContext, options);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatResponseMessage IJsonModel<ChatResponseMessage>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatResponseMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatResponseMessage)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatResponseMessage(document.RootElement, options);
+        }
+
+        internal static ChatResponseMessage DeserializeChatResponseMessage(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            ChatRole role = default;
+            string refusal = default;
+            string content = default;
+            IReadOnlyList<ChatCompletionsToolCall> toolCalls = default;
+            FunctionCall functionCall = default;
+            AzureChatExtensionsMessageContext context = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("role"u8))
+                {
+                    role = new ChatRole(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("refusal"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        refusal = null;
+                        continue;
+                    }
+                    refusal = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("content"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        content = null;
+                        continue;
+                    }
+                    content = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("tool_calls"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<ChatCompletionsToolCall> array = new List<ChatCompletionsToolCall>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(ChatCompletionsToolCall.DeserializeChatCompletionsToolCall(item, options));
+                    }
+                    toolCalls = array;
+                    continue;
+                }
+                if (property.NameEquals("function_call"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    functionCall = FunctionCall.DeserializeFunctionCall(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("context"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    context = AzureChatExtensionsMessageContext.DeserializeAzureChatExtensionsMessageContext(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatResponseMessage(
+                role,
+                refusal,
+                content,
+                toolCalls ?? new ChangeTrackingList<ChatCompletionsToolCall>(),
+                functionCall,
+                context,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatResponseMessage>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatResponseMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatResponseMessage)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatResponseMessage IPersistableModel<ChatResponseMessage>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatResponseMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatResponseMessage(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatResponseMessage)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatResponseMessage>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatResponseMessage FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatResponseMessage(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatResponseMessage.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatResponseMessage.cs
new file mode 100644
index 000000000000..c62e3c7692a3
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatResponseMessage.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A representation of a chat message as received in a response. </summary>
+    public partial class ChatResponseMessage
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatResponseMessage"/>. </summary>
+        /// <param name="role"> The chat role associated with the message. </param>
+        /// <param name="refusal"> The refusal message generated by the model. </param>
+        /// <param name="content"> The content of the message. </param>
+        internal ChatResponseMessage(ChatRole role, string refusal, string content)
+        {
+            Role = role;
+            Refusal = refusal;
+            Content = content;
+            ToolCalls = new ChangeTrackingList<ChatCompletionsToolCall>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatResponseMessage"/>. </summary>
+        /// <param name="role"> The chat role associated with the message. </param>
+        /// <param name="refusal"> The refusal message generated by the model. </param>
+        /// <param name="content"> The content of the message. </param>
+        /// <param name="toolCalls">
+        /// The tool calls that must be resolved and have their outputs appended to subsequent input messages for the chat
+        /// completions request to resolve as configured.
+        /// Please note <see cref="ChatCompletionsToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="ChatCompletionsFunctionToolCall"/>.
+        /// </param>
+        /// <param name="functionCall">
+        /// The function call that must be resolved and have its output appended to subsequent input messages for the chat
+        /// completions request to resolve as configured.
+        /// </param>
+        /// <param name="azureExtensionsContext">
+        /// If Azure OpenAI chat extensions are configured, this array represents the incremental steps performed by those
+        /// extensions while processing the chat completions request.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatResponseMessage(ChatRole role, string refusal, string content, IReadOnlyList<ChatCompletionsToolCall> toolCalls, FunctionCall functionCall, AzureChatExtensionsMessageContext azureExtensionsContext, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Role = role;
+            Refusal = refusal;
+            Content = content;
+            ToolCalls = toolCalls;
+            FunctionCall = functionCall;
+            AzureExtensionsContext = azureExtensionsContext;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatResponseMessage"/> for deserialization. </summary>
+        internal ChatResponseMessage()
+        {
+        }
+
+        /// <summary> The chat role associated with the message. </summary>
+        public ChatRole Role { get; }
+        /// <summary> The refusal message generated by the model. </summary>
+        public string Refusal { get; }
+        /// <summary> The content of the message. </summary>
+        public string Content { get; }
+        /// <summary>
+        /// The tool calls that must be resolved and have their outputs appended to subsequent input messages for the chat
+        /// completions request to resolve as configured.
+        /// Please note <see cref="ChatCompletionsToolCall"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="ChatCompletionsFunctionToolCall"/>.
+        /// </summary>
+        public IReadOnlyList<ChatCompletionsToolCall> ToolCalls { get; }
+        /// <summary>
+        /// The function call that must be resolved and have its output appended to subsequent input messages for the chat
+        /// completions request to resolve as configured.
+        /// </summary>
+        public FunctionCall FunctionCall { get; }
+        /// <summary>
+        /// If Azure OpenAI chat extensions are configured, this array represents the incremental steps performed by those
+        /// extensions while processing the chat completions request.
+        /// </summary>
+        public AzureChatExtensionsMessageContext AzureExtensionsContext { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRetrievedDocument.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRetrievedDocument.cs
deleted file mode 100644
index 96e966ba79e0..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRetrievedDocument.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The AzureChatMessageContextAllRetrievedDocuments. </summary>
-    public partial class ChatRetrievedDocument
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="ChatRetrievedDocument"/>. </summary>
-        /// <param name="content"> The content of the citation. </param>
-        /// <param name="searchQueries"> The search queries executed to retrieve documents. </param>
-        /// <param name="dataSourceIndex"> The index of the data source used for retrieval. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="content"/> or <paramref name="searchQueries"/> is null. </exception>
-        internal ChatRetrievedDocument(string content, IEnumerable<string> searchQueries, int dataSourceIndex)
-        {
-            Argument.AssertNotNull(content, nameof(content));
-            Argument.AssertNotNull(searchQueries, nameof(searchQueries));
-
-            Content = content;
-            SearchQueries = searchQueries.ToList();
-            DataSourceIndex = dataSourceIndex;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ChatRetrievedDocument"/>. </summary>
-        /// <param name="content"> The content of the citation. </param>
-        /// <param name="title"> The title for the citation. </param>
-        /// <param name="uri"> The URL of the citation. </param>
-        /// <param name="filePath"> The file path for the citation. </param>
-        /// <param name="chunkId"> The chunk ID for the citation. </param>
-        /// <param name="rerankScore"> The rerank score for the retrieval. </param>
-        /// <param name="searchQueries"> The search queries executed to retrieve documents. </param>
-        /// <param name="dataSourceIndex"> The index of the data source used for retrieval. </param>
-        /// <param name="originalSearchScore"> The original search score for the retrieval. </param>
-        /// <param name="filterReason"> If applicable, an indication of why the document was filtered. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ChatRetrievedDocument(string content, string title, Uri uri, string filePath, string chunkId, double? rerankScore, IReadOnlyList<string> searchQueries, int dataSourceIndex, double? originalSearchScore, ChatDocumentFilterReason? filterReason, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Content = content;
-            Title = title;
-            Uri = uri;
-            FilePath = filePath;
-            ChunkId = chunkId;
-            RerankScore = rerankScore;
-            SearchQueries = searchQueries;
-            DataSourceIndex = dataSourceIndex;
-            OriginalSearchScore = originalSearchScore;
-            FilterReason = filterReason;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ChatRetrievedDocument"/> for deserialization. </summary>
-        internal ChatRetrievedDocument()
-        {
-        }
-
-        /// <summary> The content of the citation. </summary>
-        public string Content { get; }
-        /// <summary> The title for the citation. </summary>
-        public string Title { get; }
-        /// <summary> The chunk ID for the citation. </summary>
-        public string ChunkId { get; }
-        /// <summary> The rerank score for the retrieval. </summary>
-        public double? RerankScore { get; }
-        /// <summary> The search queries executed to retrieve documents. </summary>
-        public IReadOnlyList<string> SearchQueries { get; }
-        /// <summary> The index of the data source used for retrieval. </summary>
-        public int DataSourceIndex { get; }
-        /// <summary> The original search score for the retrieval. </summary>
-        public double? OriginalSearchScore { get; }
-        /// <summary> If applicable, an indication of why the document was filtered. </summary>
-        public ChatDocumentFilterReason? FilterReason { get; }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRole.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRole.cs
new file mode 100644
index 000000000000..f169dc55ef81
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatRole.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A description of the intended purpose of a message within a chat completions interaction. </summary>
+    public readonly partial struct ChatRole : IEquatable<ChatRole>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ChatRole"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ChatRole(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string SystemValue = "system";
+        private const string AssistantValue = "assistant";
+        private const string UserValue = "user";
+        private const string FunctionValue = "function";
+        private const string ToolValue = "tool";
+
+        /// <summary> The role that instructs or sets the behavior of the assistant. </summary>
+        public static ChatRole System { get; } = new ChatRole(SystemValue);
+        /// <summary> The role that provides responses to system-instructed, user-prompted input. </summary>
+        public static ChatRole Assistant { get; } = new ChatRole(AssistantValue);
+        /// <summary> The role that provides input for chat completions. </summary>
+        public static ChatRole User { get; } = new ChatRole(UserValue);
+        /// <summary> The role that provides function results for chat completions. </summary>
+        public static ChatRole Function { get; } = new ChatRole(FunctionValue);
+        /// <summary> The role that represents extension tool activity within a chat completions operation. </summary>
+        public static ChatRole Tool { get; } = new ChatRole(ToolValue);
+        /// <summary> Determines if two <see cref="ChatRole"/> values are the same. </summary>
+        public static bool operator ==(ChatRole left, ChatRole right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ChatRole"/> values are not the same. </summary>
+        public static bool operator !=(ChatRole left, ChatRole right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ChatRole"/>. </summary>
+        public static implicit operator ChatRole(string value) => new ChatRole(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ChatRole other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ChatRole other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatTokenLogProbabilityInfo.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatTokenLogProbabilityInfo.Serialization.cs
new file mode 100644
index 000000000000..47317f79c4cd
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatTokenLogProbabilityInfo.Serialization.cs
@@ -0,0 +1,173 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatTokenLogProbabilityInfo : IUtf8JsonSerializable, IJsonModel<ChatTokenLogProbabilityInfo>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatTokenLogProbabilityInfo>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatTokenLogProbabilityInfo>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatTokenLogProbabilityInfo>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatTokenLogProbabilityInfo)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("token"u8);
+            writer.WriteStringValue(Token);
+            writer.WritePropertyName("logprob"u8);
+            writer.WriteNumberValue(LogProbability);
+            if (Utf8ByteValues != null && Optional.IsCollectionDefined(Utf8ByteValues))
+            {
+                writer.WritePropertyName("bytes"u8);
+                writer.WriteStartArray();
+                foreach (var item in Utf8ByteValues)
+                {
+                    writer.WriteNumberValue(item);
+                }
+                writer.WriteEndArray();
+            }
+            else
+            {
+                writer.WriteNull("bytes");
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatTokenLogProbabilityInfo IJsonModel<ChatTokenLogProbabilityInfo>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatTokenLogProbabilityInfo>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatTokenLogProbabilityInfo)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatTokenLogProbabilityInfo(document.RootElement, options);
+        }
+
+        internal static ChatTokenLogProbabilityInfo DeserializeChatTokenLogProbabilityInfo(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string token = default;
+            float logprob = default;
+            IReadOnlyList<int> bytes = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("token"u8))
+                {
+                    token = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("logprob"u8))
+                {
+                    logprob = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("bytes"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        bytes = new ChangeTrackingList<int>();
+                        continue;
+                    }
+                    List<int> array = new List<int>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetInt32());
+                    }
+                    bytes = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatTokenLogProbabilityInfo(token, logprob, bytes, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatTokenLogProbabilityInfo>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatTokenLogProbabilityInfo>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatTokenLogProbabilityInfo)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatTokenLogProbabilityInfo IPersistableModel<ChatTokenLogProbabilityInfo>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatTokenLogProbabilityInfo>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatTokenLogProbabilityInfo(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatTokenLogProbabilityInfo)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatTokenLogProbabilityInfo>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatTokenLogProbabilityInfo FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatTokenLogProbabilityInfo(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatTokenLogProbabilityInfo.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatTokenLogProbabilityInfo.cs
new file mode 100644
index 000000000000..7583c16e09ac
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatTokenLogProbabilityInfo.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A representation of the log probability information for a single message content token. </summary>
+    public partial class ChatTokenLogProbabilityInfo
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatTokenLogProbabilityInfo"/>. </summary>
+        /// <param name="token"> The message content token. </param>
+        /// <param name="logProbability"> The log probability of the message content token. </param>
+        /// <param name="utf8ByteValues"> A list of integers representing the UTF-8 bytes representation of the token. Useful in instances where characters are represented by multiple tokens and their byte representations must be combined to generate the correct text representation. Can be null if there is no bytes representation for the token. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="token"/> is null. </exception>
+        internal ChatTokenLogProbabilityInfo(string token, float logProbability, IEnumerable<int> utf8ByteValues)
+        {
+            Argument.AssertNotNull(token, nameof(token));
+
+            Token = token;
+            LogProbability = logProbability;
+            Utf8ByteValues = utf8ByteValues?.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatTokenLogProbabilityInfo"/>. </summary>
+        /// <param name="token"> The message content token. </param>
+        /// <param name="logProbability"> The log probability of the message content token. </param>
+        /// <param name="utf8ByteValues"> A list of integers representing the UTF-8 bytes representation of the token. Useful in instances where characters are represented by multiple tokens and their byte representations must be combined to generate the correct text representation. Can be null if there is no bytes representation for the token. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatTokenLogProbabilityInfo(string token, float logProbability, IReadOnlyList<int> utf8ByteValues, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Token = token;
+            LogProbability = logProbability;
+            Utf8ByteValues = utf8ByteValues;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatTokenLogProbabilityInfo"/> for deserialization. </summary>
+        internal ChatTokenLogProbabilityInfo()
+        {
+        }
+
+        /// <summary> The message content token. </summary>
+        public string Token { get; }
+        /// <summary> The log probability of the message content token. </summary>
+        public float LogProbability { get; }
+        /// <summary> A list of integers representing the UTF-8 bytes representation of the token. Useful in instances where characters are represented by multiple tokens and their byte representations must be combined to generate the correct text representation. Can be null if there is no bytes representation for the token. </summary>
+        public IReadOnlyList<int> Utf8ByteValues { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatTokenLogProbabilityResult.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatTokenLogProbabilityResult.Serialization.cs
new file mode 100644
index 000000000000..4c4fbfd323ea
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatTokenLogProbabilityResult.Serialization.cs
@@ -0,0 +1,203 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ChatTokenLogProbabilityResult : IUtf8JsonSerializable, IJsonModel<ChatTokenLogProbabilityResult>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatTokenLogProbabilityResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatTokenLogProbabilityResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatTokenLogProbabilityResult>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatTokenLogProbabilityResult)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("token"u8);
+            writer.WriteStringValue(Token);
+            writer.WritePropertyName("logprob"u8);
+            writer.WriteNumberValue(LogProbability);
+            if (Utf8ByteValues != null && Optional.IsCollectionDefined(Utf8ByteValues))
+            {
+                writer.WritePropertyName("bytes"u8);
+                writer.WriteStartArray();
+                foreach (var item in Utf8ByteValues)
+                {
+                    writer.WriteNumberValue(item);
+                }
+                writer.WriteEndArray();
+            }
+            else
+            {
+                writer.WriteNull("bytes");
+            }
+            if (TopLogProbabilityEntries != null && Optional.IsCollectionDefined(TopLogProbabilityEntries))
+            {
+                writer.WritePropertyName("top_logprobs"u8);
+                writer.WriteStartArray();
+                foreach (var item in TopLogProbabilityEntries)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            else
+            {
+                writer.WriteNull("top_logprobs");
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatTokenLogProbabilityResult IJsonModel<ChatTokenLogProbabilityResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatTokenLogProbabilityResult>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatTokenLogProbabilityResult)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatTokenLogProbabilityResult(document.RootElement, options);
+        }
+
+        internal static ChatTokenLogProbabilityResult DeserializeChatTokenLogProbabilityResult(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string token = default;
+            float logprob = default;
+            IReadOnlyList<int> bytes = default;
+            IReadOnlyList<ChatTokenLogProbabilityInfo> topLogprobs = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("token"u8))
+                {
+                    token = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("logprob"u8))
+                {
+                    logprob = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("bytes"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        bytes = new ChangeTrackingList<int>();
+                        continue;
+                    }
+                    List<int> array = new List<int>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetInt32());
+                    }
+                    bytes = array;
+                    continue;
+                }
+                if (property.NameEquals("top_logprobs"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        topLogprobs = new ChangeTrackingList<ChatTokenLogProbabilityInfo>();
+                        continue;
+                    }
+                    List<ChatTokenLogProbabilityInfo> array = new List<ChatTokenLogProbabilityInfo>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(ChatTokenLogProbabilityInfo.DeserializeChatTokenLogProbabilityInfo(item, options));
+                    }
+                    topLogprobs = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatTokenLogProbabilityResult(token, logprob, bytes, topLogprobs, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatTokenLogProbabilityResult>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatTokenLogProbabilityResult>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatTokenLogProbabilityResult)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatTokenLogProbabilityResult IPersistableModel<ChatTokenLogProbabilityResult>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatTokenLogProbabilityResult>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatTokenLogProbabilityResult(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatTokenLogProbabilityResult)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatTokenLogProbabilityResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ChatTokenLogProbabilityResult FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChatTokenLogProbabilityResult(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatTokenLogProbabilityResult.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatTokenLogProbabilityResult.cs
new file mode 100644
index 000000000000..d7fe8b840266
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ChatTokenLogProbabilityResult.cs
@@ -0,0 +1,94 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A representation of the log probability information for a single content token, including a list of most likely tokens if 'top_logprobs' were requested. </summary>
+    public partial class ChatTokenLogProbabilityResult
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ChatTokenLogProbabilityResult"/>. </summary>
+        /// <param name="token"> The message content token. </param>
+        /// <param name="logProbability"> The log probability of the message content token. </param>
+        /// <param name="utf8ByteValues"> A list of integers representing the UTF-8 bytes representation of the token. Useful in instances where characters are represented by multiple tokens and their byte representations must be combined to generate the correct text representation. Can be null if there is no bytes representation for the token. </param>
+        /// <param name="topLogProbabilityEntries"> The list of most likely tokens and their log probability information, as requested via 'top_logprobs'. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="token"/> is null. </exception>
+        internal ChatTokenLogProbabilityResult(string token, float logProbability, IEnumerable<int> utf8ByteValues, IEnumerable<ChatTokenLogProbabilityInfo> topLogProbabilityEntries)
+        {
+            Argument.AssertNotNull(token, nameof(token));
+
+            Token = token;
+            LogProbability = logProbability;
+            Utf8ByteValues = utf8ByteValues?.ToList();
+            TopLogProbabilityEntries = topLogProbabilityEntries?.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatTokenLogProbabilityResult"/>. </summary>
+        /// <param name="token"> The message content token. </param>
+        /// <param name="logProbability"> The log probability of the message content token. </param>
+        /// <param name="utf8ByteValues"> A list of integers representing the UTF-8 bytes representation of the token. Useful in instances where characters are represented by multiple tokens and their byte representations must be combined to generate the correct text representation. Can be null if there is no bytes representation for the token. </param>
+        /// <param name="topLogProbabilityEntries"> The list of most likely tokens and their log probability information, as requested via 'top_logprobs'. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatTokenLogProbabilityResult(string token, float logProbability, IReadOnlyList<int> utf8ByteValues, IReadOnlyList<ChatTokenLogProbabilityInfo> topLogProbabilityEntries, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Token = token;
+            LogProbability = logProbability;
+            Utf8ByteValues = utf8ByteValues;
+            TopLogProbabilityEntries = topLogProbabilityEntries;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatTokenLogProbabilityResult"/> for deserialization. </summary>
+        internal ChatTokenLogProbabilityResult()
+        {
+        }
+
+        /// <summary> The message content token. </summary>
+        public string Token { get; }
+        /// <summary> The log probability of the message content token. </summary>
+        public float LogProbability { get; }
+        /// <summary> A list of integers representing the UTF-8 bytes representation of the token. Useful in instances where characters are represented by multiple tokens and their byte representations must be combined to generate the correct text representation. Can be null if there is no bytes representation for the token. </summary>
+        public IReadOnlyList<int> Utf8ByteValues { get; }
+        /// <summary> The list of most likely tokens and their log probability information, as requested via 'top_logprobs'. </summary>
+        public IReadOnlyList<ChatTokenLogProbabilityInfo> TopLogProbabilityEntries { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Choice.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Choice.Serialization.cs
new file mode 100644
index 000000000000..26680759e1a1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Choice.Serialization.cs
@@ -0,0 +1,204 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class Choice : IUtf8JsonSerializable, IJsonModel<Choice>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<Choice>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<Choice>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<Choice>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(Choice)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("text"u8);
+            writer.WriteStringValue(Text);
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
+            if (Optional.IsDefined(ContentFilterResults))
+            {
+                writer.WritePropertyName("content_filter_results"u8);
+                writer.WriteObjectValue(ContentFilterResults, options);
+            }
+            if (LogProbabilityModel != null)
+            {
+                writer.WritePropertyName("logprobs"u8);
+                writer.WriteObjectValue(LogProbabilityModel, options);
+            }
+            else
+            {
+                writer.WriteNull("logprobs");
+            }
+            if (FinishReason != null)
+            {
+                writer.WritePropertyName("finish_reason"u8);
+                writer.WriteStringValue(FinishReason.Value.ToString());
+            }
+            else
+            {
+                writer.WriteNull("finish_reason");
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        Choice IJsonModel<Choice>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<Choice>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(Choice)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChoice(document.RootElement, options);
+        }
+
+        internal static Choice DeserializeChoice(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string text = default;
+            int index = default;
+            ContentFilterResultsForChoice contentFilterResults = default;
+            CompletionsLogProbabilityModel logprobs = default;
+            CompletionsFinishReason? finishReason = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("text"u8))
+                {
+                    text = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("index"u8))
+                {
+                    index = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("content_filter_results"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    contentFilterResults = ContentFilterResultsForChoice.DeserializeContentFilterResultsForChoice(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("logprobs"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        logprobs = null;
+                        continue;
+                    }
+                    logprobs = CompletionsLogProbabilityModel.DeserializeCompletionsLogProbabilityModel(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("finish_reason"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        finishReason = null;
+                        continue;
+                    }
+                    finishReason = new CompletionsFinishReason(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new Choice(
+                text,
+                index,
+                contentFilterResults,
+                logprobs,
+                finishReason,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<Choice>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<Choice>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(Choice)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        Choice IPersistableModel<Choice>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<Choice>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChoice(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(Choice)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<Choice>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static Choice FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeChoice(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Choice.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Choice.cs
new file mode 100644
index 000000000000..167dc6a38b70
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Choice.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// The representation of a single prompt completion as part of an overall completions request.
+    /// Generally, `n` choices are generated per provided prompt with a default value of 1.
+    /// Token limits and other settings may limit the number of choices generated.
+    /// </summary>
+    public partial class Choice
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="Choice"/>. </summary>
+        /// <param name="text"> The generated text for a given completions prompt. </param>
+        /// <param name="index"> The ordered index associated with this completions choice. </param>
+        /// <param name="logProbabilityModel"> The log probabilities model for tokens associated with this completions choice. </param>
+        /// <param name="finishReason"> Reason for finishing. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="text"/> is null. </exception>
+        internal Choice(string text, int index, CompletionsLogProbabilityModel logProbabilityModel, CompletionsFinishReason? finishReason)
+        {
+            Argument.AssertNotNull(text, nameof(text));
+
+            Text = text;
+            Index = index;
+            LogProbabilityModel = logProbabilityModel;
+            FinishReason = finishReason;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Choice"/>. </summary>
+        /// <param name="text"> The generated text for a given completions prompt. </param>
+        /// <param name="index"> The ordered index associated with this completions choice. </param>
+        /// <param name="contentFilterResults">
+        /// Information about the content filtering category (hate, sexual, violence, self_harm), if it
+        /// has been detected, as well as the severity level (very_low, low, medium, high-scale that
+        /// determines the intensity and risk level of harmful content) and if it has been filtered or not.
+        /// </param>
+        /// <param name="logProbabilityModel"> The log probabilities model for tokens associated with this completions choice. </param>
+        /// <param name="finishReason"> Reason for finishing. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal Choice(string text, int index, ContentFilterResultsForChoice contentFilterResults, CompletionsLogProbabilityModel logProbabilityModel, CompletionsFinishReason? finishReason, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Text = text;
+            Index = index;
+            ContentFilterResults = contentFilterResults;
+            LogProbabilityModel = logProbabilityModel;
+            FinishReason = finishReason;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Choice"/> for deserialization. </summary>
+        internal Choice()
+        {
+        }
+
+        /// <summary> The generated text for a given completions prompt. </summary>
+        public string Text { get; }
+        /// <summary> The ordered index associated with this completions choice. </summary>
+        public int Index { get; }
+        /// <summary>
+        /// Information about the content filtering category (hate, sexual, violence, self_harm), if it
+        /// has been detected, as well as the severity level (very_low, low, medium, high-scale that
+        /// determines the intensity and risk level of harmful content) and if it has been filtered or not.
+        /// </summary>
+        public ContentFilterResultsForChoice ContentFilterResults { get; }
+        /// <summary> The log probabilities model for tokens associated with this completions choice. </summary>
+        public CompletionsLogProbabilityModel LogProbabilityModel { get; }
+        /// <summary> Reason for finishing. </summary>
+        public CompletionsFinishReason? FinishReason { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CompleteUploadRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompleteUploadRequest.Serialization.cs
new file mode 100644
index 000000000000..9a459ac6b9c7
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompleteUploadRequest.Serialization.cs
@@ -0,0 +1,156 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class CompleteUploadRequest : IUtf8JsonSerializable, IJsonModel<CompleteUploadRequest>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CompleteUploadRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<CompleteUploadRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompleteUploadRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CompleteUploadRequest)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("part_ids"u8);
+            writer.WriteStartArray();
+            foreach (var item in PartIds)
+            {
+                writer.WriteStringValue(item);
+            }
+            writer.WriteEndArray();
+            if (Optional.IsDefined(Md5))
+            {
+                writer.WritePropertyName("md5"u8);
+                writer.WriteStringValue(Md5);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        CompleteUploadRequest IJsonModel<CompleteUploadRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompleteUploadRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CompleteUploadRequest)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeCompleteUploadRequest(document.RootElement, options);
+        }
+
+        internal static CompleteUploadRequest DeserializeCompleteUploadRequest(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IList<string> partIds = default;
+            string md5 = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("part_ids"u8))
+                {
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    partIds = array;
+                    continue;
+                }
+                if (property.NameEquals("md5"u8))
+                {
+                    md5 = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new CompleteUploadRequest(partIds, md5, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<CompleteUploadRequest>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompleteUploadRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(CompleteUploadRequest)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        CompleteUploadRequest IPersistableModel<CompleteUploadRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompleteUploadRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeCompleteUploadRequest(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(CompleteUploadRequest)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<CompleteUploadRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static CompleteUploadRequest FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeCompleteUploadRequest(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CompleteUploadRequest.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompleteUploadRequest.cs
new file mode 100644
index 000000000000..0022308524f9
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompleteUploadRequest.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The request body of an upload completion request. </summary>
+    public partial class CompleteUploadRequest
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="CompleteUploadRequest"/>. </summary>
+        /// <param name="partIds"> The ordered list of Part IDs. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="partIds"/> is null. </exception>
+        public CompleteUploadRequest(IEnumerable<string> partIds)
+        {
+            Argument.AssertNotNull(partIds, nameof(partIds));
+
+            PartIds = partIds.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CompleteUploadRequest"/>. </summary>
+        /// <param name="partIds"> The ordered list of Part IDs. </param>
+        /// <param name="md5"> The optional md5 checksum for the file contents to verify if the bytes uploaded matches what you expect. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal CompleteUploadRequest(IList<string> partIds, string md5, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            PartIds = partIds;
+            Md5 = md5;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CompleteUploadRequest"/> for deserialization. </summary>
+        internal CompleteUploadRequest()
+        {
+        }
+
+        /// <summary> The ordered list of Part IDs. </summary>
+        public IList<string> PartIds { get; }
+        /// <summary> The optional md5 checksum for the file contents to verify if the bytes uploaded matches what you expect. </summary>
+        public string Md5 { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Completions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Completions.Serialization.cs
new file mode 100644
index 000000000000..3e12e8602555
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Completions.Serialization.cs
@@ -0,0 +1,212 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class Completions : IUtf8JsonSerializable, IJsonModel<Completions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<Completions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<Completions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<Completions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(Completions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("created"u8);
+            writer.WriteNumberValue(Created, "U");
+            if (Optional.IsCollectionDefined(PromptFilterResults))
+            {
+                writer.WritePropertyName("prompt_filter_results"u8);
+                writer.WriteStartArray();
+                foreach (var item in PromptFilterResults)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            writer.WritePropertyName("choices"u8);
+            writer.WriteStartArray();
+            foreach (var item in Choices)
+            {
+                writer.WriteObjectValue(item, options);
+            }
+            writer.WriteEndArray();
+            writer.WritePropertyName("usage"u8);
+            writer.WriteObjectValue(Usage, options);
+            if (Optional.IsDefined(SystemFingerprint))
+            {
+                writer.WritePropertyName("system_fingerprint"u8);
+                writer.WriteStringValue(SystemFingerprint);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        Completions IJsonModel<Completions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<Completions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(Completions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeCompletions(document.RootElement, options);
+        }
+
+        internal static Completions DeserializeCompletions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string id = default;
+            DateTimeOffset created = default;
+            IReadOnlyList<ContentFilterResultsForPrompt> promptFilterResults = default;
+            IReadOnlyList<Choice> choices = default;
+            CompletionsUsage usage = default;
+            string systemFingerprint = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("created"u8))
+                {
+                    created = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("prompt_filter_results"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<ContentFilterResultsForPrompt> array = new List<ContentFilterResultsForPrompt>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(ContentFilterResultsForPrompt.DeserializeContentFilterResultsForPrompt(item, options));
+                    }
+                    promptFilterResults = array;
+                    continue;
+                }
+                if (property.NameEquals("choices"u8))
+                {
+                    List<Choice> array = new List<Choice>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(Choice.DeserializeChoice(item, options));
+                    }
+                    choices = array;
+                    continue;
+                }
+                if (property.NameEquals("usage"u8))
+                {
+                    usage = CompletionsUsage.DeserializeCompletionsUsage(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("system_fingerprint"u8))
+                {
+                    systemFingerprint = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new Completions(
+                id,
+                created,
+                promptFilterResults ?? new ChangeTrackingList<ContentFilterResultsForPrompt>(),
+                choices,
+                usage,
+                systemFingerprint,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<Completions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<Completions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(Completions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        Completions IPersistableModel<Completions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<Completions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeCompletions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(Completions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<Completions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static Completions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeCompletions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Completions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Completions.cs
new file mode 100644
index 000000000000..005de8a20f34
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Completions.cs
@@ -0,0 +1,144 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// Representation of the response data from a completions request.
+    /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+    /// provided prompt data.
+    /// </summary>
+    public partial class Completions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="Completions"/>. </summary>
+        /// <param name="id"> A unique identifier associated with this completions response. </param>
+        /// <param name="created">
+        /// The first timestamp associated with generation activity for this completions response,
+        /// represented as seconds since the beginning of the Unix epoch of 00:00 on 1 Jan 1970.
+        /// </param>
+        /// <param name="choices">
+        /// The collection of completions choices associated with this completions response.
+        /// Generally, `n` choices are generated per provided prompt with a default value of 1.
+        /// Token limits and other settings may limit the number of choices generated.
+        /// </param>
+        /// <param name="usage"> Usage information for tokens processed and generated as part of this completions operation. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/>, <paramref name="choices"/> or <paramref name="usage"/> is null. </exception>
+        internal Completions(string id, DateTimeOffset created, IEnumerable<Choice> choices, CompletionsUsage usage)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+            Argument.AssertNotNull(choices, nameof(choices));
+            Argument.AssertNotNull(usage, nameof(usage));
+
+            Id = id;
+            Created = created;
+            PromptFilterResults = new ChangeTrackingList<ContentFilterResultsForPrompt>();
+            Choices = choices.ToList();
+            Usage = usage;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Completions"/>. </summary>
+        /// <param name="id"> A unique identifier associated with this completions response. </param>
+        /// <param name="created">
+        /// The first timestamp associated with generation activity for this completions response,
+        /// represented as seconds since the beginning of the Unix epoch of 00:00 on 1 Jan 1970.
+        /// </param>
+        /// <param name="promptFilterResults">
+        /// Content filtering results for zero or more prompts in the request. In a streaming request,
+        /// results for different prompts may arrive at different times or in different orders.
+        /// </param>
+        /// <param name="choices">
+        /// The collection of completions choices associated with this completions response.
+        /// Generally, `n` choices are generated per provided prompt with a default value of 1.
+        /// Token limits and other settings may limit the number of choices generated.
+        /// </param>
+        /// <param name="usage"> Usage information for tokens processed and generated as part of this completions operation. </param>
+        /// <param name="systemFingerprint">
+        /// This fingerprint represents the backend configuration that the model runs with.
+        ///
+        /// Can be used in conjunction with the `seed` request parameter to understand when backend changes have been made that might impact determinism.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal Completions(string id, DateTimeOffset created, IReadOnlyList<ContentFilterResultsForPrompt> promptFilterResults, IReadOnlyList<Choice> choices, CompletionsUsage usage, string systemFingerprint, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            Created = created;
+            PromptFilterResults = promptFilterResults;
+            Choices = choices;
+            Usage = usage;
+            SystemFingerprint = systemFingerprint;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Completions"/> for deserialization. </summary>
+        internal Completions()
+        {
+        }
+
+        /// <summary> A unique identifier associated with this completions response. </summary>
+        public string Id { get; }
+        /// <summary>
+        /// The first timestamp associated with generation activity for this completions response,
+        /// represented as seconds since the beginning of the Unix epoch of 00:00 on 1 Jan 1970.
+        /// </summary>
+        public DateTimeOffset Created { get; }
+        /// <summary>
+        /// Content filtering results for zero or more prompts in the request. In a streaming request,
+        /// results for different prompts may arrive at different times or in different orders.
+        /// </summary>
+        public IReadOnlyList<ContentFilterResultsForPrompt> PromptFilterResults { get; }
+        /// <summary>
+        /// The collection of completions choices associated with this completions response.
+        /// Generally, `n` choices are generated per provided prompt with a default value of 1.
+        /// Token limits and other settings may limit the number of choices generated.
+        /// </summary>
+        public IReadOnlyList<Choice> Choices { get; }
+        /// <summary> Usage information for tokens processed and generated as part of this completions operation. </summary>
+        public CompletionsUsage Usage { get; }
+        /// <summary>
+        /// This fingerprint represents the backend configuration that the model runs with.
+        ///
+        /// Can be used in conjunction with the `seed` request parameter to understand when backend changes have been made that might impact determinism.
+        /// </summary>
+        public string SystemFingerprint { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsFinishReason.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsFinishReason.cs
new file mode 100644
index 000000000000..4270844fe202
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsFinishReason.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Representation of the manner in which a completions response concluded. </summary>
+    public readonly partial struct CompletionsFinishReason : IEquatable<CompletionsFinishReason>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="CompletionsFinishReason"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public CompletionsFinishReason(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string StoppedValue = "stop";
+        private const string TokenLimitReachedValue = "length";
+        private const string ContentFilteredValue = "content_filter";
+        private const string FunctionCallValue = "function_call";
+        private const string ToolCallsValue = "tool_calls";
+
+        /// <summary> Completions ended normally and reached its end of token generation. </summary>
+        public static CompletionsFinishReason Stopped { get; } = new CompletionsFinishReason(StoppedValue);
+        /// <summary> Completions exhausted available token limits before generation could complete. </summary>
+        public static CompletionsFinishReason TokenLimitReached { get; } = new CompletionsFinishReason(TokenLimitReachedValue);
+        /// <summary>
+        /// Completions generated a response that was identified as potentially sensitive per content
+        /// moderation policies.
+        /// </summary>
+        public static CompletionsFinishReason ContentFiltered { get; } = new CompletionsFinishReason(ContentFilteredValue);
+        /// <summary> Completion ended normally, with the model requesting a function to be called. </summary>
+        public static CompletionsFinishReason FunctionCall { get; } = new CompletionsFinishReason(FunctionCallValue);
+        /// <summary> Completion ended with the model calling a provided tool for output. </summary>
+        public static CompletionsFinishReason ToolCalls { get; } = new CompletionsFinishReason(ToolCallsValue);
+        /// <summary> Determines if two <see cref="CompletionsFinishReason"/> values are the same. </summary>
+        public static bool operator ==(CompletionsFinishReason left, CompletionsFinishReason right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="CompletionsFinishReason"/> values are not the same. </summary>
+        public static bool operator !=(CompletionsFinishReason left, CompletionsFinishReason right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="CompletionsFinishReason"/>. </summary>
+        public static implicit operator CompletionsFinishReason(string value) => new CompletionsFinishReason(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is CompletionsFinishReason other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(CompletionsFinishReason other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsLogProbabilityModel.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsLogProbabilityModel.Serialization.cs
new file mode 100644
index 000000000000..85e4d0cd3152
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsLogProbabilityModel.Serialization.cs
@@ -0,0 +1,246 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class CompletionsLogProbabilityModel : IUtf8JsonSerializable, IJsonModel<CompletionsLogProbabilityModel>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CompletionsLogProbabilityModel>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<CompletionsLogProbabilityModel>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsLogProbabilityModel>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CompletionsLogProbabilityModel)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("tokens"u8);
+            writer.WriteStartArray();
+            foreach (var item in Tokens)
+            {
+                writer.WriteStringValue(item);
+            }
+            writer.WriteEndArray();
+            writer.WritePropertyName("token_logprobs"u8);
+            writer.WriteStartArray();
+            foreach (var item in TokenLogProbabilities)
+            {
+                if (item == null)
+                {
+                    writer.WriteNullValue();
+                    continue;
+                }
+                writer.WriteNumberValue(item.Value);
+            }
+            writer.WriteEndArray();
+            writer.WritePropertyName("top_logprobs"u8);
+            writer.WriteStartArray();
+            foreach (var item in TopLogProbabilities)
+            {
+                if (item == null)
+                {
+                    writer.WriteNullValue();
+                    continue;
+                }
+                writer.WriteStartObject();
+                foreach (var item0 in item)
+                {
+                    writer.WritePropertyName(item0.Key);
+                    if (item0.Value == null)
+                    {
+                        writer.WriteNullValue();
+                        continue;
+                    }
+                    writer.WriteNumberValue(item0.Value.Value);
+                }
+                writer.WriteEndObject();
+            }
+            writer.WriteEndArray();
+            writer.WritePropertyName("text_offset"u8);
+            writer.WriteStartArray();
+            foreach (var item in TextOffsets)
+            {
+                writer.WriteNumberValue(item);
+            }
+            writer.WriteEndArray();
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        CompletionsLogProbabilityModel IJsonModel<CompletionsLogProbabilityModel>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsLogProbabilityModel>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CompletionsLogProbabilityModel)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeCompletionsLogProbabilityModel(document.RootElement, options);
+        }
+
+        internal static CompletionsLogProbabilityModel DeserializeCompletionsLogProbabilityModel(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IReadOnlyList<string> tokens = default;
+            IReadOnlyList<float?> tokenLogprobs = default;
+            IReadOnlyList<IDictionary<string, float?>> topLogprobs = default;
+            IReadOnlyList<int> textOffset = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("tokens"u8))
+                {
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    tokens = array;
+                    continue;
+                }
+                if (property.NameEquals("token_logprobs"u8))
+                {
+                    List<float?> array = new List<float?>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        if (item.ValueKind == JsonValueKind.Null)
+                        {
+                            array.Add(null);
+                        }
+                        else
+                        {
+                            array.Add(item.GetSingle());
+                        }
+                    }
+                    tokenLogprobs = array;
+                    continue;
+                }
+                if (property.NameEquals("top_logprobs"u8))
+                {
+                    List<IDictionary<string, float?>> array = new List<IDictionary<string, float?>>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        if (item.ValueKind == JsonValueKind.Null)
+                        {
+                            array.Add(null);
+                        }
+                        else
+                        {
+                            Dictionary<string, float?> dictionary = new Dictionary<string, float?>();
+                            foreach (var property0 in item.EnumerateObject())
+                            {
+                                if (property0.Value.ValueKind == JsonValueKind.Null)
+                                {
+                                    dictionary.Add(property0.Name, null);
+                                }
+                                else
+                                {
+                                    dictionary.Add(property0.Name, property0.Value.GetSingle());
+                                }
+                            }
+                            array.Add(dictionary);
+                        }
+                    }
+                    topLogprobs = array;
+                    continue;
+                }
+                if (property.NameEquals("text_offset"u8))
+                {
+                    List<int> array = new List<int>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetInt32());
+                    }
+                    textOffset = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new CompletionsLogProbabilityModel(tokens, tokenLogprobs, topLogprobs, textOffset, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<CompletionsLogProbabilityModel>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsLogProbabilityModel>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(CompletionsLogProbabilityModel)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        CompletionsLogProbabilityModel IPersistableModel<CompletionsLogProbabilityModel>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsLogProbabilityModel>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeCompletionsLogProbabilityModel(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(CompletionsLogProbabilityModel)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<CompletionsLogProbabilityModel>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static CompletionsLogProbabilityModel FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeCompletionsLogProbabilityModel(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsLogProbabilityModel.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsLogProbabilityModel.cs
new file mode 100644
index 000000000000..5b486eac6e8c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsLogProbabilityModel.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Representation of a log probabilities model for a completions generation. </summary>
+    public partial class CompletionsLogProbabilityModel
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="CompletionsLogProbabilityModel"/>. </summary>
+        /// <param name="tokens"> The textual forms of tokens evaluated in this probability model. </param>
+        /// <param name="tokenLogProbabilities"> A collection of log probability values for the tokens in this completions data. </param>
+        /// <param name="topLogProbabilities"> A mapping of tokens to maximum log probability values in this completions data. </param>
+        /// <param name="textOffsets"> The text offsets associated with tokens in this completions data. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="tokens"/>, <paramref name="tokenLogProbabilities"/>, <paramref name="topLogProbabilities"/> or <paramref name="textOffsets"/> is null. </exception>
+        internal CompletionsLogProbabilityModel(IEnumerable<string> tokens, IEnumerable<float?> tokenLogProbabilities, IEnumerable<IDictionary<string, float?>> topLogProbabilities, IEnumerable<int> textOffsets)
+        {
+            Argument.AssertNotNull(tokens, nameof(tokens));
+            Argument.AssertNotNull(tokenLogProbabilities, nameof(tokenLogProbabilities));
+            Argument.AssertNotNull(topLogProbabilities, nameof(topLogProbabilities));
+            Argument.AssertNotNull(textOffsets, nameof(textOffsets));
+
+            Tokens = tokens.ToList();
+            TokenLogProbabilities = tokenLogProbabilities.ToList();
+            TopLogProbabilities = topLogProbabilities.ToList();
+            TextOffsets = textOffsets.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CompletionsLogProbabilityModel"/>. </summary>
+        /// <param name="tokens"> The textual forms of tokens evaluated in this probability model. </param>
+        /// <param name="tokenLogProbabilities"> A collection of log probability values for the tokens in this completions data. </param>
+        /// <param name="topLogProbabilities"> A mapping of tokens to maximum log probability values in this completions data. </param>
+        /// <param name="textOffsets"> The text offsets associated with tokens in this completions data. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal CompletionsLogProbabilityModel(IReadOnlyList<string> tokens, IReadOnlyList<float?> tokenLogProbabilities, IReadOnlyList<IDictionary<string, float?>> topLogProbabilities, IReadOnlyList<int> textOffsets, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Tokens = tokens;
+            TokenLogProbabilities = tokenLogProbabilities;
+            TopLogProbabilities = topLogProbabilities;
+            TextOffsets = textOffsets;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CompletionsLogProbabilityModel"/> for deserialization. </summary>
+        internal CompletionsLogProbabilityModel()
+        {
+        }
+
+        /// <summary> The textual forms of tokens evaluated in this probability model. </summary>
+        public IReadOnlyList<string> Tokens { get; }
+        /// <summary> A collection of log probability values for the tokens in this completions data. </summary>
+        public IReadOnlyList<float?> TokenLogProbabilities { get; }
+        /// <summary> A mapping of tokens to maximum log probability values in this completions data. </summary>
+        public IReadOnlyList<IDictionary<string, float?>> TopLogProbabilities { get; }
+        /// <summary> The text offsets associated with tokens in this completions data. </summary>
+        public IReadOnlyList<int> TextOffsets { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsOptions.Serialization.cs
new file mode 100644
index 000000000000..652a24e11069
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsOptions.Serialization.cs
@@ -0,0 +1,436 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class CompletionsOptions : IUtf8JsonSerializable, IJsonModel<CompletionsOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CompletionsOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<CompletionsOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CompletionsOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("prompt"u8);
+            writer.WriteStartArray();
+            foreach (var item in Prompts)
+            {
+                writer.WriteStringValue(item);
+            }
+            writer.WriteEndArray();
+            if (Optional.IsDefined(MaxTokens))
+            {
+                writer.WritePropertyName("max_tokens"u8);
+                writer.WriteNumberValue(MaxTokens.Value);
+            }
+            if (Optional.IsDefined(Temperature))
+            {
+                writer.WritePropertyName("temperature"u8);
+                writer.WriteNumberValue(Temperature.Value);
+            }
+            if (Optional.IsDefined(NucleusSamplingFactor))
+            {
+                writer.WritePropertyName("top_p"u8);
+                writer.WriteNumberValue(NucleusSamplingFactor.Value);
+            }
+            if (Optional.IsCollectionDefined(TokenSelectionBiases))
+            {
+                writer.WritePropertyName("logit_bias"u8);
+                writer.WriteStartObject();
+                foreach (var item in TokenSelectionBiases)
+                {
+                    writer.WritePropertyName(item.Key);
+                    writer.WriteNumberValue(item.Value);
+                }
+                writer.WriteEndObject();
+            }
+            if (Optional.IsDefined(User))
+            {
+                writer.WritePropertyName("user"u8);
+                writer.WriteStringValue(User);
+            }
+            if (Optional.IsDefined(ChoicesPerPrompt))
+            {
+                writer.WritePropertyName("n"u8);
+                writer.WriteNumberValue(ChoicesPerPrompt.Value);
+            }
+            if (Optional.IsDefined(LogProbabilityCount))
+            {
+                writer.WritePropertyName("logprobs"u8);
+                writer.WriteNumberValue(LogProbabilityCount.Value);
+            }
+            if (Optional.IsDefined(Suffix))
+            {
+                writer.WritePropertyName("suffix"u8);
+                writer.WriteStringValue(Suffix);
+            }
+            if (Optional.IsDefined(Echo))
+            {
+                writer.WritePropertyName("echo"u8);
+                writer.WriteBooleanValue(Echo.Value);
+            }
+            if (Optional.IsCollectionDefined(StopSequences))
+            {
+                writer.WritePropertyName("stop"u8);
+                writer.WriteStartArray();
+                foreach (var item in StopSequences)
+                {
+                    writer.WriteStringValue(item);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsDefined(PresencePenalty))
+            {
+                writer.WritePropertyName("presence_penalty"u8);
+                writer.WriteNumberValue(PresencePenalty.Value);
+            }
+            if (Optional.IsDefined(FrequencyPenalty))
+            {
+                writer.WritePropertyName("frequency_penalty"u8);
+                writer.WriteNumberValue(FrequencyPenalty.Value);
+            }
+            if (Optional.IsDefined(GenerationSampleCount))
+            {
+                writer.WritePropertyName("best_of"u8);
+                writer.WriteNumberValue(GenerationSampleCount.Value);
+            }
+            if (Optional.IsDefined(InternalShouldStreamResponse))
+            {
+                writer.WritePropertyName("stream"u8);
+                writer.WriteBooleanValue(InternalShouldStreamResponse.Value);
+            }
+            if (Optional.IsDefined(StreamOptions))
+            {
+                if (StreamOptions != null)
+                {
+                    writer.WritePropertyName("stream_options"u8);
+                    writer.WriteObjectValue(StreamOptions, options);
+                }
+                else
+                {
+                    writer.WriteNull("stream_options");
+                }
+            }
+            if (Optional.IsDefined(DeploymentName))
+            {
+                writer.WritePropertyName("model"u8);
+                writer.WriteStringValue(DeploymentName);
+            }
+            if (Optional.IsDefined(Seed))
+            {
+                writer.WritePropertyName("seed"u8);
+                writer.WriteNumberValue(Seed.Value);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        CompletionsOptions IJsonModel<CompletionsOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CompletionsOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeCompletionsOptions(document.RootElement, options);
+        }
+
+        internal static CompletionsOptions DeserializeCompletionsOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IList<string> prompt = default;
+            int? maxTokens = default;
+            float? temperature = default;
+            float? topP = default;
+            IDictionary<string, int> logitBias = default;
+            string user = default;
+            int? n = default;
+            int? logprobs = default;
+            string suffix = default;
+            bool? echo = default;
+            IList<string> stop = default;
+            float? presencePenalty = default;
+            float? frequencyPenalty = default;
+            int? bestOf = default;
+            bool? stream = default;
+            ChatCompletionStreamOptions streamOptions = default;
+            string model = default;
+            int? seed = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("prompt"u8))
+                {
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    prompt = array;
+                    continue;
+                }
+                if (property.NameEquals("max_tokens"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    maxTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("temperature"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    temperature = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("top_p"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    topP = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("logit_bias"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    Dictionary<string, int> dictionary = new Dictionary<string, int>();
+                    foreach (var property0 in property.Value.EnumerateObject())
+                    {
+                        dictionary.Add(property0.Name, property0.Value.GetInt32());
+                    }
+                    logitBias = dictionary;
+                    continue;
+                }
+                if (property.NameEquals("user"u8))
+                {
+                    user = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("n"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    n = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("logprobs"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    logprobs = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("suffix"u8))
+                {
+                    suffix = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("echo"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    echo = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("stop"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    stop = array;
+                    continue;
+                }
+                if (property.NameEquals("presence_penalty"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    presencePenalty = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("frequency_penalty"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    frequencyPenalty = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("best_of"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    bestOf = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("stream"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    stream = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("stream_options"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        streamOptions = null;
+                        continue;
+                    }
+                    streamOptions = ChatCompletionStreamOptions.DeserializeChatCompletionStreamOptions(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("model"u8))
+                {
+                    model = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("seed"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    seed = property.Value.GetInt32();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new CompletionsOptions(
+                prompt,
+                maxTokens,
+                temperature,
+                topP,
+                logitBias ?? new ChangeTrackingDictionary<string, int>(),
+                user,
+                n,
+                logprobs,
+                suffix,
+                echo,
+                stop ?? new ChangeTrackingList<string>(),
+                presencePenalty,
+                frequencyPenalty,
+                bestOf,
+                stream,
+                streamOptions,
+                model,
+                seed,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<CompletionsOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(CompletionsOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        CompletionsOptions IPersistableModel<CompletionsOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeCompletionsOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(CompletionsOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<CompletionsOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static CompletionsOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeCompletionsOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsOptions.cs
new file mode 100644
index 000000000000..0e88c5d42c95
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsOptions.cs
@@ -0,0 +1,266 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// The configuration information for a completions request.
+    /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+    /// provided prompt data.
+    /// </summary>
+    public partial class CompletionsOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="CompletionsOptions"/>. </summary>
+        /// <param name="prompts"> The prompts to generate completions from. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="prompts"/> is null. </exception>
+        public CompletionsOptions(IEnumerable<string> prompts)
+        {
+            Argument.AssertNotNull(prompts, nameof(prompts));
+
+            Prompts = prompts.ToList();
+            TokenSelectionBiases = new ChangeTrackingDictionary<string, int>();
+            StopSequences = new ChangeTrackingList<string>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CompletionsOptions"/>. </summary>
+        /// <param name="prompts"> The prompts to generate completions from. </param>
+        /// <param name="maxTokens"> The maximum number of tokens to generate. </param>
+        /// <param name="temperature">
+        /// The sampling temperature to use that controls the apparent creativity of generated completions.
+        /// Higher values will make output more random while lower values will make results more focused
+        /// and deterministic.
+        /// It is not recommended to modify temperature and top_p for the same completions request as the
+        /// interaction of these two settings is difficult to predict.
+        /// </param>
+        /// <param name="nucleusSamplingFactor">
+        /// An alternative to sampling with temperature called nucleus sampling. This value causes the
+        /// model to consider the results of tokens with the provided probability mass. As an example, a
+        /// value of 0.15 will cause only the tokens comprising the top 15% of probability mass to be
+        /// considered.
+        /// It is not recommended to modify temperature and top_p for the same completions request as the
+        /// interaction of these two settings is difficult to predict.
+        /// </param>
+        /// <param name="tokenSelectionBiases">
+        /// A map between GPT token IDs and bias scores that influences the probability of specific tokens
+        /// appearing in a completions response. Token IDs are computed via external tokenizer tools, while
+        /// bias scores reside in the range of -100 to 100 with minimum and maximum values corresponding to
+        /// a full ban or exclusive selection of a token, respectively. The exact behavior of a given bias
+        /// score varies by model.
+        /// </param>
+        /// <param name="user">
+        /// An identifier for the caller or end user of the operation. This may be used for tracking
+        /// or rate-limiting purposes.
+        /// </param>
+        /// <param name="choicesPerPrompt">
+        /// The number of completions choices that should be generated per provided prompt as part of an
+        /// overall completions response.
+        /// Because this setting can generate many completions, it may quickly consume your token quota.
+        /// Use carefully and ensure reasonable settings for max_tokens and stop.
+        /// </param>
+        /// <param name="logProbabilityCount">
+        /// A value that controls the emission of log probabilities for the provided number of most likely
+        /// tokens within a completions response.
+        /// </param>
+        /// <param name="suffix"> The suffix that comes after a completion of inserted text. </param>
+        /// <param name="echo">
+        /// A value specifying whether completions responses should include input prompts as prefixes to
+        /// their generated output.
+        /// </param>
+        /// <param name="stopSequences"> A collection of textual sequences that will end completions generation. </param>
+        /// <param name="presencePenalty">
+        /// A value that influences the probability of generated tokens appearing based on their existing
+        /// presence in generated text.
+        /// Positive values will make tokens less likely to appear when they already exist and increase the
+        /// model's likelihood to output new topics.
+        /// </param>
+        /// <param name="frequencyPenalty">
+        /// A value that influences the probability of generated tokens appearing based on their cumulative
+        /// frequency in generated text.
+        /// Positive values will make tokens less likely to appear as their frequency increases and
+        /// decrease the likelihood of the model repeating the same statements verbatim.
+        /// </param>
+        /// <param name="generationSampleCount">
+        /// A value that controls how many completions will be internally generated prior to response
+        /// formulation.
+        /// When used together with n, best_of controls the number of candidate completions and must be
+        /// greater than n.
+        /// Because this setting can generate many completions, it may quickly consume your token quota.
+        /// Use carefully and ensure reasonable settings for max_tokens and stop.
+        /// </param>
+        /// <param name="internalShouldStreamResponse"> A value indicating whether chat completions should be streamed for this request. </param>
+        /// <param name="streamOptions"> Options for streaming response. Only set this when you set `stream: true`. </param>
+        /// <param name="deploymentName">
+        /// The model name to provide as part of this completions request.
+        /// Not applicable to Azure OpenAI, where deployment information should be included in the Azure
+        /// resource URI that's connected to.
+        /// </param>
+        /// <param name="seed">
+        /// If specified, our system will make a best effort to sample deterministically, such that repeated requests with the same `seed` and parameters should return the same result.
+        ///
+        /// Determinism is not guaranteed, and you should refer to the `system_fingerprint` response parameter to monitor changes in the backend.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal CompletionsOptions(IList<string> prompts, int? maxTokens, float? temperature, float? nucleusSamplingFactor, IDictionary<string, int> tokenSelectionBiases, string user, int? choicesPerPrompt, int? logProbabilityCount, string suffix, bool? echo, IList<string> stopSequences, float? presencePenalty, float? frequencyPenalty, int? generationSampleCount, bool? internalShouldStreamResponse, ChatCompletionStreamOptions streamOptions, string deploymentName, int? seed, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Prompts = prompts;
+            MaxTokens = maxTokens;
+            Temperature = temperature;
+            NucleusSamplingFactor = nucleusSamplingFactor;
+            TokenSelectionBiases = tokenSelectionBiases;
+            User = user;
+            ChoicesPerPrompt = choicesPerPrompt;
+            LogProbabilityCount = logProbabilityCount;
+            Suffix = suffix;
+            Echo = echo;
+            StopSequences = stopSequences;
+            PresencePenalty = presencePenalty;
+            FrequencyPenalty = frequencyPenalty;
+            GenerationSampleCount = generationSampleCount;
+            InternalShouldStreamResponse = internalShouldStreamResponse;
+            StreamOptions = streamOptions;
+            DeploymentName = deploymentName;
+            Seed = seed;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CompletionsOptions"/> for deserialization. </summary>
+        internal CompletionsOptions()
+        {
+        }
+
+        /// <summary> The prompts to generate completions from. </summary>
+        public IList<string> Prompts { get; }
+        /// <summary> The maximum number of tokens to generate. </summary>
+        public int? MaxTokens { get; set; }
+        /// <summary>
+        /// The sampling temperature to use that controls the apparent creativity of generated completions.
+        /// Higher values will make output more random while lower values will make results more focused
+        /// and deterministic.
+        /// It is not recommended to modify temperature and top_p for the same completions request as the
+        /// interaction of these two settings is difficult to predict.
+        /// </summary>
+        public float? Temperature { get; set; }
+        /// <summary>
+        /// An alternative to sampling with temperature called nucleus sampling. This value causes the
+        /// model to consider the results of tokens with the provided probability mass. As an example, a
+        /// value of 0.15 will cause only the tokens comprising the top 15% of probability mass to be
+        /// considered.
+        /// It is not recommended to modify temperature and top_p for the same completions request as the
+        /// interaction of these two settings is difficult to predict.
+        /// </summary>
+        public float? NucleusSamplingFactor { get; set; }
+        /// <summary>
+        /// A map between GPT token IDs and bias scores that influences the probability of specific tokens
+        /// appearing in a completions response. Token IDs are computed via external tokenizer tools, while
+        /// bias scores reside in the range of -100 to 100 with minimum and maximum values corresponding to
+        /// a full ban or exclusive selection of a token, respectively. The exact behavior of a given bias
+        /// score varies by model.
+        /// </summary>
+        public IDictionary<string, int> TokenSelectionBiases { get; }
+        /// <summary>
+        /// An identifier for the caller or end user of the operation. This may be used for tracking
+        /// or rate-limiting purposes.
+        /// </summary>
+        public string User { get; set; }
+        /// <summary>
+        /// The number of completions choices that should be generated per provided prompt as part of an
+        /// overall completions response.
+        /// Because this setting can generate many completions, it may quickly consume your token quota.
+        /// Use carefully and ensure reasonable settings for max_tokens and stop.
+        /// </summary>
+        public int? ChoicesPerPrompt { get; set; }
+        /// <summary>
+        /// A value that controls the emission of log probabilities for the provided number of most likely
+        /// tokens within a completions response.
+        /// </summary>
+        public int? LogProbabilityCount { get; set; }
+        /// <summary> The suffix that comes after a completion of inserted text. </summary>
+        public string Suffix { get; set; }
+        /// <summary>
+        /// A value specifying whether completions responses should include input prompts as prefixes to
+        /// their generated output.
+        /// </summary>
+        public bool? Echo { get; set; }
+        /// <summary> A collection of textual sequences that will end completions generation. </summary>
+        public IList<string> StopSequences { get; }
+        /// <summary>
+        /// A value that influences the probability of generated tokens appearing based on their existing
+        /// presence in generated text.
+        /// Positive values will make tokens less likely to appear when they already exist and increase the
+        /// model's likelihood to output new topics.
+        /// </summary>
+        public float? PresencePenalty { get; set; }
+        /// <summary>
+        /// A value that influences the probability of generated tokens appearing based on their cumulative
+        /// frequency in generated text.
+        /// Positive values will make tokens less likely to appear as their frequency increases and
+        /// decrease the likelihood of the model repeating the same statements verbatim.
+        /// </summary>
+        public float? FrequencyPenalty { get; set; }
+        /// <summary>
+        /// A value that controls how many completions will be internally generated prior to response
+        /// formulation.
+        /// When used together with n, best_of controls the number of candidate completions and must be
+        /// greater than n.
+        /// Because this setting can generate many completions, it may quickly consume your token quota.
+        /// Use carefully and ensure reasonable settings for max_tokens and stop.
+        /// </summary>
+        public int? GenerationSampleCount { get; set; }
+        /// <summary> A value indicating whether chat completions should be streamed for this request. </summary>
+        public bool? InternalShouldStreamResponse { get; set; }
+        /// <summary> Options for streaming response. Only set this when you set `stream: true`. </summary>
+        public ChatCompletionStreamOptions StreamOptions { get; set; }
+        /// <summary>
+        /// The model name to provide as part of this completions request.
+        /// Not applicable to Azure OpenAI, where deployment information should be included in the Azure
+        /// resource URI that's connected to.
+        /// </summary>
+        public string DeploymentName { get; set; }
+        /// <summary>
+        /// If specified, our system will make a best effort to sample deterministically, such that repeated requests with the same `seed` and parameters should return the same result.
+        ///
+        /// Determinism is not guaranteed, and you should refer to the `system_fingerprint` response parameter to monitor changes in the backend.
+        /// </summary>
+        public int? Seed { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsUsage.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsUsage.Serialization.cs
new file mode 100644
index 000000000000..02e18395a92d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsUsage.Serialization.cs
@@ -0,0 +1,166 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class CompletionsUsage : IUtf8JsonSerializable, IJsonModel<CompletionsUsage>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CompletionsUsage>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<CompletionsUsage>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsUsage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CompletionsUsage)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("completion_tokens"u8);
+            writer.WriteNumberValue(CompletionTokens);
+            writer.WritePropertyName("prompt_tokens"u8);
+            writer.WriteNumberValue(PromptTokens);
+            writer.WritePropertyName("total_tokens"u8);
+            writer.WriteNumberValue(TotalTokens);
+            if (Optional.IsDefined(CompletionTokensDetails))
+            {
+                writer.WritePropertyName("completion_tokens_details"u8);
+                writer.WriteObjectValue(CompletionTokensDetails, options);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        CompletionsUsage IJsonModel<CompletionsUsage>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsUsage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CompletionsUsage)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeCompletionsUsage(document.RootElement, options);
+        }
+
+        internal static CompletionsUsage DeserializeCompletionsUsage(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            int completionTokens = default;
+            int promptTokens = default;
+            int totalTokens = default;
+            CompletionsUsageCompletionTokensDetails completionTokensDetails = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("completion_tokens"u8))
+                {
+                    completionTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("prompt_tokens"u8))
+                {
+                    promptTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("total_tokens"u8))
+                {
+                    totalTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("completion_tokens_details"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    completionTokensDetails = CompletionsUsageCompletionTokensDetails.DeserializeCompletionsUsageCompletionTokensDetails(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new CompletionsUsage(completionTokens, promptTokens, totalTokens, completionTokensDetails, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<CompletionsUsage>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsUsage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(CompletionsUsage)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        CompletionsUsage IPersistableModel<CompletionsUsage>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsUsage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeCompletionsUsage(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(CompletionsUsage)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<CompletionsUsage>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static CompletionsUsage FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeCompletionsUsage(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsUsage.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsUsage.cs
new file mode 100644
index 000000000000..8f0490056805
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsUsage.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// Representation of the token counts processed for a completions request.
+    /// Counts consider all tokens across prompts, choices, choice alternates, best_of generations, and
+    /// other consumers.
+    /// </summary>
+    public partial class CompletionsUsage
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="CompletionsUsage"/>. </summary>
+        /// <param name="completionTokens"> The number of tokens generated across all completions emissions. </param>
+        /// <param name="promptTokens"> The number of tokens in the provided prompts for the completions request. </param>
+        /// <param name="totalTokens"> The total number of tokens processed for the completions request and response. </param>
+        internal CompletionsUsage(int completionTokens, int promptTokens, int totalTokens)
+        {
+            CompletionTokens = completionTokens;
+            PromptTokens = promptTokens;
+            TotalTokens = totalTokens;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CompletionsUsage"/>. </summary>
+        /// <param name="completionTokens"> The number of tokens generated across all completions emissions. </param>
+        /// <param name="promptTokens"> The number of tokens in the provided prompts for the completions request. </param>
+        /// <param name="totalTokens"> The total number of tokens processed for the completions request and response. </param>
+        /// <param name="completionTokensDetails"> Breakdown of tokens used in a completion. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal CompletionsUsage(int completionTokens, int promptTokens, int totalTokens, CompletionsUsageCompletionTokensDetails completionTokensDetails, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            CompletionTokens = completionTokens;
+            PromptTokens = promptTokens;
+            TotalTokens = totalTokens;
+            CompletionTokensDetails = completionTokensDetails;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CompletionsUsage"/> for deserialization. </summary>
+        internal CompletionsUsage()
+        {
+        }
+
+        /// <summary> The number of tokens generated across all completions emissions. </summary>
+        public int CompletionTokens { get; }
+        /// <summary> The number of tokens in the provided prompts for the completions request. </summary>
+        public int PromptTokens { get; }
+        /// <summary> The total number of tokens processed for the completions request and response. </summary>
+        public int TotalTokens { get; }
+        /// <summary> Breakdown of tokens used in a completion. </summary>
+        public CompletionsUsageCompletionTokensDetails CompletionTokensDetails { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsUsageCompletionTokensDetails.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsUsageCompletionTokensDetails.Serialization.cs
new file mode 100644
index 000000000000..28718cfdd940
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsUsageCompletionTokensDetails.Serialization.cs
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class CompletionsUsageCompletionTokensDetails : IUtf8JsonSerializable, IJsonModel<CompletionsUsageCompletionTokensDetails>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CompletionsUsageCompletionTokensDetails>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<CompletionsUsageCompletionTokensDetails>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsUsageCompletionTokensDetails>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CompletionsUsageCompletionTokensDetails)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(ReasoningTokens))
+            {
+                writer.WritePropertyName("reasoning_tokens"u8);
+                writer.WriteNumberValue(ReasoningTokens.Value);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        CompletionsUsageCompletionTokensDetails IJsonModel<CompletionsUsageCompletionTokensDetails>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsUsageCompletionTokensDetails>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CompletionsUsageCompletionTokensDetails)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeCompletionsUsageCompletionTokensDetails(document.RootElement, options);
+        }
+
+        internal static CompletionsUsageCompletionTokensDetails DeserializeCompletionsUsageCompletionTokensDetails(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            int? reasoningTokens = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("reasoning_tokens"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    reasoningTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new CompletionsUsageCompletionTokensDetails(reasoningTokens, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<CompletionsUsageCompletionTokensDetails>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsUsageCompletionTokensDetails>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(CompletionsUsageCompletionTokensDetails)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        CompletionsUsageCompletionTokensDetails IPersistableModel<CompletionsUsageCompletionTokensDetails>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CompletionsUsageCompletionTokensDetails>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeCompletionsUsageCompletionTokensDetails(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(CompletionsUsageCompletionTokensDetails)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<CompletionsUsageCompletionTokensDetails>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static CompletionsUsageCompletionTokensDetails FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeCompletionsUsageCompletionTokensDetails(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterProtectedMaterialCitationResult.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsUsageCompletionTokensDetails.cs
similarity index 62%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterProtectedMaterialCitationResult.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsUsageCompletionTokensDetails.cs
index 155740c21393..e2cf5d8994d8 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterProtectedMaterialCitationResult.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/CompletionsUsageCompletionTokensDetails.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -7,8 +10,8 @@
 
 namespace Azure.AI.OpenAI
 {
-    /// <summary> The AzureContentFilterResultForChoiceProtectedMaterialCodeCitation. </summary>
-    public partial class ContentFilterProtectedMaterialCitationResult
+    /// <summary> The CompletionsUsageCompletionTokensDetails. </summary>
+    public partial class CompletionsUsageCompletionTokensDetails
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -40,24 +43,23 @@ public partial class ContentFilterProtectedMaterialCitationResult
         /// </list>
         /// </para>
         /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="ContentFilterProtectedMaterialCitationResult"/>. </summary>
-        internal ContentFilterProtectedMaterialCitationResult()
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="CompletionsUsageCompletionTokensDetails"/>. </summary>
+        internal CompletionsUsageCompletionTokensDetails()
         {
         }
 
-        /// <summary> Initializes a new instance of <see cref="ContentFilterProtectedMaterialCitationResult"/>. </summary>
-        /// <param name="license"> The name or identifier of the license associated with the detection. </param>
-        /// <param name="uri"> The URL associated with the license. </param>
+        /// <summary> Initializes a new instance of <see cref="CompletionsUsageCompletionTokensDetails"/>. </summary>
+        /// <param name="reasoningTokens"> Tokens generated by the model for reasoning. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContentFilterProtectedMaterialCitationResult(string license, Uri uri, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal CompletionsUsageCompletionTokensDetails(int? reasoningTokens, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
-            License = license;
-            Uri = uri;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
+            ReasoningTokens = reasoningTokens;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> The name or identifier of the license associated with the detection. </summary>
-        public string License { get; }
+        /// <summary> Tokens generated by the model for reasoning. </summary>
+        public int? ReasoningTokens { get; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterBlocklistIdResult.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterBlocklistIdResult.Serialization.cs
new file mode 100644
index 000000000000..65a5bb117995
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterBlocklistIdResult.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ContentFilterBlocklistIdResult : IUtf8JsonSerializable, IJsonModel<ContentFilterBlocklistIdResult>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContentFilterBlocklistIdResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ContentFilterBlocklistIdResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterBlocklistIdResult>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ContentFilterBlocklistIdResult)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("filtered"u8);
+            writer.WriteBooleanValue(Filtered);
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ContentFilterBlocklistIdResult IJsonModel<ContentFilterBlocklistIdResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterBlocklistIdResult>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ContentFilterBlocklistIdResult)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeContentFilterBlocklistIdResult(document.RootElement, options);
+        }
+
+        internal static ContentFilterBlocklistIdResult DeserializeContentFilterBlocklistIdResult(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            bool filtered = default;
+            string id = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("filtered"u8))
+                {
+                    filtered = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ContentFilterBlocklistIdResult(filtered, id, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ContentFilterBlocklistIdResult>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterBlocklistIdResult>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ContentFilterBlocklistIdResult)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ContentFilterBlocklistIdResult IPersistableModel<ContentFilterBlocklistIdResult>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterBlocklistIdResult>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeContentFilterBlocklistIdResult(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ContentFilterBlocklistIdResult)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ContentFilterBlocklistIdResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ContentFilterBlocklistIdResult FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeContentFilterBlocklistIdResult(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterBlocklistResultDetail.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterBlocklistIdResult.cs
similarity index 59%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterBlocklistResultDetail.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterBlocklistIdResult.cs
index d0726035c32b..012d845ccce3 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterBlocklistResultDetail.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterBlocklistIdResult.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -7,8 +10,8 @@
 
 namespace Azure.AI.OpenAI
 {
-    /// <summary> The AzureContentFilterBlocklistResultDetail. </summary>
-    internal partial class InternalAzureContentFilterBlocklistResultDetail
+    /// <summary> Represents the outcome of an evaluation against a custom blocklist as performed by content filtering. </summary>
+    public partial class ContentFilterBlocklistIdResult
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -40,12 +43,13 @@ internal partial class InternalAzureContentFilterBlocklistResultDetail
         /// </list>
         /// </para>
         /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="InternalAzureContentFilterBlocklistResultDetail"/>. </summary>
-        /// <param name="filtered"> A value indicating whether the blocklist produced a filtering action. </param>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ContentFilterBlocklistIdResult"/>. </summary>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
         /// <param name="id"> The ID of the custom blocklist evaluated. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
-        internal InternalAzureContentFilterBlocklistResultDetail(bool filtered, string id)
+        internal ContentFilterBlocklistIdResult(bool filtered, string id)
         {
             Argument.AssertNotNull(id, nameof(id));
 
@@ -53,26 +57,25 @@ internal InternalAzureContentFilterBlocklistResultDetail(bool filtered, string i
             Id = id;
         }
 
-        /// <summary> Initializes a new instance of <see cref="InternalAzureContentFilterBlocklistResultDetail"/>. </summary>
-        /// <param name="filtered"> A value indicating whether the blocklist produced a filtering action. </param>
+        /// <summary> Initializes a new instance of <see cref="ContentFilterBlocklistIdResult"/>. </summary>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
         /// <param name="id"> The ID of the custom blocklist evaluated. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalAzureContentFilterBlocklistResultDetail(bool filtered, string id, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal ContentFilterBlocklistIdResult(bool filtered, string id, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Filtered = filtered;
             Id = id;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="InternalAzureContentFilterBlocklistResultDetail"/> for deserialization. </summary>
-        internal InternalAzureContentFilterBlocklistResultDetail()
+        /// <summary> Initializes a new instance of <see cref="ContentFilterBlocklistIdResult"/> for deserialization. </summary>
+        internal ContentFilterBlocklistIdResult()
         {
         }
 
-        /// <summary> A value indicating whether the blocklist produced a filtering action. </summary>
-        internal bool Filtered { get; set; }
+        /// <summary> A value indicating whether or not the content has been filtered. </summary>
+        public bool Filtered { get; }
         /// <summary> The ID of the custom blocklist evaluated. </summary>
-        internal string Id { get; set; }
+        public string Id { get; }
     }
 }
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterCitedDetectionResult.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterCitedDetectionResult.Serialization.cs
new file mode 100644
index 000000000000..dc9381ee06b9
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterCitedDetectionResult.Serialization.cs
@@ -0,0 +1,169 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ContentFilterCitedDetectionResult : IUtf8JsonSerializable, IJsonModel<ContentFilterCitedDetectionResult>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContentFilterCitedDetectionResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ContentFilterCitedDetectionResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterCitedDetectionResult>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ContentFilterCitedDetectionResult)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("filtered"u8);
+            writer.WriteBooleanValue(Filtered);
+            writer.WritePropertyName("detected"u8);
+            writer.WriteBooleanValue(Detected);
+            if (Optional.IsDefined(Url))
+            {
+                writer.WritePropertyName("URL"u8);
+                writer.WriteStringValue(Url.AbsoluteUri);
+            }
+            if (Optional.IsDefined(License))
+            {
+                writer.WritePropertyName("license"u8);
+                writer.WriteStringValue(License);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ContentFilterCitedDetectionResult IJsonModel<ContentFilterCitedDetectionResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterCitedDetectionResult>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ContentFilterCitedDetectionResult)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeContentFilterCitedDetectionResult(document.RootElement, options);
+        }
+
+        internal static ContentFilterCitedDetectionResult DeserializeContentFilterCitedDetectionResult(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            bool filtered = default;
+            bool detected = default;
+            Uri url = default;
+            string license = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("filtered"u8))
+                {
+                    filtered = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("detected"u8))
+                {
+                    detected = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("URL"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    url = new Uri(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("license"u8))
+                {
+                    license = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ContentFilterCitedDetectionResult(filtered, detected, url, license, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ContentFilterCitedDetectionResult>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterCitedDetectionResult>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ContentFilterCitedDetectionResult)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ContentFilterCitedDetectionResult IPersistableModel<ContentFilterCitedDetectionResult>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterCitedDetectionResult>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeContentFilterCitedDetectionResult(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ContentFilterCitedDetectionResult)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ContentFilterCitedDetectionResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ContentFilterCitedDetectionResult FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeContentFilterCitedDetectionResult(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterCitedDetectionResult.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterCitedDetectionResult.cs
new file mode 100644
index 000000000000..5e73e0beb4b2
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterCitedDetectionResult.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Represents the outcome of a detection operation against protected resources as performed by content filtering. </summary>
+    public partial class ContentFilterCitedDetectionResult
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ContentFilterCitedDetectionResult"/>. </summary>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
+        /// <param name="detected"> A value indicating whether detection occurred, irrespective of severity or whether the content was filtered. </param>
+        internal ContentFilterCitedDetectionResult(bool filtered, bool detected)
+        {
+            Filtered = filtered;
+            Detected = detected;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ContentFilterCitedDetectionResult"/>. </summary>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
+        /// <param name="detected"> A value indicating whether detection occurred, irrespective of severity or whether the content was filtered. </param>
+        /// <param name="url"> The internet location associated with the detection. </param>
+        /// <param name="license"> The license description associated with the detection. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ContentFilterCitedDetectionResult(bool filtered, bool detected, Uri url, string license, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Filtered = filtered;
+            Detected = detected;
+            Url = url;
+            License = license;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ContentFilterCitedDetectionResult"/> for deserialization. </summary>
+        internal ContentFilterCitedDetectionResult()
+        {
+        }
+
+        /// <summary> A value indicating whether or not the content has been filtered. </summary>
+        public bool Filtered { get; }
+        /// <summary> A value indicating whether detection occurred, irrespective of severity or whether the content was filtered. </summary>
+        public bool Detected { get; }
+        /// <summary> The internet location associated with the detection. </summary>
+        public Uri Url { get; }
+        /// <summary> The license description associated with the detection. </summary>
+        public string License { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterBlocklistResult.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterDetailedResults.Serialization.cs
similarity index 54%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterBlocklistResult.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterDetailedResults.Serialization.cs
index a2f4dd0e63c4..3b06a2040887 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterBlocklistResult.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterDetailedResults.Serialization.cs
@@ -1,49 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
 namespace Azure.AI.OpenAI
 {
-    public partial class ContentFilterBlocklistResult : IJsonModel<ContentFilterBlocklistResult>
+    public partial class ContentFilterDetailedResults : IUtf8JsonSerializable, IJsonModel<ContentFilterDetailedResults>
     {
-        void IJsonModel<ContentFilterBlocklistResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContentFilterDetailedResults>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ContentFilterDetailedResults>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterBlocklistResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterDetailedResults>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ContentFilterBlocklistResult)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(ContentFilterDetailedResults)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("filtered") != true)
-            {
-                writer.WritePropertyName("filtered"u8);
-                writer.WriteBooleanValue(Filtered);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("details") != true && Optional.IsCollectionDefined(InternalDetails))
+            writer.WritePropertyName("filtered"u8);
+            writer.WriteBooleanValue(Filtered);
+            if (Optional.IsCollectionDefined(Details))
             {
                 writer.WritePropertyName("details"u8);
                 writer.WriteStartArray();
-                foreach (var item in InternalDetails)
+                foreach (var item in Details)
                 {
-                    writer.WriteObjectValue<InternalAzureContentFilterBlocklistResultDetail>(item, options);
+                    writer.WriteObjectValue(item, options);
                 }
                 writer.WriteEndArray();
             }
-            if (SerializedAdditionalRawData != null)
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -58,19 +56,19 @@ void IJsonModel<ContentFilterBlocklistResult>.Write(Utf8JsonWriter writer, Model
             writer.WriteEndObject();
         }
 
-        ContentFilterBlocklistResult IJsonModel<ContentFilterBlocklistResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        ContentFilterDetailedResults IJsonModel<ContentFilterDetailedResults>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterBlocklistResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterDetailedResults>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ContentFilterBlocklistResult)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(ContentFilterDetailedResults)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContentFilterBlocklistResult(document.RootElement, options);
+            return DeserializeContentFilterDetailedResults(document.RootElement, options);
         }
 
-        internal static ContentFilterBlocklistResult DeserializeContentFilterBlocklistResult(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static ContentFilterDetailedResults DeserializeContentFilterDetailedResults(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -79,7 +77,7 @@ internal static ContentFilterBlocklistResult DeserializeContentFilterBlocklistRe
                 return null;
             }
             bool filtered = default;
-            IReadOnlyList<InternalAzureContentFilterBlocklistResultDetail> details = default;
+            IReadOnlyList<ContentFilterBlocklistIdResult> details = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -95,67 +93,68 @@ internal static ContentFilterBlocklistResult DeserializeContentFilterBlocklistRe
                     {
                         continue;
                     }
-                    List<InternalAzureContentFilterBlocklistResultDetail> array = new List<InternalAzureContentFilterBlocklistResultDetail>();
+                    List<ContentFilterBlocklistIdResult> array = new List<ContentFilterBlocklistIdResult>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(InternalAzureContentFilterBlocklistResultDetail.DeserializeInternalAzureContentFilterBlocklistResultDetail(item, options));
+                        array.Add(ContentFilterBlocklistIdResult.DeserializeContentFilterBlocklistIdResult(item, options));
                     }
                     details = array;
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new ContentFilterBlocklistResult(filtered, details ?? new ChangeTrackingList<InternalAzureContentFilterBlocklistResultDetail>(), serializedAdditionalRawData);
+            return new ContentFilterDetailedResults(filtered, details ?? new ChangeTrackingList<ContentFilterBlocklistIdResult>(), serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<ContentFilterBlocklistResult>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<ContentFilterDetailedResults>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterBlocklistResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterDetailedResults>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(ContentFilterBlocklistResult)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ContentFilterDetailedResults)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ContentFilterBlocklistResult IPersistableModel<ContentFilterBlocklistResult>.Create(BinaryData data, ModelReaderWriterOptions options)
+        ContentFilterDetailedResults IPersistableModel<ContentFilterDetailedResults>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterBlocklistResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterDetailedResults>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContentFilterBlocklistResult(document.RootElement, options);
+                        return DeserializeContentFilterDetailedResults(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(ContentFilterBlocklistResult)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ContentFilterDetailedResults)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ContentFilterBlocklistResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ContentFilterDetailedResults>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static ContentFilterBlocklistResult FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ContentFilterDetailedResults FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContentFilterBlocklistResult(document.RootElement);
+            return DeserializeContentFilterDetailedResults(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterBlocklistResult.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterDetailedResults.cs
similarity index 55%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterBlocklistResult.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterDetailedResults.cs
index d033e0e34b57..c044a5f4eadf 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterBlocklistResult.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterDetailedResults.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -7,8 +10,8 @@
 
 namespace Azure.AI.OpenAI
 {
-    /// <summary> A collection of true/false filtering results for configured custom blocklists. </summary>
-    public partial class ContentFilterBlocklistResult
+    /// <summary> Represents a structured collection of result details for content filtering. </summary>
+    public partial class ContentFilterDetailedResults
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -40,32 +43,35 @@ public partial class ContentFilterBlocklistResult
         /// </list>
         /// </para>
         /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="ContentFilterBlocklistResult"/>. </summary>
-        /// <param name="filtered"> A value indicating whether any of the detailed blocklists resulted in a filtering action. </param>
-        internal ContentFilterBlocklistResult(bool filtered)
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ContentFilterDetailedResults"/>. </summary>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
+        internal ContentFilterDetailedResults(bool filtered)
         {
             Filtered = filtered;
-            InternalDetails = new ChangeTrackingList<InternalAzureContentFilterBlocklistResultDetail>();
+            Details = new ChangeTrackingList<ContentFilterBlocklistIdResult>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="ContentFilterBlocklistResult"/>. </summary>
-        /// <param name="filtered"> A value indicating whether any of the detailed blocklists resulted in a filtering action. </param>
-        /// <param name="internalDetails"> The pairs of individual blocklist IDs and whether they resulted in a filtering action. </param>
+        /// <summary> Initializes a new instance of <see cref="ContentFilterDetailedResults"/>. </summary>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
+        /// <param name="details"> The collection of detailed blocklist result information. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContentFilterBlocklistResult(bool filtered, IReadOnlyList<InternalAzureContentFilterBlocklistResultDetail> internalDetails, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal ContentFilterDetailedResults(bool filtered, IReadOnlyList<ContentFilterBlocklistIdResult> details, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Filtered = filtered;
-            InternalDetails = internalDetails;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
+            Details = details;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="ContentFilterBlocklistResult"/> for deserialization. </summary>
-        internal ContentFilterBlocklistResult()
+        /// <summary> Initializes a new instance of <see cref="ContentFilterDetailedResults"/> for deserialization. </summary>
+        internal ContentFilterDetailedResults()
         {
         }
 
-        /// <summary> A value indicating whether any of the detailed blocklists resulted in a filtering action. </summary>
+        /// <summary> A value indicating whether or not the content has been filtered. </summary>
         public bool Filtered { get; }
+        /// <summary> The collection of detailed blocklist result information. </summary>
+        public IReadOnlyList<ContentFilterBlocklistIdResult> Details { get; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterDetectionResult.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterDetectionResult.Serialization.cs
index 9c520fede22f..7e922f14a0d0 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterDetectionResult.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterDetectionResult.Serialization.cs
@@ -1,17 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
 namespace Azure.AI.OpenAI
 {
-    public partial class ContentFilterDetectionResult : IJsonModel<ContentFilterDetectionResult>
+    public partial class ContentFilterDetectionResult : IUtf8JsonSerializable, IJsonModel<ContentFilterDetectionResult>
     {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContentFilterDetectionResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
         void IJsonModel<ContentFilterDetectionResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             var format = options.Format == "W" ? ((IPersistableModel<ContentFilterDetectionResult>)this).GetFormatFromOptions(options) : options.Format;
@@ -21,24 +26,14 @@ void IJsonModel<ContentFilterDetectionResult>.Write(Utf8JsonWriter writer, Model
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("filtered") != true)
-            {
-                writer.WritePropertyName("filtered"u8);
-                writer.WriteBooleanValue(Filtered);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("detected") != true)
+            writer.WritePropertyName("filtered"u8);
+            writer.WriteBooleanValue(Filtered);
+            writer.WritePropertyName("detected"u8);
+            writer.WriteBooleanValue(Detected);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                writer.WritePropertyName("detected"u8);
-                writer.WriteBooleanValue(Detected);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -91,7 +86,6 @@ internal static ContentFilterDetectionResult DeserializeContentFilterDetectionRe
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
@@ -131,17 +125,19 @@ ContentFilterDetectionResult IPersistableModel<ContentFilterDetectionResult>.Cre
         string IPersistableModel<ContentFilterDetectionResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static ContentFilterDetectionResult FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ContentFilterDetectionResult FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
             return DeserializeContentFilterDetectionResult(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterDetectionResult.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterDetectionResult.cs
index 34aab24008fd..eed9a9faac26 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterDetectionResult.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterDetectionResult.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -7,10 +10,7 @@
 
 namespace Azure.AI.OpenAI
 {
-    /// <summary>
-    /// A labeled content filter result item that indicates whether the content was detected and whether the content was
-    /// filtered.
-    /// </summary>
+    /// <summary> Represents the outcome of a detection operation performed by content filtering. </summary>
     public partial class ContentFilterDetectionResult
     {
         /// <summary>
@@ -43,10 +43,11 @@ public partial class ContentFilterDetectionResult
         /// </list>
         /// </para>
         /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
         /// <summary> Initializes a new instance of <see cref="ContentFilterDetectionResult"/>. </summary>
-        /// <param name="filtered"> Whether the content detection resulted in a content filtering action. </param>
-        /// <param name="detected"> Whether the labeled content category was detected in the content. </param>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
+        /// <param name="detected"> A value indicating whether detection occurred, irrespective of severity or whether the content was filtered. </param>
         internal ContentFilterDetectionResult(bool filtered, bool detected)
         {
             Filtered = filtered;
@@ -54,14 +55,14 @@ internal ContentFilterDetectionResult(bool filtered, bool detected)
         }
 
         /// <summary> Initializes a new instance of <see cref="ContentFilterDetectionResult"/>. </summary>
-        /// <param name="filtered"> Whether the content detection resulted in a content filtering action. </param>
-        /// <param name="detected"> Whether the labeled content category was detected in the content. </param>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
+        /// <param name="detected"> A value indicating whether detection occurred, irrespective of severity or whether the content was filtered. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
         internal ContentFilterDetectionResult(bool filtered, bool detected, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Filtered = filtered;
             Detected = detected;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
         /// <summary> Initializes a new instance of <see cref="ContentFilterDetectionResult"/> for deserialization. </summary>
@@ -69,9 +70,9 @@ internal ContentFilterDetectionResult()
         {
         }
 
-        /// <summary> Whether the content detection resulted in a content filtering action. </summary>
+        /// <summary> A value indicating whether or not the content has been filtered. </summary>
         public bool Filtered { get; }
-        /// <summary> Whether the labeled content category was detected in the content. </summary>
+        /// <summary> A value indicating whether detection occurred, irrespective of severity or whether the content was filtered. </summary>
         public bool Detected { get; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterProtectedMaterialCitationResult.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterProtectedMaterialCitationResult.Serialization.cs
deleted file mode 100644
index 6847bd6a8e6b..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterProtectedMaterialCitationResult.Serialization.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI
-{
-    public partial class ContentFilterProtectedMaterialCitationResult : IJsonModel<ContentFilterProtectedMaterialCitationResult>
-    {
-        void IJsonModel<ContentFilterProtectedMaterialCitationResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterProtectedMaterialCitationResult>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContentFilterProtectedMaterialCitationResult)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("license") != true && Optional.IsDefined(License))
-            {
-                writer.WritePropertyName("license"u8);
-                writer.WriteStringValue(License);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("URL") != true && Optional.IsDefined(Uri))
-            {
-                writer.WritePropertyName("URL"u8);
-                writer.WriteStringValue(Uri.AbsoluteUri);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        ContentFilterProtectedMaterialCitationResult IJsonModel<ContentFilterProtectedMaterialCitationResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterProtectedMaterialCitationResult>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContentFilterProtectedMaterialCitationResult)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContentFilterProtectedMaterialCitationResult(document.RootElement, options);
-        }
-
-        internal static ContentFilterProtectedMaterialCitationResult DeserializeContentFilterProtectedMaterialCitationResult(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string license = default;
-            Uri url = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("license"u8))
-                {
-                    license = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("URL"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    url = new Uri(property.Value.GetString());
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContentFilterProtectedMaterialCitationResult(license, url, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContentFilterProtectedMaterialCitationResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterProtectedMaterialCitationResult>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContentFilterProtectedMaterialCitationResult)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContentFilterProtectedMaterialCitationResult IPersistableModel<ContentFilterProtectedMaterialCitationResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterProtectedMaterialCitationResult>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContentFilterProtectedMaterialCitationResult(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContentFilterProtectedMaterialCitationResult)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContentFilterProtectedMaterialCitationResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static ContentFilterProtectedMaterialCitationResult FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContentFilterProtectedMaterialCitationResult(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterProtectedMaterialResult.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterProtectedMaterialResult.Serialization.cs
deleted file mode 100644
index 96ed6972ea3c..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterProtectedMaterialResult.Serialization.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI
-{
-    public partial class ContentFilterProtectedMaterialResult : IJsonModel<ContentFilterProtectedMaterialResult>
-    {
-        void IJsonModel<ContentFilterProtectedMaterialResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterProtectedMaterialResult>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContentFilterProtectedMaterialResult)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("filtered") != true)
-            {
-                writer.WritePropertyName("filtered"u8);
-                writer.WriteBooleanValue(Filtered);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("detected") != true)
-            {
-                writer.WritePropertyName("detected"u8);
-                writer.WriteBooleanValue(Detected);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("citation") != true && Optional.IsDefined(Citation))
-            {
-                writer.WritePropertyName("citation"u8);
-                writer.WriteObjectValue(Citation, options);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        ContentFilterProtectedMaterialResult IJsonModel<ContentFilterProtectedMaterialResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterProtectedMaterialResult>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContentFilterProtectedMaterialResult)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContentFilterProtectedMaterialResult(document.RootElement, options);
-        }
-
-        internal static ContentFilterProtectedMaterialResult DeserializeContentFilterProtectedMaterialResult(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            bool filtered = default;
-            bool detected = default;
-            ContentFilterProtectedMaterialCitationResult citation = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("filtered"u8))
-                {
-                    filtered = property.Value.GetBoolean();
-                    continue;
-                }
-                if (property.NameEquals("detected"u8))
-                {
-                    detected = property.Value.GetBoolean();
-                    continue;
-                }
-                if (property.NameEquals("citation"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    citation = ContentFilterProtectedMaterialCitationResult.DeserializeContentFilterProtectedMaterialCitationResult(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContentFilterProtectedMaterialResult(filtered, detected, citation, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContentFilterProtectedMaterialResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterProtectedMaterialResult>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContentFilterProtectedMaterialResult)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContentFilterProtectedMaterialResult IPersistableModel<ContentFilterProtectedMaterialResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterProtectedMaterialResult>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContentFilterProtectedMaterialResult(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContentFilterProtectedMaterialResult)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContentFilterProtectedMaterialResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static ContentFilterProtectedMaterialResult FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContentFilterProtectedMaterialResult(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterProtectedMaterialResult.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterProtectedMaterialResult.cs
deleted file mode 100644
index 533e4b11b32b..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterProtectedMaterialResult.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI
-{
-    /// <summary> The AzureContentFilterResultForChoiceProtectedMaterialCode. </summary>
-    public partial class ContentFilterProtectedMaterialResult
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="ContentFilterProtectedMaterialResult"/>. </summary>
-        /// <param name="filtered"> Whether the content detection resulted in a content filtering action. </param>
-        /// <param name="detected"> Whether the labeled content category was detected in the content. </param>
-        internal ContentFilterProtectedMaterialResult(bool filtered, bool detected)
-        {
-            Filtered = filtered;
-            Detected = detected;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContentFilterProtectedMaterialResult"/>. </summary>
-        /// <param name="filtered"> Whether the content detection resulted in a content filtering action. </param>
-        /// <param name="detected"> Whether the labeled content category was detected in the content. </param>
-        /// <param name="citation"> If available, the citation details describing the associated license and its location. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContentFilterProtectedMaterialResult(bool filtered, bool detected, ContentFilterProtectedMaterialCitationResult citation, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Filtered = filtered;
-            Detected = detected;
-            Citation = citation;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ContentFilterProtectedMaterialResult"/> for deserialization. </summary>
-        internal ContentFilterProtectedMaterialResult()
-        {
-        }
-
-        /// <summary> Whether the content detection resulted in a content filtering action. </summary>
-        public bool Filtered { get; }
-        /// <summary> Whether the labeled content category was detected in the content. </summary>
-        public bool Detected { get; }
-        /// <summary> If available, the citation details describing the associated license and its location. </summary>
-        public ContentFilterProtectedMaterialCitationResult Citation { get; }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResult.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResult.Serialization.cs
new file mode 100644
index 000000000000..66e09ecace67
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResult.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ContentFilterResult : IUtf8JsonSerializable, IJsonModel<ContentFilterResult>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContentFilterResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ContentFilterResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ContentFilterResult)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("filtered"u8);
+            writer.WriteBooleanValue(Filtered);
+            writer.WritePropertyName("severity"u8);
+            writer.WriteStringValue(Severity.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ContentFilterResult IJsonModel<ContentFilterResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ContentFilterResult)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeContentFilterResult(document.RootElement, options);
+        }
+
+        internal static ContentFilterResult DeserializeContentFilterResult(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            bool filtered = default;
+            ContentFilterSeverity severity = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("filtered"u8))
+                {
+                    filtered = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("severity"u8))
+                {
+                    severity = new ContentFilterSeverity(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ContentFilterResult(filtered, severity, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ContentFilterResult>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ContentFilterResult)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ContentFilterResult IPersistableModel<ContentFilterResult>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeContentFilterResult(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ContentFilterResult)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ContentFilterResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ContentFilterResult FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeContentFilterResult(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterSeverityResult.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResult.cs
similarity index 57%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterSeverityResult.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResult.cs
index 95f0fa1bca5a..ea7952376a34 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterSeverityResult.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResult.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -7,11 +10,8 @@
 
 namespace Azure.AI.OpenAI
 {
-    /// <summary>
-    /// A labeled content filter result item that indicates whether the content was filtered and what the qualitative
-    /// severity level of the content was, as evaluated against content filter configuration for the category.
-    /// </summary>
-    public partial class ContentFilterSeverityResult
+    /// <summary> Information about filtered content severity level and if it has been filtered or not. </summary>
+    public partial class ContentFilterResult
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -43,33 +43,36 @@ public partial class ContentFilterSeverityResult
         /// </list>
         /// </para>
         /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="ContentFilterSeverityResult"/>. </summary>
-        /// <param name="filtered"> Whether the content severity resulted in a content filtering action. </param>
-        /// <param name="severity"> The labeled severity of the content. </param>
-        internal ContentFilterSeverityResult(bool filtered, ContentFilterSeverity severity)
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ContentFilterResult"/>. </summary>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
+        /// <param name="severity"> Ratings for the intensity and risk level of filtered content. </param>
+        internal ContentFilterResult(bool filtered, ContentFilterSeverity severity)
         {
             Filtered = filtered;
             Severity = severity;
         }
 
-        /// <summary> Initializes a new instance of <see cref="ContentFilterSeverityResult"/>. </summary>
-        /// <param name="filtered"> Whether the content severity resulted in a content filtering action. </param>
-        /// <param name="severity"> The labeled severity of the content. </param>
+        /// <summary> Initializes a new instance of <see cref="ContentFilterResult"/>. </summary>
+        /// <param name="filtered"> A value indicating whether or not the content has been filtered. </param>
+        /// <param name="severity"> Ratings for the intensity and risk level of filtered content. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ContentFilterSeverityResult(bool filtered, ContentFilterSeverity severity, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal ContentFilterResult(bool filtered, ContentFilterSeverity severity, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Filtered = filtered;
             Severity = severity;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="ContentFilterSeverityResult"/> for deserialization. </summary>
-        internal ContentFilterSeverityResult()
+        /// <summary> Initializes a new instance of <see cref="ContentFilterResult"/> for deserialization. </summary>
+        internal ContentFilterResult()
         {
         }
 
-        /// <summary> Whether the content severity resulted in a content filtering action. </summary>
+        /// <summary> A value indicating whether or not the content has been filtered. </summary>
         public bool Filtered { get; }
+        /// <summary> Ratings for the intensity and risk level of filtered content. </summary>
+        public ContentFilterSeverity Severity { get; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterResultForPromptContentFilterResults.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultDetailsForPrompt.Serialization.cs
similarity index 55%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterResultForPromptContentFilterResults.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultDetailsForPrompt.Serialization.cs
index c2378dd52216..549644d7cf19 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterResultForPromptContentFilterResults.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultDetailsForPrompt.Serialization.cs
@@ -1,79 +1,80 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
 namespace Azure.AI.OpenAI
 {
-    internal partial class InternalAzureContentFilterResultForPromptContentFilterResults : IJsonModel<InternalAzureContentFilterResultForPromptContentFilterResults>
+    public partial class ContentFilterResultDetailsForPrompt : IUtf8JsonSerializable, IJsonModel<ContentFilterResultDetailsForPrompt>
     {
-        void IJsonModel<InternalAzureContentFilterResultForPromptContentFilterResults>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContentFilterResultDetailsForPrompt>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ContentFilterResultDetailsForPrompt>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterResultForPromptContentFilterResults>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResultDetailsForPrompt>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalAzureContentFilterResultForPromptContentFilterResults)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(ContentFilterResultDetailsForPrompt)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("sexual") != true && Optional.IsDefined(Sexual))
+            if (Optional.IsDefined(Sexual))
             {
                 writer.WritePropertyName("sexual"u8);
                 writer.WriteObjectValue(Sexual, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("hate") != true && Optional.IsDefined(Hate))
-            {
-                writer.WritePropertyName("hate"u8);
-                writer.WriteObjectValue(Hate, options);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("violence") != true && Optional.IsDefined(Violence))
+            if (Optional.IsDefined(Violence))
             {
                 writer.WritePropertyName("violence"u8);
                 writer.WriteObjectValue(Violence, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("self_harm") != true && Optional.IsDefined(SelfHarm))
+            if (Optional.IsDefined(Hate))
+            {
+                writer.WritePropertyName("hate"u8);
+                writer.WriteObjectValue(Hate, options);
+            }
+            if (Optional.IsDefined(SelfHarm))
             {
                 writer.WritePropertyName("self_harm"u8);
                 writer.WriteObjectValue(SelfHarm, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("profanity") != true && Optional.IsDefined(Profanity))
+            if (Optional.IsDefined(Profanity))
             {
                 writer.WritePropertyName("profanity"u8);
                 writer.WriteObjectValue(Profanity, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("custom_blocklists") != true && Optional.IsDefined(CustomBlocklists))
+            if (Optional.IsDefined(CustomBlocklists))
             {
                 writer.WritePropertyName("custom_blocklists"u8);
                 writer.WriteObjectValue(CustomBlocklists, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("error") != true && Optional.IsDefined(Error))
+            if (Optional.IsDefined(Error))
             {
                 writer.WritePropertyName("error"u8);
-                writer.WriteObjectValue(Error, options);
+                JsonSerializer.Serialize(writer, Error);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("jailbreak") != true)
+            if (Optional.IsDefined(Jailbreak))
             {
                 writer.WritePropertyName("jailbreak"u8);
                 writer.WriteObjectValue(Jailbreak, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("indirect_attack") != true)
+            if (Optional.IsDefined(IndirectAttack))
             {
                 writer.WritePropertyName("indirect_attack"u8);
                 writer.WriteObjectValue(IndirectAttack, options);
             }
-            if (SerializedAdditionalRawData != null)
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -88,19 +89,19 @@ void IJsonModel<InternalAzureContentFilterResultForPromptContentFilterResults>.W
             writer.WriteEndObject();
         }
 
-        InternalAzureContentFilterResultForPromptContentFilterResults IJsonModel<InternalAzureContentFilterResultForPromptContentFilterResults>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        ContentFilterResultDetailsForPrompt IJsonModel<ContentFilterResultDetailsForPrompt>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterResultForPromptContentFilterResults>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResultDetailsForPrompt>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalAzureContentFilterResultForPromptContentFilterResults)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(ContentFilterResultDetailsForPrompt)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureContentFilterResultForPromptContentFilterResults(document.RootElement, options);
+            return DeserializeContentFilterResultDetailsForPrompt(document.RootElement, options);
         }
 
-        internal static InternalAzureContentFilterResultForPromptContentFilterResults DeserializeInternalAzureContentFilterResultForPromptContentFilterResults(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static ContentFilterResultDetailsForPrompt DeserializeContentFilterResultDetailsForPrompt(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -108,13 +109,13 @@ internal static InternalAzureContentFilterResultForPromptContentFilterResults De
             {
                 return null;
             }
-            ContentFilterSeverityResult sexual = default;
-            ContentFilterSeverityResult hate = default;
-            ContentFilterSeverityResult violence = default;
-            ContentFilterSeverityResult selfHarm = default;
+            ContentFilterResult sexual = default;
+            ContentFilterResult violence = default;
+            ContentFilterResult hate = default;
+            ContentFilterResult selfHarm = default;
             ContentFilterDetectionResult profanity = default;
-            ContentFilterBlocklistResult customBlocklists = default;
-            InternalAzureContentFilterResultForPromptContentFilterResultsError error = default;
+            ContentFilterDetailedResults customBlocklists = default;
+            ResponseError error = default;
             ContentFilterDetectionResult jailbreak = default;
             ContentFilterDetectionResult indirectAttack = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
@@ -127,25 +128,25 @@ internal static InternalAzureContentFilterResultForPromptContentFilterResults De
                     {
                         continue;
                     }
-                    sexual = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    sexual = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
-                if (property.NameEquals("hate"u8))
+                if (property.NameEquals("violence"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    hate = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    violence = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
-                if (property.NameEquals("violence"u8))
+                if (property.NameEquals("hate"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    violence = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    hate = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("self_harm"u8))
@@ -154,7 +155,7 @@ internal static InternalAzureContentFilterResultForPromptContentFilterResults De
                     {
                         continue;
                     }
-                    selfHarm = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    selfHarm = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("profanity"u8))
@@ -172,7 +173,7 @@ internal static InternalAzureContentFilterResultForPromptContentFilterResults De
                     {
                         continue;
                     }
-                    customBlocklists = ContentFilterBlocklistResult.DeserializeContentFilterBlocklistResult(property.Value, options);
+                    customBlocklists = ContentFilterDetailedResults.DeserializeContentFilterDetailedResults(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("error"u8))
@@ -181,30 +182,37 @@ internal static InternalAzureContentFilterResultForPromptContentFilterResults De
                     {
                         continue;
                     }
-                    error = InternalAzureContentFilterResultForPromptContentFilterResultsError.DeserializeInternalAzureContentFilterResultForPromptContentFilterResultsError(property.Value, options);
+                    error = JsonSerializer.Deserialize<ResponseError>(property.Value.GetRawText());
                     continue;
                 }
                 if (property.NameEquals("jailbreak"u8))
                 {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
                     jailbreak = ContentFilterDetectionResult.DeserializeContentFilterDetectionResult(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("indirect_attack"u8))
                 {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
                     indirectAttack = ContentFilterDetectionResult.DeserializeContentFilterDetectionResult(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureContentFilterResultForPromptContentFilterResults(
+            return new ContentFilterResultDetailsForPrompt(
                 sexual,
-                hate,
                 violence,
+                hate,
                 selfHarm,
                 profanity,
                 customBlocklists,
@@ -214,50 +222,51 @@ internal static InternalAzureContentFilterResultForPromptContentFilterResults De
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<InternalAzureContentFilterResultForPromptContentFilterResults>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<ContentFilterResultDetailsForPrompt>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterResultForPromptContentFilterResults>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResultDetailsForPrompt>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(InternalAzureContentFilterResultForPromptContentFilterResults)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ContentFilterResultDetailsForPrompt)} does not support writing '{options.Format}' format.");
             }
         }
 
-        InternalAzureContentFilterResultForPromptContentFilterResults IPersistableModel<InternalAzureContentFilterResultForPromptContentFilterResults>.Create(BinaryData data, ModelReaderWriterOptions options)
+        ContentFilterResultDetailsForPrompt IPersistableModel<ContentFilterResultDetailsForPrompt>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterResultForPromptContentFilterResults>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResultDetailsForPrompt>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureContentFilterResultForPromptContentFilterResults(document.RootElement, options);
+                        return DeserializeContentFilterResultDetailsForPrompt(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(InternalAzureContentFilterResultForPromptContentFilterResults)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ContentFilterResultDetailsForPrompt)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<InternalAzureContentFilterResultForPromptContentFilterResults>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ContentFilterResultDetailsForPrompt>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static InternalAzureContentFilterResultForPromptContentFilterResults FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ContentFilterResultDetailsForPrompt FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureContentFilterResultForPromptContentFilterResults(document.RootElement);
+            return DeserializeContentFilterResultDetailsForPrompt(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultDetailsForPrompt.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultDetailsForPrompt.cs
new file mode 100644
index 000000000000..acec97c64cc9
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultDetailsForPrompt.cs
@@ -0,0 +1,137 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Information about content filtering evaluated against input data to Azure OpenAI. </summary>
+    public partial class ContentFilterResultDetailsForPrompt
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ContentFilterResultDetailsForPrompt"/>. </summary>
+        internal ContentFilterResultDetailsForPrompt()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ContentFilterResultDetailsForPrompt"/>. </summary>
+        /// <param name="sexual">
+        /// Describes language related to anatomical organs and genitals, romantic relationships,
+        ///  acts portrayed in erotic or affectionate terms, physical sexual acts, including
+        ///  those portrayed as an assault or a forced sexual violent act against one’s will,
+        ///  prostitution, pornography, and abuse.
+        /// </param>
+        /// <param name="violence">
+        /// Describes language related to physical actions intended to hurt, injure, damage, or
+        /// kill someone or something; describes weapons, etc.
+        /// </param>
+        /// <param name="hate">
+        /// Describes language attacks or uses that include pejorative or discriminatory language
+        /// with reference to a person or identity group on the basis of certain differentiating
+        /// attributes of these groups including but not limited to race, ethnicity, nationality,
+        /// gender identity and expression, sexual orientation, religion, immigration status, ability
+        /// status, personal appearance, and body size.
+        /// </param>
+        /// <param name="selfHarm">
+        /// Describes language related to physical actions intended to purposely hurt, injure,
+        /// or damage one’s body, or kill oneself.
+        /// </param>
+        /// <param name="profanity"> Describes whether profanity was detected. </param>
+        /// <param name="customBlocklists"> Describes detection results against configured custom blocklists. </param>
+        /// <param name="error">
+        /// Describes an error returned if the content filtering system is
+        /// down or otherwise unable to complete the operation in time.
+        /// </param>
+        /// <param name="jailbreak"> Whether a jailbreak attempt was detected in the prompt. </param>
+        /// <param name="indirectAttack"> Whether an indirect attack was detected in the prompt. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ContentFilterResultDetailsForPrompt(ContentFilterResult sexual, ContentFilterResult violence, ContentFilterResult hate, ContentFilterResult selfHarm, ContentFilterDetectionResult profanity, ContentFilterDetailedResults customBlocklists, ResponseError error, ContentFilterDetectionResult jailbreak, ContentFilterDetectionResult indirectAttack, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Sexual = sexual;
+            Violence = violence;
+            Hate = hate;
+            SelfHarm = selfHarm;
+            Profanity = profanity;
+            CustomBlocklists = customBlocklists;
+            Error = error;
+            Jailbreak = jailbreak;
+            IndirectAttack = indirectAttack;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary>
+        /// Describes language related to anatomical organs and genitals, romantic relationships,
+        ///  acts portrayed in erotic or affectionate terms, physical sexual acts, including
+        ///  those portrayed as an assault or a forced sexual violent act against one’s will,
+        ///  prostitution, pornography, and abuse.
+        /// </summary>
+        public ContentFilterResult Sexual { get; }
+        /// <summary>
+        /// Describes language related to physical actions intended to hurt, injure, damage, or
+        /// kill someone or something; describes weapons, etc.
+        /// </summary>
+        public ContentFilterResult Violence { get; }
+        /// <summary>
+        /// Describes language attacks or uses that include pejorative or discriminatory language
+        /// with reference to a person or identity group on the basis of certain differentiating
+        /// attributes of these groups including but not limited to race, ethnicity, nationality,
+        /// gender identity and expression, sexual orientation, religion, immigration status, ability
+        /// status, personal appearance, and body size.
+        /// </summary>
+        public ContentFilterResult Hate { get; }
+        /// <summary>
+        /// Describes language related to physical actions intended to purposely hurt, injure,
+        /// or damage one’s body, or kill oneself.
+        /// </summary>
+        public ContentFilterResult SelfHarm { get; }
+        /// <summary> Describes whether profanity was detected. </summary>
+        public ContentFilterDetectionResult Profanity { get; }
+        /// <summary> Describes detection results against configured custom blocklists. </summary>
+        public ContentFilterDetailedResults CustomBlocklists { get; }
+        /// <summary>
+        /// Describes an error returned if the content filtering system is
+        /// down or otherwise unable to complete the operation in time.
+        /// </summary>
+        public ResponseError Error { get; }
+        /// <summary> Whether a jailbreak attempt was detected in the prompt. </summary>
+        public ContentFilterDetectionResult Jailbreak { get; }
+        /// <summary> Whether an indirect attack was detected in the prompt. </summary>
+        public ContentFilterDetectionResult IndirectAttack { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ResponseContentFilterResult.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultsForChoice.Serialization.cs
similarity index 56%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/ResponseContentFilterResult.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultsForChoice.Serialization.cs
index 5e9da43d62eb..e624904d153a 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ResponseContentFilterResult.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultsForChoice.Serialization.cs
@@ -1,79 +1,80 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
 namespace Azure.AI.OpenAI
 {
-    public partial class ResponseContentFilterResult : IJsonModel<ResponseContentFilterResult>
+    public partial class ContentFilterResultsForChoice : IUtf8JsonSerializable, IJsonModel<ContentFilterResultsForChoice>
     {
-        void IJsonModel<ResponseContentFilterResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContentFilterResultsForChoice>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ContentFilterResultsForChoice>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResultsForChoice>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ResponseContentFilterResult)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(ContentFilterResultsForChoice)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("sexual") != true && Optional.IsDefined(Sexual))
+            if (Optional.IsDefined(Sexual))
             {
                 writer.WritePropertyName("sexual"u8);
                 writer.WriteObjectValue(Sexual, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("hate") != true && Optional.IsDefined(Hate))
-            {
-                writer.WritePropertyName("hate"u8);
-                writer.WriteObjectValue(Hate, options);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("violence") != true && Optional.IsDefined(Violence))
+            if (Optional.IsDefined(Violence))
             {
                 writer.WritePropertyName("violence"u8);
                 writer.WriteObjectValue(Violence, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("self_harm") != true && Optional.IsDefined(SelfHarm))
+            if (Optional.IsDefined(Hate))
+            {
+                writer.WritePropertyName("hate"u8);
+                writer.WriteObjectValue(Hate, options);
+            }
+            if (Optional.IsDefined(SelfHarm))
             {
                 writer.WritePropertyName("self_harm"u8);
                 writer.WriteObjectValue(SelfHarm, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("profanity") != true && Optional.IsDefined(Profanity))
+            if (Optional.IsDefined(Profanity))
             {
                 writer.WritePropertyName("profanity"u8);
                 writer.WriteObjectValue(Profanity, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("custom_blocklists") != true && Optional.IsDefined(CustomBlocklists))
+            if (Optional.IsDefined(CustomBlocklists))
             {
                 writer.WritePropertyName("custom_blocklists"u8);
                 writer.WriteObjectValue(CustomBlocklists, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("error") != true && Optional.IsDefined(Error))
+            if (Optional.IsDefined(Error))
             {
                 writer.WritePropertyName("error"u8);
-                writer.WriteObjectValue<InternalAzureContentFilterResultForPromptContentFilterResultsError>(Error, options);
+                JsonSerializer.Serialize(writer, Error);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("protected_material_text") != true && Optional.IsDefined(ProtectedMaterialText))
+            if (Optional.IsDefined(ProtectedMaterialText))
             {
                 writer.WritePropertyName("protected_material_text"u8);
                 writer.WriteObjectValue(ProtectedMaterialText, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("protected_material_code") != true && Optional.IsDefined(ProtectedMaterialCode))
+            if (Optional.IsDefined(ProtectedMaterialCode))
             {
                 writer.WritePropertyName("protected_material_code"u8);
                 writer.WriteObjectValue(ProtectedMaterialCode, options);
             }
-            if (SerializedAdditionalRawData != null)
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -88,19 +89,19 @@ void IJsonModel<ResponseContentFilterResult>.Write(Utf8JsonWriter writer, ModelR
             writer.WriteEndObject();
         }
 
-        ResponseContentFilterResult IJsonModel<ResponseContentFilterResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        ContentFilterResultsForChoice IJsonModel<ContentFilterResultsForChoice>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResultsForChoice>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ResponseContentFilterResult)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(ContentFilterResultsForChoice)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResponseContentFilterResult(document.RootElement, options);
+            return DeserializeContentFilterResultsForChoice(document.RootElement, options);
         }
 
-        internal static ResponseContentFilterResult DeserializeResponseContentFilterResult(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static ContentFilterResultsForChoice DeserializeContentFilterResultsForChoice(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -108,15 +109,15 @@ internal static ResponseContentFilterResult DeserializeResponseContentFilterResu
             {
                 return null;
             }
-            ContentFilterSeverityResult sexual = default;
-            ContentFilterSeverityResult hate = default;
-            ContentFilterSeverityResult violence = default;
-            ContentFilterSeverityResult selfHarm = default;
+            ContentFilterResult sexual = default;
+            ContentFilterResult violence = default;
+            ContentFilterResult hate = default;
+            ContentFilterResult selfHarm = default;
             ContentFilterDetectionResult profanity = default;
-            ContentFilterBlocklistResult customBlocklists = default;
-            InternalAzureContentFilterResultForPromptContentFilterResultsError error = default;
+            ContentFilterDetailedResults customBlocklists = default;
+            ResponseError error = default;
             ContentFilterDetectionResult protectedMaterialText = default;
-            ContentFilterProtectedMaterialResult protectedMaterialCode = default;
+            ContentFilterCitedDetectionResult protectedMaterialCode = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -127,25 +128,25 @@ internal static ResponseContentFilterResult DeserializeResponseContentFilterResu
                     {
                         continue;
                     }
-                    sexual = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    sexual = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
-                if (property.NameEquals("hate"u8))
+                if (property.NameEquals("violence"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    hate = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    violence = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
-                if (property.NameEquals("violence"u8))
+                if (property.NameEquals("hate"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    violence = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    hate = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("self_harm"u8))
@@ -154,7 +155,7 @@ internal static ResponseContentFilterResult DeserializeResponseContentFilterResu
                     {
                         continue;
                     }
-                    selfHarm = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    selfHarm = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("profanity"u8))
@@ -172,7 +173,7 @@ internal static ResponseContentFilterResult DeserializeResponseContentFilterResu
                     {
                         continue;
                     }
-                    customBlocklists = ContentFilterBlocklistResult.DeserializeContentFilterBlocklistResult(property.Value, options);
+                    customBlocklists = ContentFilterDetailedResults.DeserializeContentFilterDetailedResults(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("error"u8))
@@ -181,7 +182,7 @@ internal static ResponseContentFilterResult DeserializeResponseContentFilterResu
                     {
                         continue;
                     }
-                    error = InternalAzureContentFilterResultForPromptContentFilterResultsError.DeserializeInternalAzureContentFilterResultForPromptContentFilterResultsError(property.Value, options);
+                    error = JsonSerializer.Deserialize<ResponseError>(property.Value.GetRawText());
                     continue;
                 }
                 if (property.NameEquals("protected_material_text"u8))
@@ -199,20 +200,19 @@ internal static ResponseContentFilterResult DeserializeResponseContentFilterResu
                     {
                         continue;
                     }
-                    protectedMaterialCode = ContentFilterProtectedMaterialResult.DeserializeContentFilterProtectedMaterialResult(property.Value, options);
+                    protectedMaterialCode = ContentFilterCitedDetectionResult.DeserializeContentFilterCitedDetectionResult(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new ResponseContentFilterResult(
+            return new ContentFilterResultsForChoice(
                 sexual,
-                hate,
                 violence,
+                hate,
                 selfHarm,
                 profanity,
                 customBlocklists,
@@ -222,49 +222,51 @@ internal static ResponseContentFilterResult DeserializeResponseContentFilterResu
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<ResponseContentFilterResult>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<ContentFilterResultsForChoice>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResultsForChoice>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(ResponseContentFilterResult)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ContentFilterResultsForChoice)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ResponseContentFilterResult IPersistableModel<ResponseContentFilterResult>.Create(BinaryData data, ModelReaderWriterOptions options)
+        ContentFilterResultsForChoice IPersistableModel<ContentFilterResultsForChoice>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResultsForChoice>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResponseContentFilterResult(document.RootElement, options);
+                        return DeserializeContentFilterResultsForChoice(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(ResponseContentFilterResult)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ContentFilterResultsForChoice)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ResponseContentFilterResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ContentFilterResultsForChoice>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static ResponseContentFilterResult FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ContentFilterResultsForChoice FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResponseContentFilterResult(document.RootElement);
+            return DeserializeContentFilterResultsForChoice(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultsForChoice.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultsForChoice.cs
new file mode 100644
index 000000000000..4f0ffaf66415
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultsForChoice.cs
@@ -0,0 +1,137 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Information about content filtering evaluated against generated model output. </summary>
+    public partial class ContentFilterResultsForChoice
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ContentFilterResultsForChoice"/>. </summary>
+        internal ContentFilterResultsForChoice()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ContentFilterResultsForChoice"/>. </summary>
+        /// <param name="sexual">
+        /// Describes language related to anatomical organs and genitals, romantic relationships,
+        ///  acts portrayed in erotic or affectionate terms, physical sexual acts, including
+        ///  those portrayed as an assault or a forced sexual violent act against one’s will,
+        ///  prostitution, pornography, and abuse.
+        /// </param>
+        /// <param name="violence">
+        /// Describes language related to physical actions intended to hurt, injure, damage, or
+        /// kill someone or something; describes weapons, etc.
+        /// </param>
+        /// <param name="hate">
+        /// Describes language attacks or uses that include pejorative or discriminatory language
+        /// with reference to a person or identity group on the basis of certain differentiating
+        /// attributes of these groups including but not limited to race, ethnicity, nationality,
+        /// gender identity and expression, sexual orientation, religion, immigration status, ability
+        /// status, personal appearance, and body size.
+        /// </param>
+        /// <param name="selfHarm">
+        /// Describes language related to physical actions intended to purposely hurt, injure,
+        /// or damage one’s body, or kill oneself.
+        /// </param>
+        /// <param name="profanity"> Describes whether profanity was detected. </param>
+        /// <param name="customBlocklists"> Describes detection results against configured custom blocklists. </param>
+        /// <param name="error">
+        /// Describes an error returned if the content filtering system is
+        /// down or otherwise unable to complete the operation in time.
+        /// </param>
+        /// <param name="protectedMaterialText"> Information about detection of protected text material. </param>
+        /// <param name="protectedMaterialCode"> Information about detection of protected code material. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ContentFilterResultsForChoice(ContentFilterResult sexual, ContentFilterResult violence, ContentFilterResult hate, ContentFilterResult selfHarm, ContentFilterDetectionResult profanity, ContentFilterDetailedResults customBlocklists, ResponseError error, ContentFilterDetectionResult protectedMaterialText, ContentFilterCitedDetectionResult protectedMaterialCode, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Sexual = sexual;
+            Violence = violence;
+            Hate = hate;
+            SelfHarm = selfHarm;
+            Profanity = profanity;
+            CustomBlocklists = customBlocklists;
+            Error = error;
+            ProtectedMaterialText = protectedMaterialText;
+            ProtectedMaterialCode = protectedMaterialCode;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary>
+        /// Describes language related to anatomical organs and genitals, romantic relationships,
+        ///  acts portrayed in erotic or affectionate terms, physical sexual acts, including
+        ///  those portrayed as an assault or a forced sexual violent act against one’s will,
+        ///  prostitution, pornography, and abuse.
+        /// </summary>
+        public ContentFilterResult Sexual { get; }
+        /// <summary>
+        /// Describes language related to physical actions intended to hurt, injure, damage, or
+        /// kill someone or something; describes weapons, etc.
+        /// </summary>
+        public ContentFilterResult Violence { get; }
+        /// <summary>
+        /// Describes language attacks or uses that include pejorative or discriminatory language
+        /// with reference to a person or identity group on the basis of certain differentiating
+        /// attributes of these groups including but not limited to race, ethnicity, nationality,
+        /// gender identity and expression, sexual orientation, religion, immigration status, ability
+        /// status, personal appearance, and body size.
+        /// </summary>
+        public ContentFilterResult Hate { get; }
+        /// <summary>
+        /// Describes language related to physical actions intended to purposely hurt, injure,
+        /// or damage one’s body, or kill oneself.
+        /// </summary>
+        public ContentFilterResult SelfHarm { get; }
+        /// <summary> Describes whether profanity was detected. </summary>
+        public ContentFilterDetectionResult Profanity { get; }
+        /// <summary> Describes detection results against configured custom blocklists. </summary>
+        public ContentFilterDetailedResults CustomBlocklists { get; }
+        /// <summary>
+        /// Describes an error returned if the content filtering system is
+        /// down or otherwise unable to complete the operation in time.
+        /// </summary>
+        public ResponseError Error { get; }
+        /// <summary> Information about detection of protected text material. </summary>
+        public ContentFilterDetectionResult ProtectedMaterialText { get; }
+        /// <summary> Information about detection of protected code material. </summary>
+        public ContentFilterCitedDetectionResult ProtectedMaterialCode { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultsForPrompt.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultsForPrompt.Serialization.cs
new file mode 100644
index 000000000000..27cdee78bdf5
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultsForPrompt.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ContentFilterResultsForPrompt : IUtf8JsonSerializable, IJsonModel<ContentFilterResultsForPrompt>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ContentFilterResultsForPrompt>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ContentFilterResultsForPrompt>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResultsForPrompt>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ContentFilterResultsForPrompt)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("prompt_index"u8);
+            writer.WriteNumberValue(PromptIndex);
+            writer.WritePropertyName("content_filter_results"u8);
+            writer.WriteObjectValue(ContentFilterResults, options);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ContentFilterResultsForPrompt IJsonModel<ContentFilterResultsForPrompt>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResultsForPrompt>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ContentFilterResultsForPrompt)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeContentFilterResultsForPrompt(document.RootElement, options);
+        }
+
+        internal static ContentFilterResultsForPrompt DeserializeContentFilterResultsForPrompt(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            int promptIndex = default;
+            ContentFilterResultDetailsForPrompt contentFilterResults = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("prompt_index"u8))
+                {
+                    promptIndex = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("content_filter_results"u8))
+                {
+                    contentFilterResults = ContentFilterResultDetailsForPrompt.DeserializeContentFilterResultDetailsForPrompt(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ContentFilterResultsForPrompt(promptIndex, contentFilterResults, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ContentFilterResultsForPrompt>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResultsForPrompt>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ContentFilterResultsForPrompt)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ContentFilterResultsForPrompt IPersistableModel<ContentFilterResultsForPrompt>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterResultsForPrompt>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeContentFilterResultsForPrompt(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ContentFilterResultsForPrompt)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ContentFilterResultsForPrompt>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ContentFilterResultsForPrompt FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeContentFilterResultsForPrompt(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultsForPrompt.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultsForPrompt.cs
new file mode 100644
index 000000000000..4e411955a776
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterResultsForPrompt.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Content filtering results for a single prompt in the request. </summary>
+    public partial class ContentFilterResultsForPrompt
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ContentFilterResultsForPrompt"/>. </summary>
+        /// <param name="promptIndex"> The index of this prompt in the set of prompt results. </param>
+        /// <param name="contentFilterResults"> Content filtering results for this prompt. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="contentFilterResults"/> is null. </exception>
+        internal ContentFilterResultsForPrompt(int promptIndex, ContentFilterResultDetailsForPrompt contentFilterResults)
+        {
+            Argument.AssertNotNull(contentFilterResults, nameof(contentFilterResults));
+
+            PromptIndex = promptIndex;
+            ContentFilterResults = contentFilterResults;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ContentFilterResultsForPrompt"/>. </summary>
+        /// <param name="promptIndex"> The index of this prompt in the set of prompt results. </param>
+        /// <param name="contentFilterResults"> Content filtering results for this prompt. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ContentFilterResultsForPrompt(int promptIndex, ContentFilterResultDetailsForPrompt contentFilterResults, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            PromptIndex = promptIndex;
+            ContentFilterResults = contentFilterResults;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ContentFilterResultsForPrompt"/> for deserialization. </summary>
+        internal ContentFilterResultsForPrompt()
+        {
+        }
+
+        /// <summary> The index of this prompt in the set of prompt results. </summary>
+        public int PromptIndex { get; }
+        /// <summary> Content filtering results for this prompt. </summary>
+        public ContentFilterResultDetailsForPrompt ContentFilterResults { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterSeverity.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterSeverity.cs
index 91a9f01a8528..4c49dd0aec22 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterSeverity.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterSeverity.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -7,7 +10,7 @@
 
 namespace Azure.AI.OpenAI
 {
-    /// <summary> The AzureContentFilterSeverityResultSeverity. </summary>
+    /// <summary> Ratings for the intensity and risk level of harmful content. </summary>
     public readonly partial struct ContentFilterSeverity : IEquatable<ContentFilterSeverity>
     {
         private readonly string _value;
@@ -24,19 +27,36 @@ public ContentFilterSeverity(string value)
         private const string MediumValue = "medium";
         private const string HighValue = "high";
 
-        /// <summary> safe. </summary>
+        /// <summary>
+        /// Content may be related to violence, self-harm, sexual, or hate categories but the terms
+        /// are used in general, journalistic, scientific, medical, and similar professional contexts,
+        /// which are appropriate for most audiences.
+        /// </summary>
         public static ContentFilterSeverity Safe { get; } = new ContentFilterSeverity(SafeValue);
-        /// <summary> low. </summary>
+        /// <summary>
+        /// Content that expresses prejudiced, judgmental, or opinionated views, includes offensive
+        /// use of language, stereotyping, use cases exploring a fictional world (for example, gaming,
+        /// literature) and depictions at low intensity.
+        /// </summary>
         public static ContentFilterSeverity Low { get; } = new ContentFilterSeverity(LowValue);
-        /// <summary> medium. </summary>
+        /// <summary>
+        /// Content that uses offensive, insulting, mocking, intimidating, or demeaning language
+        /// towards specific identity groups, includes depictions of seeking and executing harmful
+        /// instructions, fantasies, glorification, promotion of harm at medium intensity.
+        /// </summary>
         public static ContentFilterSeverity Medium { get; } = new ContentFilterSeverity(MediumValue);
-        /// <summary> high. </summary>
+        /// <summary>
+        /// Content that displays explicit and severe harmful instructions, actions,
+        /// damage, or abuse; includes endorsement, glorification, or promotion of severe
+        /// harmful acts, extreme or illegal forms of harm, radicalization, or non-consensual
+        /// power exchange or abuse.
+        /// </summary>
         public static ContentFilterSeverity High { get; } = new ContentFilterSeverity(HighValue);
         /// <summary> Determines if two <see cref="ContentFilterSeverity"/> values are the same. </summary>
         public static bool operator ==(ContentFilterSeverity left, ContentFilterSeverity right) => left.Equals(right);
         /// <summary> Determines if two <see cref="ContentFilterSeverity"/> values are not the same. </summary>
         public static bool operator !=(ContentFilterSeverity left, ContentFilterSeverity right) => !left.Equals(right);
-        /// <summary> Converts a string to a <see cref="ContentFilterSeverity"/>. </summary>
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ContentFilterSeverity"/>. </summary>
         public static implicit operator ContentFilterSeverity(string value) => new ContentFilterSeverity(value);
 
         /// <inheritdoc />
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterSeverityResult.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterSeverityResult.Serialization.cs
deleted file mode 100644
index 6f7da3ac8cab..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ContentFilterSeverityResult.Serialization.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI
-{
-    public partial class ContentFilterSeverityResult : IJsonModel<ContentFilterSeverityResult>
-    {
-        void IJsonModel<ContentFilterSeverityResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterSeverityResult>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContentFilterSeverityResult)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("filtered") != true)
-            {
-                writer.WritePropertyName("filtered"u8);
-                writer.WriteBooleanValue(Filtered);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("severity") != true)
-            {
-                writer.WritePropertyName("severity"u8);
-                writer.WriteStringValue(Severity.ToString());
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        ContentFilterSeverityResult IJsonModel<ContentFilterSeverityResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterSeverityResult>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ContentFilterSeverityResult)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeContentFilterSeverityResult(document.RootElement, options);
-        }
-
-        internal static ContentFilterSeverityResult DeserializeContentFilterSeverityResult(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            bool filtered = default;
-            ContentFilterSeverity severity = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("filtered"u8))
-                {
-                    filtered = property.Value.GetBoolean();
-                    continue;
-                }
-                if (property.NameEquals("severity"u8))
-                {
-                    severity = new ContentFilterSeverity(property.Value.GetString());
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ContentFilterSeverityResult(filtered, severity, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<ContentFilterSeverityResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterSeverityResult>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ContentFilterSeverityResult)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ContentFilterSeverityResult IPersistableModel<ContentFilterSeverityResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ContentFilterSeverityResult>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeContentFilterSeverityResult(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ContentFilterSeverityResult)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ContentFilterSeverityResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static ContentFilterSeverityResult FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeContentFilterSeverityResult(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CosmosChatDataSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CosmosChatDataSource.Serialization.cs
deleted file mode 100644
index 7330e9d27e85..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/CosmosChatDataSource.Serialization.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    public partial class CosmosChatDataSource : IJsonModel<CosmosChatDataSource>
-    {
-        void IJsonModel<CosmosChatDataSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<CosmosChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(CosmosChatDataSource)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("parameters") != true)
-            {
-                writer.WritePropertyName("parameters"u8);
-                writer.WriteObjectValue<InternalAzureCosmosDBChatDataSourceParameters>(InternalParameters, options);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        CosmosChatDataSource IJsonModel<CosmosChatDataSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<CosmosChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(CosmosChatDataSource)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeCosmosChatDataSource(document.RootElement, options);
-        }
-
-        internal static CosmosChatDataSource DeserializeCosmosChatDataSource(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            InternalAzureCosmosDBChatDataSourceParameters parameters = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("parameters"u8))
-                {
-                    parameters = InternalAzureCosmosDBChatDataSourceParameters.DeserializeInternalAzureCosmosDBChatDataSourceParameters(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new CosmosChatDataSource(type, serializedAdditionalRawData, parameters);
-        }
-
-        BinaryData IPersistableModel<CosmosChatDataSource>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<CosmosChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(CosmosChatDataSource)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        CosmosChatDataSource IPersistableModel<CosmosChatDataSource>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<CosmosChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeCosmosChatDataSource(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(CosmosChatDataSource)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<CosmosChatDataSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new CosmosChatDataSource FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeCosmosChatDataSource(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CosmosChatDataSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CosmosChatDataSource.cs
deleted file mode 100644
index 779961ba9e04..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/CosmosChatDataSource.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> Represents a data source configuration that will use an Azure CosmosDB resource. </summary>
-    public partial class CosmosChatDataSource : ChatDataSource
-    {
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CreateUploadRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CreateUploadRequest.Serialization.cs
new file mode 100644
index 000000000000..f788f96b1fa7
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/CreateUploadRequest.Serialization.cs
@@ -0,0 +1,159 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class CreateUploadRequest : IUtf8JsonSerializable, IJsonModel<CreateUploadRequest>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<CreateUploadRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<CreateUploadRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateUploadRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CreateUploadRequest)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("filename"u8);
+            writer.WriteStringValue(Filename);
+            writer.WritePropertyName("purpose"u8);
+            writer.WriteStringValue(Purpose.ToString());
+            writer.WritePropertyName("bytes"u8);
+            writer.WriteNumberValue(Bytes);
+            writer.WritePropertyName("mime_type"u8);
+            writer.WriteStringValue(MimeType);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        CreateUploadRequest IJsonModel<CreateUploadRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateUploadRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(CreateUploadRequest)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeCreateUploadRequest(document.RootElement, options);
+        }
+
+        internal static CreateUploadRequest DeserializeCreateUploadRequest(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string filename = default;
+            CreateUploadRequestPurpose purpose = default;
+            int bytes = default;
+            string mimeType = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("filename"u8))
+                {
+                    filename = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("purpose"u8))
+                {
+                    purpose = new CreateUploadRequestPurpose(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("bytes"u8))
+                {
+                    bytes = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("mime_type"u8))
+                {
+                    mimeType = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new CreateUploadRequest(filename, purpose, bytes, mimeType, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<CreateUploadRequest>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateUploadRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(CreateUploadRequest)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        CreateUploadRequest IPersistableModel<CreateUploadRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<CreateUploadRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeCreateUploadRequest(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(CreateUploadRequest)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<CreateUploadRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static CreateUploadRequest FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeCreateUploadRequest(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CreateUploadRequest.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CreateUploadRequest.cs
new file mode 100644
index 000000000000..a48d33b00bf1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/CreateUploadRequest.cs
@@ -0,0 +1,118 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The request body of an upload creation operation. </summary>
+    public partial class CreateUploadRequest
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="CreateUploadRequest"/>. </summary>
+        /// <param name="filename"> The name of the file to upload. </param>
+        /// <param name="purpose">
+        /// The intended purpose of the uploaded file.
+        ///
+        /// Use 'assistants' for Assistants and Message files, 'vision' for Assistants image file inputs, 'batch' for Batch API, and 'fine-tune' for Fine-tuning.
+        /// </param>
+        /// <param name="bytes"> The number of bytes in the file you are uploading. </param>
+        /// <param name="mimeType">
+        /// The MIME type of the file.
+        ///
+        /// This must fall within the supported MIME types for your file purpose. See the supported MIME types for assistants and vision.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="filename"/> or <paramref name="mimeType"/> is null. </exception>
+        public CreateUploadRequest(string filename, CreateUploadRequestPurpose purpose, int bytes, string mimeType)
+        {
+            Argument.AssertNotNull(filename, nameof(filename));
+            Argument.AssertNotNull(mimeType, nameof(mimeType));
+
+            Filename = filename;
+            Purpose = purpose;
+            Bytes = bytes;
+            MimeType = mimeType;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CreateUploadRequest"/>. </summary>
+        /// <param name="filename"> The name of the file to upload. </param>
+        /// <param name="purpose">
+        /// The intended purpose of the uploaded file.
+        ///
+        /// Use 'assistants' for Assistants and Message files, 'vision' for Assistants image file inputs, 'batch' for Batch API, and 'fine-tune' for Fine-tuning.
+        /// </param>
+        /// <param name="bytes"> The number of bytes in the file you are uploading. </param>
+        /// <param name="mimeType">
+        /// The MIME type of the file.
+        ///
+        /// This must fall within the supported MIME types for your file purpose. See the supported MIME types for assistants and vision.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal CreateUploadRequest(string filename, CreateUploadRequestPurpose purpose, int bytes, string mimeType, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Filename = filename;
+            Purpose = purpose;
+            Bytes = bytes;
+            MimeType = mimeType;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="CreateUploadRequest"/> for deserialization. </summary>
+        internal CreateUploadRequest()
+        {
+        }
+
+        /// <summary> The name of the file to upload. </summary>
+        public string Filename { get; }
+        /// <summary>
+        /// The intended purpose of the uploaded file.
+        ///
+        /// Use 'assistants' for Assistants and Message files, 'vision' for Assistants image file inputs, 'batch' for Batch API, and 'fine-tune' for Fine-tuning.
+        /// </summary>
+        public CreateUploadRequestPurpose Purpose { get; }
+        /// <summary> The number of bytes in the file you are uploading. </summary>
+        public int Bytes { get; }
+        /// <summary>
+        /// The MIME type of the file.
+        ///
+        /// This must fall within the supported MIME types for your file purpose. See the supported MIME types for assistants and vision.
+        /// </summary>
+        public string MimeType { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/CreateUploadRequestPurpose.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/CreateUploadRequestPurpose.cs
new file mode 100644
index 000000000000..c729a2f7df13
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/CreateUploadRequestPurpose.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The CreateUploadRequestPurpose. </summary>
+    public readonly partial struct CreateUploadRequestPurpose : IEquatable<CreateUploadRequestPurpose>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="CreateUploadRequestPurpose"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public CreateUploadRequestPurpose(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string AssistantsValue = "assistants";
+        private const string BatchValue = "batch";
+        private const string FineTuneValue = "fine-tune";
+        private const string VisionValue = "vision";
+
+        /// <summary> assistants. </summary>
+        public static CreateUploadRequestPurpose Assistants { get; } = new CreateUploadRequestPurpose(AssistantsValue);
+        /// <summary> batch. </summary>
+        public static CreateUploadRequestPurpose Batch { get; } = new CreateUploadRequestPurpose(BatchValue);
+        /// <summary> fine-tune. </summary>
+        public static CreateUploadRequestPurpose FineTune { get; } = new CreateUploadRequestPurpose(FineTuneValue);
+        /// <summary> vision. </summary>
+        public static CreateUploadRequestPurpose Vision { get; } = new CreateUploadRequestPurpose(VisionValue);
+        /// <summary> Determines if two <see cref="CreateUploadRequestPurpose"/> values are the same. </summary>
+        public static bool operator ==(CreateUploadRequestPurpose left, CreateUploadRequestPurpose right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="CreateUploadRequestPurpose"/> values are not the same. </summary>
+        public static bool operator !=(CreateUploadRequestPurpose left, CreateUploadRequestPurpose right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="CreateUploadRequestPurpose"/>. </summary>
+        public static implicit operator CreateUploadRequestPurpose(string value) => new CreateUploadRequestPurpose(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is CreateUploadRequestPurpose other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(CreateUploadRequestPurpose other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceAuthentication.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceAuthentication.Serialization.cs
deleted file mode 100644
index da7309b6f794..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceAuthentication.Serialization.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    [PersistableModelProxy(typeof(InternalUnknownAzureChatDataSourceAuthenticationOptions))]
-    public partial class DataSourceAuthentication : IJsonModel<DataSourceAuthentication>
-    {
-        void IJsonModel<DataSourceAuthentication>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceAuthentication>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DataSourceAuthentication)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        DataSourceAuthentication IJsonModel<DataSourceAuthentication>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceAuthentication>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DataSourceAuthentication)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDataSourceAuthentication(document.RootElement, options);
-        }
-
-        internal static DataSourceAuthentication DeserializeDataSourceAuthentication(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            if (element.TryGetProperty("type", out JsonElement discriminator))
-            {
-                switch (discriminator.GetString())
-                {
-                    case "access_token": return InternalAzureChatDataSourceAccessTokenAuthenticationOptions.DeserializeInternalAzureChatDataSourceAccessTokenAuthenticationOptions(element, options);
-                    case "api_key": return InternalAzureChatDataSourceApiKeyAuthenticationOptions.DeserializeInternalAzureChatDataSourceApiKeyAuthenticationOptions(element, options);
-                    case "connection_string": return InternalAzureChatDataSourceConnectionStringAuthenticationOptions.DeserializeInternalAzureChatDataSourceConnectionStringAuthenticationOptions(element, options);
-                    case "encoded_api_key": return InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions.DeserializeInternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions(element, options);
-                    case "key_and_key_id": return InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions.DeserializeInternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions(element, options);
-                    case "system_assigned_managed_identity": return InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions.DeserializeInternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions(element, options);
-                    case "user_assigned_managed_identity": return InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions.DeserializeInternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions(element, options);
-                    case "username_and_password": return InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions.DeserializeInternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions(element, options);
-                }
-            }
-            return InternalUnknownAzureChatDataSourceAuthenticationOptions.DeserializeInternalUnknownAzureChatDataSourceAuthenticationOptions(element, options);
-        }
-
-        BinaryData IPersistableModel<DataSourceAuthentication>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceAuthentication>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DataSourceAuthentication)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DataSourceAuthentication IPersistableModel<DataSourceAuthentication>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceAuthentication>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDataSourceAuthentication(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DataSourceAuthentication)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DataSourceAuthentication>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static DataSourceAuthentication FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDataSourceAuthentication(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceQueryType.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceQueryType.cs
deleted file mode 100644
index 1f05c54d6d19..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceQueryType.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The AzureSearchChatDataSourceParametersQueryType. </summary>
-    public readonly partial struct DataSourceQueryType : IEquatable<DataSourceQueryType>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="DataSourceQueryType"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public DataSourceQueryType(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string SimpleValue = "simple";
-        private const string SemanticValue = "semantic";
-        private const string VectorValue = "vector";
-        private const string VectorSimpleHybridValue = "vector_simple_hybrid";
-        private const string VectorSemanticHybridValue = "vector_semantic_hybrid";
-
-        /// <summary> simple. </summary>
-        public static DataSourceQueryType Simple { get; } = new DataSourceQueryType(SimpleValue);
-        /// <summary> semantic. </summary>
-        public static DataSourceQueryType Semantic { get; } = new DataSourceQueryType(SemanticValue);
-        /// <summary> vector. </summary>
-        public static DataSourceQueryType Vector { get; } = new DataSourceQueryType(VectorValue);
-        /// <summary> vector_simple_hybrid. </summary>
-        public static DataSourceQueryType VectorSimpleHybrid { get; } = new DataSourceQueryType(VectorSimpleHybridValue);
-        /// <summary> vector_semantic_hybrid. </summary>
-        public static DataSourceQueryType VectorSemanticHybrid { get; } = new DataSourceQueryType(VectorSemanticHybridValue);
-        /// <summary> Determines if two <see cref="DataSourceQueryType"/> values are the same. </summary>
-        public static bool operator ==(DataSourceQueryType left, DataSourceQueryType right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="DataSourceQueryType"/> values are not the same. </summary>
-        public static bool operator !=(DataSourceQueryType left, DataSourceQueryType right) => !left.Equals(right);
-        /// <summary> Converts a string to a <see cref="DataSourceQueryType"/>. </summary>
-        public static implicit operator DataSourceQueryType(string value) => new DataSourceQueryType(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is DataSourceQueryType other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(DataSourceQueryType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceVectorizer.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceVectorizer.Serialization.cs
deleted file mode 100644
index c6e4b24822ee..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceVectorizer.Serialization.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    [PersistableModelProxy(typeof(InternalUnknownAzureChatDataSourceVectorizationSource))]
-    public partial class DataSourceVectorizer : IJsonModel<DataSourceVectorizer>
-    {
-        void IJsonModel<DataSourceVectorizer>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceVectorizer>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DataSourceVectorizer)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        DataSourceVectorizer IJsonModel<DataSourceVectorizer>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceVectorizer>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DataSourceVectorizer)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDataSourceVectorizer(document.RootElement, options);
-        }
-
-        internal static DataSourceVectorizer DeserializeDataSourceVectorizer(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            if (element.TryGetProperty("type", out JsonElement discriminator))
-            {
-                switch (discriminator.GetString())
-                {
-                    case "deployment_name": return InternalAzureChatDataSourceDeploymentNameVectorizationSource.DeserializeInternalAzureChatDataSourceDeploymentNameVectorizationSource(element, options);
-                    case "endpoint": return InternalAzureChatDataSourceEndpointVectorizationSource.DeserializeInternalAzureChatDataSourceEndpointVectorizationSource(element, options);
-                    case "integrated": return InternalAzureChatDataSourceIntegratedVectorizationSource.DeserializeInternalAzureChatDataSourceIntegratedVectorizationSource(element, options);
-                    case "model_id": return InternalAzureChatDataSourceModelIdVectorizationSource.DeserializeInternalAzureChatDataSourceModelIdVectorizationSource(element, options);
-                }
-            }
-            return InternalUnknownAzureChatDataSourceVectorizationSource.DeserializeInternalUnknownAzureChatDataSourceVectorizationSource(element, options);
-        }
-
-        BinaryData IPersistableModel<DataSourceVectorizer>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceVectorizer>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DataSourceVectorizer)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DataSourceVectorizer IPersistableModel<DataSourceVectorizer>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceVectorizer>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDataSourceVectorizer(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DataSourceVectorizer)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DataSourceVectorizer>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static DataSourceVectorizer FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeDataSourceVectorizer(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatDataSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatDataSource.Serialization.cs
deleted file mode 100644
index 5265a931500b..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatDataSource.Serialization.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    public partial class ElasticsearchChatDataSource : IJsonModel<ElasticsearchChatDataSource>
-    {
-        void IJsonModel<ElasticsearchChatDataSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ElasticsearchChatDataSource)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("parameters") != true)
-            {
-                writer.WritePropertyName("parameters"u8);
-                writer.WriteObjectValue<InternalElasticsearchChatDataSourceParameters>(InternalParameters, options);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        ElasticsearchChatDataSource IJsonModel<ElasticsearchChatDataSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ElasticsearchChatDataSource)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeElasticsearchChatDataSource(document.RootElement, options);
-        }
-
-        internal static ElasticsearchChatDataSource DeserializeElasticsearchChatDataSource(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            InternalElasticsearchChatDataSourceParameters parameters = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("parameters"u8))
-                {
-                    parameters = InternalElasticsearchChatDataSourceParameters.DeserializeInternalElasticsearchChatDataSourceParameters(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ElasticsearchChatDataSource(type, serializedAdditionalRawData, parameters);
-        }
-
-        BinaryData IPersistableModel<ElasticsearchChatDataSource>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ElasticsearchChatDataSource)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ElasticsearchChatDataSource IPersistableModel<ElasticsearchChatDataSource>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeElasticsearchChatDataSource(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ElasticsearchChatDataSource)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ElasticsearchChatDataSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new ElasticsearchChatDataSource FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeElasticsearchChatDataSource(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatDataSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatDataSource.cs
deleted file mode 100644
index a3c0db4133ef..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatDataSource.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The ElasticsearchChatDataSource. </summary>
-    public partial class ElasticsearchChatDataSource : ChatDataSource
-    {
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatExtensionConfiguration.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatExtensionConfiguration.Serialization.cs
new file mode 100644
index 000000000000..33f0c67f3110
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatExtensionConfiguration.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ElasticsearchChatExtensionConfiguration : IUtf8JsonSerializable, IJsonModel<ElasticsearchChatExtensionConfiguration>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ElasticsearchChatExtensionConfiguration>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ElasticsearchChatExtensionConfiguration>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ElasticsearchChatExtensionConfiguration)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("parameters"u8);
+            writer.WriteObjectValue(Parameters, options);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ElasticsearchChatExtensionConfiguration IJsonModel<ElasticsearchChatExtensionConfiguration>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ElasticsearchChatExtensionConfiguration)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeElasticsearchChatExtensionConfiguration(document.RootElement, options);
+        }
+
+        internal static ElasticsearchChatExtensionConfiguration DeserializeElasticsearchChatExtensionConfiguration(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            ElasticsearchChatExtensionParameters parameters = default;
+            AzureChatExtensionType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("parameters"u8))
+                {
+                    parameters = ElasticsearchChatExtensionParameters.DeserializeElasticsearchChatExtensionParameters(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new AzureChatExtensionType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ElasticsearchChatExtensionConfiguration(type, serializedAdditionalRawData, parameters);
+        }
+
+        BinaryData IPersistableModel<ElasticsearchChatExtensionConfiguration>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ElasticsearchChatExtensionConfiguration)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ElasticsearchChatExtensionConfiguration IPersistableModel<ElasticsearchChatExtensionConfiguration>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeElasticsearchChatExtensionConfiguration(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ElasticsearchChatExtensionConfiguration)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ElasticsearchChatExtensionConfiguration>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new ElasticsearchChatExtensionConfiguration FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeElasticsearchChatExtensionConfiguration(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatExtensionConfiguration.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatExtensionConfiguration.cs
new file mode 100644
index 000000000000..c02c027fb162
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatExtensionConfiguration.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// A specific representation of configurable options for Elasticsearch when using it as an Azure OpenAI chat
+    /// extension.
+    /// </summary>
+    public partial class ElasticsearchChatExtensionConfiguration : AzureChatExtensionConfiguration
+    {
+        /// <summary> Initializes a new instance of <see cref="ElasticsearchChatExtensionConfiguration"/>. </summary>
+        /// <param name="parameters"> The parameters to use when configuring Elasticsearch®. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="parameters"/> is null. </exception>
+        public ElasticsearchChatExtensionConfiguration(ElasticsearchChatExtensionParameters parameters)
+        {
+            Argument.AssertNotNull(parameters, nameof(parameters));
+
+            Type = AzureChatExtensionType.Elasticsearch;
+            Parameters = parameters;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ElasticsearchChatExtensionConfiguration"/>. </summary>
+        /// <param name="type">
+        ///   The label for the type of an Azure chat extension. This typically corresponds to a matching Azure resource.
+        ///   Azure chat extensions are only compatible with Azure OpenAI.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="parameters"> The parameters to use when configuring Elasticsearch®. </param>
+        internal ElasticsearchChatExtensionConfiguration(AzureChatExtensionType type, IDictionary<string, BinaryData> serializedAdditionalRawData, ElasticsearchChatExtensionParameters parameters) : base(type, serializedAdditionalRawData)
+        {
+            Parameters = parameters;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ElasticsearchChatExtensionConfiguration"/> for deserialization. </summary>
+        internal ElasticsearchChatExtensionConfiguration()
+        {
+        }
+
+        /// <summary> The parameters to use when configuring Elasticsearch®. </summary>
+        public ElasticsearchChatExtensionParameters Parameters { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalElasticsearchChatDataSourceParameters.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatExtensionParameters.Serialization.cs
similarity index 56%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/InternalElasticsearchChatDataSourceParameters.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatExtensionParameters.Serialization.cs
index f526b7d19d4e..f08f3587fefe 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalElasticsearchChatDataSourceParameters.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatExtensionParameters.Serialization.cs
@@ -1,99 +1,94 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI
 {
-    internal partial class InternalElasticsearchChatDataSourceParameters : IJsonModel<InternalElasticsearchChatDataSourceParameters>
+    public partial class ElasticsearchChatExtensionParameters : IUtf8JsonSerializable, IJsonModel<ElasticsearchChatExtensionParameters>
     {
-        void IJsonModel<InternalElasticsearchChatDataSourceParameters>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ElasticsearchChatExtensionParameters>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ElasticsearchChatExtensionParameters>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalElasticsearchChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalElasticsearchChatDataSourceParameters)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(ElasticsearchChatExtensionParameters)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("top_n_documents") != true && Optional.IsDefined(TopNDocuments))
+            if (Optional.IsDefined(DocumentCount))
             {
                 writer.WritePropertyName("top_n_documents"u8);
-                writer.WriteNumberValue(TopNDocuments.Value);
+                writer.WriteNumberValue(DocumentCount.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("in_scope") != true && Optional.IsDefined(InScope))
+            if (Optional.IsDefined(ShouldRestrictResultScope))
             {
                 writer.WritePropertyName("in_scope"u8);
-                writer.WriteBooleanValue(InScope.Value);
+                writer.WriteBooleanValue(ShouldRestrictResultScope.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("strictness") != true && Optional.IsDefined(Strictness))
+            if (Optional.IsDefined(Strictness))
             {
                 writer.WritePropertyName("strictness"u8);
                 writer.WriteNumberValue(Strictness.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("max_search_queries") != true && Optional.IsDefined(MaxSearchQueries))
+            if (Optional.IsDefined(MaxSearchQueries))
             {
                 writer.WritePropertyName("max_search_queries"u8);
                 writer.WriteNumberValue(MaxSearchQueries.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("allow_partial_result") != true && Optional.IsDefined(AllowPartialResult))
+            if (Optional.IsDefined(AllowPartialResult))
             {
                 writer.WritePropertyName("allow_partial_result"u8);
                 writer.WriteBooleanValue(AllowPartialResult.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("include_contexts") != true && Optional.IsCollectionDefined(_internalIncludeContexts))
+            if (Optional.IsCollectionDefined(IncludeContexts))
             {
                 writer.WritePropertyName("include_contexts"u8);
                 writer.WriteStartArray();
-                foreach (var item in _internalIncludeContexts)
+                foreach (var item in IncludeContexts)
                 {
-                    writer.WriteStringValue(item);
+                    writer.WriteStringValue(item.ToString());
                 }
                 writer.WriteEndArray();
             }
-            if (SerializedAdditionalRawData?.ContainsKey("endpoint") != true)
-            {
-                writer.WritePropertyName("endpoint"u8);
-                writer.WriteStringValue(Endpoint.AbsoluteUri);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("index_name") != true)
-            {
-                writer.WritePropertyName("index_name"u8);
-                writer.WriteStringValue(IndexName);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("authentication") != true)
+            if (Optional.IsDefined(Authentication))
             {
                 writer.WritePropertyName("authentication"u8);
-                writer.WriteObjectValue<DataSourceAuthentication>(Authentication, options);
+                writer.WriteObjectValue(Authentication, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("fields_mapping") != true && Optional.IsDefined(FieldMappings))
+            writer.WritePropertyName("endpoint"u8);
+            writer.WriteStringValue(Endpoint.AbsoluteUri);
+            writer.WritePropertyName("index_name"u8);
+            writer.WriteStringValue(IndexName);
+            if (Optional.IsDefined(FieldMappingOptions))
             {
                 writer.WritePropertyName("fields_mapping"u8);
-                writer.WriteObjectValue<DataSourceFieldMappings>(FieldMappings, options);
+                writer.WriteObjectValue(FieldMappingOptions, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("query_type") != true && Optional.IsDefined(QueryType))
+            if (Optional.IsDefined(QueryType))
             {
                 writer.WritePropertyName("query_type"u8);
                 writer.WriteStringValue(QueryType.Value.ToString());
             }
-            if (SerializedAdditionalRawData?.ContainsKey("embedding_dependency") != true && Optional.IsDefined(VectorizationSource))
+            if (Optional.IsDefined(EmbeddingDependency))
             {
                 writer.WritePropertyName("embedding_dependency"u8);
-                writer.WriteObjectValue<DataSourceVectorizer>(VectorizationSource, options);
+                writer.WriteObjectValue(EmbeddingDependency, options);
             }
-            if (SerializedAdditionalRawData != null)
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -108,19 +103,19 @@ void IJsonModel<InternalElasticsearchChatDataSourceParameters>.Write(Utf8JsonWri
             writer.WriteEndObject();
         }
 
-        InternalElasticsearchChatDataSourceParameters IJsonModel<InternalElasticsearchChatDataSourceParameters>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        ElasticsearchChatExtensionParameters IJsonModel<ElasticsearchChatExtensionParameters>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalElasticsearchChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalElasticsearchChatDataSourceParameters)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(ElasticsearchChatExtensionParameters)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalElasticsearchChatDataSourceParameters(document.RootElement, options);
+            return DeserializeElasticsearchChatExtensionParameters(document.RootElement, options);
         }
 
-        internal static InternalElasticsearchChatDataSourceParameters DeserializeInternalElasticsearchChatDataSourceParameters(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static ElasticsearchChatExtensionParameters DeserializeElasticsearchChatExtensionParameters(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -133,13 +128,13 @@ internal static InternalElasticsearchChatDataSourceParameters DeserializeInterna
             int? strictness = default;
             int? maxSearchQueries = default;
             bool? allowPartialResult = default;
-            IList<string> includeContexts = default;
+            IList<OnYourDataContextProperty> includeContexts = default;
+            OnYourDataAuthenticationOptions authentication = default;
             Uri endpoint = default;
             string indexName = default;
-            DataSourceAuthentication authentication = default;
-            DataSourceFieldMappings fieldsMapping = default;
-            DataSourceQueryType? queryType = default;
-            DataSourceVectorizer embeddingDependency = default;
+            ElasticsearchIndexFieldMappingOptions fieldsMapping = default;
+            ElasticsearchQueryType? queryType = default;
+            OnYourDataVectorizationSource embeddingDependency = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -195,14 +190,23 @@ internal static InternalElasticsearchChatDataSourceParameters DeserializeInterna
                     {
                         continue;
                     }
-                    List<string> array = new List<string>();
+                    List<OnYourDataContextProperty> array = new List<OnYourDataContextProperty>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(item.GetString());
+                        array.Add(new OnYourDataContextProperty(item.GetString()));
                     }
                     includeContexts = array;
                     continue;
                 }
+                if (property.NameEquals("authentication"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    authentication = OnYourDataAuthenticationOptions.DeserializeOnYourDataAuthenticationOptions(property.Value, options);
+                    continue;
+                }
                 if (property.NameEquals("endpoint"u8))
                 {
                     endpoint = new Uri(property.Value.GetString());
@@ -213,18 +217,13 @@ internal static InternalElasticsearchChatDataSourceParameters DeserializeInterna
                     indexName = property.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("authentication"u8))
-                {
-                    authentication = DataSourceAuthentication.DeserializeDataSourceAuthentication(property.Value, options);
-                    continue;
-                }
                 if (property.NameEquals("fields_mapping"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    fieldsMapping = DataSourceFieldMappings.DeserializeDataSourceFieldMappings(property.Value, options);
+                    fieldsMapping = ElasticsearchIndexFieldMappingOptions.DeserializeElasticsearchIndexFieldMappingOptions(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("query_type"u8))
@@ -233,7 +232,7 @@ internal static InternalElasticsearchChatDataSourceParameters DeserializeInterna
                     {
                         continue;
                     }
-                    queryType = new DataSourceQueryType(property.Value.GetString());
+                    queryType = new ElasticsearchQueryType(property.Value.GetString());
                     continue;
                 }
                 if (property.NameEquals("embedding_dependency"u8))
@@ -242,76 +241,76 @@ internal static InternalElasticsearchChatDataSourceParameters DeserializeInterna
                     {
                         continue;
                     }
-                    embeddingDependency = DataSourceVectorizer.DeserializeDataSourceVectorizer(property.Value, options);
+                    embeddingDependency = OnYourDataVectorizationSource.DeserializeOnYourDataVectorizationSource(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new InternalElasticsearchChatDataSourceParameters(
+            return new ElasticsearchChatExtensionParameters(
                 topNDocuments,
                 inScope,
                 strictness,
                 maxSearchQueries,
                 allowPartialResult,
-                includeContexts ?? new ChangeTrackingList<string>(),
+                includeContexts ?? new ChangeTrackingList<OnYourDataContextProperty>(),
+                authentication,
                 endpoint,
                 indexName,
-                authentication,
                 fieldsMapping,
                 queryType,
                 embeddingDependency,
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<InternalElasticsearchChatDataSourceParameters>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<ElasticsearchChatExtensionParameters>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalElasticsearchChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(InternalElasticsearchChatDataSourceParameters)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ElasticsearchChatExtensionParameters)} does not support writing '{options.Format}' format.");
             }
         }
 
-        InternalElasticsearchChatDataSourceParameters IPersistableModel<InternalElasticsearchChatDataSourceParameters>.Create(BinaryData data, ModelReaderWriterOptions options)
+        ElasticsearchChatExtensionParameters IPersistableModel<ElasticsearchChatExtensionParameters>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalElasticsearchChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalElasticsearchChatDataSourceParameters(document.RootElement, options);
+                        return DeserializeElasticsearchChatExtensionParameters(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(InternalElasticsearchChatDataSourceParameters)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ElasticsearchChatExtensionParameters)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<InternalElasticsearchChatDataSourceParameters>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ElasticsearchChatExtensionParameters>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static InternalElasticsearchChatDataSourceParameters FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ElasticsearchChatExtensionParameters FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalElasticsearchChatDataSourceParameters(document.RootElement);
+            return DeserializeElasticsearchChatExtensionParameters(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatExtensionParameters.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatExtensionParameters.cs
new file mode 100644
index 000000000000..ce7080e5d85f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchChatExtensionParameters.cs
@@ -0,0 +1,159 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Parameters to use when configuring Elasticsearch® as an Azure OpenAI chat extension. The supported authentication types are KeyAndKeyId and EncodedAPIKey. </summary>
+    public partial class ElasticsearchChatExtensionParameters
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ElasticsearchChatExtensionParameters"/>. </summary>
+        /// <param name="endpoint"> The endpoint of Elasticsearch®. </param>
+        /// <param name="indexName"> The index name of Elasticsearch®. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/> or <paramref name="indexName"/> is null. </exception>
+        public ElasticsearchChatExtensionParameters(Uri endpoint, string indexName)
+        {
+            Argument.AssertNotNull(endpoint, nameof(endpoint));
+            Argument.AssertNotNull(indexName, nameof(indexName));
+
+            IncludeContexts = new ChangeTrackingList<OnYourDataContextProperty>();
+            Endpoint = endpoint;
+            IndexName = indexName;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ElasticsearchChatExtensionParameters"/>. </summary>
+        /// <param name="documentCount"> The configured top number of documents to feature for the configured query. </param>
+        /// <param name="shouldRestrictResultScope"> Whether queries should be restricted to use of indexed data. </param>
+        /// <param name="strictness"> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </param>
+        /// <param name="maxSearchQueries">
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </param>
+        /// <param name="allowPartialResult">
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </param>
+        /// <param name="includeContexts"> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </param>
+        /// <param name="authentication">
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// Please note <see cref="OnYourDataAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataAccessTokenAuthenticationOptions"/>, <see cref="OnYourDataApiKeyAuthenticationOptions"/>, <see cref="OnYourDataConnectionStringAuthenticationOptions"/>, <see cref="OnYourDataEncodedApiKeyAuthenticationOptions"/>, <see cref="OnYourDataKeyAndKeyIdAuthenticationOptions"/>, <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>, <see cref="OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> and <see cref="OnYourDataUsernameAndPasswordAuthenticationOptions"/>.
+        /// </param>
+        /// <param name="endpoint"> The endpoint of Elasticsearch®. </param>
+        /// <param name="indexName"> The index name of Elasticsearch®. </param>
+        /// <param name="fieldMappingOptions"> The index field mapping options of Elasticsearch®. </param>
+        /// <param name="queryType"> The query type of Elasticsearch®. </param>
+        /// <param name="embeddingDependency">
+        /// The embedding dependency for vector search.
+        /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OnYourDataModelIdVectorizationSource"/>.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ElasticsearchChatExtensionParameters(int? documentCount, bool? shouldRestrictResultScope, int? strictness, int? maxSearchQueries, bool? allowPartialResult, IList<OnYourDataContextProperty> includeContexts, OnYourDataAuthenticationOptions authentication, Uri endpoint, string indexName, ElasticsearchIndexFieldMappingOptions fieldMappingOptions, ElasticsearchQueryType? queryType, OnYourDataVectorizationSource embeddingDependency, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            DocumentCount = documentCount;
+            ShouldRestrictResultScope = shouldRestrictResultScope;
+            Strictness = strictness;
+            MaxSearchQueries = maxSearchQueries;
+            AllowPartialResult = allowPartialResult;
+            IncludeContexts = includeContexts;
+            Authentication = authentication;
+            Endpoint = endpoint;
+            IndexName = indexName;
+            FieldMappingOptions = fieldMappingOptions;
+            QueryType = queryType;
+            EmbeddingDependency = embeddingDependency;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ElasticsearchChatExtensionParameters"/> for deserialization. </summary>
+        internal ElasticsearchChatExtensionParameters()
+        {
+        }
+
+        /// <summary> The configured top number of documents to feature for the configured query. </summary>
+        public int? DocumentCount { get; set; }
+        /// <summary> Whether queries should be restricted to use of indexed data. </summary>
+        public bool? ShouldRestrictResultScope { get; set; }
+        /// <summary> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </summary>
+        public int? Strictness { get; set; }
+        /// <summary>
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </summary>
+        public int? MaxSearchQueries { get; set; }
+        /// <summary>
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </summary>
+        public bool? AllowPartialResult { get; set; }
+        /// <summary> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </summary>
+        public IList<OnYourDataContextProperty> IncludeContexts { get; }
+        /// <summary>
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// Please note <see cref="OnYourDataAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataAccessTokenAuthenticationOptions"/>, <see cref="OnYourDataApiKeyAuthenticationOptions"/>, <see cref="OnYourDataConnectionStringAuthenticationOptions"/>, <see cref="OnYourDataEncodedApiKeyAuthenticationOptions"/>, <see cref="OnYourDataKeyAndKeyIdAuthenticationOptions"/>, <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>, <see cref="OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> and <see cref="OnYourDataUsernameAndPasswordAuthenticationOptions"/>.
+        /// </summary>
+        public OnYourDataAuthenticationOptions Authentication { get; set; }
+        /// <summary> The endpoint of Elasticsearch®. </summary>
+        public Uri Endpoint { get; }
+        /// <summary> The index name of Elasticsearch®. </summary>
+        public string IndexName { get; }
+        /// <summary> The index field mapping options of Elasticsearch®. </summary>
+        public ElasticsearchIndexFieldMappingOptions FieldMappingOptions { get; set; }
+        /// <summary> The query type of Elasticsearch®. </summary>
+        public ElasticsearchQueryType? QueryType { get; set; }
+        /// <summary>
+        /// The embedding dependency for vector search.
+        /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OnYourDataModelIdVectorizationSource"/>.
+        /// </summary>
+        public OnYourDataVectorizationSource EmbeddingDependency { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchIndexFieldMappingOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchIndexFieldMappingOptions.Serialization.cs
new file mode 100644
index 000000000000..27b2455ca8a6
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchIndexFieldMappingOptions.Serialization.cs
@@ -0,0 +1,228 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ElasticsearchIndexFieldMappingOptions : IUtf8JsonSerializable, IJsonModel<ElasticsearchIndexFieldMappingOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ElasticsearchIndexFieldMappingOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ElasticsearchIndexFieldMappingOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchIndexFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ElasticsearchIndexFieldMappingOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(TitleFieldName))
+            {
+                writer.WritePropertyName("title_field"u8);
+                writer.WriteStringValue(TitleFieldName);
+            }
+            if (Optional.IsDefined(UrlFieldName))
+            {
+                writer.WritePropertyName("url_field"u8);
+                writer.WriteStringValue(UrlFieldName);
+            }
+            if (Optional.IsDefined(FilepathFieldName))
+            {
+                writer.WritePropertyName("filepath_field"u8);
+                writer.WriteStringValue(FilepathFieldName);
+            }
+            if (Optional.IsCollectionDefined(ContentFieldNames))
+            {
+                writer.WritePropertyName("content_fields"u8);
+                writer.WriteStartArray();
+                foreach (var item in ContentFieldNames)
+                {
+                    writer.WriteStringValue(item);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsDefined(ContentFieldSeparator))
+            {
+                writer.WritePropertyName("content_fields_separator"u8);
+                writer.WriteStringValue(ContentFieldSeparator);
+            }
+            if (Optional.IsCollectionDefined(VectorFieldNames))
+            {
+                writer.WritePropertyName("vector_fields"u8);
+                writer.WriteStartArray();
+                foreach (var item in VectorFieldNames)
+                {
+                    writer.WriteStringValue(item);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ElasticsearchIndexFieldMappingOptions IJsonModel<ElasticsearchIndexFieldMappingOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchIndexFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ElasticsearchIndexFieldMappingOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeElasticsearchIndexFieldMappingOptions(document.RootElement, options);
+        }
+
+        internal static ElasticsearchIndexFieldMappingOptions DeserializeElasticsearchIndexFieldMappingOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string titleField = default;
+            string urlField = default;
+            string filepathField = default;
+            IList<string> contentFields = default;
+            string contentFieldsSeparator = default;
+            IList<string> vectorFields = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("title_field"u8))
+                {
+                    titleField = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("url_field"u8))
+                {
+                    urlField = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("filepath_field"u8))
+                {
+                    filepathField = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("content_fields"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    contentFields = array;
+                    continue;
+                }
+                if (property.NameEquals("content_fields_separator"u8))
+                {
+                    contentFieldsSeparator = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("vector_fields"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    vectorFields = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ElasticsearchIndexFieldMappingOptions(
+                titleField,
+                urlField,
+                filepathField,
+                contentFields ?? new ChangeTrackingList<string>(),
+                contentFieldsSeparator,
+                vectorFields ?? new ChangeTrackingList<string>(),
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ElasticsearchIndexFieldMappingOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchIndexFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ElasticsearchIndexFieldMappingOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ElasticsearchIndexFieldMappingOptions IPersistableModel<ElasticsearchIndexFieldMappingOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ElasticsearchIndexFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeElasticsearchIndexFieldMappingOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ElasticsearchIndexFieldMappingOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ElasticsearchIndexFieldMappingOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ElasticsearchIndexFieldMappingOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeElasticsearchIndexFieldMappingOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceFieldMappings.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchIndexFieldMappingOptions.cs
similarity index 52%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceFieldMappings.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchIndexFieldMappingOptions.cs
index 7a7d022310ae..6213ad25cb49 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/DataSourceFieldMappings.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchIndexFieldMappingOptions.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -5,10 +8,10 @@
 using System;
 using System.Collections.Generic;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI
 {
-    /// <summary> The AzureSearchChatDataSourceParametersFieldsMapping. </summary>
-    public partial class DataSourceFieldMappings
+    /// <summary> Optional settings to control how fields are processed when using a configured Elasticsearch® resource. </summary>
+    public partial class ElasticsearchIndexFieldMappingOptions
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -40,27 +43,45 @@ public partial class DataSourceFieldMappings
         /// </list>
         /// </para>
         /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DataSourceFieldMappings"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="ElasticsearchIndexFieldMappingOptions"/>. </summary>
+        public ElasticsearchIndexFieldMappingOptions()
+        {
+            ContentFieldNames = new ChangeTrackingList<string>();
+            VectorFieldNames = new ChangeTrackingList<string>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ElasticsearchIndexFieldMappingOptions"/>. </summary>
         /// <param name="titleFieldName"> The name of the index field to use as a title. </param>
         /// <param name="urlFieldName"> The name of the index field to use as a URL. </param>
-        /// <param name="filePathFieldName"> The name of the index field to use as a filepath. </param>
+        /// <param name="filepathFieldName"> The name of the index field to use as a filepath. </param>
         /// <param name="contentFieldNames"> The names of index fields that should be treated as content. </param>
         /// <param name="contentFieldSeparator"> The separator pattern that content fields should use. </param>
         /// <param name="vectorFieldNames"> The names of fields that represent vector data. </param>
-        /// <param name="imageVectorFieldNames"> The names of fields that represent image vector data. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DataSourceFieldMappings(string titleFieldName, string urlFieldName, string filePathFieldName, IList<string> contentFieldNames, string contentFieldSeparator, IList<string> vectorFieldNames, IList<string> imageVectorFieldNames, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal ElasticsearchIndexFieldMappingOptions(string titleFieldName, string urlFieldName, string filepathFieldName, IList<string> contentFieldNames, string contentFieldSeparator, IList<string> vectorFieldNames, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             TitleFieldName = titleFieldName;
             UrlFieldName = urlFieldName;
-            FilePathFieldName = filePathFieldName;
+            FilepathFieldName = filepathFieldName;
             ContentFieldNames = contentFieldNames;
             ContentFieldSeparator = contentFieldSeparator;
             VectorFieldNames = vectorFieldNames;
-            ImageVectorFieldNames = imageVectorFieldNames;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
         }
+
+        /// <summary> The name of the index field to use as a title. </summary>
+        public string TitleFieldName { get; set; }
+        /// <summary> The name of the index field to use as a URL. </summary>
+        public string UrlFieldName { get; set; }
+        /// <summary> The name of the index field to use as a filepath. </summary>
+        public string FilepathFieldName { get; set; }
+        /// <summary> The names of index fields that should be treated as content. </summary>
+        public IList<string> ContentFieldNames { get; }
+        /// <summary> The separator pattern that content fields should use. </summary>
+        public string ContentFieldSeparator { get; set; }
+        /// <summary> The names of fields that represent vector data. </summary>
+        public IList<string> VectorFieldNames { get; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchQueryType.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchQueryType.cs
new file mode 100644
index 000000000000..d8588a637f6d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ElasticsearchQueryType.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The type of Elasticsearch® retrieval query that should be executed when using it as an Azure OpenAI chat extension. </summary>
+    public readonly partial struct ElasticsearchQueryType : IEquatable<ElasticsearchQueryType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ElasticsearchQueryType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ElasticsearchQueryType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string SimpleValue = "simple";
+        private const string VectorValue = "vector";
+
+        /// <summary> Represents the default, simple query parser. </summary>
+        public static ElasticsearchQueryType Simple { get; } = new ElasticsearchQueryType(SimpleValue);
+        /// <summary> Represents vector search over computed data. </summary>
+        public static ElasticsearchQueryType Vector { get; } = new ElasticsearchQueryType(VectorValue);
+        /// <summary> Determines if two <see cref="ElasticsearchQueryType"/> values are the same. </summary>
+        public static bool operator ==(ElasticsearchQueryType left, ElasticsearchQueryType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ElasticsearchQueryType"/> values are not the same. </summary>
+        public static bool operator !=(ElasticsearchQueryType left, ElasticsearchQueryType right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ElasticsearchQueryType"/>. </summary>
+        public static implicit operator ElasticsearchQueryType(string value) => new ElasticsearchQueryType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ElasticsearchQueryType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ElasticsearchQueryType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingEncodingFormat.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingEncodingFormat.cs
new file mode 100644
index 000000000000..213af80cfdb5
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingEncodingFormat.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Represents the available formats for embeddings data on responses. </summary>
+    public readonly partial struct EmbeddingEncodingFormat : IEquatable<EmbeddingEncodingFormat>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingEncodingFormat"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public EmbeddingEncodingFormat(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string FloatValue = "float";
+        private const string Base64Value = "base64";
+
+        /// <summary> Specifies that responses should provide arrays of floats for each embedding. </summary>
+        public static EmbeddingEncodingFormat Float { get; } = new EmbeddingEncodingFormat(FloatValue);
+        /// <summary> Specifies that responses should provide a base64-encoded string for each embedding. </summary>
+        public static EmbeddingEncodingFormat Base64 { get; } = new EmbeddingEncodingFormat(Base64Value);
+        /// <summary> Determines if two <see cref="EmbeddingEncodingFormat"/> values are the same. </summary>
+        public static bool operator ==(EmbeddingEncodingFormat left, EmbeddingEncodingFormat right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="EmbeddingEncodingFormat"/> values are not the same. </summary>
+        public static bool operator !=(EmbeddingEncodingFormat left, EmbeddingEncodingFormat right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="EmbeddingEncodingFormat"/>. </summary>
+        public static implicit operator EmbeddingEncodingFormat(string value) => new EmbeddingEncodingFormat(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is EmbeddingEncodingFormat other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(EmbeddingEncodingFormat other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantFile.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingItem.Serialization.cs
similarity index 61%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantFile.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingItem.Serialization.cs
index ea4cf4b4c062..cbb79f23908f 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantFile.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingItem.Serialization.cs
@@ -11,29 +11,32 @@
 using System.Text.Json;
 using Azure.Core;
 
-namespace Azure.AI.OpenAI.Assistants
+namespace Azure.AI.OpenAI
 {
-    public partial class AssistantFile : IUtf8JsonSerializable, IJsonModel<AssistantFile>
+    internal partial class EmbeddingItem : IUtf8JsonSerializable, IJsonModel<EmbeddingItem>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AssistantFile>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<EmbeddingItem>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<AssistantFile>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<EmbeddingItem>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<AssistantFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingItem>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(AssistantFile)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(EmbeddingItem)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            writer.WritePropertyName("id"u8);
-            writer.WriteStringValue(Id);
+            writer.WritePropertyName("embedding"u8);
+            writer.WriteStartArray();
+            foreach (var item in Embedding)
+            {
+                writer.WriteNumberValue(item);
+            }
+            writer.WriteEndArray();
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
             writer.WritePropertyName("object"u8);
-            writer.WriteStringValue(Object);
-            writer.WritePropertyName("created_at"u8);
-            writer.WriteNumberValue(CreatedAt, "U");
-            writer.WritePropertyName("assistant_id"u8);
-            writer.WriteStringValue(AssistantId);
+            writer.WriteStringValue(Object.ToString());
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -52,19 +55,19 @@ void IJsonModel<AssistantFile>.Write(Utf8JsonWriter writer, ModelReaderWriterOpt
             writer.WriteEndObject();
         }
 
-        AssistantFile IJsonModel<AssistantFile>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        EmbeddingItem IJsonModel<EmbeddingItem>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<AssistantFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingItem>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(AssistantFile)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(EmbeddingItem)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAssistantFile(document.RootElement, options);
+            return DeserializeEmbeddingItem(document.RootElement, options);
         }
 
-        internal static AssistantFile DeserializeAssistantFile(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static EmbeddingItem DeserializeEmbeddingItem(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -72,32 +75,31 @@ internal static AssistantFile DeserializeAssistantFile(JsonElement element, Mode
             {
                 return null;
             }
-            string id = default;
-            string @object = default;
-            DateTimeOffset createdAt = default;
-            string assistantId = default;
+            IReadOnlyList<float> embedding = default;
+            int index = default;
+            EmbeddingItemObject @object = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
             {
-                if (property.NameEquals("id"u8))
+                if (property.NameEquals("embedding"u8))
                 {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("object"u8))
-                {
-                    @object = property.Value.GetString();
+                    List<float> array = new List<float>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetSingle());
+                    }
+                    embedding = array;
                     continue;
                 }
-                if (property.NameEquals("created_at"u8))
+                if (property.NameEquals("index"u8))
                 {
-                    createdAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    index = property.Value.GetInt32();
                     continue;
                 }
-                if (property.NameEquals("assistant_id"u8))
+                if (property.NameEquals("object"u8))
                 {
-                    assistantId = property.Value.GetString();
+                    @object = new EmbeddingItemObject(property.Value.GetString());
                     continue;
                 }
                 if (options.Format != "W")
@@ -106,46 +108,46 @@ internal static AssistantFile DeserializeAssistantFile(JsonElement element, Mode
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new AssistantFile(id, @object, createdAt, assistantId, serializedAdditionalRawData);
+            return new EmbeddingItem(embedding, index, @object, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<AssistantFile>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<EmbeddingItem>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<AssistantFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingItem>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(AssistantFile)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(EmbeddingItem)} does not support writing '{options.Format}' format.");
             }
         }
 
-        AssistantFile IPersistableModel<AssistantFile>.Create(BinaryData data, ModelReaderWriterOptions options)
+        EmbeddingItem IPersistableModel<EmbeddingItem>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<AssistantFile>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingItem>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeAssistantFile(document.RootElement, options);
+                        return DeserializeEmbeddingItem(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(AssistantFile)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(EmbeddingItem)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<AssistantFile>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<EmbeddingItem>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
         /// <param name="response"> The response to deserialize the model from. </param>
-        internal static AssistantFile FromResponse(Response response)
+        internal static EmbeddingItem FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeAssistantFile(document.RootElement);
+            return DeserializeEmbeddingItem(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingItem.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingItem.cs
new file mode 100644
index 000000000000..047042d2c0f5
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingItem.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Representation of a single embeddings relatedness comparison. </summary>
+    internal partial class EmbeddingItem
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingItem"/>. </summary>
+        /// <param name="embedding">
+        /// List of embeddings value for the input prompt. These represent a measurement of the
+        /// vector-based relatedness of the provided input.
+        /// </param>
+        /// <param name="index"> Index of the prompt to which the EmbeddingItem corresponds. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="embedding"/> is null. </exception>
+        internal EmbeddingItem(IEnumerable<float> embedding, int index)
+        {
+            Argument.AssertNotNull(embedding, nameof(embedding));
+
+            Embedding = embedding.ToList();
+            Index = index;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingItem"/>. </summary>
+        /// <param name="embedding">
+        /// List of embeddings value for the input prompt. These represent a measurement of the
+        /// vector-based relatedness of the provided input.
+        /// </param>
+        /// <param name="index"> Index of the prompt to which the EmbeddingItem corresponds. </param>
+        /// <param name="object"> The object type which is always 'embedding'. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal EmbeddingItem(IReadOnlyList<float> embedding, int index, EmbeddingItemObject @object, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Embedding = embedding;
+            Index = index;
+            Object = @object;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingItem"/> for deserialization. </summary>
+        internal EmbeddingItem()
+        {
+        }
+
+        /// <summary>
+        /// List of embeddings value for the input prompt. These represent a measurement of the
+        /// vector-based relatedness of the provided input.
+        /// </summary>
+        public IReadOnlyList<float> Embedding { get; }
+        /// <summary> Index of the prompt to which the EmbeddingItem corresponds. </summary>
+        public int Index { get; }
+        /// <summary> The object type which is always 'embedding'. </summary>
+        public EmbeddingItemObject Object { get; } = EmbeddingItemObject.Embedding;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingItemObject.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingItemObject.cs
new file mode 100644
index 000000000000..6d8867c0c41e
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingItemObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The EmbeddingItem_object. </summary>
+    internal readonly partial struct EmbeddingItemObject : IEquatable<EmbeddingItemObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingItemObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public EmbeddingItemObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string EmbeddingValue = "embedding";
+
+        /// <summary> embedding. </summary>
+        public static EmbeddingItemObject Embedding { get; } = new EmbeddingItemObject(EmbeddingValue);
+        /// <summary> Determines if two <see cref="EmbeddingItemObject"/> values are the same. </summary>
+        public static bool operator ==(EmbeddingItemObject left, EmbeddingItemObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="EmbeddingItemObject"/> values are not the same. </summary>
+        public static bool operator !=(EmbeddingItemObject left, EmbeddingItemObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="EmbeddingItemObject"/>. </summary>
+        public static implicit operator EmbeddingItemObject(string value) => new EmbeddingItemObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is EmbeddingItemObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(EmbeddingItemObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Embeddings.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Embeddings.Serialization.cs
new file mode 100644
index 000000000000..89f93bf0e677
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Embeddings.Serialization.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class Embeddings : IUtf8JsonSerializable, IJsonModel<OpenAI.Embeddings>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OpenAI.Embeddings>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OpenAI.Embeddings>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAI.Embeddings>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OpenAI.Embeddings)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("data"u8);
+            writer.WriteStartArray();
+            foreach (var item in Data)
+            {
+                writer.WriteObjectValue(item, options);
+            }
+            writer.WriteEndArray();
+            writer.WritePropertyName("usage"u8);
+            writer.WriteObjectValue(Usage, options);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OpenAI.Embeddings IJsonModel<OpenAI.Embeddings>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAI.Embeddings>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OpenAI.Embeddings)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return OpenAI.Embeddings.DeserializeEmbeddings(document.RootElement, options);
+        }
+
+        internal static OpenAI.Embeddings DeserializeEmbeddings(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IReadOnlyList<EmbeddingItem> data = default;
+            EmbeddingsUsage usage = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("data"u8))
+                {
+                    List<EmbeddingItem> array = new List<EmbeddingItem>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(EmbeddingItem.DeserializeEmbeddingItem(item, options));
+                    }
+                    data = array;
+                    continue;
+                }
+                if (property.NameEquals("usage"u8))
+                {
+                    usage = EmbeddingsUsage.DeserializeEmbeddingsUsage(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OpenAI.Embeddings(data, usage, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<OpenAI.Embeddings>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAI.Embeddings>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OpenAI.Embeddings)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OpenAI.Embeddings IPersistableModel<OpenAI.Embeddings>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAI.Embeddings>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return OpenAI.Embeddings.DeserializeEmbeddings(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OpenAI.Embeddings)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OpenAI.Embeddings>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static OpenAI.Embeddings FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return OpenAI.Embeddings.DeserializeEmbeddings(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<OpenAI.Embeddings>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Embeddings.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Embeddings.cs
new file mode 100644
index 000000000000..f6c3403bd45e
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Embeddings.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// Representation of the response data from an embeddings request.
+    /// Embeddings measure the relatedness of text strings and are commonly used for search, clustering,
+    /// recommendations, and other similar scenarios.
+    /// </summary>
+    internal partial class Embeddings
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.Embeddings"/>. </summary>
+        /// <param name="data"> Embedding values for the prompts submitted in the request. </param>
+        /// <param name="usage"> Usage counts for tokens input using the embeddings API. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="data"/> or <paramref name="usage"/> is null. </exception>
+        internal Embeddings(IEnumerable<EmbeddingItem> data, EmbeddingsUsage usage)
+        {
+            Argument.AssertNotNull(data, nameof(data));
+            Argument.AssertNotNull(usage, nameof(usage));
+
+            Data = data.ToList();
+            Usage = usage;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.Embeddings"/>. </summary>
+        /// <param name="data"> Embedding values for the prompts submitted in the request. </param>
+        /// <param name="usage"> Usage counts for tokens input using the embeddings API. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal Embeddings(IReadOnlyList<EmbeddingItem> data, EmbeddingsUsage usage, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Data = data;
+            Usage = usage;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAI.Embeddings"/> for deserialization. </summary>
+        internal Embeddings()
+        {
+        }
+
+        /// <summary> Embedding values for the prompts submitted in the request. </summary>
+        public IReadOnlyList<EmbeddingItem> Data { get; }
+        /// <summary> Usage counts for tokens input using the embeddings API. </summary>
+        public EmbeddingsUsage Usage { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingsOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingsOptions.Serialization.cs
new file mode 100644
index 000000000000..140629070ca3
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingsOptions.Serialization.cs
@@ -0,0 +1,215 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class EmbeddingsOptions : IUtf8JsonSerializable, IJsonModel<EmbeddingsOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<EmbeddingsOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<EmbeddingsOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(EmbeddingsOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(User))
+            {
+                writer.WritePropertyName("user"u8);
+                writer.WriteStringValue(User);
+            }
+            if (Optional.IsDefined(DeploymentName))
+            {
+                writer.WritePropertyName("model"u8);
+                writer.WriteStringValue(DeploymentName);
+            }
+            writer.WritePropertyName("input"u8);
+            writer.WriteStartArray();
+            foreach (var item in Input)
+            {
+                writer.WriteStringValue(item);
+            }
+            writer.WriteEndArray();
+            if (Optional.IsDefined(EncodingFormat))
+            {
+                writer.WritePropertyName("encoding_format"u8);
+                writer.WriteStringValue(EncodingFormat.Value.ToString());
+            }
+            if (Optional.IsDefined(Dimensions))
+            {
+                writer.WritePropertyName("dimensions"u8);
+                writer.WriteNumberValue(Dimensions.Value);
+            }
+            if (Optional.IsDefined(InputType))
+            {
+                writer.WritePropertyName("input_type"u8);
+                writer.WriteStringValue(InputType);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        EmbeddingsOptions IJsonModel<EmbeddingsOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(EmbeddingsOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeEmbeddingsOptions(document.RootElement, options);
+        }
+
+        internal static EmbeddingsOptions DeserializeEmbeddingsOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string user = default;
+            string model = default;
+            IList<string> input = default;
+            EmbeddingEncodingFormat? encodingFormat = default;
+            int? dimensions = default;
+            string inputType = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("user"u8))
+                {
+                    user = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("model"u8))
+                {
+                    model = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("input"u8))
+                {
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    input = array;
+                    continue;
+                }
+                if (property.NameEquals("encoding_format"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    encodingFormat = new EmbeddingEncodingFormat(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("dimensions"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    dimensions = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("input_type"u8))
+                {
+                    inputType = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new EmbeddingsOptions(
+                user,
+                model,
+                input,
+                encodingFormat,
+                dimensions,
+                inputType,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<EmbeddingsOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(EmbeddingsOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        EmbeddingsOptions IPersistableModel<EmbeddingsOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeEmbeddingsOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(EmbeddingsOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<EmbeddingsOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static EmbeddingsOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeEmbeddingsOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingsOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingsOptions.cs
new file mode 100644
index 000000000000..7a25f39f4f5a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingsOptions.cs
@@ -0,0 +1,132 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// The configuration information for an embeddings request.
+    /// Embeddings measure the relatedness of text strings and are commonly used for search, clustering,
+    /// recommendations, and other similar scenarios.
+    /// </summary>
+    public partial class EmbeddingsOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingsOptions"/>. </summary>
+        /// <param name="input">
+        /// Input texts to get embeddings for, encoded as a an array of strings.
+        /// Each input must not exceed 2048 tokens in length.
+        ///
+        /// Unless you are embedding code, we suggest replacing newlines (\n) in your input with a single space,
+        /// as we have observed inferior results when newlines are present.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="input"/> is null. </exception>
+        public EmbeddingsOptions(IEnumerable<string> input)
+        {
+            Argument.AssertNotNull(input, nameof(input));
+
+            Input = input.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingsOptions"/>. </summary>
+        /// <param name="user">
+        /// An identifier for the caller or end user of the operation. This may be used for tracking
+        /// or rate-limiting purposes.
+        /// </param>
+        /// <param name="deploymentName">
+        /// The model name to provide as part of this embeddings request.
+        /// Not applicable to Azure OpenAI, where deployment information should be included in the Azure
+        /// resource URI that's connected to.
+        /// </param>
+        /// <param name="input">
+        /// Input texts to get embeddings for, encoded as a an array of strings.
+        /// Each input must not exceed 2048 tokens in length.
+        ///
+        /// Unless you are embedding code, we suggest replacing newlines (\n) in your input with a single space,
+        /// as we have observed inferior results when newlines are present.
+        /// </param>
+        /// <param name="encodingFormat"> The response encoding format to use for embedding data. </param>
+        /// <param name="dimensions"> The number of dimensions the resulting output embeddings should have. Only supported in `text-embedding-3` and later models. </param>
+        /// <param name="inputType"> When using Azure OpenAI, specifies the input type to use for embedding search. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal EmbeddingsOptions(string user, string deploymentName, IList<string> input, EmbeddingEncodingFormat? encodingFormat, int? dimensions, string inputType, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            User = user;
+            DeploymentName = deploymentName;
+            Input = input;
+            EncodingFormat = encodingFormat;
+            Dimensions = dimensions;
+            InputType = inputType;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingsOptions"/> for deserialization. </summary>
+        internal EmbeddingsOptions()
+        {
+        }
+
+        /// <summary>
+        /// An identifier for the caller or end user of the operation. This may be used for tracking
+        /// or rate-limiting purposes.
+        /// </summary>
+        public string User { get; set; }
+        /// <summary>
+        /// The model name to provide as part of this embeddings request.
+        /// Not applicable to Azure OpenAI, where deployment information should be included in the Azure
+        /// resource URI that's connected to.
+        /// </summary>
+        public string DeploymentName { get; set; }
+        /// <summary>
+        /// Input texts to get embeddings for, encoded as a an array of strings.
+        /// Each input must not exceed 2048 tokens in length.
+        ///
+        /// Unless you are embedding code, we suggest replacing newlines (\n) in your input with a single space,
+        /// as we have observed inferior results when newlines are present.
+        /// </summary>
+        public IList<string> Input { get; }
+        /// <summary> The response encoding format to use for embedding data. </summary>
+        public EmbeddingEncodingFormat? EncodingFormat { get; set; }
+        /// <summary> The number of dimensions the resulting output embeddings should have. Only supported in `text-embedding-3` and later models. </summary>
+        public int? Dimensions { get; set; }
+        /// <summary> When using Azure OpenAI, specifies the input type to use for embedding search. </summary>
+        public string InputType { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingsUsage.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingsUsage.Serialization.cs
new file mode 100644
index 000000000000..bd51b2789ae4
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingsUsage.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class EmbeddingsUsage : IUtf8JsonSerializable, IJsonModel<EmbeddingsUsage>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<EmbeddingsUsage>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<EmbeddingsUsage>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsUsage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(EmbeddingsUsage)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("prompt_tokens"u8);
+            writer.WriteNumberValue(PromptTokens);
+            writer.WritePropertyName("total_tokens"u8);
+            writer.WriteNumberValue(TotalTokens);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        EmbeddingsUsage IJsonModel<EmbeddingsUsage>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsUsage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(EmbeddingsUsage)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeEmbeddingsUsage(document.RootElement, options);
+        }
+
+        internal static EmbeddingsUsage DeserializeEmbeddingsUsage(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            int promptTokens = default;
+            int totalTokens = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("prompt_tokens"u8))
+                {
+                    promptTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("total_tokens"u8))
+                {
+                    totalTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new EmbeddingsUsage(promptTokens, totalTokens, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<EmbeddingsUsage>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsUsage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(EmbeddingsUsage)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        EmbeddingsUsage IPersistableModel<EmbeddingsUsage>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsUsage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeEmbeddingsUsage(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(EmbeddingsUsage)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<EmbeddingsUsage>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static EmbeddingsUsage FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeEmbeddingsUsage(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingsUsage.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingsUsage.cs
new file mode 100644
index 000000000000..00f0ce06d636
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/EmbeddingsUsage.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Measurement of the amount of tokens used in this request and response. </summary>
+    internal partial class EmbeddingsUsage
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingsUsage"/>. </summary>
+        /// <param name="promptTokens"> Number of tokens sent in the original request. </param>
+        /// <param name="totalTokens"> Total number of tokens transacted in this request/response. </param>
+        internal EmbeddingsUsage(int promptTokens, int totalTokens)
+        {
+            PromptTokens = promptTokens;
+            TotalTokens = totalTokens;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingsUsage"/>. </summary>
+        /// <param name="promptTokens"> Number of tokens sent in the original request. </param>
+        /// <param name="totalTokens"> Total number of tokens transacted in this request/response. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal EmbeddingsUsage(int promptTokens, int totalTokens, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            PromptTokens = promptTokens;
+            TotalTokens = totalTokens;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingsUsage"/> for deserialization. </summary>
+        internal EmbeddingsUsage()
+        {
+        }
+
+        /// <summary> Number of tokens sent in the original request. </summary>
+        public int PromptTokens { get; }
+        /// <summary> Total number of tokens transacted in this request/response. </summary>
+        public int TotalTokens { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FileDeletionStatus.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FileDeletionStatus.Serialization.cs
new file mode 100644
index 000000000000..f707b65a7c65
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FileDeletionStatus.Serialization.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class FileDeletionStatus : IUtf8JsonSerializable, IJsonModel<FileDeletionStatus>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<FileDeletionStatus>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<FileDeletionStatus>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FileDeletionStatus)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("deleted"u8);
+            writer.WriteBooleanValue(Deleted);
+            writer.WritePropertyName("object"u8);
+            writer.WriteStringValue(Object.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        FileDeletionStatus IJsonModel<FileDeletionStatus>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FileDeletionStatus)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeFileDeletionStatus(document.RootElement, options);
+        }
+
+        internal static FileDeletionStatus DeserializeFileDeletionStatus(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string id = default;
+            bool deleted = default;
+            FileDeletionStatusObject @object = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("deleted"u8))
+                {
+                    deleted = property.Value.GetBoolean();
+                    continue;
+                }
+                if (property.NameEquals("object"u8))
+                {
+                    @object = new FileDeletionStatusObject(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new FileDeletionStatus(id, deleted, @object, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<FileDeletionStatus>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(FileDeletionStatus)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        FileDeletionStatus IPersistableModel<FileDeletionStatus>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileDeletionStatus>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeFileDeletionStatus(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(FileDeletionStatus)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<FileDeletionStatus>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static FileDeletionStatus FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeFileDeletionStatus(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FileDeletionStatus.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FileDeletionStatus.cs
new file mode 100644
index 000000000000..1ffbf9b3ebf9
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FileDeletionStatus.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A status response from a file deletion operation. </summary>
+    public partial class FileDeletionStatus
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="FileDeletionStatus"/>. </summary>
+        /// <param name="id"> The ID of the resource specified for deletion. </param>
+        /// <param name="deleted"> A value indicating whether deletion was successful. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
+        internal FileDeletionStatus(string id, bool deleted)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+
+            Id = id;
+            Deleted = deleted;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FileDeletionStatus"/>. </summary>
+        /// <param name="id"> The ID of the resource specified for deletion. </param>
+        /// <param name="deleted"> A value indicating whether deletion was successful. </param>
+        /// <param name="object"> The object type, which is always 'file'. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal FileDeletionStatus(string id, bool deleted, FileDeletionStatusObject @object, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            Deleted = deleted;
+            Object = @object;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FileDeletionStatus"/> for deserialization. </summary>
+        internal FileDeletionStatus()
+        {
+        }
+
+        /// <summary> The ID of the resource specified for deletion. </summary>
+        public string Id { get; }
+        /// <summary> A value indicating whether deletion was successful. </summary>
+        public bool Deleted { get; }
+        /// <summary> The object type, which is always 'file'. </summary>
+        public FileDeletionStatusObject Object { get; } = FileDeletionStatusObject.File;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FileDeletionStatusObject.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FileDeletionStatusObject.cs
new file mode 100644
index 000000000000..7023f72b90f5
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FileDeletionStatusObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The FileDeletionStatus_object. </summary>
+    public readonly partial struct FileDeletionStatusObject : IEquatable<FileDeletionStatusObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="FileDeletionStatusObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public FileDeletionStatusObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string FileValue = "file";
+
+        /// <summary> file. </summary>
+        public static FileDeletionStatusObject File { get; } = new FileDeletionStatusObject(FileValue);
+        /// <summary> Determines if two <see cref="FileDeletionStatusObject"/> values are the same. </summary>
+        public static bool operator ==(FileDeletionStatusObject left, FileDeletionStatusObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="FileDeletionStatusObject"/> values are not the same. </summary>
+        public static bool operator !=(FileDeletionStatusObject left, FileDeletionStatusObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="FileDeletionStatusObject"/>. </summary>
+        public static implicit operator FileDeletionStatusObject(string value) => new FileDeletionStatusObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is FileDeletionStatusObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(FileDeletionStatusObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FileListResponse.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FileListResponse.Serialization.cs
new file mode 100644
index 000000000000..0b3f7339e23a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FileListResponse.Serialization.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class FileListResponse : IUtf8JsonSerializable, IJsonModel<FileListResponse>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<FileListResponse>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<FileListResponse>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileListResponse>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FileListResponse)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("object"u8);
+            writer.WriteStringValue(Object.ToString());
+            writer.WritePropertyName("data"u8);
+            writer.WriteStartArray();
+            foreach (var item in Data)
+            {
+                writer.WriteObjectValue(item, options);
+            }
+            writer.WriteEndArray();
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        FileListResponse IJsonModel<FileListResponse>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileListResponse>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FileListResponse)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeFileListResponse(document.RootElement, options);
+        }
+
+        internal static FileListResponse DeserializeFileListResponse(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            FileListResponseObject @object = default;
+            IReadOnlyList<OpenAIFile> data = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("object"u8))
+                {
+                    @object = new FileListResponseObject(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("data"u8))
+                {
+                    List<OpenAIFile> array = new List<OpenAIFile>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(OpenAIFile.DeserializeOpenAIFile(item, options));
+                    }
+                    data = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new FileListResponse(@object, data, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<FileListResponse>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileListResponse>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(FileListResponse)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        FileListResponse IPersistableModel<FileListResponse>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FileListResponse>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeFileListResponse(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(FileListResponse)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<FileListResponse>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static FileListResponse FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeFileListResponse(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FileListResponse.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FileListResponse.cs
new file mode 100644
index 000000000000..bcd03986f3fc
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FileListResponse.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The response data from a file list operation. </summary>
+    public partial class FileListResponse
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="FileListResponse"/>. </summary>
+        /// <param name="data"> The files returned for the request. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
+        internal FileListResponse(IEnumerable<OpenAIFile> data)
+        {
+            Argument.AssertNotNull(data, nameof(data));
+
+            Data = data.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FileListResponse"/>. </summary>
+        /// <param name="object"> The object type, which is always 'list'. </param>
+        /// <param name="data"> The files returned for the request. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal FileListResponse(FileListResponseObject @object, IReadOnlyList<OpenAIFile> data, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Object = @object;
+            Data = data;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FileListResponse"/> for deserialization. </summary>
+        internal FileListResponse()
+        {
+        }
+
+        /// <summary> The object type, which is always 'list'. </summary>
+        public FileListResponseObject Object { get; } = FileListResponseObject.List;
+
+        /// <summary> The files returned for the request. </summary>
+        public IReadOnlyList<OpenAIFile> Data { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FileListResponseObject.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FileListResponseObject.cs
new file mode 100644
index 000000000000..4d72d8c6702d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FileListResponseObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The FileListResponse_object. </summary>
+    public readonly partial struct FileListResponseObject : IEquatable<FileListResponseObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="FileListResponseObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public FileListResponseObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ListValue = "list";
+
+        /// <summary> list. </summary>
+        public static FileListResponseObject List { get; } = new FileListResponseObject(ListValue);
+        /// <summary> Determines if two <see cref="FileListResponseObject"/> values are the same. </summary>
+        public static bool operator ==(FileListResponseObject left, FileListResponseObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="FileListResponseObject"/> values are not the same. </summary>
+        public static bool operator !=(FileListResponseObject left, FileListResponseObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="FileListResponseObject"/>. </summary>
+        public static implicit operator FileListResponseObject(string value) => new FileListResponseObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is FileListResponseObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(FileListResponseObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FilePurpose.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FilePurpose.cs
new file mode 100644
index 000000000000..a77cbe48fa1b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FilePurpose.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The possible values denoting the intended usage of a file. </summary>
+    public readonly partial struct FilePurpose : IEquatable<FilePurpose>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="FilePurpose"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public FilePurpose(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string FineTuneValue = "fine-tune";
+        private const string FineTuneResultsValue = "fine-tune-results";
+        private const string AssistantsValue = "assistants";
+        private const string AssistantsOutputValue = "assistants_output";
+        private const string BatchValue = "batch";
+        private const string BatchOutputValue = "batch_output";
+        private const string VisionValue = "vision";
+
+        /// <summary> Indicates a file is used for fine tuning input. </summary>
+        public static FilePurpose FineTune { get; } = new FilePurpose(FineTuneValue);
+        /// <summary> Indicates a file is used for fine tuning results. </summary>
+        public static FilePurpose FineTuneResults { get; } = new FilePurpose(FineTuneResultsValue);
+        /// <summary> Indicates a file is used as input to assistants. </summary>
+        public static FilePurpose Assistants { get; } = new FilePurpose(AssistantsValue);
+        /// <summary> Indicates a file is used as output by assistants. </summary>
+        public static FilePurpose AssistantsOutput { get; } = new FilePurpose(AssistantsOutputValue);
+        /// <summary> Indicates a file is used as input to . </summary>
+        public static FilePurpose Batch { get; } = new FilePurpose(BatchValue);
+        /// <summary> Indicates a file is used as output by a vector store batch operation. </summary>
+        public static FilePurpose BatchOutput { get; } = new FilePurpose(BatchOutputValue);
+        /// <summary> Indicates a file is used as input to a vision operation. </summary>
+        public static FilePurpose Vision { get; } = new FilePurpose(VisionValue);
+        /// <summary> Determines if two <see cref="FilePurpose"/> values are the same. </summary>
+        public static bool operator ==(FilePurpose left, FilePurpose right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="FilePurpose"/> values are not the same. </summary>
+        public static bool operator !=(FilePurpose left, FilePurpose right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="FilePurpose"/>. </summary>
+        public static implicit operator FilePurpose(string value) => new FilePurpose(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is FilePurpose other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(FilePurpose other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FileState.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FileState.cs
new file mode 100644
index 000000000000..637802d9dee3
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FileState.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The state of the file. </summary>
+    public readonly partial struct FileState : IEquatable<FileState>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="FileState"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public FileState(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string UploadedValue = "uploaded";
+        private const string PendingValue = "pending";
+        private const string RunningValue = "running";
+        private const string ProcessedValue = "processed";
+        private const string ErrorValue = "error";
+        private const string DeletingValue = "deleting";
+        private const string DeletedValue = "deleted";
+
+        /// <summary>
+        /// The file has been uploaded but it's not yet processed. This state is not returned by Azure OpenAI and exposed only for
+        /// compatibility. It can be categorized as an inactive state.
+        /// </summary>
+        public static FileState Uploaded { get; } = new FileState(UploadedValue);
+        /// <summary> The operation was created and is not queued to be processed in the future. It can be categorized as an inactive state. </summary>
+        public static FileState Pending { get; } = new FileState(PendingValue);
+        /// <summary> The operation has started to be processed. It can be categorized as an active state. </summary>
+        public static FileState Running { get; } = new FileState(RunningValue);
+        /// <summary> The operation has successfully processed and is ready for consumption. It can be categorized as a terminal state. </summary>
+        public static FileState Processed { get; } = new FileState(ProcessedValue);
+        /// <summary> The operation has completed processing with a failure and cannot be further consumed. It can be categorized as a terminal state. </summary>
+        public static FileState Error { get; } = new FileState(ErrorValue);
+        /// <summary>
+        /// The entity is in the process to be deleted. This state is not returned by Azure OpenAI and exposed only for compatibility.
+        /// It can be categorized as an active state.
+        /// </summary>
+        public static FileState Deleting { get; } = new FileState(DeletingValue);
+        /// <summary>
+        /// The entity has been deleted but may still be referenced by other entities predating the deletion. It can be categorized as a
+        /// terminal state.
+        /// </summary>
+        public static FileState Deleted { get; } = new FileState(DeletedValue);
+        /// <summary> Determines if two <see cref="FileState"/> values are the same. </summary>
+        public static bool operator ==(FileState left, FileState right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="FileState"/> values are not the same. </summary>
+        public static bool operator !=(FileState left, FileState right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="FileState"/>. </summary>
+        public static implicit operator FileState(string value) => new FileState(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is FileState other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(FileState other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionCall.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionCall.Serialization.cs
new file mode 100644
index 000000000000..dce00585fff1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionCall.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class FunctionCall : IUtf8JsonSerializable, IJsonModel<FunctionCall>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<FunctionCall>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<FunctionCall>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FunctionCall)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("name"u8);
+            writer.WriteStringValue(Name);
+            writer.WritePropertyName("arguments"u8);
+            writer.WriteStringValue(Arguments);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        FunctionCall IJsonModel<FunctionCall>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionCall>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FunctionCall)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeFunctionCall(document.RootElement, options);
+        }
+
+        internal static FunctionCall DeserializeFunctionCall(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string name = default;
+            string arguments = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("name"u8))
+                {
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("arguments"u8))
+                {
+                    arguments = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new FunctionCall(name, arguments, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<FunctionCall>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(FunctionCall)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        FunctionCall IPersistableModel<FunctionCall>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionCall>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeFunctionCall(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(FunctionCall)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<FunctionCall>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static FunctionCall FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeFunctionCall(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionCall.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionCall.cs
new file mode 100644
index 000000000000..2a2534aebe1e
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionCall.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The name and arguments of a function that should be called, as generated by the model. </summary>
+    public partial class FunctionCall
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="FunctionCall"/>. </summary>
+        /// <param name="name"> The name of the function to call. </param>
+        /// <param name="arguments">
+        /// The arguments to call the function with, as generated by the model in JSON format.
+        /// Note that the model does not always generate valid JSON, and may hallucinate parameters
+        /// not defined by your function schema. Validate the arguments in your code before calling
+        /// your function.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="name"/> or <paramref name="arguments"/> is null. </exception>
+        public FunctionCall(string name, string arguments)
+        {
+            Argument.AssertNotNull(name, nameof(name));
+            Argument.AssertNotNull(arguments, nameof(arguments));
+
+            Name = name;
+            Arguments = arguments;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FunctionCall"/>. </summary>
+        /// <param name="name"> The name of the function to call. </param>
+        /// <param name="arguments">
+        /// The arguments to call the function with, as generated by the model in JSON format.
+        /// Note that the model does not always generate valid JSON, and may hallucinate parameters
+        /// not defined by your function schema. Validate the arguments in your code before calling
+        /// your function.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal FunctionCall(string name, string arguments, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Name = name;
+            Arguments = arguments;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FunctionCall"/> for deserialization. </summary>
+        internal FunctionCall()
+        {
+        }
+
+        /// <summary> The name of the function to call. </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// The arguments to call the function with, as generated by the model in JSON format.
+        /// Note that the model does not always generate valid JSON, and may hallucinate parameters
+        /// not defined by your function schema. Validate the arguments in your code before calling
+        /// your function.
+        /// </summary>
+        public string Arguments { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionCallPreset.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionCallPreset.cs
new file mode 100644
index 000000000000..6e15f0039916
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionCallPreset.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// The collection of predefined behaviors for handling request-provided function information in a chat completions
+    /// operation.
+    /// </summary>
+    public readonly partial struct FunctionCallPreset : IEquatable<FunctionCallPreset>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="FunctionCallPreset"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public FunctionCallPreset(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string AutoValue = "auto";
+        private const string NoneValue = "none";
+
+        /// <summary>
+        /// Specifies that the model may either use any of the functions provided in this chat completions request or
+        /// instead return a standard chat completions response as if no functions were provided.
+        /// </summary>
+        public static FunctionCallPreset Auto { get; } = new FunctionCallPreset(AutoValue);
+        /// <summary>
+        /// Specifies that the model should not respond with a function call and should instead provide a standard chat
+        /// completions response. Response content may still be influenced by the provided function information.
+        /// </summary>
+        public static FunctionCallPreset None { get; } = new FunctionCallPreset(NoneValue);
+        /// <summary> Determines if two <see cref="FunctionCallPreset"/> values are the same. </summary>
+        public static bool operator ==(FunctionCallPreset left, FunctionCallPreset right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="FunctionCallPreset"/> values are not the same. </summary>
+        public static bool operator !=(FunctionCallPreset left, FunctionCallPreset right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="FunctionCallPreset"/>. </summary>
+        public static implicit operator FunctionCallPreset(string value) => new FunctionCallPreset(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is FunctionCallPreset other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(FunctionCallPreset other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionDefinition.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionDefinition.Serialization.cs
new file mode 100644
index 000000000000..e9999febe97f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionDefinition.Serialization.cs
@@ -0,0 +1,168 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class FunctionDefinition : IUtf8JsonSerializable, IJsonModel<FunctionDefinition>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<FunctionDefinition>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<FunctionDefinition>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FunctionDefinition)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("name"u8);
+            writer.WriteStringValue(Name);
+            if (Optional.IsDefined(Description))
+            {
+                writer.WritePropertyName("description"u8);
+                writer.WriteStringValue(Description);
+            }
+            if (Optional.IsDefined(Parameters))
+            {
+                writer.WritePropertyName("parameters"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(Parameters);
+#else
+                using (JsonDocument document = JsonDocument.Parse(Parameters))
+                {
+                    JsonSerializer.Serialize(writer, document.RootElement);
+                }
+#endif
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        FunctionDefinition IJsonModel<FunctionDefinition>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FunctionDefinition)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeFunctionDefinition(document.RootElement, options);
+        }
+
+        internal static FunctionDefinition DeserializeFunctionDefinition(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string name = default;
+            string description = default;
+            BinaryData parameters = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("name"u8))
+                {
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("description"u8))
+                {
+                    description = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("parameters"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    parameters = BinaryData.FromString(property.Value.GetRawText());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new FunctionDefinition(name, description, parameters, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<FunctionDefinition>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionDefinition>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(FunctionDefinition)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        FunctionDefinition IPersistableModel<FunctionDefinition>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionDefinition>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeFunctionDefinition(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(FunctionDefinition)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<FunctionDefinition>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static FunctionDefinition FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeFunctionDefinition(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionDefinition.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionDefinition.cs
new file mode 100644
index 000000000000..1de7bfba323c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionDefinition.cs
@@ -0,0 +1,118 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The definition of a caller-specified function that chat completions may invoke in response to matching user input. </summary>
+    public partial class FunctionDefinition
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="FunctionDefinition"/>. </summary>
+        /// <param name="name"> The name of the function to be called. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
+        public FunctionDefinition(string name)
+        {
+            Argument.AssertNotNull(name, nameof(name));
+
+            Name = name;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FunctionDefinition"/>. </summary>
+        /// <param name="name"> The name of the function to be called. </param>
+        /// <param name="description">
+        /// A description of what the function does. The model will use this description when selecting the function and
+        /// interpreting its parameters.
+        /// </param>
+        /// <param name="parameters"> The parameters the function accepts, described as a JSON Schema object. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal FunctionDefinition(string name, string description, BinaryData parameters, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Name = name;
+            Description = description;
+            Parameters = parameters;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FunctionDefinition"/> for deserialization. </summary>
+        internal FunctionDefinition()
+        {
+        }
+
+        /// <summary> The name of the function to be called. </summary>
+        public string Name { get; }
+        /// <summary>
+        /// A description of what the function does. The model will use this description when selecting the function and
+        /// interpreting its parameters.
+        /// </summary>
+        public string Description { get; set; }
+        /// <summary>
+        /// The parameters the function accepts, described as a JSON Schema object.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData Parameters { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionName.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionName.Serialization.cs
new file mode 100644
index 000000000000..373fa127c97b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionName.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class FunctionName : IUtf8JsonSerializable, IJsonModel<FunctionName>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<FunctionName>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<FunctionName>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionName>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FunctionName)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("name"u8);
+            writer.WriteStringValue(Name);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        FunctionName IJsonModel<FunctionName>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionName>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(FunctionName)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeFunctionName(document.RootElement, options);
+        }
+
+        internal static FunctionName DeserializeFunctionName(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string name = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("name"u8))
+                {
+                    name = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new FunctionName(name, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<FunctionName>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionName>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(FunctionName)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        FunctionName IPersistableModel<FunctionName>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<FunctionName>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeFunctionName(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(FunctionName)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<FunctionName>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static FunctionName FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeFunctionName(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionName.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionName.cs
new file mode 100644
index 000000000000..14ca22fb4973
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/FunctionName.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// A structure that specifies the exact name of a specific, request-provided function to use when processing a chat
+    /// completions operation.
+    /// </summary>
+    public partial class FunctionName
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="FunctionName"/>. </summary>
+        /// <param name="name"> The name of the function to call. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
+        public FunctionName(string name)
+        {
+            Argument.AssertNotNull(name, nameof(name));
+
+            Name = name;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FunctionName"/>. </summary>
+        /// <param name="name"> The name of the function to call. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal FunctionName(string name, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Name = name;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="FunctionName"/> for deserialization. </summary>
+        internal FunctionName()
+        {
+        }
+
+        /// <summary> The name of the function to call. </summary>
+        public string Name { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ResponseImageContentFilterResult.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationContentFilterResults.Serialization.cs
similarity index 51%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/ResponseImageContentFilterResult.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationContentFilterResults.Serialization.cs
index ea977b08966e..608585f71046 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ResponseImageContentFilterResult.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationContentFilterResults.Serialization.cs
@@ -1,54 +1,55 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
 namespace Azure.AI.OpenAI
 {
-    public partial class ResponseImageContentFilterResult : IJsonModel<ResponseImageContentFilterResult>
+    public partial class ImageGenerationContentFilterResults : IUtf8JsonSerializable, IJsonModel<ImageGenerationContentFilterResults>
     {
-        void IJsonModel<ResponseImageContentFilterResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ImageGenerationContentFilterResults>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ImageGenerationContentFilterResults>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseImageContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationContentFilterResults>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ResponseImageContentFilterResult)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(ImageGenerationContentFilterResults)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("sexual") != true && Optional.IsDefined(Sexual))
+            if (Optional.IsDefined(Sexual))
             {
                 writer.WritePropertyName("sexual"u8);
                 writer.WriteObjectValue(Sexual, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("violence") != true && Optional.IsDefined(Violence))
+            if (Optional.IsDefined(Violence))
             {
                 writer.WritePropertyName("violence"u8);
                 writer.WriteObjectValue(Violence, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("hate") != true && Optional.IsDefined(Hate))
+            if (Optional.IsDefined(Hate))
             {
                 writer.WritePropertyName("hate"u8);
                 writer.WriteObjectValue(Hate, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("self_harm") != true && Optional.IsDefined(SelfHarm))
+            if (Optional.IsDefined(SelfHarm))
             {
                 writer.WritePropertyName("self_harm"u8);
                 writer.WriteObjectValue(SelfHarm, options);
             }
-            if (SerializedAdditionalRawData != null)
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -63,19 +64,19 @@ void IJsonModel<ResponseImageContentFilterResult>.Write(Utf8JsonWriter writer, M
             writer.WriteEndObject();
         }
 
-        ResponseImageContentFilterResult IJsonModel<ResponseImageContentFilterResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        ImageGenerationContentFilterResults IJsonModel<ImageGenerationContentFilterResults>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseImageContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationContentFilterResults>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ResponseImageContentFilterResult)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(ImageGenerationContentFilterResults)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeResponseImageContentFilterResult(document.RootElement, options);
+            return DeserializeImageGenerationContentFilterResults(document.RootElement, options);
         }
 
-        internal static ResponseImageContentFilterResult DeserializeResponseImageContentFilterResult(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static ImageGenerationContentFilterResults DeserializeImageGenerationContentFilterResults(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -83,10 +84,10 @@ internal static ResponseImageContentFilterResult DeserializeResponseImageContent
             {
                 return null;
             }
-            ContentFilterSeverityResult sexual = default;
-            ContentFilterSeverityResult violence = default;
-            ContentFilterSeverityResult hate = default;
-            ContentFilterSeverityResult selfHarm = default;
+            ContentFilterResult sexual = default;
+            ContentFilterResult violence = default;
+            ContentFilterResult hate = default;
+            ContentFilterResult selfHarm = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -97,7 +98,7 @@ internal static ResponseImageContentFilterResult DeserializeResponseImageContent
                     {
                         continue;
                     }
-                    sexual = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    sexual = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("violence"u8))
@@ -106,7 +107,7 @@ internal static ResponseImageContentFilterResult DeserializeResponseImageContent
                     {
                         continue;
                     }
-                    violence = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    violence = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("hate"u8))
@@ -115,7 +116,7 @@ internal static ResponseImageContentFilterResult DeserializeResponseImageContent
                     {
                         continue;
                     }
-                    hate = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    hate = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("self_harm"u8))
@@ -124,62 +125,63 @@ internal static ResponseImageContentFilterResult DeserializeResponseImageContent
                     {
                         continue;
                     }
-                    selfHarm = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    selfHarm = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new ResponseImageContentFilterResult(sexual, violence, hate, selfHarm, serializedAdditionalRawData);
+            return new ImageGenerationContentFilterResults(sexual, violence, hate, selfHarm, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<ResponseImageContentFilterResult>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<ImageGenerationContentFilterResults>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseImageContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationContentFilterResults>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(ResponseImageContentFilterResult)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ImageGenerationContentFilterResults)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ResponseImageContentFilterResult IPersistableModel<ResponseImageContentFilterResult>.Create(BinaryData data, ModelReaderWriterOptions options)
+        ImageGenerationContentFilterResults IPersistableModel<ImageGenerationContentFilterResults>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseImageContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationContentFilterResults>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeResponseImageContentFilterResult(document.RootElement, options);
+                        return DeserializeImageGenerationContentFilterResults(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(ResponseImageContentFilterResult)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ImageGenerationContentFilterResults)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ResponseImageContentFilterResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ImageGenerationContentFilterResults>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static ResponseImageContentFilterResult FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ImageGenerationContentFilterResults FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeResponseImageContentFilterResult(document.RootElement);
+            return DeserializeImageGenerationContentFilterResults(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationContentFilterResults.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationContentFilterResults.cs
new file mode 100644
index 000000000000..a9dd21aaaa9d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationContentFilterResults.cs
@@ -0,0 +1,111 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Describes the content filtering result for the image generation request. </summary>
+    public partial class ImageGenerationContentFilterResults
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerationContentFilterResults"/>. </summary>
+        internal ImageGenerationContentFilterResults()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerationContentFilterResults"/>. </summary>
+        /// <param name="sexual">
+        /// Describes language related to anatomical organs and genitals, romantic relationships,
+        ///  acts portrayed in erotic or affectionate terms, physical sexual acts, including
+        ///  those portrayed as an assault or a forced sexual violent act against one’s will,
+        ///  prostitution, pornography, and abuse.
+        /// </param>
+        /// <param name="violence">
+        /// Describes language related to physical actions intended to hurt, injure, damage, or
+        /// kill someone or something; describes weapons, etc.
+        /// </param>
+        /// <param name="hate">
+        /// Describes language attacks or uses that include pejorative or discriminatory language
+        /// with reference to a person or identity group on the basis of certain differentiating
+        /// attributes of these groups including but not limited to race, ethnicity, nationality,
+        /// gender identity and expression, sexual orientation, religion, immigration status, ability
+        /// status, personal appearance, and body size.
+        /// </param>
+        /// <param name="selfHarm">
+        /// Describes language related to physical actions intended to purposely hurt, injure,
+        /// or damage one’s body, or kill oneself.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ImageGenerationContentFilterResults(ContentFilterResult sexual, ContentFilterResult violence, ContentFilterResult hate, ContentFilterResult selfHarm, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Sexual = sexual;
+            Violence = violence;
+            Hate = hate;
+            SelfHarm = selfHarm;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary>
+        /// Describes language related to anatomical organs and genitals, romantic relationships,
+        ///  acts portrayed in erotic or affectionate terms, physical sexual acts, including
+        ///  those portrayed as an assault or a forced sexual violent act against one’s will,
+        ///  prostitution, pornography, and abuse.
+        /// </summary>
+        public ContentFilterResult Sexual { get; }
+        /// <summary>
+        /// Describes language related to physical actions intended to hurt, injure, damage, or
+        /// kill someone or something; describes weapons, etc.
+        /// </summary>
+        public ContentFilterResult Violence { get; }
+        /// <summary>
+        /// Describes language attacks or uses that include pejorative or discriminatory language
+        /// with reference to a person or identity group on the basis of certain differentiating
+        /// attributes of these groups including but not limited to race, ethnicity, nationality,
+        /// gender identity and expression, sexual orientation, religion, immigration status, ability
+        /// status, personal appearance, and body size.
+        /// </summary>
+        public ContentFilterResult Hate { get; }
+        /// <summary>
+        /// Describes language related to physical actions intended to purposely hurt, injure,
+        /// or damage one’s body, or kill oneself.
+        /// </summary>
+        public ContentFilterResult SelfHarm { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationData.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationData.Serialization.cs
new file mode 100644
index 000000000000..039a7e59aa06
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationData.Serialization.cs
@@ -0,0 +1,200 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ImageGenerationData : IUtf8JsonSerializable, IJsonModel<ImageGenerationData>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ImageGenerationData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ImageGenerationData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationData>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ImageGenerationData)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Url))
+            {
+                writer.WritePropertyName("url"u8);
+                writer.WriteStringValue(Url.AbsoluteUri);
+            }
+            if (Optional.IsDefined(Base64Data))
+            {
+                writer.WritePropertyName("b64_json"u8);
+                writer.WriteStringValue(Base64Data);
+            }
+            if (Optional.IsDefined(ContentFilterResults))
+            {
+                writer.WritePropertyName("content_filter_results"u8);
+                writer.WriteObjectValue(ContentFilterResults, options);
+            }
+            if (Optional.IsDefined(RevisedPrompt))
+            {
+                writer.WritePropertyName("revised_prompt"u8);
+                writer.WriteStringValue(RevisedPrompt);
+            }
+            if (Optional.IsDefined(PromptFilterResults))
+            {
+                writer.WritePropertyName("prompt_filter_results"u8);
+                writer.WriteObjectValue(PromptFilterResults, options);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ImageGenerationData IJsonModel<ImageGenerationData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationData>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ImageGenerationData)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeImageGenerationData(document.RootElement, options);
+        }
+
+        internal static ImageGenerationData DeserializeImageGenerationData(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            Uri url = default;
+            string b64Json = default;
+            ImageGenerationContentFilterResults contentFilterResults = default;
+            string revisedPrompt = default;
+            ImageGenerationPromptFilterResults promptFilterResults = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("url"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    url = new Uri(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("b64_json"u8))
+                {
+                    b64Json = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("content_filter_results"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    contentFilterResults = ImageGenerationContentFilterResults.DeserializeImageGenerationContentFilterResults(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("revised_prompt"u8))
+                {
+                    revisedPrompt = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("prompt_filter_results"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    promptFilterResults = ImageGenerationPromptFilterResults.DeserializeImageGenerationPromptFilterResults(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ImageGenerationData(
+                url,
+                b64Json,
+                contentFilterResults,
+                revisedPrompt,
+                promptFilterResults,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ImageGenerationData>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationData>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ImageGenerationData)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ImageGenerationData IPersistableModel<ImageGenerationData>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationData>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeImageGenerationData(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ImageGenerationData)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ImageGenerationData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ImageGenerationData FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeImageGenerationData(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationData.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationData.cs
new file mode 100644
index 000000000000..63091f309bba
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationData.cs
@@ -0,0 +1,104 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// A representation of a single generated image, provided as either base64-encoded data or as a URL from which the image
+    /// may be retrieved.
+    /// </summary>
+    public partial class ImageGenerationData
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerationData"/>. </summary>
+        internal ImageGenerationData()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerationData"/>. </summary>
+        /// <param name="url"> The URL that provides temporary access to download the generated image. </param>
+        /// <param name="base64Data"> The complete data for an image, represented as a base64-encoded string. </param>
+        /// <param name="contentFilterResults"> Information about the content filtering results. </param>
+        /// <param name="revisedPrompt">
+        /// The final prompt used by the model to generate the image.
+        /// Only provided with dall-3-models and only when revisions were made to the prompt.
+        /// </param>
+        /// <param name="promptFilterResults">
+        /// Information about the content filtering category (hate, sexual, violence, self_harm), if
+        /// it has been detected, as well as the severity level (very_low, low, medium, high-scale
+        /// that determines the intensity and risk level of harmful content) and if it has been
+        /// filtered or not. Information about jailbreak content and profanity, if it has been detected,
+        /// and if it has been filtered or not. And information about customer block list, if it has
+        /// been filtered and its id.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ImageGenerationData(Uri url, string base64Data, ImageGenerationContentFilterResults contentFilterResults, string revisedPrompt, ImageGenerationPromptFilterResults promptFilterResults, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Url = url;
+            Base64Data = base64Data;
+            ContentFilterResults = contentFilterResults;
+            RevisedPrompt = revisedPrompt;
+            PromptFilterResults = promptFilterResults;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The URL that provides temporary access to download the generated image. </summary>
+        public Uri Url { get; }
+        /// <summary> The complete data for an image, represented as a base64-encoded string. </summary>
+        public string Base64Data { get; }
+        /// <summary> Information about the content filtering results. </summary>
+        public ImageGenerationContentFilterResults ContentFilterResults { get; }
+        /// <summary>
+        /// The final prompt used by the model to generate the image.
+        /// Only provided with dall-3-models and only when revisions were made to the prompt.
+        /// </summary>
+        public string RevisedPrompt { get; }
+        /// <summary>
+        /// Information about the content filtering category (hate, sexual, violence, self_harm), if
+        /// it has been detected, as well as the severity level (very_low, low, medium, high-scale
+        /// that determines the intensity and risk level of harmful content) and if it has been
+        /// filtered or not. Information about jailbreak content and profanity, if it has been detected,
+        /// and if it has been filtered or not. And information about customer block list, if it has
+        /// been filtered and its id.
+        /// </summary>
+        public ImageGenerationPromptFilterResults PromptFilterResults { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationOptions.Serialization.cs
new file mode 100644
index 000000000000..528a86636d2d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationOptions.Serialization.cs
@@ -0,0 +1,241 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ImageGenerationOptions : IUtf8JsonSerializable, IJsonModel<ImageGenerationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ImageGenerationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ImageGenerationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ImageGenerationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(DeploymentName))
+            {
+                writer.WritePropertyName("model"u8);
+                writer.WriteStringValue(DeploymentName);
+            }
+            writer.WritePropertyName("prompt"u8);
+            writer.WriteStringValue(Prompt);
+            if (Optional.IsDefined(ImageCount))
+            {
+                writer.WritePropertyName("n"u8);
+                writer.WriteNumberValue(ImageCount.Value);
+            }
+            if (Optional.IsDefined(Size))
+            {
+                writer.WritePropertyName("size"u8);
+                writer.WriteStringValue(Size.Value.ToString());
+            }
+            if (Optional.IsDefined(ResponseFormat))
+            {
+                writer.WritePropertyName("response_format"u8);
+                writer.WriteStringValue(ResponseFormat.Value.ToString());
+            }
+            if (Optional.IsDefined(Quality))
+            {
+                writer.WritePropertyName("quality"u8);
+                writer.WriteStringValue(Quality.Value.ToString());
+            }
+            if (Optional.IsDefined(Style))
+            {
+                writer.WritePropertyName("style"u8);
+                writer.WriteStringValue(Style.Value.ToString());
+            }
+            if (Optional.IsDefined(User))
+            {
+                writer.WritePropertyName("user"u8);
+                writer.WriteStringValue(User);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ImageGenerationOptions IJsonModel<ImageGenerationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ImageGenerationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeImageGenerationOptions(document.RootElement, options);
+        }
+
+        internal static ImageGenerationOptions DeserializeImageGenerationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string model = default;
+            string prompt = default;
+            int? n = default;
+            ImageSize? size = default;
+            ImageGenerationResponseFormat? responseFormat = default;
+            ImageGenerationQuality? quality = default;
+            ImageGenerationStyle? style = default;
+            string user = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("model"u8))
+                {
+                    model = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("prompt"u8))
+                {
+                    prompt = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("n"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    n = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("size"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    size = new ImageSize(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("response_format"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    responseFormat = new ImageGenerationResponseFormat(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("quality"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    quality = new ImageGenerationQuality(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("style"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    style = new ImageGenerationStyle(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("user"u8))
+                {
+                    user = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ImageGenerationOptions(
+                model,
+                prompt,
+                n,
+                size,
+                responseFormat,
+                quality,
+                style,
+                user,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ImageGenerationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ImageGenerationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ImageGenerationOptions IPersistableModel<ImageGenerationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeImageGenerationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ImageGenerationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ImageGenerationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ImageGenerationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeImageGenerationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationOptions.cs
new file mode 100644
index 000000000000..d5756901ef45
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationOptions.cs
@@ -0,0 +1,137 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Represents the request data used to generate images. </summary>
+    public partial class ImageGenerationOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerationOptions"/>. </summary>
+        /// <param name="prompt"> A description of the desired images. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="prompt"/> is null. </exception>
+        public ImageGenerationOptions(string prompt)
+        {
+            Argument.AssertNotNull(prompt, nameof(prompt));
+
+            Prompt = prompt;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerationOptions"/>. </summary>
+        /// <param name="deploymentName">
+        /// The model name or Azure OpenAI model deployment name to use for image generation. If not specified, dall-e-2 will be
+        /// inferred as a default.
+        /// </param>
+        /// <param name="prompt"> A description of the desired images. </param>
+        /// <param name="imageCount">
+        /// The number of images to generate.
+        /// Dall-e-2 models support values between 1 and 10.
+        /// Dall-e-3 models only support a value of 1.
+        /// </param>
+        /// <param name="size">
+        /// The desired dimensions for generated images.
+        /// Dall-e-2 models support 256x256, 512x512, or 1024x1024.
+        /// Dall-e-3 models support 1024x1024, 1792x1024, or 1024x1792.
+        /// </param>
+        /// <param name="responseFormat"> The format in which image generation response items should be presented. </param>
+        /// <param name="quality">
+        /// The desired image generation quality level to use.
+        /// Only configurable with dall-e-3 models.
+        /// </param>
+        /// <param name="style">
+        /// The desired image generation style to use.
+        /// Only configurable with dall-e-3 models.
+        /// </param>
+        /// <param name="user"> A unique identifier representing your end-user, which can help to monitor and detect abuse. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ImageGenerationOptions(string deploymentName, string prompt, int? imageCount, ImageSize? size, ImageGenerationResponseFormat? responseFormat, ImageGenerationQuality? quality, ImageGenerationStyle? style, string user, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            DeploymentName = deploymentName;
+            Prompt = prompt;
+            ImageCount = imageCount;
+            Size = size;
+            ResponseFormat = responseFormat;
+            Quality = quality;
+            Style = style;
+            User = user;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerationOptions"/> for deserialization. </summary>
+        internal ImageGenerationOptions()
+        {
+        }
+
+        /// <summary>
+        /// The model name or Azure OpenAI model deployment name to use for image generation. If not specified, dall-e-2 will be
+        /// inferred as a default.
+        /// </summary>
+        public string DeploymentName { get; set; }
+        /// <summary> A description of the desired images. </summary>
+        public string Prompt { get; set; }
+        /// <summary>
+        /// The number of images to generate.
+        /// Dall-e-2 models support values between 1 and 10.
+        /// Dall-e-3 models only support a value of 1.
+        /// </summary>
+        public int? ImageCount { get; set; }
+        /// <summary>
+        /// The desired dimensions for generated images.
+        /// Dall-e-2 models support 256x256, 512x512, or 1024x1024.
+        /// Dall-e-3 models support 1024x1024, 1792x1024, or 1024x1792.
+        /// </summary>
+        public ImageSize? Size { get; set; }
+        /// <summary> The format in which image generation response items should be presented. </summary>
+        public ImageGenerationResponseFormat? ResponseFormat { get; set; }
+        /// <summary>
+        /// The desired image generation quality level to use.
+        /// Only configurable with dall-e-3 models.
+        /// </summary>
+        public ImageGenerationQuality? Quality { get; set; }
+        /// <summary>
+        /// The desired image generation style to use.
+        /// Only configurable with dall-e-3 models.
+        /// </summary>
+        public ImageGenerationStyle? Style { get; set; }
+        /// <summary> A unique identifier representing your end-user, which can help to monitor and detect abuse. </summary>
+        public string User { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/RequestImageContentFilterResult.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationPromptFilterResults.Serialization.cs
similarity index 57%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/RequestImageContentFilterResult.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationPromptFilterResults.Serialization.cs
index 150a5f9d7775..2bb2794da06b 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/RequestImageContentFilterResult.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationPromptFilterResults.Serialization.cs
@@ -1,69 +1,70 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
 namespace Azure.AI.OpenAI
 {
-    public partial class RequestImageContentFilterResult : IJsonModel<RequestImageContentFilterResult>
+    public partial class ImageGenerationPromptFilterResults : IUtf8JsonSerializable, IJsonModel<ImageGenerationPromptFilterResults>
     {
-        void IJsonModel<RequestImageContentFilterResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ImageGenerationPromptFilterResults>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ImageGenerationPromptFilterResults>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<RequestImageContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationPromptFilterResults>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(RequestImageContentFilterResult)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(ImageGenerationPromptFilterResults)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("profanity") != true && Optional.IsDefined(Profanity))
-            {
-                writer.WritePropertyName("profanity"u8);
-                writer.WriteObjectValue(Profanity, options);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("custom_blocklists") != true && Optional.IsDefined(CustomBlocklists))
-            {
-                writer.WritePropertyName("custom_blocklists"u8);
-                writer.WriteObjectValue(CustomBlocklists, options);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("jailbreak") != true)
-            {
-                writer.WritePropertyName("jailbreak"u8);
-                writer.WriteObjectValue(Jailbreak, options);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("sexual") != true && Optional.IsDefined(Sexual))
+            if (Optional.IsDefined(Sexual))
             {
                 writer.WritePropertyName("sexual"u8);
                 writer.WriteObjectValue(Sexual, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("violence") != true && Optional.IsDefined(Violence))
+            if (Optional.IsDefined(Violence))
             {
                 writer.WritePropertyName("violence"u8);
                 writer.WriteObjectValue(Violence, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("hate") != true && Optional.IsDefined(Hate))
+            if (Optional.IsDefined(Hate))
             {
                 writer.WritePropertyName("hate"u8);
                 writer.WriteObjectValue(Hate, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("self_harm") != true && Optional.IsDefined(SelfHarm))
+            if (Optional.IsDefined(SelfHarm))
             {
                 writer.WritePropertyName("self_harm"u8);
                 writer.WriteObjectValue(SelfHarm, options);
             }
-            if (SerializedAdditionalRawData != null)
+            if (Optional.IsDefined(Profanity))
+            {
+                writer.WritePropertyName("profanity"u8);
+                writer.WriteObjectValue(Profanity, options);
+            }
+            if (Optional.IsDefined(Jailbreak))
+            {
+                writer.WritePropertyName("jailbreak"u8);
+                writer.WriteObjectValue(Jailbreak, options);
+            }
+            if (Optional.IsDefined(CustomBlocklists))
+            {
+                writer.WritePropertyName("custom_blocklists"u8);
+                writer.WriteObjectValue(CustomBlocklists, options);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -78,19 +79,19 @@ void IJsonModel<RequestImageContentFilterResult>.Write(Utf8JsonWriter writer, Mo
             writer.WriteEndObject();
         }
 
-        RequestImageContentFilterResult IJsonModel<RequestImageContentFilterResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        ImageGenerationPromptFilterResults IJsonModel<ImageGenerationPromptFilterResults>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<RequestImageContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationPromptFilterResults>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(RequestImageContentFilterResult)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(ImageGenerationPromptFilterResults)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeRequestImageContentFilterResult(document.RootElement, options);
+            return DeserializeImageGenerationPromptFilterResults(document.RootElement, options);
         }
 
-        internal static RequestImageContentFilterResult DeserializeRequestImageContentFilterResult(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static ImageGenerationPromptFilterResults DeserializeImageGenerationPromptFilterResults(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -98,137 +99,142 @@ internal static RequestImageContentFilterResult DeserializeRequestImageContentFi
             {
                 return null;
             }
+            ContentFilterResult sexual = default;
+            ContentFilterResult violence = default;
+            ContentFilterResult hate = default;
+            ContentFilterResult selfHarm = default;
             ContentFilterDetectionResult profanity = default;
-            ContentFilterBlocklistResult customBlocklists = default;
             ContentFilterDetectionResult jailbreak = default;
-            ContentFilterSeverityResult sexual = default;
-            ContentFilterSeverityResult violence = default;
-            ContentFilterSeverityResult hate = default;
-            ContentFilterSeverityResult selfHarm = default;
+            ContentFilterDetailedResults customBlocklists = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
             {
-                if (property.NameEquals("profanity"u8))
+                if (property.NameEquals("sexual"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    profanity = ContentFilterDetectionResult.DeserializeContentFilterDetectionResult(property.Value, options);
+                    sexual = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
-                if (property.NameEquals("custom_blocklists"u8))
+                if (property.NameEquals("violence"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    customBlocklists = ContentFilterBlocklistResult.DeserializeContentFilterBlocklistResult(property.Value, options);
+                    violence = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
-                if (property.NameEquals("jailbreak"u8))
+                if (property.NameEquals("hate"u8))
                 {
-                    jailbreak = ContentFilterDetectionResult.DeserializeContentFilterDetectionResult(property.Value, options);
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    hate = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
-                if (property.NameEquals("sexual"u8))
+                if (property.NameEquals("self_harm"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    sexual = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    selfHarm = ContentFilterResult.DeserializeContentFilterResult(property.Value, options);
                     continue;
                 }
-                if (property.NameEquals("violence"u8))
+                if (property.NameEquals("profanity"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    violence = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    profanity = ContentFilterDetectionResult.DeserializeContentFilterDetectionResult(property.Value, options);
                     continue;
                 }
-                if (property.NameEquals("hate"u8))
+                if (property.NameEquals("jailbreak"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    hate = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    jailbreak = ContentFilterDetectionResult.DeserializeContentFilterDetectionResult(property.Value, options);
                     continue;
                 }
-                if (property.NameEquals("self_harm"u8))
+                if (property.NameEquals("custom_blocklists"u8))
                 {
                     if (property.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    selfHarm = ContentFilterSeverityResult.DeserializeContentFilterSeverityResult(property.Value, options);
+                    customBlocklists = ContentFilterDetailedResults.DeserializeContentFilterDetailedResults(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new RequestImageContentFilterResult(
+            return new ImageGenerationPromptFilterResults(
                 sexual,
                 violence,
                 hate,
                 selfHarm,
-                serializedAdditionalRawData,
                 profanity,
+                jailbreak,
                 customBlocklists,
-                jailbreak);
+                serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<RequestImageContentFilterResult>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<ImageGenerationPromptFilterResults>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<RequestImageContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationPromptFilterResults>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(RequestImageContentFilterResult)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ImageGenerationPromptFilterResults)} does not support writing '{options.Format}' format.");
             }
         }
 
-        RequestImageContentFilterResult IPersistableModel<RequestImageContentFilterResult>.Create(BinaryData data, ModelReaderWriterOptions options)
+        ImageGenerationPromptFilterResults IPersistableModel<ImageGenerationPromptFilterResults>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<RequestImageContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerationPromptFilterResults>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeRequestImageContentFilterResult(document.RootElement, options);
+                        return DeserializeImageGenerationPromptFilterResults(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(RequestImageContentFilterResult)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ImageGenerationPromptFilterResults)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<RequestImageContentFilterResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ImageGenerationPromptFilterResults>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new RequestImageContentFilterResult FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ImageGenerationPromptFilterResults FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeRequestImageContentFilterResult(document.RootElement);
+            return DeserializeImageGenerationPromptFilterResults(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationPromptFilterResults.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationPromptFilterResults.cs
new file mode 100644
index 000000000000..e66c52bc7c1f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationPromptFilterResults.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Describes the content filtering results for the prompt of a image generation request. </summary>
+    public partial class ImageGenerationPromptFilterResults
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerationPromptFilterResults"/>. </summary>
+        internal ImageGenerationPromptFilterResults()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerationPromptFilterResults"/>. </summary>
+        /// <param name="sexual">
+        /// Describes language related to anatomical organs and genitals, romantic relationships,
+        ///  acts portrayed in erotic or affectionate terms, physical sexual acts, including
+        ///  those portrayed as an assault or a forced sexual violent act against one’s will,
+        ///  prostitution, pornography, and abuse.
+        /// </param>
+        /// <param name="violence">
+        /// Describes language related to physical actions intended to hurt, injure, damage, or
+        /// kill someone or something; describes weapons, etc.
+        /// </param>
+        /// <param name="hate">
+        /// Describes language attacks or uses that include pejorative or discriminatory language
+        /// with reference to a person or identity group on the basis of certain differentiating
+        /// attributes of these groups including but not limited to race, ethnicity, nationality,
+        /// gender identity and expression, sexual orientation, religion, immigration status, ability
+        /// status, personal appearance, and body size.
+        /// </param>
+        /// <param name="selfHarm">
+        /// Describes language related to physical actions intended to purposely hurt, injure,
+        /// or damage one’s body, or kill oneself.
+        /// </param>
+        /// <param name="profanity"> Describes whether profanity was detected. </param>
+        /// <param name="jailbreak"> Whether a jailbreak attempt was detected in the prompt. </param>
+        /// <param name="customBlocklists"> Information about customer block lists and if something was detected the associated list ID. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ImageGenerationPromptFilterResults(ContentFilterResult sexual, ContentFilterResult violence, ContentFilterResult hate, ContentFilterResult selfHarm, ContentFilterDetectionResult profanity, ContentFilterDetectionResult jailbreak, ContentFilterDetailedResults customBlocklists, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Sexual = sexual;
+            Violence = violence;
+            Hate = hate;
+            SelfHarm = selfHarm;
+            Profanity = profanity;
+            Jailbreak = jailbreak;
+            CustomBlocklists = customBlocklists;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary>
+        /// Describes language related to anatomical organs and genitals, romantic relationships,
+        ///  acts portrayed in erotic or affectionate terms, physical sexual acts, including
+        ///  those portrayed as an assault or a forced sexual violent act against one’s will,
+        ///  prostitution, pornography, and abuse.
+        /// </summary>
+        public ContentFilterResult Sexual { get; }
+        /// <summary>
+        /// Describes language related to physical actions intended to hurt, injure, damage, or
+        /// kill someone or something; describes weapons, etc.
+        /// </summary>
+        public ContentFilterResult Violence { get; }
+        /// <summary>
+        /// Describes language attacks or uses that include pejorative or discriminatory language
+        /// with reference to a person or identity group on the basis of certain differentiating
+        /// attributes of these groups including but not limited to race, ethnicity, nationality,
+        /// gender identity and expression, sexual orientation, religion, immigration status, ability
+        /// status, personal appearance, and body size.
+        /// </summary>
+        public ContentFilterResult Hate { get; }
+        /// <summary>
+        /// Describes language related to physical actions intended to purposely hurt, injure,
+        /// or damage one’s body, or kill oneself.
+        /// </summary>
+        public ContentFilterResult SelfHarm { get; }
+        /// <summary> Describes whether profanity was detected. </summary>
+        public ContentFilterDetectionResult Profanity { get; }
+        /// <summary> Whether a jailbreak attempt was detected in the prompt. </summary>
+        public ContentFilterDetectionResult Jailbreak { get; }
+        /// <summary> Information about customer block lists and if something was detected the associated list ID. </summary>
+        public ContentFilterDetailedResults CustomBlocklists { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationQuality.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationQuality.cs
new file mode 100644
index 000000000000..31d282d1a6db
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationQuality.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// An image generation configuration that specifies how the model should prioritize quality, cost, and speed.
+    /// Only configurable with dall-e-3 models.
+    /// </summary>
+    public readonly partial struct ImageGenerationQuality : IEquatable<ImageGenerationQuality>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerationQuality"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ImageGenerationQuality(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string StandardValue = "standard";
+        private const string HdValue = "hd";
+
+        /// <summary> Requests image generation with standard, balanced characteristics of quality, cost, and speed. </summary>
+        public static ImageGenerationQuality Standard { get; } = new ImageGenerationQuality(StandardValue);
+        /// <summary> Requests image generation with higher quality, higher cost and lower speed relative to standard. </summary>
+        public static ImageGenerationQuality Hd { get; } = new ImageGenerationQuality(HdValue);
+        /// <summary> Determines if two <see cref="ImageGenerationQuality"/> values are the same. </summary>
+        public static bool operator ==(ImageGenerationQuality left, ImageGenerationQuality right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ImageGenerationQuality"/> values are not the same. </summary>
+        public static bool operator !=(ImageGenerationQuality left, ImageGenerationQuality right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ImageGenerationQuality"/>. </summary>
+        public static implicit operator ImageGenerationQuality(string value) => new ImageGenerationQuality(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ImageGenerationQuality other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ImageGenerationQuality other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationResponseFormat.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationResponseFormat.cs
new file mode 100644
index 000000000000..b4445f444a22
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationResponseFormat.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The format in which the generated images are returned. </summary>
+    internal readonly partial struct ImageGenerationResponseFormat : IEquatable<ImageGenerationResponseFormat>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerationResponseFormat"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ImageGenerationResponseFormat(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string UrlValue = "url";
+        private const string Base64Value = "b64_json";
+
+        /// <summary> Image generation response items should provide a URL from which the image may be retrieved. </summary>
+        public static ImageGenerationResponseFormat Url { get; } = new ImageGenerationResponseFormat(UrlValue);
+        /// <summary> Image generation response items should provide image data as a base64-encoded string. </summary>
+        public static ImageGenerationResponseFormat Base64 { get; } = new ImageGenerationResponseFormat(Base64Value);
+        /// <summary> Determines if two <see cref="ImageGenerationResponseFormat"/> values are the same. </summary>
+        public static bool operator ==(ImageGenerationResponseFormat left, ImageGenerationResponseFormat right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ImageGenerationResponseFormat"/> values are not the same. </summary>
+        public static bool operator !=(ImageGenerationResponseFormat left, ImageGenerationResponseFormat right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ImageGenerationResponseFormat"/>. </summary>
+        public static implicit operator ImageGenerationResponseFormat(string value) => new ImageGenerationResponseFormat(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ImageGenerationResponseFormat other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ImageGenerationResponseFormat other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationStyle.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationStyle.cs
new file mode 100644
index 000000000000..800d3ae8e5bf
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerationStyle.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// An image generation configuration that specifies how the model should incorporate realism and other visual characteristics.
+    /// Only configurable with dall-e-3 models.
+    /// </summary>
+    public readonly partial struct ImageGenerationStyle : IEquatable<ImageGenerationStyle>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerationStyle"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ImageGenerationStyle(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string NaturalValue = "natural";
+        private const string VividValue = "vivid";
+
+        /// <summary> Requests image generation in a natural style with less preference for dramatic and hyper-realistic characteristics. </summary>
+        public static ImageGenerationStyle Natural { get; } = new ImageGenerationStyle(NaturalValue);
+        /// <summary>
+        /// Requests image generation in a vivid style with a higher preference for dramatic and hyper-realistic
+        /// characteristics.
+        /// </summary>
+        public static ImageGenerationStyle Vivid { get; } = new ImageGenerationStyle(VividValue);
+        /// <summary> Determines if two <see cref="ImageGenerationStyle"/> values are the same. </summary>
+        public static bool operator ==(ImageGenerationStyle left, ImageGenerationStyle right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ImageGenerationStyle"/> values are not the same. </summary>
+        public static bool operator !=(ImageGenerationStyle left, ImageGenerationStyle right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ImageGenerationStyle"/>. </summary>
+        public static implicit operator ImageGenerationStyle(string value) => new ImageGenerationStyle(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ImageGenerationStyle other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ImageGenerationStyle other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerations.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerations.Serialization.cs
new file mode 100644
index 000000000000..aaf4621d6b1b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerations.Serialization.cs
@@ -0,0 +1,153 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class ImageGenerations : IUtf8JsonSerializable, IJsonModel<ImageGenerations>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ImageGenerations>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ImageGenerations>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerations>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ImageGenerations)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("created"u8);
+            writer.WriteNumberValue(Created, "U");
+            writer.WritePropertyName("data"u8);
+            writer.WriteStartArray();
+            foreach (var item in Data)
+            {
+                writer.WriteObjectValue(item, options);
+            }
+            writer.WriteEndArray();
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ImageGenerations IJsonModel<ImageGenerations>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerations>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ImageGenerations)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeImageGenerations(document.RootElement, options);
+        }
+
+        internal static ImageGenerations DeserializeImageGenerations(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            DateTimeOffset created = default;
+            IReadOnlyList<ImageGenerationData> data = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("created"u8))
+                {
+                    created = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("data"u8))
+                {
+                    List<ImageGenerationData> array = new List<ImageGenerationData>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(ImageGenerationData.DeserializeImageGenerationData(item, options));
+                    }
+                    data = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ImageGenerations(created, data, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ImageGenerations>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerations>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ImageGenerations)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ImageGenerations IPersistableModel<ImageGenerations>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ImageGenerations>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeImageGenerations(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ImageGenerations)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ImageGenerations>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static ImageGenerations FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeImageGenerations(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerations.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerations.cs
new file mode 100644
index 000000000000..66823f093e60
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageGenerations.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The result of a successful image generation operation. </summary>
+    public partial class ImageGenerations
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerations"/>. </summary>
+        /// <param name="created">
+        /// A timestamp representing when this operation was started.
+        /// Expressed in seconds since the Unix epoch of 1970-01-01T00:00:00+0000.
+        /// </param>
+        /// <param name="data"> The images generated by the operation. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
+        internal ImageGenerations(DateTimeOffset created, IEnumerable<ImageGenerationData> data)
+        {
+            Argument.AssertNotNull(data, nameof(data));
+
+            Created = created;
+            Data = data.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerations"/>. </summary>
+        /// <param name="created">
+        /// A timestamp representing when this operation was started.
+        /// Expressed in seconds since the Unix epoch of 1970-01-01T00:00:00+0000.
+        /// </param>
+        /// <param name="data"> The images generated by the operation. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ImageGenerations(DateTimeOffset created, IReadOnlyList<ImageGenerationData> data, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Created = created;
+            Data = data;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ImageGenerations"/> for deserialization. </summary>
+        internal ImageGenerations()
+        {
+        }
+
+        /// <summary>
+        /// A timestamp representing when this operation was started.
+        /// Expressed in seconds since the Unix epoch of 1970-01-01T00:00:00+0000.
+        /// </summary>
+        public DateTimeOffset Created { get; }
+        /// <summary> The images generated by the operation. </summary>
+        public IReadOnlyList<ImageGenerationData> Data { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageSize.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageSize.cs
new file mode 100644
index 000000000000..46b72f092ac6
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/ImageSize.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The desired size of generated images. </summary>
+    public readonly partial struct ImageSize : IEquatable<ImageSize>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ImageSize"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ImageSize(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string Size256x256Value = "256x256";
+        private const string Size512x512Value = "512x512";
+        private const string Size1024x1024Value = "1024x1024";
+        private const string Size1792x1024Value = "1792x1024";
+        private const string Size1024x1792Value = "1024x1792";
+
+        /// <summary>
+        /// Very small image size of 256x256 pixels.
+        /// Only supported with dall-e-2 models.
+        /// </summary>
+        public static ImageSize Size256x256 { get; } = new ImageSize(Size256x256Value);
+        /// <summary>
+        /// A smaller image size of 512x512 pixels.
+        /// Only supported with dall-e-2 models.
+        /// </summary>
+        public static ImageSize Size512x512 { get; } = new ImageSize(Size512x512Value);
+        /// <summary>
+        /// A standard, square image size of 1024x1024 pixels.
+        /// Supported by both dall-e-2 and dall-e-3 models.
+        /// </summary>
+        public static ImageSize Size1024x1024 { get; } = new ImageSize(Size1024x1024Value);
+        /// <summary>
+        /// A wider image size of 1024x1792 pixels.
+        /// Only supported with dall-e-3 models.
+        /// </summary>
+        public static ImageSize Size1792x1024 { get; } = new ImageSize(Size1792x1024Value);
+        /// <summary>
+        /// A taller image size of 1792x1024 pixels.
+        /// Only supported with dall-e-3 models.
+        /// </summary>
+        public static ImageSize Size1024x1792 { get; } = new ImageSize(Size1024x1792Value);
+        /// <summary> Determines if two <see cref="ImageSize"/> values are the same. </summary>
+        public static bool operator ==(ImageSize left, ImageSize right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ImageSize"/> values are not the same. </summary>
+        public static bool operator !=(ImageSize left, ImageSize right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ImageSize"/>. </summary>
+        public static implicit operator ImageSize(string value) => new ImageSize(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ImageSize other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ImageSize other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/Argument.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/Argument.cs
index 5a8ab138b061..21077f384b16 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/Argument.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/Argument.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/BinaryContentHelper.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/BinaryContentHelper.cs
deleted file mode 100644
index 94ae48ee4fd1..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/BinaryContentHelper.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI
-{
-    internal static class BinaryContentHelper
-    {
-        public static BinaryContent FromEnumerable<T>(IEnumerable<T> enumerable)
-        where T : notnull
-        {
-            Utf8JsonBinaryContent content = new Utf8JsonBinaryContent();
-            content.JsonWriter.WriteStartArray();
-            foreach (var item in enumerable)
-            {
-                content.JsonWriter.WriteObjectValue(item, ModelSerializationExtensions.WireOptions);
-            }
-            content.JsonWriter.WriteEndArray();
-
-            return content;
-        }
-
-        public static BinaryContent FromEnumerable(IEnumerable<BinaryData> enumerable)
-        {
-            Utf8JsonBinaryContent content = new Utf8JsonBinaryContent();
-            content.JsonWriter.WriteStartArray();
-            foreach (var item in enumerable)
-            {
-                if (item == null)
-                {
-                    content.JsonWriter.WriteNullValue();
-                }
-                else
-                {
-#if NET6_0_OR_GREATER
-				content.JsonWriter.WriteRawValue(item);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item))
-                    {
-                        JsonSerializer.Serialize(content.JsonWriter, document.RootElement);
-                    }
-#endif
-                }
-            }
-            content.JsonWriter.WriteEndArray();
-
-            return content;
-        }
-
-        public static BinaryContent FromEnumerable<T>(ReadOnlySpan<T> span)
-        where T : notnull
-        {
-            Utf8JsonBinaryContent content = new Utf8JsonBinaryContent();
-            content.JsonWriter.WriteStartArray();
-            for (int i = 0; i < span.Length; i++)
-            {
-                content.JsonWriter.WriteObjectValue(span[i], ModelSerializationExtensions.WireOptions);
-            }
-            content.JsonWriter.WriteEndArray();
-
-            return content;
-        }
-
-        public static BinaryContent FromDictionary<TValue>(IDictionary<string, TValue> dictionary)
-        where TValue : notnull
-        {
-            Utf8JsonBinaryContent content = new Utf8JsonBinaryContent();
-            content.JsonWriter.WriteStartObject();
-            foreach (var item in dictionary)
-            {
-                content.JsonWriter.WritePropertyName(item.Key);
-                content.JsonWriter.WriteObjectValue(item.Value, ModelSerializationExtensions.WireOptions);
-            }
-            content.JsonWriter.WriteEndObject();
-
-            return content;
-        }
-
-        public static BinaryContent FromDictionary(IDictionary<string, BinaryData> dictionary)
-        {
-            Utf8JsonBinaryContent content = new Utf8JsonBinaryContent();
-            content.JsonWriter.WriteStartObject();
-            foreach (var item in dictionary)
-            {
-                content.JsonWriter.WritePropertyName(item.Key);
-                if (item.Value == null)
-                {
-                    content.JsonWriter.WriteNullValue();
-                }
-                else
-                {
-#if NET6_0_OR_GREATER
-				content.JsonWriter.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(content.JsonWriter, document.RootElement);
-                    }
-#endif
-                }
-            }
-            content.JsonWriter.WriteEndObject();
-
-            return content;
-        }
-
-        public static BinaryContent FromObject(object value)
-        {
-            Utf8JsonBinaryContent content = new Utf8JsonBinaryContent();
-            content.JsonWriter.WriteObjectValue<object>(value, ModelSerializationExtensions.WireOptions);
-            return content;
-        }
-
-        public static BinaryContent FromObject(BinaryData value)
-        {
-            Utf8JsonBinaryContent content = new Utf8JsonBinaryContent();
-#if NET6_0_OR_GREATER
-				content.JsonWriter.WriteRawValue(value);
-#else
-            using (JsonDocument document = JsonDocument.Parse(value))
-            {
-                JsonSerializer.Serialize(content.JsonWriter, document.RootElement);
-            }
-#endif
-            return content;
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ChangeTrackingDictionary.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ChangeTrackingDictionary.cs
index 058e71abee85..8bd92c447cd8 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ChangeTrackingDictionary.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ChangeTrackingDictionary.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ChangeTrackingList.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ChangeTrackingList.cs
index 9c6986a3ad4a..b06e0a43ffe7 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ChangeTrackingList.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ChangeTrackingList.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ClientPipelineExtensions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ClientPipelineExtensions.cs
deleted file mode 100644
index e1d028882494..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ClientPipelineExtensions.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Threading.Tasks;
-
-namespace Azure.AI.OpenAI
-{
-    internal static partial class ClientPipelineExtensions
-    {
-        public static async ValueTask<ClientResult<bool>> ProcessHeadAsBoolMessageAsync(this ClientPipeline pipeline, PipelineMessage message, RequestOptions options)
-        {
-            PipelineResponse response = await pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false);
-            switch (response.Status)
-            {
-                case >= 200 and < 300:
-                    return ClientResult.FromValue(true, response);
-                case >= 400 and < 500:
-                    return ClientResult.FromValue(false, response);
-                default:
-                    return new ErrorResult<bool>(response, new ClientResultException(response));
-            }
-        }
-
-        public static ClientResult<bool> ProcessHeadAsBoolMessage(this ClientPipeline pipeline, PipelineMessage message, RequestOptions options)
-        {
-            PipelineResponse response = pipeline.ProcessMessage(message, options);
-            switch (response.Status)
-            {
-                case >= 200 and < 300:
-                    return ClientResult.FromValue(true, response);
-                case >= 400 and < 500:
-                    return ClientResult.FromValue(false, response);
-                default:
-                    return new ErrorResult<bool>(response, new ClientResultException(response));
-            }
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ClientUriBuilder.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ClientUriBuilder.cs
deleted file mode 100644
index aa2ae4da331e..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ClientUriBuilder.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Azure.AI.OpenAI
-{
-    internal partial class ClientUriBuilder
-    {
-        private UriBuilder _uriBuilder;
-        private StringBuilder _pathBuilder;
-        private StringBuilder _queryBuilder;
-
-        public ClientUriBuilder()
-        {
-        }
-
-        private UriBuilder UriBuilder => _uriBuilder ??= new UriBuilder();
-
-        private StringBuilder PathBuilder => _pathBuilder ??= new StringBuilder(UriBuilder.Path);
-
-        private StringBuilder QueryBuilder => _queryBuilder ??= new StringBuilder(UriBuilder.Query);
-
-        public void Reset(Uri uri)
-        {
-            _uriBuilder = new UriBuilder(uri);
-            _pathBuilder = new StringBuilder(UriBuilder.Path);
-            _queryBuilder = new StringBuilder(UriBuilder.Query);
-        }
-
-        public void AppendPath(string value, bool escape)
-        {
-            Argument.AssertNotNullOrWhiteSpace(value, nameof(value));
-
-            if (escape)
-            {
-                value = Uri.EscapeDataString(value);
-            }
-
-            if (PathBuilder.Length > 0 && PathBuilder[PathBuilder.Length - 1] == '/' && value[0] == '/')
-            {
-                PathBuilder.Remove(PathBuilder.Length - 1, 1);
-            }
-
-            PathBuilder.Append(value);
-            UriBuilder.Path = PathBuilder.ToString();
-        }
-
-        public void AppendPath(bool value, bool escape = false)
-        {
-            AppendPath(ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendPath(float value, bool escape = true)
-        {
-            AppendPath(ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendPath(double value, bool escape = true)
-        {
-            AppendPath(ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendPath(int value, bool escape = true)
-        {
-            AppendPath(ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendPath(byte[] value, string format, bool escape = true)
-        {
-            AppendPath(ModelSerializationExtensions.TypeFormatters.ConvertToString(value, format), escape);
-        }
-
-        public void AppendPath(IEnumerable<string> value, bool escape = true)
-        {
-            AppendPath(ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendPath(DateTimeOffset value, string format, bool escape = true)
-        {
-            AppendPath(ModelSerializationExtensions.TypeFormatters.ConvertToString(value, format), escape);
-        }
-
-        public void AppendPath(TimeSpan value, string format, bool escape = true)
-        {
-            AppendPath(ModelSerializationExtensions.TypeFormatters.ConvertToString(value, format), escape);
-        }
-
-        public void AppendPath(Guid value, bool escape = true)
-        {
-            AppendPath(ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendPath(long value, bool escape = true)
-        {
-            AppendPath(ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendQuery(string name, string value, bool escape)
-        {
-            Argument.AssertNotNullOrWhiteSpace(name, nameof(name));
-            Argument.AssertNotNullOrWhiteSpace(value, nameof(value));
-
-            if (QueryBuilder.Length > 0)
-            {
-                QueryBuilder.Append('&');
-            }
-
-            if (escape)
-            {
-                value = Uri.EscapeDataString(value);
-            }
-
-            QueryBuilder.Append(name);
-            QueryBuilder.Append('=');
-            QueryBuilder.Append(value);
-        }
-
-        public void AppendQuery(string name, bool value, bool escape = false)
-        {
-            AppendQuery(name, ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendQuery(string name, float value, bool escape = true)
-        {
-            AppendQuery(name, ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendQuery(string name, DateTimeOffset value, string format, bool escape = true)
-        {
-            AppendQuery(name, ModelSerializationExtensions.TypeFormatters.ConvertToString(value, format), escape);
-        }
-
-        public void AppendQuery(string name, TimeSpan value, string format, bool escape = true)
-        {
-            AppendQuery(name, ModelSerializationExtensions.TypeFormatters.ConvertToString(value, format), escape);
-        }
-
-        public void AppendQuery(string name, double value, bool escape = true)
-        {
-            AppendQuery(name, ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendQuery(string name, decimal value, bool escape = true)
-        {
-            AppendQuery(name, ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendQuery(string name, int value, bool escape = true)
-        {
-            AppendQuery(name, ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendQuery(string name, long value, bool escape = true)
-        {
-            AppendQuery(name, ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendQuery(string name, TimeSpan value, bool escape = true)
-        {
-            AppendQuery(name, ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendQuery(string name, byte[] value, string format, bool escape = true)
-        {
-            AppendQuery(name, ModelSerializationExtensions.TypeFormatters.ConvertToString(value, format), escape);
-        }
-
-        public void AppendQuery(string name, Guid value, bool escape = true)
-        {
-            AppendQuery(name, ModelSerializationExtensions.TypeFormatters.ConvertToString(value), escape);
-        }
-
-        public void AppendQueryDelimited<T>(string name, IEnumerable<T> value, string delimiter, bool escape = true)
-        {
-            var stringValues = value.Select(v => ModelSerializationExtensions.TypeFormatters.ConvertToString(v));
-            AppendQuery(name, string.Join(delimiter, stringValues), escape);
-        }
-
-        public void AppendQueryDelimited<T>(string name, IEnumerable<T> value, string delimiter, string format, bool escape = true)
-        {
-            var stringValues = value.Select(v => ModelSerializationExtensions.TypeFormatters.ConvertToString(v, format));
-            AppendQuery(name, string.Join(delimiter, stringValues), escape);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ErrorResult.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ErrorResult.cs
deleted file mode 100644
index f9ea3276e769..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ErrorResult.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System.ClientModel;
-using System.ClientModel.Primitives;
-
-namespace Azure.AI.OpenAI
-{
-    internal class ErrorResult<T> : ClientResult<T>
-    {
-        private readonly PipelineResponse _response;
-        private readonly ClientResultException _exception;
-
-        public ErrorResult(PipelineResponse response, ClientResultException exception) : base(default, response)
-        {
-            _response = response;
-            _exception = exception;
-        }
-
-        public override T Value => throw _exception;
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ModelSerializationExtensions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ModelSerializationExtensions.cs
index f4286bb0eeca..4a45f613de8c 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ModelSerializationExtensions.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/ModelSerializationExtensions.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
@@ -9,13 +12,13 @@
 using System.Globalization;
 using System.Text.Json;
 using System.Xml;
+using Azure.Core;
 
 namespace Azure.AI.OpenAI
 {
     internal static class ModelSerializationExtensions
     {
         internal static readonly ModelReaderWriterOptions WireOptions = new ModelReaderWriterOptions("W");
-        internal static readonly BinaryData SentinelValue = BinaryData.FromObjectAsJson("__EMPTY__");
 
         public static object GetObject(this JsonElement element)
         {
@@ -174,6 +177,9 @@ public static void WriteObjectValue<T>(this Utf8JsonWriter writer, T value, Mode
                 case IJsonModel<T> jsonModel:
                     jsonModel.Write(writer, options ?? WireOptions);
                     break;
+                case IUtf8JsonSerializable serializable:
+                    serializable.Write(writer);
+                    break;
                 case byte[] bytes:
                     writer.WriteBase64StringValue(bytes);
                     break;
@@ -250,13 +256,6 @@ public static void WriteObjectValue(this Utf8JsonWriter writer, object value, Mo
             writer.WriteObjectValue<object>(value, options);
         }
 
-        internal static bool IsSentinelValue(BinaryData value)
-        {
-            ReadOnlySpan<byte> sentinelSpan = SentinelValue.ToMemory().Span;
-            ReadOnlySpan<byte> valueSpan = value.ToMemory().Span;
-            return sentinelSpan.SequenceEqual(valueSpan);
-        }
-
         internal static class TypeFormatters
         {
             private const string RoundtripZFormat = "yyyy-MM-ddTHH:mm:ss.fffffffZ";
@@ -267,7 +266,7 @@ internal static class TypeFormatters
             public static string ToString(DateTime value, string format) => value.Kind switch
             {
                 DateTimeKind.Utc => ToString((DateTimeOffset)value, format),
-                _ => throw new NotSupportedException($"DateTime {value} has a Kind of {value.Kind}. Generated clients require it to be UTC. You can call DateTime.SpecifyKind to change Kind property value to DateTimeKind.Utc.")
+                _ => throw new NotSupportedException($"DateTime {value} has a Kind of {value.Kind}. Azure SDK requires it to be UTC. You can call DateTime.SpecifyKind to change Kind property value to DateTimeKind.Utc.")
             };
 
             public static string ToString(DateTimeOffset value, string format) => format switch
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/MultipartFormDataBinaryContent.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/MultipartFormDataRequestContent.cs
similarity index 92%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/MultipartFormDataBinaryContent.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/MultipartFormDataRequestContent.cs
index 43825f6b4a86..68d9091c6708 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/MultipartFormDataBinaryContent.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/MultipartFormDataRequestContent.cs
@@ -1,27 +1,31 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.Globalization;
 using System.IO;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure.Core;
+using Azure.Core.Pipeline;
 
 namespace Azure.AI.OpenAI
 {
-    internal class MultipartFormDataBinaryContent : BinaryContent
+    internal class MultipartFormDataRequestContent : RequestContent
     {
-        private readonly MultipartFormDataContent _multipartContent;
+        private readonly System.Net.Http.MultipartFormDataContent _multipartContent;
         private static readonly Random _random = new Random();
         private static readonly char[] _boundaryValues = "0123456789=ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz".ToCharArray();
 
-        public MultipartFormDataBinaryContent()
+        public MultipartFormDataRequestContent()
         {
-            _multipartContent = new MultipartFormDataContent(CreateBoundary());
+            _multipartContent = new System.Net.Http.MultipartFormDataContent(CreateBoundary());
         }
 
         public string ContentType
@@ -176,7 +180,9 @@ public override void WriteTo(Stream stream, CancellationToken cancellationToken
 #if NET6_0_OR_GREATER
 				_multipartContent.CopyTo(stream, default, cancellationToken);
 #else
-            _multipartContent.CopyToAsync(stream).GetAwaiter().GetResult();
+#pragma warning disable AZC0107
+            _multipartContent.CopyToAsync(stream).EnsureCompleted();
+#pragma warning restore AZC0107
 #endif
         }
 
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/Optional.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/Optional.cs
index 56bba5f656ac..a58dc86ec6a1 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/Optional.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/Optional.cs
@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/Utf8JsonBinaryContent.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/Utf8JsonRequestContent.cs
similarity index 82%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/Utf8JsonBinaryContent.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/Utf8JsonRequestContent.cs
index 7f70307bf7f8..62b7404a506e 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/Utf8JsonBinaryContent.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Internal/Utf8JsonRequestContent.cs
@@ -1,21 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
-using System.ClientModel;
 using System.IO;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure.Core;
 
 namespace Azure.AI.OpenAI
 {
-    internal class Utf8JsonBinaryContent : BinaryContent
+    internal class Utf8JsonRequestContent : RequestContent
     {
         private readonly MemoryStream _stream;
-        private readonly BinaryContent _content;
+        private readonly RequestContent _content;
 
-        public Utf8JsonBinaryContent()
+        public Utf8JsonRequestContent()
         {
             _stream = new MemoryStream();
             _content = Create(_stream);
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceAccessTokenAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceAccessTokenAuthenticationOptions.Serialization.cs
deleted file mode 100644
index 344aed0274a7..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceAccessTokenAuthenticationOptions.Serialization.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    internal partial class InternalAzureChatDataSourceAccessTokenAuthenticationOptions : IJsonModel<InternalAzureChatDataSourceAccessTokenAuthenticationOptions>
-    {
-        void IJsonModel<InternalAzureChatDataSourceAccessTokenAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceAccessTokenAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceAccessTokenAuthenticationOptions)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("access_token") != true)
-            {
-                writer.WritePropertyName("access_token"u8);
-                writer.WriteStringValue(AccessToken);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureChatDataSourceAccessTokenAuthenticationOptions IJsonModel<InternalAzureChatDataSourceAccessTokenAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceAccessTokenAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceAccessTokenAuthenticationOptions)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureChatDataSourceAccessTokenAuthenticationOptions(document.RootElement, options);
-        }
-
-        internal static InternalAzureChatDataSourceAccessTokenAuthenticationOptions DeserializeInternalAzureChatDataSourceAccessTokenAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string accessToken = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("access_token"u8))
-                {
-                    accessToken = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureChatDataSourceAccessTokenAuthenticationOptions(type, serializedAdditionalRawData, accessToken);
-        }
-
-        BinaryData IPersistableModel<InternalAzureChatDataSourceAccessTokenAuthenticationOptions>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceAccessTokenAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceAccessTokenAuthenticationOptions)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureChatDataSourceAccessTokenAuthenticationOptions IPersistableModel<InternalAzureChatDataSourceAccessTokenAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceAccessTokenAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureChatDataSourceAccessTokenAuthenticationOptions(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceAccessTokenAuthenticationOptions)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureChatDataSourceAccessTokenAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalAzureChatDataSourceAccessTokenAuthenticationOptions FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureChatDataSourceAccessTokenAuthenticationOptions(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceAccessTokenAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceAccessTokenAuthenticationOptions.cs
deleted file mode 100644
index 73fc1546e469..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceAccessTokenAuthenticationOptions.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The AzureChatDataSourceAccessTokenAuthenticationOptions. </summary>
-    internal partial class InternalAzureChatDataSourceAccessTokenAuthenticationOptions : DataSourceAuthentication
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceAccessTokenAuthenticationOptions"/>. </summary>
-        /// <param name="accessToken"></param>
-        /// <exception cref="ArgumentNullException"> <paramref name="accessToken"/> is null. </exception>
-        public InternalAzureChatDataSourceAccessTokenAuthenticationOptions(string accessToken)
-        {
-            Argument.AssertNotNull(accessToken, nameof(accessToken));
-
-            Type = "access_token";
-            AccessToken = accessToken;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceAccessTokenAuthenticationOptions"/>. </summary>
-        /// <param name="type"> Discriminator. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="accessToken"></param>
-        internal InternalAzureChatDataSourceAccessTokenAuthenticationOptions(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, string accessToken) : base(type, serializedAdditionalRawData)
-        {
-            AccessToken = accessToken;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceAccessTokenAuthenticationOptions"/> for deserialization. </summary>
-        internal InternalAzureChatDataSourceAccessTokenAuthenticationOptions()
-        {
-        }
-
-        /// <summary> Gets the access token. </summary>
-        internal string AccessToken { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceApiKeyAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceApiKeyAuthenticationOptions.cs
deleted file mode 100644
index 1d92c00c05f7..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceApiKeyAuthenticationOptions.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The AzureChatDataSourceApiKeyAuthenticationOptions. </summary>
-    internal partial class InternalAzureChatDataSourceApiKeyAuthenticationOptions : DataSourceAuthentication
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceApiKeyAuthenticationOptions"/>. </summary>
-        /// <param name="key"></param>
-        /// <exception cref="ArgumentNullException"> <paramref name="key"/> is null. </exception>
-        public InternalAzureChatDataSourceApiKeyAuthenticationOptions(string key)
-        {
-            Argument.AssertNotNull(key, nameof(key));
-
-            Type = "api_key";
-            Key = key;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceApiKeyAuthenticationOptions"/>. </summary>
-        /// <param name="type"> Discriminator. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="key"></param>
-        internal InternalAzureChatDataSourceApiKeyAuthenticationOptions(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, string key) : base(type, serializedAdditionalRawData)
-        {
-            Key = key;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceApiKeyAuthenticationOptions"/> for deserialization. </summary>
-        internal InternalAzureChatDataSourceApiKeyAuthenticationOptions()
-        {
-        }
-
-        /// <summary> Gets the key. </summary>
-        internal string Key { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceConnectionStringAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceConnectionStringAuthenticationOptions.Serialization.cs
deleted file mode 100644
index 87563d7c14b9..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceConnectionStringAuthenticationOptions.Serialization.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    internal partial class InternalAzureChatDataSourceConnectionStringAuthenticationOptions : IJsonModel<InternalAzureChatDataSourceConnectionStringAuthenticationOptions>
-    {
-        void IJsonModel<InternalAzureChatDataSourceConnectionStringAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceConnectionStringAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceConnectionStringAuthenticationOptions)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("connection_string") != true)
-            {
-                writer.WritePropertyName("connection_string"u8);
-                writer.WriteStringValue(ConnectionString);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureChatDataSourceConnectionStringAuthenticationOptions IJsonModel<InternalAzureChatDataSourceConnectionStringAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceConnectionStringAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceConnectionStringAuthenticationOptions)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureChatDataSourceConnectionStringAuthenticationOptions(document.RootElement, options);
-        }
-
-        internal static InternalAzureChatDataSourceConnectionStringAuthenticationOptions DeserializeInternalAzureChatDataSourceConnectionStringAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string connectionString = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("connection_string"u8))
-                {
-                    connectionString = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureChatDataSourceConnectionStringAuthenticationOptions(type, serializedAdditionalRawData, connectionString);
-        }
-
-        BinaryData IPersistableModel<InternalAzureChatDataSourceConnectionStringAuthenticationOptions>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceConnectionStringAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceConnectionStringAuthenticationOptions)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureChatDataSourceConnectionStringAuthenticationOptions IPersistableModel<InternalAzureChatDataSourceConnectionStringAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceConnectionStringAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureChatDataSourceConnectionStringAuthenticationOptions(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceConnectionStringAuthenticationOptions)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureChatDataSourceConnectionStringAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalAzureChatDataSourceConnectionStringAuthenticationOptions FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureChatDataSourceConnectionStringAuthenticationOptions(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceConnectionStringAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceConnectionStringAuthenticationOptions.cs
deleted file mode 100644
index 86a7f544bd27..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceConnectionStringAuthenticationOptions.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The AzureChatDataSourceConnectionStringAuthenticationOptions. </summary>
-    internal partial class InternalAzureChatDataSourceConnectionStringAuthenticationOptions : DataSourceAuthentication
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceConnectionStringAuthenticationOptions"/>. </summary>
-        /// <param name="connectionString"></param>
-        /// <exception cref="ArgumentNullException"> <paramref name="connectionString"/> is null. </exception>
-        public InternalAzureChatDataSourceConnectionStringAuthenticationOptions(string connectionString)
-        {
-            Argument.AssertNotNull(connectionString, nameof(connectionString));
-
-            Type = "connection_string";
-            ConnectionString = connectionString;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceConnectionStringAuthenticationOptions"/>. </summary>
-        /// <param name="type"> Discriminator. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="connectionString"></param>
-        internal InternalAzureChatDataSourceConnectionStringAuthenticationOptions(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, string connectionString) : base(type, serializedAdditionalRawData)
-        {
-            ConnectionString = connectionString;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceConnectionStringAuthenticationOptions"/> for deserialization. </summary>
-        internal InternalAzureChatDataSourceConnectionStringAuthenticationOptions()
-        {
-        }
-
-        /// <summary> Gets the connection string. </summary>
-        internal string ConnectionString { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceDeploymentNameVectorizationSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceDeploymentNameVectorizationSource.Serialization.cs
deleted file mode 100644
index a322da00a07b..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceDeploymentNameVectorizationSource.Serialization.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    internal partial class InternalAzureChatDataSourceDeploymentNameVectorizationSource : IJsonModel<InternalAzureChatDataSourceDeploymentNameVectorizationSource>
-    {
-        void IJsonModel<InternalAzureChatDataSourceDeploymentNameVectorizationSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceDeploymentNameVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceDeploymentNameVectorizationSource)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("deployment_name") != true)
-            {
-                writer.WritePropertyName("deployment_name"u8);
-                writer.WriteStringValue(DeploymentName);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("dimensions") != true && Optional.IsDefined(Dimensions))
-            {
-                writer.WritePropertyName("dimensions"u8);
-                writer.WriteNumberValue(Dimensions.Value);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureChatDataSourceDeploymentNameVectorizationSource IJsonModel<InternalAzureChatDataSourceDeploymentNameVectorizationSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceDeploymentNameVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceDeploymentNameVectorizationSource)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureChatDataSourceDeploymentNameVectorizationSource(document.RootElement, options);
-        }
-
-        internal static InternalAzureChatDataSourceDeploymentNameVectorizationSource DeserializeInternalAzureChatDataSourceDeploymentNameVectorizationSource(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string deploymentName = default;
-            int? dimensions = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("deployment_name"u8))
-                {
-                    deploymentName = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("dimensions"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    dimensions = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureChatDataSourceDeploymentNameVectorizationSource(type, serializedAdditionalRawData, deploymentName, dimensions);
-        }
-
-        BinaryData IPersistableModel<InternalAzureChatDataSourceDeploymentNameVectorizationSource>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceDeploymentNameVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceDeploymentNameVectorizationSource)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureChatDataSourceDeploymentNameVectorizationSource IPersistableModel<InternalAzureChatDataSourceDeploymentNameVectorizationSource>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceDeploymentNameVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureChatDataSourceDeploymentNameVectorizationSource(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceDeploymentNameVectorizationSource)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureChatDataSourceDeploymentNameVectorizationSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalAzureChatDataSourceDeploymentNameVectorizationSource FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureChatDataSourceDeploymentNameVectorizationSource(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceDeploymentNameVectorizationSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceDeploymentNameVectorizationSource.cs
deleted file mode 100644
index e413a85711ef..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceDeploymentNameVectorizationSource.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary>
-    /// Represents a vectorization source that makes internal service calls against an Azure OpenAI embedding model
-    /// deployment. In contrast with the endpoint-based vectorization source, a deployment-name-based vectorization source
-    /// must be part of the same Azure OpenAI resource but can be used even in private networks.
-    /// </summary>
-    internal partial class InternalAzureChatDataSourceDeploymentNameVectorizationSource : DataSourceVectorizer
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceDeploymentNameVectorizationSource"/>. </summary>
-        /// <param name="deploymentName">
-        /// The embedding model deployment to use for vectorization. This deployment must exist within the same Azure OpenAI
-        /// resource as the model deployment being used for chat completions.
-        /// </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="deploymentName"/> is null. </exception>
-        public InternalAzureChatDataSourceDeploymentNameVectorizationSource(string deploymentName)
-        {
-            Argument.AssertNotNull(deploymentName, nameof(deploymentName));
-
-            Type = "deployment_name";
-            DeploymentName = deploymentName;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceDeploymentNameVectorizationSource"/>. </summary>
-        /// <param name="type"> The differentiating identifier for the concrete vectorization source. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="deploymentName">
-        /// The embedding model deployment to use for vectorization. This deployment must exist within the same Azure OpenAI
-        /// resource as the model deployment being used for chat completions.
-        /// </param>
-        /// <param name="dimensions">
-        /// The number of dimensions to request on embeddings.
-        /// Only supported in 'text-embedding-3' and later models.
-        /// </param>
-        internal InternalAzureChatDataSourceDeploymentNameVectorizationSource(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, string deploymentName, int? dimensions) : base(type, serializedAdditionalRawData)
-        {
-            DeploymentName = deploymentName;
-            Dimensions = dimensions;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceDeploymentNameVectorizationSource"/> for deserialization. </summary>
-        internal InternalAzureChatDataSourceDeploymentNameVectorizationSource()
-        {
-        }
-
-        /// <summary>
-        /// The embedding model deployment to use for vectorization. This deployment must exist within the same Azure OpenAI
-        /// resource as the model deployment being used for chat completions.
-        /// </summary>
-        internal string DeploymentName { get; set; }
-        /// <summary>
-        /// The number of dimensions to request on embeddings.
-        /// Only supported in 'text-embedding-3' and later models.
-        /// </summary>
-        public int? Dimensions { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions.Serialization.cs
deleted file mode 100644
index b24dfb4f4137..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions.Serialization.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    internal partial class InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions : IJsonModel<InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions>
-    {
-        void IJsonModel<InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("encoded_api_key") != true)
-            {
-                writer.WritePropertyName("encoded_api_key"u8);
-                writer.WriteStringValue(EncodedApiKey);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions IJsonModel<InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions(document.RootElement, options);
-        }
-
-        internal static InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions DeserializeInternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string encodedApiKey = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("encoded_api_key"u8))
-                {
-                    encodedApiKey = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions(type, serializedAdditionalRawData, encodedApiKey);
-        }
-
-        BinaryData IPersistableModel<InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions IPersistableModel<InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions.cs
deleted file mode 100644
index 36c145320c34..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The AzureChatDataSourceEncodedApiKeyAuthenticationOptions. </summary>
-    internal partial class InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions : DataSourceAuthentication
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions"/>. </summary>
-        /// <param name="encodedApiKey"></param>
-        /// <exception cref="ArgumentNullException"> <paramref name="encodedApiKey"/> is null. </exception>
-        public InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions(string encodedApiKey)
-        {
-            Argument.AssertNotNull(encodedApiKey, nameof(encodedApiKey));
-
-            Type = "encoded_api_key";
-            EncodedApiKey = encodedApiKey;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions"/>. </summary>
-        /// <param name="type"> Discriminator. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="encodedApiKey"></param>
-        internal InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, string encodedApiKey) : base(type, serializedAdditionalRawData)
-        {
-            EncodedApiKey = encodedApiKey;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions"/> for deserialization. </summary>
-        internal InternalAzureChatDataSourceEncodedApiKeyAuthenticationOptions()
-        {
-        }
-
-        /// <summary> Gets the encoded api key. </summary>
-        internal string EncodedApiKey { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceEndpointVectorizationSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceEndpointVectorizationSource.Serialization.cs
deleted file mode 100644
index e984e66bca8a..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceEndpointVectorizationSource.Serialization.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    internal partial class InternalAzureChatDataSourceEndpointVectorizationSource : IJsonModel<InternalAzureChatDataSourceEndpointVectorizationSource>
-    {
-        void IJsonModel<InternalAzureChatDataSourceEndpointVectorizationSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceEndpointVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceEndpointVectorizationSource)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("endpoint") != true)
-            {
-                writer.WritePropertyName("endpoint"u8);
-                writer.WriteStringValue(Endpoint.AbsoluteUri);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("authentication") != true)
-            {
-                writer.WritePropertyName("authentication"u8);
-                writer.WriteObjectValue<DataSourceAuthentication>(Authentication, options);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("dimensions") != true && Optional.IsDefined(Dimensions))
-            {
-                writer.WritePropertyName("dimensions"u8);
-                writer.WriteNumberValue(Dimensions.Value);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureChatDataSourceEndpointVectorizationSource IJsonModel<InternalAzureChatDataSourceEndpointVectorizationSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceEndpointVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceEndpointVectorizationSource)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureChatDataSourceEndpointVectorizationSource(document.RootElement, options);
-        }
-
-        internal static InternalAzureChatDataSourceEndpointVectorizationSource DeserializeInternalAzureChatDataSourceEndpointVectorizationSource(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            Uri endpoint = default;
-            DataSourceAuthentication authentication = default;
-            int? dimensions = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("endpoint"u8))
-                {
-                    endpoint = new Uri(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("authentication"u8))
-                {
-                    authentication = DataSourceAuthentication.DeserializeDataSourceAuthentication(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("dimensions"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    dimensions = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureChatDataSourceEndpointVectorizationSource(type, serializedAdditionalRawData, endpoint, authentication, dimensions);
-        }
-
-        BinaryData IPersistableModel<InternalAzureChatDataSourceEndpointVectorizationSource>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceEndpointVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceEndpointVectorizationSource)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureChatDataSourceEndpointVectorizationSource IPersistableModel<InternalAzureChatDataSourceEndpointVectorizationSource>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceEndpointVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureChatDataSourceEndpointVectorizationSource(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceEndpointVectorizationSource)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureChatDataSourceEndpointVectorizationSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalAzureChatDataSourceEndpointVectorizationSource FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureChatDataSourceEndpointVectorizationSource(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceEndpointVectorizationSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceEndpointVectorizationSource.cs
deleted file mode 100644
index 38b036485065..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceEndpointVectorizationSource.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> Represents a vectorization source that makes public service calls against an Azure OpenAI embedding model deployment. </summary>
-    internal partial class InternalAzureChatDataSourceEndpointVectorizationSource : DataSourceVectorizer
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceEndpointVectorizationSource"/>. </summary>
-        /// <param name="endpoint">
-        /// Specifies the resource endpoint URL from which embeddings should be retrieved.
-        /// It should be in the format of:
-        /// https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYMENT_NAME/embeddings.
-        /// The api-version query parameter is not allowed.
-        /// </param>
-        /// <param name="authentication">
-        /// The authentication mechanism to use with the endpoint-based vectorization source.
-        /// Endpoint authentication supports API key and access token mechanisms.
-        /// Please note <see cref="DataSourceAuthentication"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/> or <paramref name="authentication"/> is null. </exception>
-        public InternalAzureChatDataSourceEndpointVectorizationSource(Uri endpoint, DataSourceAuthentication authentication)
-        {
-            Argument.AssertNotNull(endpoint, nameof(endpoint));
-            Argument.AssertNotNull(authentication, nameof(authentication));
-
-            Type = "endpoint";
-            Endpoint = endpoint;
-            Authentication = authentication;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceEndpointVectorizationSource"/>. </summary>
-        /// <param name="type"> The differentiating identifier for the concrete vectorization source. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="endpoint">
-        /// Specifies the resource endpoint URL from which embeddings should be retrieved.
-        /// It should be in the format of:
-        /// https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYMENT_NAME/embeddings.
-        /// The api-version query parameter is not allowed.
-        /// </param>
-        /// <param name="authentication">
-        /// The authentication mechanism to use with the endpoint-based vectorization source.
-        /// Endpoint authentication supports API key and access token mechanisms.
-        /// Please note <see cref="DataSourceAuthentication"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="dimensions">
-        /// The number of dimensions to request on embeddings.
-        /// Only supported in 'text-embedding-3' and later models.
-        /// </param>
-        internal InternalAzureChatDataSourceEndpointVectorizationSource(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, Uri endpoint, DataSourceAuthentication authentication, int? dimensions) : base(type, serializedAdditionalRawData)
-        {
-            Endpoint = endpoint;
-            Authentication = authentication;
-            Dimensions = dimensions;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceEndpointVectorizationSource"/> for deserialization. </summary>
-        internal InternalAzureChatDataSourceEndpointVectorizationSource()
-        {
-        }
-
-        /// <summary>
-        /// Specifies the resource endpoint URL from which embeddings should be retrieved.
-        /// It should be in the format of:
-        /// https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYMENT_NAME/embeddings.
-        /// The api-version query parameter is not allowed.
-        /// </summary>
-        internal Uri Endpoint { get; set; }
-        /// <summary>
-        /// The number of dimensions to request on embeddings.
-        /// Only supported in 'text-embedding-3' and later models.
-        /// </summary>
-        public int? Dimensions { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceIntegratedVectorizationSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceIntegratedVectorizationSource.Serialization.cs
deleted file mode 100644
index 92c61b0e631a..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceIntegratedVectorizationSource.Serialization.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    internal partial class InternalAzureChatDataSourceIntegratedVectorizationSource : IJsonModel<InternalAzureChatDataSourceIntegratedVectorizationSource>
-    {
-        void IJsonModel<InternalAzureChatDataSourceIntegratedVectorizationSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceIntegratedVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceIntegratedVectorizationSource)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureChatDataSourceIntegratedVectorizationSource IJsonModel<InternalAzureChatDataSourceIntegratedVectorizationSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceIntegratedVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceIntegratedVectorizationSource)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureChatDataSourceIntegratedVectorizationSource(document.RootElement, options);
-        }
-
-        internal static InternalAzureChatDataSourceIntegratedVectorizationSource DeserializeInternalAzureChatDataSourceIntegratedVectorizationSource(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureChatDataSourceIntegratedVectorizationSource(type, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<InternalAzureChatDataSourceIntegratedVectorizationSource>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceIntegratedVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceIntegratedVectorizationSource)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureChatDataSourceIntegratedVectorizationSource IPersistableModel<InternalAzureChatDataSourceIntegratedVectorizationSource>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceIntegratedVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureChatDataSourceIntegratedVectorizationSource(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceIntegratedVectorizationSource)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureChatDataSourceIntegratedVectorizationSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalAzureChatDataSourceIntegratedVectorizationSource FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureChatDataSourceIntegratedVectorizationSource(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceIntegratedVectorizationSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceIntegratedVectorizationSource.cs
deleted file mode 100644
index 08fa29e39635..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceIntegratedVectorizationSource.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> Represents an integrated vectorization source as defined within the supporting search resource. </summary>
-    internal partial class InternalAzureChatDataSourceIntegratedVectorizationSource : DataSourceVectorizer
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceIntegratedVectorizationSource"/>. </summary>
-        public InternalAzureChatDataSourceIntegratedVectorizationSource()
-        {
-            Type = "integrated";
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceIntegratedVectorizationSource"/>. </summary>
-        /// <param name="type"> The differentiating identifier for the concrete vectorization source. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalAzureChatDataSourceIntegratedVectorizationSource(string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
-        {
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions.Serialization.cs
deleted file mode 100644
index 3d1b11f308cc..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions.Serialization.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    internal partial class InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions : IJsonModel<InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions>
-    {
-        void IJsonModel<InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("key") != true)
-            {
-                writer.WritePropertyName("key"u8);
-                writer.WriteStringValue(Key);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("key_id") != true)
-            {
-                writer.WritePropertyName("key_id"u8);
-                writer.WriteStringValue(KeyId);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions IJsonModel<InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions(document.RootElement, options);
-        }
-
-        internal static InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions DeserializeInternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string key = default;
-            string keyId = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("key"u8))
-                {
-                    key = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("key_id"u8))
-                {
-                    keyId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions(type, serializedAdditionalRawData, key, keyId);
-        }
-
-        BinaryData IPersistableModel<InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions IPersistableModel<InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions.cs
deleted file mode 100644
index 528d5880483e..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The AzureChatDataSourceKeyAndKeyIdAuthenticationOptions. </summary>
-    internal partial class InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions : DataSourceAuthentication
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions"/>. </summary>
-        /// <param name="key"></param>
-        /// <param name="keyId"></param>
-        /// <exception cref="ArgumentNullException"> <paramref name="key"/> or <paramref name="keyId"/> is null. </exception>
-        public InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions(string key, string keyId)
-        {
-            Argument.AssertNotNull(key, nameof(key));
-            Argument.AssertNotNull(keyId, nameof(keyId));
-
-            Type = "key_and_key_id";
-            Key = key;
-            KeyId = keyId;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions"/>. </summary>
-        /// <param name="type"> Discriminator. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="key"></param>
-        /// <param name="keyId"></param>
-        internal InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, string key, string keyId) : base(type, serializedAdditionalRawData)
-        {
-            Key = key;
-            KeyId = keyId;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions"/> for deserialization. </summary>
-        internal InternalAzureChatDataSourceKeyAndKeyIdAuthenticationOptions()
-        {
-        }
-
-        /// <summary> Gets the key. </summary>
-        internal string Key { get; set; }
-        /// <summary> Gets the key id. </summary>
-        internal string KeyId { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceModelIdVectorizationSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceModelIdVectorizationSource.Serialization.cs
deleted file mode 100644
index cbbae8276b91..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceModelIdVectorizationSource.Serialization.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    internal partial class InternalAzureChatDataSourceModelIdVectorizationSource : IJsonModel<InternalAzureChatDataSourceModelIdVectorizationSource>
-    {
-        void IJsonModel<InternalAzureChatDataSourceModelIdVectorizationSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceModelIdVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceModelIdVectorizationSource)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("model_id") != true)
-            {
-                writer.WritePropertyName("model_id"u8);
-                writer.WriteStringValue(ModelId);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureChatDataSourceModelIdVectorizationSource IJsonModel<InternalAzureChatDataSourceModelIdVectorizationSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceModelIdVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceModelIdVectorizationSource)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureChatDataSourceModelIdVectorizationSource(document.RootElement, options);
-        }
-
-        internal static InternalAzureChatDataSourceModelIdVectorizationSource DeserializeInternalAzureChatDataSourceModelIdVectorizationSource(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string modelId = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("model_id"u8))
-                {
-                    modelId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureChatDataSourceModelIdVectorizationSource(type, serializedAdditionalRawData, modelId);
-        }
-
-        BinaryData IPersistableModel<InternalAzureChatDataSourceModelIdVectorizationSource>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceModelIdVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceModelIdVectorizationSource)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureChatDataSourceModelIdVectorizationSource IPersistableModel<InternalAzureChatDataSourceModelIdVectorizationSource>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceModelIdVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureChatDataSourceModelIdVectorizationSource(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceModelIdVectorizationSource)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureChatDataSourceModelIdVectorizationSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalAzureChatDataSourceModelIdVectorizationSource FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureChatDataSourceModelIdVectorizationSource(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceModelIdVectorizationSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceModelIdVectorizationSource.cs
deleted file mode 100644
index b4bf391b5bf6..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceModelIdVectorizationSource.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary>
-    /// Represents a vectorization source that makes service calls based on a search service model ID.
-    /// This source type is currently only supported by Elasticsearch.
-    /// </summary>
-    internal partial class InternalAzureChatDataSourceModelIdVectorizationSource : DataSourceVectorizer
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceModelIdVectorizationSource"/>. </summary>
-        /// <param name="modelId"> The embedding model build ID to use for vectorization. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="modelId"/> is null. </exception>
-        internal InternalAzureChatDataSourceModelIdVectorizationSource(string modelId)
-        {
-            Argument.AssertNotNull(modelId, nameof(modelId));
-
-            Type = "model_id";
-            ModelId = modelId;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceModelIdVectorizationSource"/>. </summary>
-        /// <param name="type"> The differentiating identifier for the concrete vectorization source. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="modelId"> The embedding model build ID to use for vectorization. </param>
-        internal InternalAzureChatDataSourceModelIdVectorizationSource(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, string modelId) : base(type, serializedAdditionalRawData)
-        {
-            ModelId = modelId;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceModelIdVectorizationSource"/> for deserialization. </summary>
-        internal InternalAzureChatDataSourceModelIdVectorizationSource()
-        {
-        }
-
-        /// <summary> The embedding model build ID to use for vectorization. </summary>
-        internal string ModelId { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions.Serialization.cs
deleted file mode 100644
index 3d97453fcfd2..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions.Serialization.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    internal partial class InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions : IJsonModel<InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions>
-    {
-        void IJsonModel<InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions IJsonModel<InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions(document.RootElement, options);
-        }
-
-        internal static InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions DeserializeInternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions(type, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions IPersistableModel<InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions.cs
deleted file mode 100644
index 6b64f501d4d7..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The AzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions. </summary>
-    internal partial class InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions : DataSourceAuthentication
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions"/>. </summary>
-        public InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions()
-        {
-            Type = "system_assigned_managed_identity";
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions"/>. </summary>
-        /// <param name="type"> Discriminator. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalAzureChatDataSourceSystemAssignedManagedIdentityAuthenticationOptions(string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
-        {
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions.Serialization.cs
deleted file mode 100644
index 92a62ed8c6bb..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions.Serialization.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    internal partial class InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions : IJsonModel<InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions>
-    {
-        void IJsonModel<InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("managed_identity_resource_id") != true)
-            {
-                writer.WritePropertyName("managed_identity_resource_id"u8);
-                writer.WriteStringValue(ManagedIdentityResourceId);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions IJsonModel<InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions(document.RootElement, options);
-        }
-
-        internal static InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions DeserializeInternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string managedIdentityResourceId = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("managed_identity_resource_id"u8))
-                {
-                    managedIdentityResourceId = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions(type, serializedAdditionalRawData, managedIdentityResourceId);
-        }
-
-        BinaryData IPersistableModel<InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions IPersistableModel<InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions.cs
deleted file mode 100644
index 97f938b2bd14..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The AzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions. </summary>
-    internal partial class InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions : DataSourceAuthentication
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions"/>. </summary>
-        /// <param name="managedIdentityResourceId"></param>
-        /// <exception cref="ArgumentNullException"> <paramref name="managedIdentityResourceId"/> is null. </exception>
-        public InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions(string managedIdentityResourceId)
-        {
-            Argument.AssertNotNull(managedIdentityResourceId, nameof(managedIdentityResourceId));
-
-            Type = "user_assigned_managed_identity";
-            ManagedIdentityResourceId = managedIdentityResourceId;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions"/>. </summary>
-        /// <param name="type"> Discriminator. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="managedIdentityResourceId"></param>
-        internal InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, string managedIdentityResourceId) : base(type, serializedAdditionalRawData)
-        {
-            ManagedIdentityResourceId = managedIdentityResourceId;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions"/> for deserialization. </summary>
-        internal InternalAzureChatDataSourceUserAssignedManagedIdentityAuthenticationOptions()
-        {
-        }
-
-        /// <summary> Gets the managed identity resource id. </summary>
-        internal string ManagedIdentityResourceId { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions.Serialization.cs
deleted file mode 100644
index 4fa05a6eb3b8..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions.Serialization.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    internal partial class InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions : IJsonModel<InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions>
-    {
-        void IJsonModel<InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("username") != true)
-            {
-                writer.WritePropertyName("username"u8);
-                writer.WriteStringValue(Username);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("password") != true)
-            {
-                writer.WritePropertyName("password"u8);
-                writer.WriteStringValue(Password);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions IJsonModel<InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions(document.RootElement, options);
-        }
-
-        internal static InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions DeserializeInternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string username = default;
-            string password = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("username"u8))
-                {
-                    username = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("password"u8))
-                {
-                    password = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions(type, serializedAdditionalRawData, username, password);
-        }
-
-        BinaryData IPersistableModel<InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions IPersistableModel<InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions.cs
deleted file mode 100644
index c72d02a0de9b..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The AzureChatDataSourceUsernameAndPasswordAuthenticationOptions. </summary>
-    internal partial class InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions : DataSourceAuthentication
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions"/>. </summary>
-        /// <param name="username"></param>
-        /// <param name="password"></param>
-        /// <exception cref="ArgumentNullException"> <paramref name="username"/> or <paramref name="password"/> is null. </exception>
-        public InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions(string username, string password)
-        {
-            Argument.AssertNotNull(username, nameof(username));
-            Argument.AssertNotNull(password, nameof(password));
-
-            Type = "username_and_password";
-            Username = username;
-            Password = password;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions"/>. </summary>
-        /// <param name="type"> Discriminator. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="username"></param>
-        /// <param name="password"></param>
-        internal InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions(string type, IDictionary<string, BinaryData> serializedAdditionalRawData, string username, string password) : base(type, serializedAdditionalRawData)
-        {
-            Username = username;
-            Password = password;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions"/> for deserialization. </summary>
-        internal InternalAzureChatDataSourceUsernameAndPasswordAuthenticationOptions()
-        {
-        }
-
-        /// <summary> Gets the username. </summary>
-        internal string Username { get; set; }
-        /// <summary> Gets the password. </summary>
-        internal string Password { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterBlocklistIdResult.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterBlocklistIdResult.Serialization.cs
deleted file mode 100644
index e00fc19ccf89..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterBlocklistIdResult.Serialization.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI
-{
-    internal partial class InternalAzureContentFilterBlocklistIdResult : IJsonModel<InternalAzureContentFilterBlocklistIdResult>
-    {
-        void IJsonModel<InternalAzureContentFilterBlocklistIdResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterBlocklistIdResult>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureContentFilterBlocklistIdResult)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("id") != true)
-            {
-                writer.WritePropertyName("id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("filtered") != true)
-            {
-                writer.WritePropertyName("filtered"u8);
-                writer.WriteBooleanValue(Filtered);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureContentFilterBlocklistIdResult IJsonModel<InternalAzureContentFilterBlocklistIdResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterBlocklistIdResult>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureContentFilterBlocklistIdResult)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureContentFilterBlocklistIdResult(document.RootElement, options);
-        }
-
-        internal static InternalAzureContentFilterBlocklistIdResult DeserializeInternalAzureContentFilterBlocklistIdResult(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string id = default;
-            bool filtered = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("filtered"u8))
-                {
-                    filtered = property.Value.GetBoolean();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureContentFilterBlocklistIdResult(id, filtered, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<InternalAzureContentFilterBlocklistIdResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterBlocklistIdResult>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureContentFilterBlocklistIdResult)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureContentFilterBlocklistIdResult IPersistableModel<InternalAzureContentFilterBlocklistIdResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterBlocklistIdResult>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureContentFilterBlocklistIdResult(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureContentFilterBlocklistIdResult)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureContentFilterBlocklistIdResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static InternalAzureContentFilterBlocklistIdResult FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureContentFilterBlocklistIdResult(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterBlocklistIdResult.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterBlocklistIdResult.cs
deleted file mode 100644
index 1950182689c4..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterBlocklistIdResult.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI
-{
-    /// <summary>
-    /// A content filter result item that associates an existing custom blocklist ID with a value indicating whether or not
-    /// the corresponding blocklist resulted in content being filtered.
-    /// </summary>
-    internal partial class InternalAzureContentFilterBlocklistIdResult
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="InternalAzureContentFilterBlocklistIdResult"/>. </summary>
-        /// <param name="id"> The ID of the custom blocklist associated with the filtered status. </param>
-        /// <param name="filtered"> Whether the associated blocklist resulted in the content being filtered. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
-        internal InternalAzureContentFilterBlocklistIdResult(string id, bool filtered)
-        {
-            Argument.AssertNotNull(id, nameof(id));
-
-            Id = id;
-            Filtered = filtered;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureContentFilterBlocklistIdResult"/>. </summary>
-        /// <param name="id"> The ID of the custom blocklist associated with the filtered status. </param>
-        /// <param name="filtered"> Whether the associated blocklist resulted in the content being filtered. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalAzureContentFilterBlocklistIdResult(string id, bool filtered, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Id = id;
-            Filtered = filtered;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureContentFilterBlocklistIdResult"/> for deserialization. </summary>
-        internal InternalAzureContentFilterBlocklistIdResult()
-        {
-        }
-
-        /// <summary> The ID of the custom blocklist associated with the filtered status. </summary>
-        internal string Id { get; set; }
-        /// <summary> Whether the associated blocklist resulted in the content being filtered. </summary>
-        internal bool Filtered { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterBlocklistResultDetail.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterBlocklistResultDetail.Serialization.cs
deleted file mode 100644
index 02ac4d99cbe9..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterBlocklistResultDetail.Serialization.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI
-{
-    internal partial class InternalAzureContentFilterBlocklistResultDetail : IJsonModel<InternalAzureContentFilterBlocklistResultDetail>
-    {
-        void IJsonModel<InternalAzureContentFilterBlocklistResultDetail>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterBlocklistResultDetail>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureContentFilterBlocklistResultDetail)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("filtered") != true)
-            {
-                writer.WritePropertyName("filtered"u8);
-                writer.WriteBooleanValue(Filtered);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("id") != true)
-            {
-                writer.WritePropertyName("id"u8);
-                writer.WriteStringValue(Id);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureContentFilterBlocklistResultDetail IJsonModel<InternalAzureContentFilterBlocklistResultDetail>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterBlocklistResultDetail>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureContentFilterBlocklistResultDetail)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureContentFilterBlocklistResultDetail(document.RootElement, options);
-        }
-
-        internal static InternalAzureContentFilterBlocklistResultDetail DeserializeInternalAzureContentFilterBlocklistResultDetail(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            bool filtered = default;
-            string id = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("filtered"u8))
-                {
-                    filtered = property.Value.GetBoolean();
-                    continue;
-                }
-                if (property.NameEquals("id"u8))
-                {
-                    id = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureContentFilterBlocklistResultDetail(filtered, id, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<InternalAzureContentFilterBlocklistResultDetail>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterBlocklistResultDetail>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureContentFilterBlocklistResultDetail)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureContentFilterBlocklistResultDetail IPersistableModel<InternalAzureContentFilterBlocklistResultDetail>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterBlocklistResultDetail>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureContentFilterBlocklistResultDetail(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureContentFilterBlocklistResultDetail)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureContentFilterBlocklistResultDetail>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static InternalAzureContentFilterBlocklistResultDetail FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureContentFilterBlocklistResultDetail(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterResultForPromptContentFilterResults.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterResultForPromptContentFilterResults.cs
deleted file mode 100644
index 8c654f48774d..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterResultForPromptContentFilterResults.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI
-{
-    /// <summary> The AzureContentFilterResultForPromptContentFilterResults. </summary>
-    internal partial class InternalAzureContentFilterResultForPromptContentFilterResults
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="InternalAzureContentFilterResultForPromptContentFilterResults"/>. </summary>
-        /// <param name="jailbreak">
-        /// A detection result that describes user prompt injection attacks, where malicious users deliberately exploit
-        /// system vulnerabilities to elicit unauthorized behavior from the LLM. This could lead to inappropriate content
-        /// generation or violations of system-imposed restrictions.
-        /// </param>
-        /// <param name="indirectAttack">
-        /// A detection result that describes attacks on systems powered by Generative AI models that can happen every time
-        /// an application processes information that wasn’t directly authored by either the developer of the application or
-        /// the user.
-        /// </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="jailbreak"/> or <paramref name="indirectAttack"/> is null. </exception>
-        internal InternalAzureContentFilterResultForPromptContentFilterResults(ContentFilterDetectionResult jailbreak, ContentFilterDetectionResult indirectAttack)
-        {
-            Argument.AssertNotNull(jailbreak, nameof(jailbreak));
-            Argument.AssertNotNull(indirectAttack, nameof(indirectAttack));
-
-            Jailbreak = jailbreak;
-            IndirectAttack = indirectAttack;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureContentFilterResultForPromptContentFilterResults"/>. </summary>
-        /// <param name="sexual">
-        /// A content filter category for language related to anatomical organs and genitals, romantic relationships, acts
-        /// portrayed in erotic or affectionate terms, pregnancy, physical sexual acts, including those portrayed as an
-        /// assault or a forced sexual violent act against one's will, prostitution, pornography, and abuse.
-        /// </param>
-        /// <param name="hate">
-        /// A content filter category that can refer to any content that attacks or uses pejorative or discriminatory
-        /// language with reference to a person or identity group based on certain differentiating attributes of these groups
-        /// including but not limited to race, ethnicity, nationality, gender identity and expression, sexual orientation,
-        /// religion, immigration status, ability status, personal appearance, and body size.
-        /// </param>
-        /// <param name="violence">
-        /// A content filter category for language related to physical actions intended to hurt, injure, damage, or kill
-        /// someone or something; describes weapons, guns and related entities, such as manufactures, associations,
-        /// legislation, and so on.
-        /// </param>
-        /// <param name="selfHarm">
-        /// A content filter category that describes language related to physical actions intended to purposely hurt, injure,
-        /// damage one's body or kill oneself.
-        /// </param>
-        /// <param name="profanity">
-        /// A detection result that identifies whether crude, vulgar, or otherwise objection language is present in the
-        /// content.
-        /// </param>
-        /// <param name="customBlocklists"> A collection of binary filtering outcomes for configured custom blocklists. </param>
-        /// <param name="error"> If present, details about an error that prevented content filtering from completing its evaluation. </param>
-        /// <param name="jailbreak">
-        /// A detection result that describes user prompt injection attacks, where malicious users deliberately exploit
-        /// system vulnerabilities to elicit unauthorized behavior from the LLM. This could lead to inappropriate content
-        /// generation or violations of system-imposed restrictions.
-        /// </param>
-        /// <param name="indirectAttack">
-        /// A detection result that describes attacks on systems powered by Generative AI models that can happen every time
-        /// an application processes information that wasn’t directly authored by either the developer of the application or
-        /// the user.
-        /// </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalAzureContentFilterResultForPromptContentFilterResults(ContentFilterSeverityResult sexual, ContentFilterSeverityResult hate, ContentFilterSeverityResult violence, ContentFilterSeverityResult selfHarm, ContentFilterDetectionResult profanity, ContentFilterBlocklistResult customBlocklists, InternalAzureContentFilterResultForPromptContentFilterResultsError error, ContentFilterDetectionResult jailbreak, ContentFilterDetectionResult indirectAttack, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Sexual = sexual;
-            Hate = hate;
-            Violence = violence;
-            SelfHarm = selfHarm;
-            Profanity = profanity;
-            CustomBlocklists = customBlocklists;
-            Error = error;
-            Jailbreak = jailbreak;
-            IndirectAttack = indirectAttack;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureContentFilterResultForPromptContentFilterResults"/> for deserialization. </summary>
-        internal InternalAzureContentFilterResultForPromptContentFilterResults()
-        {
-        }
-
-        /// <summary>
-        /// A content filter category for language related to anatomical organs and genitals, romantic relationships, acts
-        /// portrayed in erotic or affectionate terms, pregnancy, physical sexual acts, including those portrayed as an
-        /// assault or a forced sexual violent act against one's will, prostitution, pornography, and abuse.
-        /// </summary>
-        internal ContentFilterSeverityResult Sexual { get; set; }
-        /// <summary>
-        /// A content filter category that can refer to any content that attacks or uses pejorative or discriminatory
-        /// language with reference to a person or identity group based on certain differentiating attributes of these groups
-        /// including but not limited to race, ethnicity, nationality, gender identity and expression, sexual orientation,
-        /// religion, immigration status, ability status, personal appearance, and body size.
-        /// </summary>
-        internal ContentFilterSeverityResult Hate { get; set; }
-        /// <summary>
-        /// A content filter category for language related to physical actions intended to hurt, injure, damage, or kill
-        /// someone or something; describes weapons, guns and related entities, such as manufactures, associations,
-        /// legislation, and so on.
-        /// </summary>
-        internal ContentFilterSeverityResult Violence { get; set; }
-        /// <summary>
-        /// A content filter category that describes language related to physical actions intended to purposely hurt, injure,
-        /// damage one's body or kill oneself.
-        /// </summary>
-        internal ContentFilterSeverityResult SelfHarm { get; set; }
-        /// <summary>
-        /// A detection result that identifies whether crude, vulgar, or otherwise objection language is present in the
-        /// content.
-        /// </summary>
-        internal ContentFilterDetectionResult Profanity { get; set; }
-        /// <summary> A collection of binary filtering outcomes for configured custom blocklists. </summary>
-        internal ContentFilterBlocklistResult CustomBlocklists { get; set; }
-        /// <summary> If present, details about an error that prevented content filtering from completing its evaluation. </summary>
-        internal InternalAzureContentFilterResultForPromptContentFilterResultsError Error { get; set; }
-        /// <summary>
-        /// A detection result that describes user prompt injection attacks, where malicious users deliberately exploit
-        /// system vulnerabilities to elicit unauthorized behavior from the LLM. This could lead to inappropriate content
-        /// generation or violations of system-imposed restrictions.
-        /// </summary>
-        internal ContentFilterDetectionResult Jailbreak { get; set; }
-        /// <summary>
-        /// A detection result that describes attacks on systems powered by Generative AI models that can happen every time
-        /// an application processes information that wasn’t directly authored by either the developer of the application or
-        /// the user.
-        /// </summary>
-        internal ContentFilterDetectionResult IndirectAttack { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterResultForPromptContentFilterResultsError.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterResultForPromptContentFilterResultsError.Serialization.cs
deleted file mode 100644
index 24d22365ed03..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureContentFilterResultForPromptContentFilterResultsError.Serialization.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI
-{
-    internal partial class InternalAzureContentFilterResultForPromptContentFilterResultsError : IJsonModel<InternalAzureContentFilterResultForPromptContentFilterResultsError>
-    {
-        void IJsonModel<InternalAzureContentFilterResultForPromptContentFilterResultsError>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterResultForPromptContentFilterResultsError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureContentFilterResultForPromptContentFilterResultsError)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("code") != true)
-            {
-                writer.WritePropertyName("code"u8);
-                writer.WriteNumberValue(Code);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("message") != true)
-            {
-                writer.WritePropertyName("message"u8);
-                writer.WriteStringValue(Message);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureContentFilterResultForPromptContentFilterResultsError IJsonModel<InternalAzureContentFilterResultForPromptContentFilterResultsError>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterResultForPromptContentFilterResultsError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureContentFilterResultForPromptContentFilterResultsError)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureContentFilterResultForPromptContentFilterResultsError(document.RootElement, options);
-        }
-
-        internal static InternalAzureContentFilterResultForPromptContentFilterResultsError DeserializeInternalAzureContentFilterResultForPromptContentFilterResultsError(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            int code = default;
-            string message = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("code"u8))
-                {
-                    code = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("message"u8))
-                {
-                    message = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureContentFilterResultForPromptContentFilterResultsError(code, message, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<InternalAzureContentFilterResultForPromptContentFilterResultsError>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterResultForPromptContentFilterResultsError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureContentFilterResultForPromptContentFilterResultsError)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureContentFilterResultForPromptContentFilterResultsError IPersistableModel<InternalAzureContentFilterResultForPromptContentFilterResultsError>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureContentFilterResultForPromptContentFilterResultsError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureContentFilterResultForPromptContentFilterResultsError(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureContentFilterResultForPromptContentFilterResultsError)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureContentFilterResultForPromptContentFilterResultsError>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static InternalAzureContentFilterResultForPromptContentFilterResultsError FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureContentFilterResultForPromptContentFilterResultsError(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureCosmosDBChatDataSourceParameters.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureCosmosDBChatDataSourceParameters.cs
deleted file mode 100644
index 90c5774584cc..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureCosmosDBChatDataSourceParameters.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The AzureCosmosDBChatDataSourceParameters. </summary>
-    internal partial class InternalAzureCosmosDBChatDataSourceParameters
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="InternalAzureCosmosDBChatDataSourceParameters"/>. </summary>
-        /// <param name="containerName"></param>
-        /// <param name="databaseName"></param>
-        /// <param name="vectorizationSource">
-        /// Please note <see cref="DataSourceVectorizer"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="indexName"></param>
-        /// <param name="authentication">
-        /// Please note <see cref="DataSourceAuthentication"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="fieldMappings"></param>
-        /// <exception cref="ArgumentNullException"> <paramref name="containerName"/>, <paramref name="databaseName"/>, <paramref name="vectorizationSource"/>, <paramref name="indexName"/>, <paramref name="authentication"/> or <paramref name="fieldMappings"/> is null. </exception>
-        public InternalAzureCosmosDBChatDataSourceParameters(string containerName, string databaseName, DataSourceVectorizer vectorizationSource, string indexName, DataSourceAuthentication authentication, DataSourceFieldMappings fieldMappings)
-        {
-            Argument.AssertNotNull(containerName, nameof(containerName));
-            Argument.AssertNotNull(databaseName, nameof(databaseName));
-            Argument.AssertNotNull(vectorizationSource, nameof(vectorizationSource));
-            Argument.AssertNotNull(indexName, nameof(indexName));
-            Argument.AssertNotNull(authentication, nameof(authentication));
-            Argument.AssertNotNull(fieldMappings, nameof(fieldMappings));
-
-            _internalIncludeContexts = new ChangeTrackingList<string>();
-            ContainerName = containerName;
-            DatabaseName = databaseName;
-            VectorizationSource = vectorizationSource;
-            IndexName = indexName;
-            Authentication = authentication;
-            FieldMappings = fieldMappings;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureCosmosDBChatDataSourceParameters"/>. </summary>
-        /// <param name="topNDocuments"> The configured number of documents to feature in the query. </param>
-        /// <param name="inScope"> Whether queries should be restricted to use of the indexed data. </param>
-        /// <param name="strictness">
-        /// The configured strictness of the search relevance filtering.
-        /// Higher strictness will increase precision but lower recall of the answer.
-        /// </param>
-        /// <param name="maxSearchQueries">
-        /// The maximum number of rewritten queries that should be sent to the search provider for a single user message.
-        /// By default, the system will make an automatic determination.
-        /// </param>
-        /// <param name="allowPartialResult">
-        /// If set to true, the system will allow partial search results to be used and the request will fail if all
-        /// partial queries fail. If not specified or specified as false, the request will fail if any search query fails.
-        /// </param>
-        /// <param name="internalIncludeContexts">
-        /// The output context properties to include on the response.
-        /// By default, citations and intent will be requested.
-        /// </param>
-        /// <param name="containerName"></param>
-        /// <param name="databaseName"></param>
-        /// <param name="vectorizationSource">
-        /// Please note <see cref="DataSourceVectorizer"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="indexName"></param>
-        /// <param name="authentication">
-        /// Please note <see cref="DataSourceAuthentication"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="fieldMappings"></param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalAzureCosmosDBChatDataSourceParameters(int? topNDocuments, bool? inScope, int? strictness, int? maxSearchQueries, bool? allowPartialResult, IList<string> internalIncludeContexts, string containerName, string databaseName, DataSourceVectorizer vectorizationSource, string indexName, DataSourceAuthentication authentication, DataSourceFieldMappings fieldMappings, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TopNDocuments = topNDocuments;
-            InScope = inScope;
-            Strictness = strictness;
-            MaxSearchQueries = maxSearchQueries;
-            AllowPartialResult = allowPartialResult;
-            _internalIncludeContexts = internalIncludeContexts;
-            ContainerName = containerName;
-            DatabaseName = databaseName;
-            VectorizationSource = vectorizationSource;
-            IndexName = indexName;
-            Authentication = authentication;
-            FieldMappings = fieldMappings;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureCosmosDBChatDataSourceParameters"/> for deserialization. </summary>
-        internal InternalAzureCosmosDBChatDataSourceParameters()
-        {
-        }
-
-        /// <summary> The configured number of documents to feature in the query. </summary>
-        public int? TopNDocuments { get; set; }
-        /// <summary> Whether queries should be restricted to use of the indexed data. </summary>
-        public bool? InScope { get; set; }
-        /// <summary>
-        /// The configured strictness of the search relevance filtering.
-        /// Higher strictness will increase precision but lower recall of the answer.
-        /// </summary>
-        public int? Strictness { get; set; }
-        /// <summary>
-        /// The maximum number of rewritten queries that should be sent to the search provider for a single user message.
-        /// By default, the system will make an automatic determination.
-        /// </summary>
-        public int? MaxSearchQueries { get; set; }
-        /// <summary>
-        /// If set to true, the system will allow partial search results to be used and the request will fail if all
-        /// partial queries fail. If not specified or specified as false, the request will fail if any search query fails.
-        /// </summary>
-        public bool? AllowPartialResult { get; set; }
-        /// <summary> Gets the container name. </summary>
-        internal string ContainerName { get; set; }
-        /// <summary> Gets the database name. </summary>
-        internal string DatabaseName { get; set; }
-        /// <summary> Gets the index name. </summary>
-        internal string IndexName { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIChatErrorInnerError.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIChatErrorInnerError.Serialization.cs
deleted file mode 100644
index 0a58496a1938..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIChatErrorInnerError.Serialization.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI
-{
-    internal partial class InternalAzureOpenAIChatErrorInnerError : IJsonModel<InternalAzureOpenAIChatErrorInnerError>
-    {
-        void IJsonModel<InternalAzureOpenAIChatErrorInnerError>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureOpenAIChatErrorInnerError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureOpenAIChatErrorInnerError)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("code") != true && Optional.IsDefined(Code))
-            {
-                writer.WritePropertyName("code"u8);
-                writer.WriteStringValue(Code.Value.ToString());
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("revised_prompt") != true && Optional.IsDefined(RevisedPrompt))
-            {
-                writer.WritePropertyName("revised_prompt"u8);
-                writer.WriteStringValue(RevisedPrompt);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("content_filter_results") != true && Optional.IsDefined(ContentFilterResults))
-            {
-                writer.WritePropertyName("content_filter_results"u8);
-                writer.WriteObjectValue(ContentFilterResults, options);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureOpenAIChatErrorInnerError IJsonModel<InternalAzureOpenAIChatErrorInnerError>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureOpenAIChatErrorInnerError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureOpenAIChatErrorInnerError)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureOpenAIChatErrorInnerError(document.RootElement, options);
-        }
-
-        internal static InternalAzureOpenAIChatErrorInnerError DeserializeInternalAzureOpenAIChatErrorInnerError(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            InternalAzureOpenAIChatErrorInnerErrorCode? code = default;
-            string revisedPrompt = default;
-            RequestContentFilterResult contentFilterResults = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("code"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    code = new InternalAzureOpenAIChatErrorInnerErrorCode(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("revised_prompt"u8))
-                {
-                    revisedPrompt = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("content_filter_results"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    contentFilterResults = RequestContentFilterResult.DeserializeRequestContentFilterResult(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureOpenAIChatErrorInnerError(code, revisedPrompt, contentFilterResults, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<InternalAzureOpenAIChatErrorInnerError>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureOpenAIChatErrorInnerError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureOpenAIChatErrorInnerError)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureOpenAIChatErrorInnerError IPersistableModel<InternalAzureOpenAIChatErrorInnerError>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureOpenAIChatErrorInnerError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureOpenAIChatErrorInnerError(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureOpenAIChatErrorInnerError)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureOpenAIChatErrorInnerError>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static InternalAzureOpenAIChatErrorInnerError FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureOpenAIChatErrorInnerError(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIChatErrorInnerError.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIChatErrorInnerError.cs
deleted file mode 100644
index 2209ed339feb..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIChatErrorInnerError.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI
-{
-    /// <summary> The AzureOpenAIChatErrorInnerError. </summary>
-    internal partial class InternalAzureOpenAIChatErrorInnerError
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="InternalAzureOpenAIChatErrorInnerError"/>. </summary>
-        internal InternalAzureOpenAIChatErrorInnerError()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureOpenAIChatErrorInnerError"/>. </summary>
-        /// <param name="code"> The code associated with the inner error. </param>
-        /// <param name="revisedPrompt"> If applicable, the modified prompt used for generation. </param>
-        /// <param name="contentFilterResults"> The content filter result details associated with the inner error. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalAzureOpenAIChatErrorInnerError(InternalAzureOpenAIChatErrorInnerErrorCode? code, string revisedPrompt, RequestContentFilterResult contentFilterResults, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Code = code;
-            RevisedPrompt = revisedPrompt;
-            ContentFilterResults = contentFilterResults;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The code associated with the inner error. </summary>
-        internal InternalAzureOpenAIChatErrorInnerErrorCode? Code { get; set; }
-        /// <summary> If applicable, the modified prompt used for generation. </summary>
-        internal string RevisedPrompt { get; set; }
-        /// <summary> The content filter result details associated with the inner error. </summary>
-        internal RequestContentFilterResult ContentFilterResults { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIChatErrorInnerErrorCode.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIChatErrorInnerErrorCode.cs
deleted file mode 100644
index 1e1ab2f0c352..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIChatErrorInnerErrorCode.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.AI.OpenAI
-{
-    /// <summary> The AzureOpenAIChatErrorInnerError_code. </summary>
-    internal readonly partial struct InternalAzureOpenAIChatErrorInnerErrorCode : IEquatable<InternalAzureOpenAIChatErrorInnerErrorCode>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureOpenAIChatErrorInnerErrorCode"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public InternalAzureOpenAIChatErrorInnerErrorCode(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string ResponsibleAIPolicyViolationValue = "ResponsibleAIPolicyViolation";
-
-        /// <summary> ResponsibleAIPolicyViolation. </summary>
-        internal static InternalAzureOpenAIChatErrorInnerErrorCode ResponsibleAIPolicyViolation { get; set; } = new InternalAzureOpenAIChatErrorInnerErrorCode(ResponsibleAIPolicyViolationValue);
-        /// <summary> Determines if two <see cref="InternalAzureOpenAIChatErrorInnerErrorCode"/> values are the same. </summary>
-        public static bool operator ==(InternalAzureOpenAIChatErrorInnerErrorCode left, InternalAzureOpenAIChatErrorInnerErrorCode right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="InternalAzureOpenAIChatErrorInnerErrorCode"/> values are not the same. </summary>
-        public static bool operator !=(InternalAzureOpenAIChatErrorInnerErrorCode left, InternalAzureOpenAIChatErrorInnerErrorCode right) => !left.Equals(right);
-        /// <summary> Converts a string to a <see cref="InternalAzureOpenAIChatErrorInnerErrorCode"/>. </summary>
-        public static implicit operator InternalAzureOpenAIChatErrorInnerErrorCode(string value) => new InternalAzureOpenAIChatErrorInnerErrorCode(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is InternalAzureOpenAIChatErrorInnerErrorCode other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(InternalAzureOpenAIChatErrorInnerErrorCode other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIDalleErrorInnerError.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIDalleErrorInnerError.Serialization.cs
deleted file mode 100644
index 36e2e5564ba2..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIDalleErrorInnerError.Serialization.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI
-{
-    internal partial class InternalAzureOpenAIDalleErrorInnerError : IJsonModel<InternalAzureOpenAIDalleErrorInnerError>
-    {
-        void IJsonModel<InternalAzureOpenAIDalleErrorInnerError>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureOpenAIDalleErrorInnerError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureOpenAIDalleErrorInnerError)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("code") != true && Optional.IsDefined(Code))
-            {
-                writer.WritePropertyName("code"u8);
-                writer.WriteStringValue(Code.Value.ToString());
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("revised_prompt") != true && Optional.IsDefined(RevisedPrompt))
-            {
-                writer.WritePropertyName("revised_prompt"u8);
-                writer.WriteStringValue(RevisedPrompt);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("content_filter_results") != true && Optional.IsDefined(ContentFilterResults))
-            {
-                writer.WritePropertyName("content_filter_results"u8);
-                writer.WriteObjectValue(ContentFilterResults, options);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        InternalAzureOpenAIDalleErrorInnerError IJsonModel<InternalAzureOpenAIDalleErrorInnerError>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureOpenAIDalleErrorInnerError>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(InternalAzureOpenAIDalleErrorInnerError)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureOpenAIDalleErrorInnerError(document.RootElement, options);
-        }
-
-        internal static InternalAzureOpenAIDalleErrorInnerError DeserializeInternalAzureOpenAIDalleErrorInnerError(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            InternalAzureOpenAIDalleErrorInnerErrorCode? code = default;
-            string revisedPrompt = default;
-            RequestImageContentFilterResult contentFilterResults = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("code"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    code = new InternalAzureOpenAIDalleErrorInnerErrorCode(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("revised_prompt"u8))
-                {
-                    revisedPrompt = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("content_filter_results"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    contentFilterResults = RequestImageContentFilterResult.DeserializeRequestImageContentFilterResult(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureOpenAIDalleErrorInnerError(code, revisedPrompt, contentFilterResults, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<InternalAzureOpenAIDalleErrorInnerError>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureOpenAIDalleErrorInnerError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureOpenAIDalleErrorInnerError)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        InternalAzureOpenAIDalleErrorInnerError IPersistableModel<InternalAzureOpenAIDalleErrorInnerError>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureOpenAIDalleErrorInnerError>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureOpenAIDalleErrorInnerError(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(InternalAzureOpenAIDalleErrorInnerError)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<InternalAzureOpenAIDalleErrorInnerError>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static InternalAzureOpenAIDalleErrorInnerError FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureOpenAIDalleErrorInnerError(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIDalleErrorInnerError.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIDalleErrorInnerError.cs
deleted file mode 100644
index 415434fba3a0..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIDalleErrorInnerError.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI
-{
-    /// <summary> The AzureOpenAIDalleErrorInnerError. </summary>
-    internal partial class InternalAzureOpenAIDalleErrorInnerError
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="InternalAzureOpenAIDalleErrorInnerError"/>. </summary>
-        internal InternalAzureOpenAIDalleErrorInnerError()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureOpenAIDalleErrorInnerError"/>. </summary>
-        /// <param name="code"> The code associated with the inner error. </param>
-        /// <param name="revisedPrompt"> If applicable, the modified prompt used for generation. </param>
-        /// <param name="contentFilterResults"> The content filter result details associated with the inner error. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalAzureOpenAIDalleErrorInnerError(InternalAzureOpenAIDalleErrorInnerErrorCode? code, string revisedPrompt, RequestImageContentFilterResult contentFilterResults, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Code = code;
-            RevisedPrompt = revisedPrompt;
-            ContentFilterResults = contentFilterResults;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The code associated with the inner error. </summary>
-        internal InternalAzureOpenAIDalleErrorInnerErrorCode? Code { get; set; }
-        /// <summary> If applicable, the modified prompt used for generation. </summary>
-        internal string RevisedPrompt { get; set; }
-        /// <summary> The content filter result details associated with the inner error. </summary>
-        internal RequestImageContentFilterResult ContentFilterResults { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIDalleErrorInnerErrorCode.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIDalleErrorInnerErrorCode.cs
deleted file mode 100644
index 35cf2d97866f..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureOpenAIDalleErrorInnerErrorCode.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.AI.OpenAI
-{
-    /// <summary> The AzureOpenAIDalleErrorInnerError_code. </summary>
-    internal readonly partial struct InternalAzureOpenAIDalleErrorInnerErrorCode : IEquatable<InternalAzureOpenAIDalleErrorInnerErrorCode>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureOpenAIDalleErrorInnerErrorCode"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public InternalAzureOpenAIDalleErrorInnerErrorCode(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string ResponsibleAIPolicyViolationValue = "ResponsibleAIPolicyViolation";
-
-        /// <summary> ResponsibleAIPolicyViolation. </summary>
-        internal static InternalAzureOpenAIDalleErrorInnerErrorCode ResponsibleAIPolicyViolation { get; set; } = new InternalAzureOpenAIDalleErrorInnerErrorCode(ResponsibleAIPolicyViolationValue);
-        /// <summary> Determines if two <see cref="InternalAzureOpenAIDalleErrorInnerErrorCode"/> values are the same. </summary>
-        public static bool operator ==(InternalAzureOpenAIDalleErrorInnerErrorCode left, InternalAzureOpenAIDalleErrorInnerErrorCode right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="InternalAzureOpenAIDalleErrorInnerErrorCode"/> values are not the same. </summary>
-        public static bool operator !=(InternalAzureOpenAIDalleErrorInnerErrorCode left, InternalAzureOpenAIDalleErrorInnerErrorCode right) => !left.Equals(right);
-        /// <summary> Converts a string to a <see cref="InternalAzureOpenAIDalleErrorInnerErrorCode"/>. </summary>
-        public static implicit operator InternalAzureOpenAIDalleErrorInnerErrorCode(string value) => new InternalAzureOpenAIDalleErrorInnerErrorCode(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is InternalAzureOpenAIDalleErrorInnerErrorCode other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(InternalAzureOpenAIDalleErrorInnerErrorCode other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureSearchChatDataSourceParameters.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureSearchChatDataSourceParameters.cs
deleted file mode 100644
index f46714e50404..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureSearchChatDataSourceParameters.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The AzureSearchChatDataSourceParameters. </summary>
-    internal partial class InternalAzureSearchChatDataSourceParameters
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="InternalAzureSearchChatDataSourceParameters"/>. </summary>
-        /// <param name="endpoint"> The absolute endpoint path for the Azure Search resource to use. </param>
-        /// <param name="indexName"> The name of the index to use, as specified in the Azure Search resource. </param>
-        /// <param name="authentication">
-        /// The authentication mechanism to use with Azure Search.
-        /// Please note <see cref="DataSourceAuthentication"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/>, <paramref name="indexName"/> or <paramref name="authentication"/> is null. </exception>
-        public InternalAzureSearchChatDataSourceParameters(Uri endpoint, string indexName, DataSourceAuthentication authentication)
-        {
-            Argument.AssertNotNull(endpoint, nameof(endpoint));
-            Argument.AssertNotNull(indexName, nameof(indexName));
-            Argument.AssertNotNull(authentication, nameof(authentication));
-
-            _internalIncludeContexts = new ChangeTrackingList<string>();
-            Endpoint = endpoint;
-            IndexName = indexName;
-            Authentication = authentication;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureSearchChatDataSourceParameters"/>. </summary>
-        /// <param name="topNDocuments"> The configured number of documents to feature in the query. </param>
-        /// <param name="inScope"> Whether queries should be restricted to use of the indexed data. </param>
-        /// <param name="strictness">
-        /// The configured strictness of the search relevance filtering.
-        /// Higher strictness will increase precision but lower recall of the answer.
-        /// </param>
-        /// <param name="maxSearchQueries">
-        /// The maximum number of rewritten queries that should be sent to the search provider for a single user message.
-        /// By default, the system will make an automatic determination.
-        /// </param>
-        /// <param name="allowPartialResult">
-        /// If set to true, the system will allow partial search results to be used and the request will fail if all
-        /// partial queries fail. If not specified or specified as false, the request will fail if any search query fails.
-        /// </param>
-        /// <param name="internalIncludeContexts">
-        /// The output context properties to include on the response.
-        /// By default, citations and intent will be requested.
-        /// </param>
-        /// <param name="endpoint"> The absolute endpoint path for the Azure Search resource to use. </param>
-        /// <param name="indexName"> The name of the index to use, as specified in the Azure Search resource. </param>
-        /// <param name="authentication">
-        /// The authentication mechanism to use with Azure Search.
-        /// Please note <see cref="DataSourceAuthentication"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="fieldMappings"> The field mappings to use with the Azure Search resource. </param>
-        /// <param name="queryType"> The query type for the Azure Search resource to use. </param>
-        /// <param name="semanticConfiguration"> Additional semantic configuration for the query. </param>
-        /// <param name="filter"> A filter to apply to the search. </param>
-        /// <param name="vectorizationSource">
-        /// The vectorization source to use with Azure Search.
-        /// Supported sources for Azure Search include endpoint, deployment name, and integrated.
-        /// Please note <see cref="DataSourceVectorizer"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalAzureSearchChatDataSourceParameters(int? topNDocuments, bool? inScope, int? strictness, int? maxSearchQueries, bool? allowPartialResult, IList<string> internalIncludeContexts, Uri endpoint, string indexName, DataSourceAuthentication authentication, DataSourceFieldMappings fieldMappings, DataSourceQueryType? queryType, string semanticConfiguration, string filter, DataSourceVectorizer vectorizationSource, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TopNDocuments = topNDocuments;
-            InScope = inScope;
-            Strictness = strictness;
-            MaxSearchQueries = maxSearchQueries;
-            AllowPartialResult = allowPartialResult;
-            _internalIncludeContexts = internalIncludeContexts;
-            Endpoint = endpoint;
-            IndexName = indexName;
-            Authentication = authentication;
-            FieldMappings = fieldMappings;
-            QueryType = queryType;
-            SemanticConfiguration = semanticConfiguration;
-            Filter = filter;
-            VectorizationSource = vectorizationSource;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureSearchChatDataSourceParameters"/> for deserialization. </summary>
-        internal InternalAzureSearchChatDataSourceParameters()
-        {
-        }
-
-        /// <summary> The configured number of documents to feature in the query. </summary>
-        public int? TopNDocuments { get; set; }
-        /// <summary> Whether queries should be restricted to use of the indexed data. </summary>
-        public bool? InScope { get; set; }
-        /// <summary>
-        /// The configured strictness of the search relevance filtering.
-        /// Higher strictness will increase precision but lower recall of the answer.
-        /// </summary>
-        public int? Strictness { get; set; }
-        /// <summary>
-        /// The maximum number of rewritten queries that should be sent to the search provider for a single user message.
-        /// By default, the system will make an automatic determination.
-        /// </summary>
-        public int? MaxSearchQueries { get; set; }
-        /// <summary>
-        /// If set to true, the system will allow partial search results to be used and the request will fail if all
-        /// partial queries fail. If not specified or specified as false, the request will fail if any search query fails.
-        /// </summary>
-        public bool? AllowPartialResult { get; set; }
-        /// <summary> The absolute endpoint path for the Azure Search resource to use. </summary>
-        internal Uri Endpoint { get; set; }
-        /// <summary> The name of the index to use, as specified in the Azure Search resource. </summary>
-        internal string IndexName { get; set; }
-        /// <summary> Additional semantic configuration for the query. </summary>
-        public string SemanticConfiguration { get; set; }
-        /// <summary> A filter to apply to the search. </summary>
-        public string Filter { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureSearchChatDataSourceParametersIncludeContext.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureSearchChatDataSourceParametersIncludeContext.cs
deleted file mode 100644
index 90e6d867660d..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureSearchChatDataSourceParametersIncludeContext.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The AzureSearchChatDataSourceParametersIncludeContext. </summary>
-    internal readonly partial struct InternalAzureSearchChatDataSourceParametersIncludeContext : IEquatable<InternalAzureSearchChatDataSourceParametersIncludeContext>
-    {
-        private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="InternalAzureSearchChatDataSourceParametersIncludeContext"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public InternalAzureSearchChatDataSourceParametersIncludeContext(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
-        private const string CitationsValue = "citations";
-        private const string IntentValue = "intent";
-        private const string AllRetrievedDocumentsValue = "all_retrieved_documents";
-
-        /// <summary> citations. </summary>
-        internal static InternalAzureSearchChatDataSourceParametersIncludeContext Citations { get; set; } = new InternalAzureSearchChatDataSourceParametersIncludeContext(CitationsValue);
-        /// <summary> intent. </summary>
-        internal static InternalAzureSearchChatDataSourceParametersIncludeContext Intent { get; set; } = new InternalAzureSearchChatDataSourceParametersIncludeContext(IntentValue);
-        /// <summary> all_retrieved_documents. </summary>
-        internal static InternalAzureSearchChatDataSourceParametersIncludeContext AllRetrievedDocuments { get; set; } = new InternalAzureSearchChatDataSourceParametersIncludeContext(AllRetrievedDocumentsValue);
-        /// <summary> Determines if two <see cref="InternalAzureSearchChatDataSourceParametersIncludeContext"/> values are the same. </summary>
-        public static bool operator ==(InternalAzureSearchChatDataSourceParametersIncludeContext left, InternalAzureSearchChatDataSourceParametersIncludeContext right) => left.Equals(right);
-        /// <summary> Determines if two <see cref="InternalAzureSearchChatDataSourceParametersIncludeContext"/> values are not the same. </summary>
-        public static bool operator !=(InternalAzureSearchChatDataSourceParametersIncludeContext left, InternalAzureSearchChatDataSourceParametersIncludeContext right) => !left.Equals(right);
-        /// <summary> Converts a string to a <see cref="InternalAzureSearchChatDataSourceParametersIncludeContext"/>. </summary>
-        public static implicit operator InternalAzureSearchChatDataSourceParametersIncludeContext(string value) => new InternalAzureSearchChatDataSourceParametersIncludeContext(value);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is InternalAzureSearchChatDataSourceParametersIncludeContext other && Equals(other);
-        /// <inheritdoc />
-        public bool Equals(InternalAzureSearchChatDataSourceParametersIncludeContext other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc />
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
-        public override string ToString() => _value;
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalElasticsearchChatDataSourceParameters.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalElasticsearchChatDataSourceParameters.cs
deleted file mode 100644
index dcd3601dd9f7..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalElasticsearchChatDataSourceParameters.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The ElasticsearchChatDataSourceParameters. </summary>
-    internal partial class InternalElasticsearchChatDataSourceParameters
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="InternalElasticsearchChatDataSourceParameters"/>. </summary>
-        /// <param name="endpoint"></param>
-        /// <param name="indexName"></param>
-        /// <param name="authentication">
-        /// Please note <see cref="DataSourceAuthentication"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/>, <paramref name="indexName"/> or <paramref name="authentication"/> is null. </exception>
-        public InternalElasticsearchChatDataSourceParameters(Uri endpoint, string indexName, DataSourceAuthentication authentication)
-        {
-            Argument.AssertNotNull(endpoint, nameof(endpoint));
-            Argument.AssertNotNull(indexName, nameof(indexName));
-            Argument.AssertNotNull(authentication, nameof(authentication));
-
-            _internalIncludeContexts = new ChangeTrackingList<string>();
-            Endpoint = endpoint;
-            IndexName = indexName;
-            Authentication = authentication;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalElasticsearchChatDataSourceParameters"/>. </summary>
-        /// <param name="topNDocuments"> The configured number of documents to feature in the query. </param>
-        /// <param name="inScope"> Whether queries should be restricted to use of the indexed data. </param>
-        /// <param name="strictness">
-        /// The configured strictness of the search relevance filtering.
-        /// Higher strictness will increase precision but lower recall of the answer.
-        /// </param>
-        /// <param name="maxSearchQueries">
-        /// The maximum number of rewritten queries that should be sent to the search provider for a single user message.
-        /// By default, the system will make an automatic determination.
-        /// </param>
-        /// <param name="allowPartialResult">
-        /// If set to true, the system will allow partial search results to be used and the request will fail if all
-        /// partial queries fail. If not specified or specified as false, the request will fail if any search query fails.
-        /// </param>
-        /// <param name="internalIncludeContexts">
-        /// The output context properties to include on the response.
-        /// By default, citations and intent will be requested.
-        /// </param>
-        /// <param name="endpoint"></param>
-        /// <param name="indexName"></param>
-        /// <param name="authentication">
-        /// Please note <see cref="DataSourceAuthentication"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="fieldMappings"></param>
-        /// <param name="queryType"></param>
-        /// <param name="vectorizationSource">
-        /// Please note <see cref="DataSourceVectorizer"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalElasticsearchChatDataSourceParameters(int? topNDocuments, bool? inScope, int? strictness, int? maxSearchQueries, bool? allowPartialResult, IList<string> internalIncludeContexts, Uri endpoint, string indexName, DataSourceAuthentication authentication, DataSourceFieldMappings fieldMappings, DataSourceQueryType? queryType, DataSourceVectorizer vectorizationSource, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TopNDocuments = topNDocuments;
-            InScope = inScope;
-            Strictness = strictness;
-            MaxSearchQueries = maxSearchQueries;
-            AllowPartialResult = allowPartialResult;
-            _internalIncludeContexts = internalIncludeContexts;
-            Endpoint = endpoint;
-            IndexName = indexName;
-            Authentication = authentication;
-            FieldMappings = fieldMappings;
-            QueryType = queryType;
-            VectorizationSource = vectorizationSource;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalElasticsearchChatDataSourceParameters"/> for deserialization. </summary>
-        internal InternalElasticsearchChatDataSourceParameters()
-        {
-        }
-
-        /// <summary> The configured number of documents to feature in the query. </summary>
-        public int? TopNDocuments { get; set; }
-        /// <summary> Whether queries should be restricted to use of the indexed data. </summary>
-        public bool? InScope { get; set; }
-        /// <summary>
-        /// The configured strictness of the search relevance filtering.
-        /// Higher strictness will increase precision but lower recall of the answer.
-        /// </summary>
-        public int? Strictness { get; set; }
-        /// <summary>
-        /// The maximum number of rewritten queries that should be sent to the search provider for a single user message.
-        /// By default, the system will make an automatic determination.
-        /// </summary>
-        public int? MaxSearchQueries { get; set; }
-        /// <summary>
-        /// If set to true, the system will allow partial search results to be used and the request will fail if all
-        /// partial queries fail. If not specified or specified as false, the request will fail if any search query fails.
-        /// </summary>
-        public bool? AllowPartialResult { get; set; }
-        /// <summary> Gets the endpoint. </summary>
-        internal Uri Endpoint { get; set; }
-        /// <summary> Gets the index name. </summary>
-        internal string IndexName { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalMongoDBChatDataSourceParameters.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalMongoDBChatDataSourceParameters.cs
deleted file mode 100644
index 52ccc319dc6f..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalMongoDBChatDataSourceParameters.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The MongoDBChatDataSourceParameters. </summary>
-    internal partial class InternalMongoDBChatDataSourceParameters
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="InternalMongoDBChatDataSourceParameters"/>. </summary>
-        /// <param name="endpoint"> The name of the MongoDB cluster endpoint. </param>
-        /// <param name="databaseName"> The name of the MongoDB database. </param>
-        /// <param name="collectionName"> The name of the MongoDB collection. </param>
-        /// <param name="appName"> The name of the MongoDB application. </param>
-        /// <param name="indexName"> The name of the MongoDB index. </param>
-        /// <param name="authentication">
-        /// The authentication mechanism to use with Pinecone.
-        /// Supported authentication mechanisms for Pinecone include: username and password.
-        /// Please note <see cref="DataSourceAuthentication"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="embeddingDependency">
-        /// The vectorization source to use as an embedding dependency for the MongoDB data source.
-        /// Supported vectorization sources for MongoDB include: endpoint, deployment name.
-        /// Please note <see cref="DataSourceVectorizer"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="fieldMappings">
-        /// Field mappings to apply to data used by the MongoDB data source.
-        /// Note that content and vector field mappings are required for MongoDB.
-        /// </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/>, <paramref name="databaseName"/>, <paramref name="collectionName"/>, <paramref name="appName"/>, <paramref name="indexName"/>, <paramref name="authentication"/>, <paramref name="embeddingDependency"/> or <paramref name="fieldMappings"/> is null. </exception>
-        public InternalMongoDBChatDataSourceParameters(string endpoint, string databaseName, string collectionName, string appName, string indexName, DataSourceAuthentication authentication, DataSourceVectorizer embeddingDependency, DataSourceFieldMappings fieldMappings)
-        {
-            Argument.AssertNotNull(endpoint, nameof(endpoint));
-            Argument.AssertNotNull(databaseName, nameof(databaseName));
-            Argument.AssertNotNull(collectionName, nameof(collectionName));
-            Argument.AssertNotNull(appName, nameof(appName));
-            Argument.AssertNotNull(indexName, nameof(indexName));
-            Argument.AssertNotNull(authentication, nameof(authentication));
-            Argument.AssertNotNull(embeddingDependency, nameof(embeddingDependency));
-            Argument.AssertNotNull(fieldMappings, nameof(fieldMappings));
-
-            _internalIncludeContexts = new ChangeTrackingList<string>();
-            Endpoint = endpoint;
-            DatabaseName = databaseName;
-            CollectionName = collectionName;
-            AppName = appName;
-            IndexName = indexName;
-            Authentication = authentication;
-            EmbeddingDependency = embeddingDependency;
-            FieldMappings = fieldMappings;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalMongoDBChatDataSourceParameters"/>. </summary>
-        /// <param name="topNDocuments"> The configured number of documents to feature in the query. </param>
-        /// <param name="inScope"> Whether queries should be restricted to use of the indexed data. </param>
-        /// <param name="strictness">
-        /// The configured strictness of the search relevance filtering.
-        /// Higher strictness will increase precision but lower recall of the answer.
-        /// </param>
-        /// <param name="maxSearchQueries">
-        /// The maximum number of rewritten queries that should be sent to the search provider for a single user message.
-        /// By default, the system will make an automatic determination.
-        /// </param>
-        /// <param name="allowPartialResult">
-        /// If set to true, the system will allow partial search results to be used and the request will fail if all
-        /// partial queries fail. If not specified or specified as false, the request will fail if any search query fails.
-        /// </param>
-        /// <param name="internalIncludeContexts">
-        /// The output context properties to include on the response.
-        /// By default, citations and intent will be requested.
-        /// </param>
-        /// <param name="endpoint"> The name of the MongoDB cluster endpoint. </param>
-        /// <param name="databaseName"> The name of the MongoDB database. </param>
-        /// <param name="collectionName"> The name of the MongoDB collection. </param>
-        /// <param name="appName"> The name of the MongoDB application. </param>
-        /// <param name="indexName"> The name of the MongoDB index. </param>
-        /// <param name="authentication">
-        /// The authentication mechanism to use with Pinecone.
-        /// Supported authentication mechanisms for Pinecone include: username and password.
-        /// Please note <see cref="DataSourceAuthentication"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="embeddingDependency">
-        /// The vectorization source to use as an embedding dependency for the MongoDB data source.
-        /// Supported vectorization sources for MongoDB include: endpoint, deployment name.
-        /// Please note <see cref="DataSourceVectorizer"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="fieldMappings">
-        /// Field mappings to apply to data used by the MongoDB data source.
-        /// Note that content and vector field mappings are required for MongoDB.
-        /// </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalMongoDBChatDataSourceParameters(int? topNDocuments, bool? inScope, int? strictness, int? maxSearchQueries, bool? allowPartialResult, IList<string> internalIncludeContexts, string endpoint, string databaseName, string collectionName, string appName, string indexName, DataSourceAuthentication authentication, DataSourceVectorizer embeddingDependency, DataSourceFieldMappings fieldMappings, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TopNDocuments = topNDocuments;
-            InScope = inScope;
-            Strictness = strictness;
-            MaxSearchQueries = maxSearchQueries;
-            AllowPartialResult = allowPartialResult;
-            _internalIncludeContexts = internalIncludeContexts;
-            Endpoint = endpoint;
-            DatabaseName = databaseName;
-            CollectionName = collectionName;
-            AppName = appName;
-            IndexName = indexName;
-            Authentication = authentication;
-            EmbeddingDependency = embeddingDependency;
-            FieldMappings = fieldMappings;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalMongoDBChatDataSourceParameters"/> for deserialization. </summary>
-        internal InternalMongoDBChatDataSourceParameters()
-        {
-        }
-
-        /// <summary> The configured number of documents to feature in the query. </summary>
-        public int? TopNDocuments { get; set; }
-        /// <summary> Whether queries should be restricted to use of the indexed data. </summary>
-        public bool? InScope { get; set; }
-        /// <summary>
-        /// The configured strictness of the search relevance filtering.
-        /// Higher strictness will increase precision but lower recall of the answer.
-        /// </summary>
-        public int? Strictness { get; set; }
-        /// <summary>
-        /// The maximum number of rewritten queries that should be sent to the search provider for a single user message.
-        /// By default, the system will make an automatic determination.
-        /// </summary>
-        public int? MaxSearchQueries { get; set; }
-        /// <summary>
-        /// If set to true, the system will allow partial search results to be used and the request will fail if all
-        /// partial queries fail. If not specified or specified as false, the request will fail if any search query fails.
-        /// </summary>
-        public bool? AllowPartialResult { get; set; }
-        /// <summary> The name of the MongoDB cluster endpoint. </summary>
-        internal string Endpoint { get; set; }
-        /// <summary> The name of the MongoDB database. </summary>
-        internal string DatabaseName { get; set; }
-        /// <summary> The name of the MongoDB collection. </summary>
-        internal string CollectionName { get; set; }
-        /// <summary> The name of the MongoDB application. </summary>
-        internal string AppName { get; set; }
-        /// <summary> The name of the MongoDB index. </summary>
-        internal string IndexName { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalPineconeChatDataSourceParameters.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalPineconeChatDataSourceParameters.cs
deleted file mode 100644
index c886686b184b..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalPineconeChatDataSourceParameters.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The PineconeChatDataSourceParameters. </summary>
-    internal partial class InternalPineconeChatDataSourceParameters
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="InternalPineconeChatDataSourceParameters"/>. </summary>
-        /// <param name="environment"> The environment name to use with Pinecone. </param>
-        /// <param name="indexName"> The name of the Pinecone database index to use. </param>
-        /// <param name="authentication">
-        /// The authentication mechanism to use with Pinecone.
-        /// Supported authentication mechanisms for Pinecone include: API key.
-        /// Please note <see cref="DataSourceAuthentication"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="vectorizationSource">
-        /// The vectorization source to use as an embedding dependency for the Pinecone data source.
-        /// Supported vectorization sources for Pinecone include: deployment name.
-        /// Please note <see cref="DataSourceVectorizer"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="fieldMappings">
-        /// Field mappings to apply to data used by the Pinecone data source.
-        /// Note that content field mappings are required for Pinecone.
-        /// </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="environment"/>, <paramref name="indexName"/>, <paramref name="authentication"/>, <paramref name="vectorizationSource"/> or <paramref name="fieldMappings"/> is null. </exception>
-        public InternalPineconeChatDataSourceParameters(string environment, string indexName, DataSourceAuthentication authentication, DataSourceVectorizer vectorizationSource, DataSourceFieldMappings fieldMappings)
-        {
-            Argument.AssertNotNull(environment, nameof(environment));
-            Argument.AssertNotNull(indexName, nameof(indexName));
-            Argument.AssertNotNull(authentication, nameof(authentication));
-            Argument.AssertNotNull(vectorizationSource, nameof(vectorizationSource));
-            Argument.AssertNotNull(fieldMappings, nameof(fieldMappings));
-
-            _internalIncludeContexts = new ChangeTrackingList<string>();
-            Environment = environment;
-            IndexName = indexName;
-            Authentication = authentication;
-            VectorizationSource = vectorizationSource;
-            FieldMappings = fieldMappings;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalPineconeChatDataSourceParameters"/>. </summary>
-        /// <param name="topNDocuments"> The configured number of documents to feature in the query. </param>
-        /// <param name="inScope"> Whether queries should be restricted to use of the indexed data. </param>
-        /// <param name="strictness">
-        /// The configured strictness of the search relevance filtering.
-        /// Higher strictness will increase precision but lower recall of the answer.
-        /// </param>
-        /// <param name="maxSearchQueries">
-        /// The maximum number of rewritten queries that should be sent to the search provider for a single user message.
-        /// By default, the system will make an automatic determination.
-        /// </param>
-        /// <param name="allowPartialResult">
-        /// If set to true, the system will allow partial search results to be used and the request will fail if all
-        /// partial queries fail. If not specified or specified as false, the request will fail if any search query fails.
-        /// </param>
-        /// <param name="internalIncludeContexts">
-        /// The output context properties to include on the response.
-        /// By default, citations and intent will be requested.
-        /// </param>
-        /// <param name="environment"> The environment name to use with Pinecone. </param>
-        /// <param name="indexName"> The name of the Pinecone database index to use. </param>
-        /// <param name="authentication">
-        /// The authentication mechanism to use with Pinecone.
-        /// Supported authentication mechanisms for Pinecone include: API key.
-        /// Please note <see cref="DataSourceAuthentication"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="vectorizationSource">
-        /// The vectorization source to use as an embedding dependency for the Pinecone data source.
-        /// Supported vectorization sources for Pinecone include: deployment name.
-        /// Please note <see cref="DataSourceVectorizer"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes..
-        /// </param>
-        /// <param name="fieldMappings">
-        /// Field mappings to apply to data used by the Pinecone data source.
-        /// Note that content field mappings are required for Pinecone.
-        /// </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalPineconeChatDataSourceParameters(int? topNDocuments, bool? inScope, int? strictness, int? maxSearchQueries, bool? allowPartialResult, IList<string> internalIncludeContexts, string environment, string indexName, DataSourceAuthentication authentication, DataSourceVectorizer vectorizationSource, DataSourceFieldMappings fieldMappings, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            TopNDocuments = topNDocuments;
-            InScope = inScope;
-            Strictness = strictness;
-            MaxSearchQueries = maxSearchQueries;
-            AllowPartialResult = allowPartialResult;
-            _internalIncludeContexts = internalIncludeContexts;
-            Environment = environment;
-            IndexName = indexName;
-            Authentication = authentication;
-            VectorizationSource = vectorizationSource;
-            FieldMappings = fieldMappings;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalPineconeChatDataSourceParameters"/> for deserialization. </summary>
-        internal InternalPineconeChatDataSourceParameters()
-        {
-        }
-
-        /// <summary> The configured number of documents to feature in the query. </summary>
-        public int? TopNDocuments { get; set; }
-        /// <summary> Whether queries should be restricted to use of the indexed data. </summary>
-        public bool? InScope { get; set; }
-        /// <summary>
-        /// The configured strictness of the search relevance filtering.
-        /// Higher strictness will increase precision but lower recall of the answer.
-        /// </summary>
-        public int? Strictness { get; set; }
-        /// <summary>
-        /// The maximum number of rewritten queries that should be sent to the search provider for a single user message.
-        /// By default, the system will make an automatic determination.
-        /// </summary>
-        public int? MaxSearchQueries { get; set; }
-        /// <summary>
-        /// If set to true, the system will allow partial search results to be used and the request will fail if all
-        /// partial queries fail. If not specified or specified as false, the request will fail if any search query fails.
-        /// </summary>
-        public bool? AllowPartialResult { get; set; }
-        /// <summary> The environment name to use with Pinecone. </summary>
-        internal string Environment { get; set; }
-        /// <summary> The name of the Pinecone database index to use. </summary>
-        internal string IndexName { get; set; }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSource.cs
deleted file mode 100644
index 7b93d69910d6..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSource.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> Unknown version of AzureChatDataSource. </summary>
-    internal partial class InternalUnknownAzureChatDataSource : ChatDataSource
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalUnknownAzureChatDataSource"/>. </summary>
-        /// <param name="type"> The differentiating type identifier for the data source. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalUnknownAzureChatDataSource(string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalUnknownAzureChatDataSource"/> for deserialization. </summary>
-        internal InternalUnknownAzureChatDataSource()
-        {
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSourceAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSourceAuthenticationOptions.Serialization.cs
deleted file mode 100644
index a852533c4a82..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSourceAuthenticationOptions.Serialization.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    internal partial class InternalUnknownAzureChatDataSourceAuthenticationOptions : IJsonModel<DataSourceAuthentication>
-    {
-        void IJsonModel<DataSourceAuthentication>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceAuthentication>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DataSourceAuthentication)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        DataSourceAuthentication IJsonModel<DataSourceAuthentication>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceAuthentication>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DataSourceAuthentication)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDataSourceAuthentication(document.RootElement, options);
-        }
-
-        internal static InternalUnknownAzureChatDataSourceAuthenticationOptions DeserializeInternalUnknownAzureChatDataSourceAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string type = "Unknown";
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalUnknownAzureChatDataSourceAuthenticationOptions(type, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<DataSourceAuthentication>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceAuthentication>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DataSourceAuthentication)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DataSourceAuthentication IPersistableModel<DataSourceAuthentication>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceAuthentication>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDataSourceAuthentication(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DataSourceAuthentication)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DataSourceAuthentication>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalUnknownAzureChatDataSourceAuthenticationOptions FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalUnknownAzureChatDataSourceAuthenticationOptions(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create<DataSourceAuthentication>(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSourceAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSourceAuthenticationOptions.cs
deleted file mode 100644
index 1833688883e8..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSourceAuthenticationOptions.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> Unknown version of AzureChatDataSourceAuthenticationOptions. </summary>
-    internal partial class InternalUnknownAzureChatDataSourceAuthenticationOptions : DataSourceAuthentication
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalUnknownAzureChatDataSourceAuthenticationOptions"/>. </summary>
-        /// <param name="type"> Discriminator. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalUnknownAzureChatDataSourceAuthenticationOptions(string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalUnknownAzureChatDataSourceAuthenticationOptions"/> for deserialization. </summary>
-        internal InternalUnknownAzureChatDataSourceAuthenticationOptions()
-        {
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSourceVectorizationSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSourceVectorizationSource.Serialization.cs
deleted file mode 100644
index ed6bccf0c5ad..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSourceVectorizationSource.Serialization.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    internal partial class InternalUnknownAzureChatDataSourceVectorizationSource : IJsonModel<DataSourceVectorizer>
-    {
-        void IJsonModel<DataSourceVectorizer>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceVectorizer>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DataSourceVectorizer)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        DataSourceVectorizer IJsonModel<DataSourceVectorizer>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceVectorizer>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(DataSourceVectorizer)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDataSourceVectorizer(document.RootElement, options);
-        }
-
-        internal static InternalUnknownAzureChatDataSourceVectorizationSource DeserializeInternalUnknownAzureChatDataSourceVectorizationSource(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string type = "Unknown";
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new InternalUnknownAzureChatDataSourceVectorizationSource(type, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<DataSourceVectorizer>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceVectorizer>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(DataSourceVectorizer)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        DataSourceVectorizer IPersistableModel<DataSourceVectorizer>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DataSourceVectorizer>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeDataSourceVectorizer(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(DataSourceVectorizer)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<DataSourceVectorizer>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalUnknownAzureChatDataSourceVectorizationSource FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalUnknownAzureChatDataSourceVectorizationSource(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create<DataSourceVectorizer>(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSourceVectorizationSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSourceVectorizationSource.cs
deleted file mode 100644
index 56560cf74c1f..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSourceVectorizationSource.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> Unknown version of AzureChatDataSourceVectorizationSource. </summary>
-    internal partial class InternalUnknownAzureChatDataSourceVectorizationSource : DataSourceVectorizer
-    {
-        /// <summary> Initializes a new instance of <see cref="InternalUnknownAzureChatDataSourceVectorizationSource"/>. </summary>
-        /// <param name="type"> The differentiating identifier for the concrete vectorization source. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal InternalUnknownAzureChatDataSourceVectorizationSource(string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="InternalUnknownAzureChatDataSourceVectorizationSource"/> for deserialization. </summary>
-        internal InternalUnknownAzureChatDataSourceVectorizationSource()
-        {
-        }
-    }
-}
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatDataSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatDataSource.Serialization.cs
deleted file mode 100644
index f3101a5b54ed..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatDataSource.Serialization.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    public partial class MongoDBChatDataSource : IJsonModel<MongoDBChatDataSource>
-    {
-        void IJsonModel<MongoDBChatDataSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MongoDBChatDataSource)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("parameters") != true)
-            {
-                writer.WritePropertyName("parameters"u8);
-                writer.WriteObjectValue<InternalMongoDBChatDataSourceParameters>(InternalParameters, options);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        MongoDBChatDataSource IJsonModel<MongoDBChatDataSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(MongoDBChatDataSource)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeMongoDBChatDataSource(document.RootElement, options);
-        }
-
-        internal static MongoDBChatDataSource DeserializeMongoDBChatDataSource(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            InternalMongoDBChatDataSourceParameters parameters = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("parameters"u8))
-                {
-                    parameters = InternalMongoDBChatDataSourceParameters.DeserializeInternalMongoDBChatDataSourceParameters(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new MongoDBChatDataSource(type, serializedAdditionalRawData, parameters);
-        }
-
-        BinaryData IPersistableModel<MongoDBChatDataSource>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(MongoDBChatDataSource)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        MongoDBChatDataSource IPersistableModel<MongoDBChatDataSource>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeMongoDBChatDataSource(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(MongoDBChatDataSource)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<MongoDBChatDataSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new MongoDBChatDataSource FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeMongoDBChatDataSource(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatDataSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatDataSource.cs
deleted file mode 100644
index 9a483cc28639..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatDataSource.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The MongoDBChatDataSource. </summary>
-    public partial class MongoDBChatDataSource : ChatDataSource
-    {
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionConfiguration.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionConfiguration.Serialization.cs
new file mode 100644
index 000000000000..5d23de217a68
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionConfiguration.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class MongoDBChatExtensionConfiguration : IUtf8JsonSerializable, IJsonModel<MongoDBChatExtensionConfiguration>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MongoDBChatExtensionConfiguration>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MongoDBChatExtensionConfiguration>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MongoDBChatExtensionConfiguration)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("parameters"u8);
+            writer.WriteObjectValue(Parameters, options);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MongoDBChatExtensionConfiguration IJsonModel<MongoDBChatExtensionConfiguration>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MongoDBChatExtensionConfiguration)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMongoDBChatExtensionConfiguration(document.RootElement, options);
+        }
+
+        internal static MongoDBChatExtensionConfiguration DeserializeMongoDBChatExtensionConfiguration(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            MongoDBChatExtensionParameters parameters = default;
+            AzureChatExtensionType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("parameters"u8))
+                {
+                    parameters = MongoDBChatExtensionParameters.DeserializeMongoDBChatExtensionParameters(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new AzureChatExtensionType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new MongoDBChatExtensionConfiguration(type, serializedAdditionalRawData, parameters);
+        }
+
+        BinaryData IPersistableModel<MongoDBChatExtensionConfiguration>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MongoDBChatExtensionConfiguration)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MongoDBChatExtensionConfiguration IPersistableModel<MongoDBChatExtensionConfiguration>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMongoDBChatExtensionConfiguration(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MongoDBChatExtensionConfiguration)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MongoDBChatExtensionConfiguration>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new MongoDBChatExtensionConfiguration FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMongoDBChatExtensionConfiguration(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionConfiguration.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionConfiguration.cs
new file mode 100644
index 000000000000..d83d67452853
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionConfiguration.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A specific representation of configurable options for a MongoDB chat extension configuration. </summary>
+    public partial class MongoDBChatExtensionConfiguration : AzureChatExtensionConfiguration
+    {
+        /// <summary> Initializes a new instance of <see cref="MongoDBChatExtensionConfiguration"/>. </summary>
+        /// <param name="parameters"> The parameters for the MongoDB chat extension. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="parameters"/> is null. </exception>
+        public MongoDBChatExtensionConfiguration(MongoDBChatExtensionParameters parameters)
+        {
+            Argument.AssertNotNull(parameters, nameof(parameters));
+
+            Type = AzureChatExtensionType.MongoDB;
+            Parameters = parameters;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MongoDBChatExtensionConfiguration"/>. </summary>
+        /// <param name="type">
+        ///   The label for the type of an Azure chat extension. This typically corresponds to a matching Azure resource.
+        ///   Azure chat extensions are only compatible with Azure OpenAI.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="parameters"> The parameters for the MongoDB chat extension. </param>
+        internal MongoDBChatExtensionConfiguration(AzureChatExtensionType type, IDictionary<string, BinaryData> serializedAdditionalRawData, MongoDBChatExtensionParameters parameters) : base(type, serializedAdditionalRawData)
+        {
+            Parameters = parameters;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MongoDBChatExtensionConfiguration"/> for deserialization. </summary>
+        internal MongoDBChatExtensionConfiguration()
+        {
+        }
+
+        /// <summary> The parameters for the MongoDB chat extension. </summary>
+        public MongoDBChatExtensionParameters Parameters { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalMongoDBChatDataSourceParameters.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionParameters.Serialization.cs
similarity index 54%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/InternalMongoDBChatDataSourceParameters.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionParameters.Serialization.cs
index b692f22a29c8..05a6fc5105fc 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalMongoDBChatDataSourceParameters.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionParameters.Serialization.cs
@@ -1,109 +1,96 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI
 {
-    internal partial class InternalMongoDBChatDataSourceParameters : IJsonModel<InternalMongoDBChatDataSourceParameters>
+    public partial class MongoDBChatExtensionParameters : IUtf8JsonSerializable, IJsonModel<MongoDBChatExtensionParameters>
     {
-        void IJsonModel<InternalMongoDBChatDataSourceParameters>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MongoDBChatExtensionParameters>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MongoDBChatExtensionParameters>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalMongoDBChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalMongoDBChatDataSourceParameters)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(MongoDBChatExtensionParameters)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("top_n_documents") != true && Optional.IsDefined(TopNDocuments))
+            if (Optional.IsDefined(DocumentCount))
             {
                 writer.WritePropertyName("top_n_documents"u8);
-                writer.WriteNumberValue(TopNDocuments.Value);
+                writer.WriteNumberValue(DocumentCount.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("in_scope") != true && Optional.IsDefined(InScope))
+            if (Optional.IsDefined(ShouldRestrictResultScope))
             {
                 writer.WritePropertyName("in_scope"u8);
-                writer.WriteBooleanValue(InScope.Value);
+                writer.WriteBooleanValue(ShouldRestrictResultScope.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("strictness") != true && Optional.IsDefined(Strictness))
+            if (Optional.IsDefined(Strictness))
             {
                 writer.WritePropertyName("strictness"u8);
                 writer.WriteNumberValue(Strictness.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("max_search_queries") != true && Optional.IsDefined(MaxSearchQueries))
+            if (Optional.IsDefined(MaxSearchQueries))
             {
                 writer.WritePropertyName("max_search_queries"u8);
                 writer.WriteNumberValue(MaxSearchQueries.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("allow_partial_result") != true && Optional.IsDefined(AllowPartialResult))
+            if (Optional.IsDefined(AllowPartialResult))
             {
                 writer.WritePropertyName("allow_partial_result"u8);
                 writer.WriteBooleanValue(AllowPartialResult.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("include_contexts") != true && Optional.IsCollectionDefined(_internalIncludeContexts))
+            if (Optional.IsCollectionDefined(IncludeContexts))
             {
                 writer.WritePropertyName("include_contexts"u8);
                 writer.WriteStartArray();
-                foreach (var item in _internalIncludeContexts)
+                foreach (var item in IncludeContexts)
                 {
-                    writer.WriteStringValue(item);
+                    writer.WriteStringValue(item.ToString());
                 }
                 writer.WriteEndArray();
             }
-            if (SerializedAdditionalRawData?.ContainsKey("endpoint") != true)
-            {
-                writer.WritePropertyName("endpoint"u8);
-                writer.WriteStringValue(Endpoint);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("database_name") != true)
-            {
-                writer.WritePropertyName("database_name"u8);
-                writer.WriteStringValue(DatabaseName);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("collection_name") != true)
-            {
-                writer.WritePropertyName("collection_name"u8);
-                writer.WriteStringValue(CollectionName);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("app_name") != true)
-            {
-                writer.WritePropertyName("app_name"u8);
-                writer.WriteStringValue(AppName);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("index_name") != true)
-            {
-                writer.WritePropertyName("index_name"u8);
-                writer.WriteStringValue(IndexName);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("authentication") != true)
+            if (Optional.IsDefined(Authentication))
             {
                 writer.WritePropertyName("authentication"u8);
-                writer.WriteObjectValue<DataSourceAuthentication>(Authentication, options);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("embedding_dependency") != true)
-            {
-                writer.WritePropertyName("embedding_dependency"u8);
-                writer.WriteObjectValue<DataSourceVectorizer>(EmbeddingDependency, options);
+                writer.WriteObjectValue(Authentication, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("fields_mapping") != true)
+            writer.WritePropertyName("endpoint"u8);
+            writer.WriteStringValue(Endpoint);
+            writer.WritePropertyName("collection_name"u8);
+            writer.WriteStringValue(CollectionName);
+            writer.WritePropertyName("database_name"u8);
+            writer.WriteStringValue(DatabaseName);
+            writer.WritePropertyName("app_name"u8);
+            writer.WriteStringValue(AppName);
+            writer.WritePropertyName("index_name"u8);
+            writer.WriteStringValue(IndexName);
+            writer.WritePropertyName("fields_mapping"u8);
+            writer.WriteObjectValue(FieldsMapping, options);
+            writer.WritePropertyName("embedding_dependency"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(EmbeddingDependency);
+#else
+            using (JsonDocument document = JsonDocument.Parse(EmbeddingDependency))
             {
-                writer.WritePropertyName("fields_mapping"u8);
-                writer.WriteObjectValue<DataSourceFieldMappings>(FieldMappings, options);
+                JsonSerializer.Serialize(writer, document.RootElement);
             }
-            if (SerializedAdditionalRawData != null)
+#endif
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -118,19 +105,19 @@ void IJsonModel<InternalMongoDBChatDataSourceParameters>.Write(Utf8JsonWriter wr
             writer.WriteEndObject();
         }
 
-        InternalMongoDBChatDataSourceParameters IJsonModel<InternalMongoDBChatDataSourceParameters>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        MongoDBChatExtensionParameters IJsonModel<MongoDBChatExtensionParameters>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalMongoDBChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalMongoDBChatDataSourceParameters)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(MongoDBChatExtensionParameters)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalMongoDBChatDataSourceParameters(document.RootElement, options);
+            return DeserializeMongoDBChatExtensionParameters(document.RootElement, options);
         }
 
-        internal static InternalMongoDBChatDataSourceParameters DeserializeInternalMongoDBChatDataSourceParameters(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static MongoDBChatExtensionParameters DeserializeMongoDBChatExtensionParameters(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -143,15 +130,15 @@ internal static InternalMongoDBChatDataSourceParameters DeserializeInternalMongo
             int? strictness = default;
             int? maxSearchQueries = default;
             bool? allowPartialResult = default;
-            IList<string> includeContexts = default;
+            IList<OnYourDataContextProperty> includeContexts = default;
+            OnYourDataUsernameAndPasswordAuthenticationOptions authentication = default;
             string endpoint = default;
-            string databaseName = default;
             string collectionName = default;
+            string databaseName = default;
             string appName = default;
             string indexName = default;
-            DataSourceAuthentication authentication = default;
-            DataSourceVectorizer embeddingDependency = default;
-            DataSourceFieldMappings fieldsMapping = default;
+            MongoDBChatExtensionParametersFieldsMapping fieldsMapping = default;
+            BinaryData embeddingDependency = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -207,22 +194,26 @@ internal static InternalMongoDBChatDataSourceParameters DeserializeInternalMongo
                     {
                         continue;
                     }
-                    List<string> array = new List<string>();
+                    List<OnYourDataContextProperty> array = new List<OnYourDataContextProperty>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(item.GetString());
+                        array.Add(new OnYourDataContextProperty(item.GetString()));
                     }
                     includeContexts = array;
                     continue;
                 }
-                if (property.NameEquals("endpoint"u8))
+                if (property.NameEquals("authentication"u8))
                 {
-                    endpoint = property.Value.GetString();
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    authentication = OnYourDataUsernameAndPasswordAuthenticationOptions.DeserializeOnYourDataUsernameAndPasswordAuthenticationOptions(property.Value, options);
                     continue;
                 }
-                if (property.NameEquals("database_name"u8))
+                if (property.NameEquals("endpoint"u8))
                 {
-                    databaseName = property.Value.GetString();
+                    endpoint = property.Value.GetString();
                     continue;
                 }
                 if (property.NameEquals("collection_name"u8))
@@ -230,6 +221,11 @@ internal static InternalMongoDBChatDataSourceParameters DeserializeInternalMongo
                     collectionName = property.Value.GetString();
                     continue;
                 }
+                if (property.NameEquals("database_name"u8))
+                {
+                    databaseName = property.Value.GetString();
+                    continue;
+                }
                 if (property.NameEquals("app_name"u8))
                 {
                     appName = property.Value.GetString();
@@ -240,90 +236,85 @@ internal static InternalMongoDBChatDataSourceParameters DeserializeInternalMongo
                     indexName = property.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("authentication"u8))
+                if (property.NameEquals("fields_mapping"u8))
                 {
-                    authentication = DataSourceAuthentication.DeserializeDataSourceAuthentication(property.Value, options);
+                    fieldsMapping = MongoDBChatExtensionParametersFieldsMapping.DeserializeMongoDBChatExtensionParametersFieldsMapping(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("embedding_dependency"u8))
                 {
-                    embeddingDependency = DataSourceVectorizer.DeserializeDataSourceVectorizer(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("fields_mapping"u8))
-                {
-                    fieldsMapping = DataSourceFieldMappings.DeserializeDataSourceFieldMappings(property.Value, options);
+                    embeddingDependency = BinaryData.FromString(property.Value.GetRawText());
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new InternalMongoDBChatDataSourceParameters(
+            return new MongoDBChatExtensionParameters(
                 topNDocuments,
                 inScope,
                 strictness,
                 maxSearchQueries,
                 allowPartialResult,
-                includeContexts ?? new ChangeTrackingList<string>(),
+                includeContexts ?? new ChangeTrackingList<OnYourDataContextProperty>(),
+                authentication,
                 endpoint,
-                databaseName,
                 collectionName,
+                databaseName,
                 appName,
                 indexName,
-                authentication,
-                embeddingDependency,
                 fieldsMapping,
+                embeddingDependency,
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<InternalMongoDBChatDataSourceParameters>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<MongoDBChatExtensionParameters>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalMongoDBChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(InternalMongoDBChatDataSourceParameters)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(MongoDBChatExtensionParameters)} does not support writing '{options.Format}' format.");
             }
         }
 
-        InternalMongoDBChatDataSourceParameters IPersistableModel<InternalMongoDBChatDataSourceParameters>.Create(BinaryData data, ModelReaderWriterOptions options)
+        MongoDBChatExtensionParameters IPersistableModel<MongoDBChatExtensionParameters>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalMongoDBChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalMongoDBChatDataSourceParameters(document.RootElement, options);
+                        return DeserializeMongoDBChatExtensionParameters(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(InternalMongoDBChatDataSourceParameters)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(MongoDBChatExtensionParameters)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<InternalMongoDBChatDataSourceParameters>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<MongoDBChatExtensionParameters>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static InternalMongoDBChatDataSourceParameters FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static MongoDBChatExtensionParameters FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalMongoDBChatDataSourceParameters(document.RootElement);
+            return DeserializeMongoDBChatExtensionParameters(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionParameters.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionParameters.cs
new file mode 100644
index 000000000000..2bcbfbd262e3
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionParameters.cs
@@ -0,0 +1,219 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Parameters for the MongoDB chat extension. The supported authentication types are AccessToken, SystemAssignedManagedIdentity and UserAssignedManagedIdentity. </summary>
+    public partial class MongoDBChatExtensionParameters
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="MongoDBChatExtensionParameters"/>. </summary>
+        /// <param name="endpoint"> The endpoint name for MongoDB. </param>
+        /// <param name="collectionName"> The collection name for MongoDB. </param>
+        /// <param name="databaseName"> The database name for MongoDB. </param>
+        /// <param name="appName"> The app name for MongoDB. </param>
+        /// <param name="indexName"> The name of the MongoDB index. </param>
+        /// <param name="fieldsMapping">
+        /// Field mappings to apply to data used by the MongoDB data source.
+        /// Note that content and vector field mappings are required for MongoDB.
+        /// </param>
+        /// <param name="embeddingDependency"> The vectorization source to use with the MongoDB chat extension. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/>, <paramref name="collectionName"/>, <paramref name="databaseName"/>, <paramref name="appName"/>, <paramref name="indexName"/>, <paramref name="fieldsMapping"/> or <paramref name="embeddingDependency"/> is null. </exception>
+        public MongoDBChatExtensionParameters(string endpoint, string collectionName, string databaseName, string appName, string indexName, MongoDBChatExtensionParametersFieldsMapping fieldsMapping, BinaryData embeddingDependency)
+        {
+            Argument.AssertNotNull(endpoint, nameof(endpoint));
+            Argument.AssertNotNull(collectionName, nameof(collectionName));
+            Argument.AssertNotNull(databaseName, nameof(databaseName));
+            Argument.AssertNotNull(appName, nameof(appName));
+            Argument.AssertNotNull(indexName, nameof(indexName));
+            Argument.AssertNotNull(fieldsMapping, nameof(fieldsMapping));
+            Argument.AssertNotNull(embeddingDependency, nameof(embeddingDependency));
+
+            IncludeContexts = new ChangeTrackingList<OnYourDataContextProperty>();
+            Endpoint = endpoint;
+            CollectionName = collectionName;
+            DatabaseName = databaseName;
+            AppName = appName;
+            IndexName = indexName;
+            FieldsMapping = fieldsMapping;
+            EmbeddingDependency = embeddingDependency;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MongoDBChatExtensionParameters"/>. </summary>
+        /// <param name="documentCount"> The configured top number of documents to feature for the configured query. </param>
+        /// <param name="shouldRestrictResultScope"> Whether queries should be restricted to use of indexed data. </param>
+        /// <param name="strictness"> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </param>
+        /// <param name="maxSearchQueries">
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </param>
+        /// <param name="allowPartialResult">
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </param>
+        /// <param name="includeContexts"> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </param>
+        /// <param name="authentication">
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// </param>
+        /// <param name="endpoint"> The endpoint name for MongoDB. </param>
+        /// <param name="collectionName"> The collection name for MongoDB. </param>
+        /// <param name="databaseName"> The database name for MongoDB. </param>
+        /// <param name="appName"> The app name for MongoDB. </param>
+        /// <param name="indexName"> The name of the MongoDB index. </param>
+        /// <param name="fieldsMapping">
+        /// Field mappings to apply to data used by the MongoDB data source.
+        /// Note that content and vector field mappings are required for MongoDB.
+        /// </param>
+        /// <param name="embeddingDependency"> The vectorization source to use with the MongoDB chat extension. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal MongoDBChatExtensionParameters(int? documentCount, bool? shouldRestrictResultScope, int? strictness, int? maxSearchQueries, bool? allowPartialResult, IList<OnYourDataContextProperty> includeContexts, OnYourDataUsernameAndPasswordAuthenticationOptions authentication, string endpoint, string collectionName, string databaseName, string appName, string indexName, MongoDBChatExtensionParametersFieldsMapping fieldsMapping, BinaryData embeddingDependency, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            DocumentCount = documentCount;
+            ShouldRestrictResultScope = shouldRestrictResultScope;
+            Strictness = strictness;
+            MaxSearchQueries = maxSearchQueries;
+            AllowPartialResult = allowPartialResult;
+            IncludeContexts = includeContexts;
+            Authentication = authentication;
+            Endpoint = endpoint;
+            CollectionName = collectionName;
+            DatabaseName = databaseName;
+            AppName = appName;
+            IndexName = indexName;
+            FieldsMapping = fieldsMapping;
+            EmbeddingDependency = embeddingDependency;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MongoDBChatExtensionParameters"/> for deserialization. </summary>
+        internal MongoDBChatExtensionParameters()
+        {
+        }
+
+        /// <summary> The configured top number of documents to feature for the configured query. </summary>
+        public int? DocumentCount { get; set; }
+        /// <summary> Whether queries should be restricted to use of indexed data. </summary>
+        public bool? ShouldRestrictResultScope { get; set; }
+        /// <summary> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </summary>
+        public int? Strictness { get; set; }
+        /// <summary>
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </summary>
+        public int? MaxSearchQueries { get; set; }
+        /// <summary>
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </summary>
+        public bool? AllowPartialResult { get; set; }
+        /// <summary> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </summary>
+        public IList<OnYourDataContextProperty> IncludeContexts { get; }
+        /// <summary>
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// </summary>
+        public OnYourDataUsernameAndPasswordAuthenticationOptions Authentication { get; set; }
+        /// <summary> The endpoint name for MongoDB. </summary>
+        public string Endpoint { get; }
+        /// <summary> The collection name for MongoDB. </summary>
+        public string CollectionName { get; }
+        /// <summary> The database name for MongoDB. </summary>
+        public string DatabaseName { get; }
+        /// <summary> The app name for MongoDB. </summary>
+        public string AppName { get; }
+        /// <summary> The name of the MongoDB index. </summary>
+        public string IndexName { get; }
+        /// <summary>
+        /// Field mappings to apply to data used by the MongoDB data source.
+        /// Note that content and vector field mappings are required for MongoDB.
+        /// </summary>
+        public MongoDBChatExtensionParametersFieldsMapping FieldsMapping { get; }
+        /// <summary>
+        /// The vectorization source to use with the MongoDB chat extension.
+        /// <para>
+        /// To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// <remarks>
+        /// Supported types:
+        /// <list type="bullet">
+        /// <item>
+        /// <description><see cref="OnYourDataEndpointVectorizationSource"/></description>
+        /// </item>
+        /// <item>
+        /// <description><see cref="OnYourDataDeploymentNameVectorizationSource"/></description>
+        /// </item>
+        /// </list>
+        /// </remarks>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        public BinaryData EmbeddingDependency { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionParametersFieldsMapping.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionParametersFieldsMapping.Serialization.cs
new file mode 100644
index 000000000000..1fb604e70ae3
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionParametersFieldsMapping.Serialization.cs
@@ -0,0 +1,214 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class MongoDBChatExtensionParametersFieldsMapping : IUtf8JsonSerializable, IJsonModel<MongoDBChatExtensionParametersFieldsMapping>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MongoDBChatExtensionParametersFieldsMapping>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<MongoDBChatExtensionParametersFieldsMapping>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatExtensionParametersFieldsMapping>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MongoDBChatExtensionParametersFieldsMapping)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("content_fields"u8);
+            writer.WriteStartArray();
+            foreach (var item in ContentFields)
+            {
+                writer.WriteStringValue(item);
+            }
+            writer.WriteEndArray();
+            writer.WritePropertyName("vector_fields"u8);
+            writer.WriteStartArray();
+            foreach (var item in VectorFields)
+            {
+                writer.WriteStringValue(item);
+            }
+            writer.WriteEndArray();
+            if (Optional.IsDefined(TitleField))
+            {
+                writer.WritePropertyName("title_field"u8);
+                writer.WriteStringValue(TitleField);
+            }
+            if (Optional.IsDefined(UrlField))
+            {
+                writer.WritePropertyName("url_field"u8);
+                writer.WriteStringValue(UrlField);
+            }
+            if (Optional.IsDefined(FilepathField))
+            {
+                writer.WritePropertyName("filepath_field"u8);
+                writer.WriteStringValue(FilepathField);
+            }
+            if (Optional.IsDefined(ContentFieldsSeparator))
+            {
+                writer.WritePropertyName("content_fields_separator"u8);
+                writer.WriteStringValue(ContentFieldsSeparator);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        MongoDBChatExtensionParametersFieldsMapping IJsonModel<MongoDBChatExtensionParametersFieldsMapping>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatExtensionParametersFieldsMapping>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(MongoDBChatExtensionParametersFieldsMapping)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeMongoDBChatExtensionParametersFieldsMapping(document.RootElement, options);
+        }
+
+        internal static MongoDBChatExtensionParametersFieldsMapping DeserializeMongoDBChatExtensionParametersFieldsMapping(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IList<string> contentFields = default;
+            IList<string> vectorFields = default;
+            string titleField = default;
+            string urlField = default;
+            string filepathField = default;
+            string contentFieldsSeparator = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("content_fields"u8))
+                {
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    contentFields = array;
+                    continue;
+                }
+                if (property.NameEquals("vector_fields"u8))
+                {
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    vectorFields = array;
+                    continue;
+                }
+                if (property.NameEquals("title_field"u8))
+                {
+                    titleField = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("url_field"u8))
+                {
+                    urlField = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("filepath_field"u8))
+                {
+                    filepathField = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("content_fields_separator"u8))
+                {
+                    contentFieldsSeparator = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new MongoDBChatExtensionParametersFieldsMapping(
+                contentFields,
+                vectorFields,
+                titleField,
+                urlField,
+                filepathField,
+                contentFieldsSeparator,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<MongoDBChatExtensionParametersFieldsMapping>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatExtensionParametersFieldsMapping>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(MongoDBChatExtensionParametersFieldsMapping)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        MongoDBChatExtensionParametersFieldsMapping IPersistableModel<MongoDBChatExtensionParametersFieldsMapping>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<MongoDBChatExtensionParametersFieldsMapping>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeMongoDBChatExtensionParametersFieldsMapping(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(MongoDBChatExtensionParametersFieldsMapping)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<MongoDBChatExtensionParametersFieldsMapping>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static MongoDBChatExtensionParametersFieldsMapping FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeMongoDBChatExtensionParametersFieldsMapping(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionParametersFieldsMapping.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionParametersFieldsMapping.cs
new file mode 100644
index 000000000000..bfe79488c08c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/MongoDBChatExtensionParametersFieldsMapping.cs
@@ -0,0 +1,99 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The MongoDBChatExtensionParametersFieldsMapping. </summary>
+    public partial class MongoDBChatExtensionParametersFieldsMapping
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="MongoDBChatExtensionParametersFieldsMapping"/>. </summary>
+        /// <param name="contentFields"></param>
+        /// <param name="vectorFields"></param>
+        /// <exception cref="ArgumentNullException"> <paramref name="contentFields"/> or <paramref name="vectorFields"/> is null. </exception>
+        public MongoDBChatExtensionParametersFieldsMapping(IEnumerable<string> contentFields, IEnumerable<string> vectorFields)
+        {
+            Argument.AssertNotNull(contentFields, nameof(contentFields));
+            Argument.AssertNotNull(vectorFields, nameof(vectorFields));
+
+            ContentFields = contentFields.ToList();
+            VectorFields = vectorFields.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MongoDBChatExtensionParametersFieldsMapping"/>. </summary>
+        /// <param name="contentFields"></param>
+        /// <param name="vectorFields"></param>
+        /// <param name="titleField"></param>
+        /// <param name="urlField"></param>
+        /// <param name="filepathField"></param>
+        /// <param name="contentFieldsSeparator"></param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal MongoDBChatExtensionParametersFieldsMapping(IList<string> contentFields, IList<string> vectorFields, string titleField, string urlField, string filepathField, string contentFieldsSeparator, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            ContentFields = contentFields;
+            VectorFields = vectorFields;
+            TitleField = titleField;
+            UrlField = urlField;
+            FilepathField = filepathField;
+            ContentFieldsSeparator = contentFieldsSeparator;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="MongoDBChatExtensionParametersFieldsMapping"/> for deserialization. </summary>
+        internal MongoDBChatExtensionParametersFieldsMapping()
+        {
+        }
+
+        /// <summary> Gets the content fields. </summary>
+        public IList<string> ContentFields { get; }
+        /// <summary> Gets the vector fields. </summary>
+        public IList<string> VectorFields { get; }
+        /// <summary> Gets or sets the title field. </summary>
+        public string TitleField { get; set; }
+        /// <summary> Gets or sets the url field. </summary>
+        public string UrlField { get; set; }
+        /// <summary> Gets or sets the filepath field. </summary>
+        public string FilepathField { get; set; }
+        /// <summary> Gets or sets the content fields separator. </summary>
+        public string ContentFieldsSeparator { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAccessTokenAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAccessTokenAuthenticationOptions.Serialization.cs
new file mode 100644
index 000000000000..a7e54c682a29
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAccessTokenAuthenticationOptions.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OnYourDataAccessTokenAuthenticationOptions : IUtf8JsonSerializable, IJsonModel<OnYourDataAccessTokenAuthenticationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataAccessTokenAuthenticationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataAccessTokenAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataAccessTokenAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataAccessTokenAuthenticationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("access_token"u8);
+            writer.WriteStringValue(AccessToken);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataAccessTokenAuthenticationOptions IJsonModel<OnYourDataAccessTokenAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataAccessTokenAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataAccessTokenAuthenticationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataAccessTokenAuthenticationOptions(document.RootElement, options);
+        }
+
+        internal static OnYourDataAccessTokenAuthenticationOptions DeserializeOnYourDataAccessTokenAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string accessToken = default;
+            OnYourDataAuthenticationType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("access_token"u8))
+                {
+                    accessToken = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataAuthenticationType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OnYourDataAccessTokenAuthenticationOptions(type, serializedAdditionalRawData, accessToken);
+        }
+
+        BinaryData IPersistableModel<OnYourDataAccessTokenAuthenticationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataAccessTokenAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataAccessTokenAuthenticationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataAccessTokenAuthenticationOptions IPersistableModel<OnYourDataAccessTokenAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataAccessTokenAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataAccessTokenAuthenticationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataAccessTokenAuthenticationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataAccessTokenAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new OnYourDataAccessTokenAuthenticationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataAccessTokenAuthenticationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAccessTokenAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAccessTokenAuthenticationOptions.cs
new file mode 100644
index 000000000000..50ccaddc9fd2
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAccessTokenAuthenticationOptions.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The authentication options for Azure OpenAI On Your Data when using access token. </summary>
+    public partial class OnYourDataAccessTokenAuthenticationOptions : OnYourDataAuthenticationOptions
+    {
+        /// <summary> Initializes a new instance of <see cref="OnYourDataAccessTokenAuthenticationOptions"/>. </summary>
+        /// <param name="accessToken"> The access token to use for authentication. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="accessToken"/> is null. </exception>
+        public OnYourDataAccessTokenAuthenticationOptions(string accessToken)
+        {
+            Argument.AssertNotNull(accessToken, nameof(accessToken));
+
+            Type = OnYourDataAuthenticationType.AccessToken;
+            AccessToken = accessToken;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataAccessTokenAuthenticationOptions"/>. </summary>
+        /// <param name="type"> The authentication type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="accessToken"> The access token to use for authentication. </param>
+        internal OnYourDataAccessTokenAuthenticationOptions(OnYourDataAuthenticationType type, IDictionary<string, BinaryData> serializedAdditionalRawData, string accessToken) : base(type, serializedAdditionalRawData)
+        {
+            AccessToken = accessToken;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataAccessTokenAuthenticationOptions"/> for deserialization. </summary>
+        internal OnYourDataAccessTokenAuthenticationOptions()
+        {
+        }
+
+        /// <summary> The access token to use for authentication. </summary>
+        public string AccessToken { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataApiKeyAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataApiKeyAuthenticationOptions.Serialization.cs
new file mode 100644
index 000000000000..cc6e44bb84fc
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataApiKeyAuthenticationOptions.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OnYourDataApiKeyAuthenticationOptions : IUtf8JsonSerializable, IJsonModel<OnYourDataApiKeyAuthenticationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataApiKeyAuthenticationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataApiKeyAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataApiKeyAuthenticationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("key"u8);
+            writer.WriteStringValue(Key);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataApiKeyAuthenticationOptions IJsonModel<OnYourDataApiKeyAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataApiKeyAuthenticationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataApiKeyAuthenticationOptions(document.RootElement, options);
+        }
+
+        internal static OnYourDataApiKeyAuthenticationOptions DeserializeOnYourDataApiKeyAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string key = default;
+            OnYourDataAuthenticationType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("key"u8))
+                {
+                    key = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataAuthenticationType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OnYourDataApiKeyAuthenticationOptions(type, serializedAdditionalRawData, key);
+        }
+
+        BinaryData IPersistableModel<OnYourDataApiKeyAuthenticationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataApiKeyAuthenticationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataApiKeyAuthenticationOptions IPersistableModel<OnYourDataApiKeyAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataApiKeyAuthenticationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataApiKeyAuthenticationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataApiKeyAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new OnYourDataApiKeyAuthenticationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataApiKeyAuthenticationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataApiKeyAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataApiKeyAuthenticationOptions.cs
new file mode 100644
index 000000000000..f0a14f528a7c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataApiKeyAuthenticationOptions.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The authentication options for Azure OpenAI On Your Data when using an API key. </summary>
+    public partial class OnYourDataApiKeyAuthenticationOptions : OnYourDataAuthenticationOptions
+    {
+        /// <summary> Initializes a new instance of <see cref="OnYourDataApiKeyAuthenticationOptions"/>. </summary>
+        /// <param name="key"> The API key to use for authentication. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="key"/> is null. </exception>
+        public OnYourDataApiKeyAuthenticationOptions(string key)
+        {
+            Argument.AssertNotNull(key, nameof(key));
+
+            Type = OnYourDataAuthenticationType.ApiKey;
+            Key = key;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataApiKeyAuthenticationOptions"/>. </summary>
+        /// <param name="type"> The authentication type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="key"> The API key to use for authentication. </param>
+        internal OnYourDataApiKeyAuthenticationOptions(OnYourDataAuthenticationType type, IDictionary<string, BinaryData> serializedAdditionalRawData, string key) : base(type, serializedAdditionalRawData)
+        {
+            Key = key;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataApiKeyAuthenticationOptions"/> for deserialization. </summary>
+        internal OnYourDataApiKeyAuthenticationOptions()
+        {
+        }
+
+        /// <summary> The API key to use for authentication. </summary>
+        public string Key { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAuthenticationOptions.Serialization.cs
new file mode 100644
index 000000000000..272a87f93700
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAuthenticationOptions.Serialization.cs
@@ -0,0 +1,133 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    [PersistableModelProxy(typeof(UnknownOnYourDataAuthenticationOptions))]
+    public partial class OnYourDataAuthenticationOptions : IUtf8JsonSerializable, IJsonModel<OnYourDataAuthenticationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataAuthenticationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataAuthenticationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataAuthenticationOptions IJsonModel<OnYourDataAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataAuthenticationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataAuthenticationOptions(document.RootElement, options);
+        }
+
+        internal static OnYourDataAuthenticationOptions DeserializeOnYourDataAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "access_token": return OnYourDataAccessTokenAuthenticationOptions.DeserializeOnYourDataAccessTokenAuthenticationOptions(element, options);
+                    case "api_key": return OnYourDataApiKeyAuthenticationOptions.DeserializeOnYourDataApiKeyAuthenticationOptions(element, options);
+                    case "connection_string": return OnYourDataConnectionStringAuthenticationOptions.DeserializeOnYourDataConnectionStringAuthenticationOptions(element, options);
+                    case "encoded_api_key": return OnYourDataEncodedApiKeyAuthenticationOptions.DeserializeOnYourDataEncodedApiKeyAuthenticationOptions(element, options);
+                    case "key_and_key_id": return OnYourDataKeyAndKeyIdAuthenticationOptions.DeserializeOnYourDataKeyAndKeyIdAuthenticationOptions(element, options);
+                    case "system_assigned_managed_identity": return OnYourDataSystemAssignedManagedIdentityAuthenticationOptions.DeserializeOnYourDataSystemAssignedManagedIdentityAuthenticationOptions(element, options);
+                    case "user_assigned_managed_identity": return OnYourDataUserAssignedManagedIdentityAuthenticationOptions.DeserializeOnYourDataUserAssignedManagedIdentityAuthenticationOptions(element, options);
+                    case "username_and_password": return OnYourDataUsernameAndPasswordAuthenticationOptions.DeserializeOnYourDataUsernameAndPasswordAuthenticationOptions(element, options);
+                }
+            }
+            return UnknownOnYourDataAuthenticationOptions.DeserializeUnknownOnYourDataAuthenticationOptions(element, options);
+        }
+
+        BinaryData IPersistableModel<OnYourDataAuthenticationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataAuthenticationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataAuthenticationOptions IPersistableModel<OnYourDataAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataAuthenticationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataAuthenticationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static OnYourDataAuthenticationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataAuthenticationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAuthenticationOptions.cs
new file mode 100644
index 000000000000..e507e2c7c801
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAuthenticationOptions.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// The authentication options for Azure OpenAI On Your Data.
+    /// Please note <see cref="OnYourDataAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="OnYourDataAccessTokenAuthenticationOptions"/>, <see cref="OnYourDataApiKeyAuthenticationOptions"/>, <see cref="OnYourDataConnectionStringAuthenticationOptions"/>, <see cref="OnYourDataEncodedApiKeyAuthenticationOptions"/>, <see cref="OnYourDataKeyAndKeyIdAuthenticationOptions"/>, <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>, <see cref="OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> and <see cref="OnYourDataUsernameAndPasswordAuthenticationOptions"/>.
+    /// </summary>
+    public abstract partial class OnYourDataAuthenticationOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataAuthenticationOptions"/>. </summary>
+        protected OnYourDataAuthenticationOptions()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataAuthenticationOptions"/>. </summary>
+        /// <param name="type"> The authentication type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal OnYourDataAuthenticationOptions(OnYourDataAuthenticationType type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Type = type;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The authentication type. </summary>
+        internal OnYourDataAuthenticationType Type { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAuthenticationType.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAuthenticationType.cs
new file mode 100644
index 000000000000..3505399d9f9d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataAuthenticationType.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The authentication types supported with Azure OpenAI On Your Data. </summary>
+    internal readonly partial struct OnYourDataAuthenticationType : IEquatable<OnYourDataAuthenticationType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataAuthenticationType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public OnYourDataAuthenticationType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ApiKeyValue = "api_key";
+        private const string ConnectionStringValue = "connection_string";
+        private const string KeyAndKeyIdValue = "key_and_key_id";
+        private const string EncodedApiKeyValue = "encoded_api_key";
+        private const string AccessTokenValue = "access_token";
+        private const string SystemAssignedManagedIdentityValue = "system_assigned_managed_identity";
+        private const string UserAssignedManagedIdentityValue = "user_assigned_managed_identity";
+        private const string UsernameAndPasswordValue = "username_and_password";
+
+        /// <summary> Authentication via API key. </summary>
+        public static OnYourDataAuthenticationType ApiKey { get; } = new OnYourDataAuthenticationType(ApiKeyValue);
+        /// <summary> Authentication via connection string. </summary>
+        public static OnYourDataAuthenticationType ConnectionString { get; } = new OnYourDataAuthenticationType(ConnectionStringValue);
+        /// <summary> Authentication via key and key ID pair. </summary>
+        public static OnYourDataAuthenticationType KeyAndKeyId { get; } = new OnYourDataAuthenticationType(KeyAndKeyIdValue);
+        /// <summary> Authentication via encoded API key. </summary>
+        public static OnYourDataAuthenticationType EncodedApiKey { get; } = new OnYourDataAuthenticationType(EncodedApiKeyValue);
+        /// <summary> Authentication via access token. </summary>
+        public static OnYourDataAuthenticationType AccessToken { get; } = new OnYourDataAuthenticationType(AccessTokenValue);
+        /// <summary> Authentication via system-assigned managed identity. </summary>
+        public static OnYourDataAuthenticationType SystemAssignedManagedIdentity { get; } = new OnYourDataAuthenticationType(SystemAssignedManagedIdentityValue);
+        /// <summary> Authentication via user-assigned managed identity. </summary>
+        public static OnYourDataAuthenticationType UserAssignedManagedIdentity { get; } = new OnYourDataAuthenticationType(UserAssignedManagedIdentityValue);
+        /// <summary> Authentication via username and password. </summary>
+        public static OnYourDataAuthenticationType UsernameAndPassword { get; } = new OnYourDataAuthenticationType(UsernameAndPasswordValue);
+        /// <summary> Determines if two <see cref="OnYourDataAuthenticationType"/> values are the same. </summary>
+        public static bool operator ==(OnYourDataAuthenticationType left, OnYourDataAuthenticationType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="OnYourDataAuthenticationType"/> values are not the same. </summary>
+        public static bool operator !=(OnYourDataAuthenticationType left, OnYourDataAuthenticationType right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="OnYourDataAuthenticationType"/>. </summary>
+        public static implicit operator OnYourDataAuthenticationType(string value) => new OnYourDataAuthenticationType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is OnYourDataAuthenticationType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(OnYourDataAuthenticationType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataConnectionStringAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataConnectionStringAuthenticationOptions.Serialization.cs
new file mode 100644
index 000000000000..07060a78b41b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataConnectionStringAuthenticationOptions.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OnYourDataConnectionStringAuthenticationOptions : IUtf8JsonSerializable, IJsonModel<OnYourDataConnectionStringAuthenticationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataConnectionStringAuthenticationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataConnectionStringAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataConnectionStringAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataConnectionStringAuthenticationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("connection_string"u8);
+            writer.WriteStringValue(ConnectionString);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataConnectionStringAuthenticationOptions IJsonModel<OnYourDataConnectionStringAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataConnectionStringAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataConnectionStringAuthenticationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataConnectionStringAuthenticationOptions(document.RootElement, options);
+        }
+
+        internal static OnYourDataConnectionStringAuthenticationOptions DeserializeOnYourDataConnectionStringAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string connectionString = default;
+            OnYourDataAuthenticationType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("connection_string"u8))
+                {
+                    connectionString = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataAuthenticationType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OnYourDataConnectionStringAuthenticationOptions(type, serializedAdditionalRawData, connectionString);
+        }
+
+        BinaryData IPersistableModel<OnYourDataConnectionStringAuthenticationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataConnectionStringAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataConnectionStringAuthenticationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataConnectionStringAuthenticationOptions IPersistableModel<OnYourDataConnectionStringAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataConnectionStringAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataConnectionStringAuthenticationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataConnectionStringAuthenticationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataConnectionStringAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new OnYourDataConnectionStringAuthenticationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataConnectionStringAuthenticationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataConnectionStringAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataConnectionStringAuthenticationOptions.cs
new file mode 100644
index 000000000000..a3a007891075
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataConnectionStringAuthenticationOptions.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The authentication options for Azure OpenAI On Your Data when using a connection string. </summary>
+    public partial class OnYourDataConnectionStringAuthenticationOptions : OnYourDataAuthenticationOptions
+    {
+        /// <summary> Initializes a new instance of <see cref="OnYourDataConnectionStringAuthenticationOptions"/>. </summary>
+        /// <param name="connectionString"> The connection string to use for authentication. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="connectionString"/> is null. </exception>
+        public OnYourDataConnectionStringAuthenticationOptions(string connectionString)
+        {
+            Argument.AssertNotNull(connectionString, nameof(connectionString));
+
+            Type = OnYourDataAuthenticationType.ConnectionString;
+            ConnectionString = connectionString;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataConnectionStringAuthenticationOptions"/>. </summary>
+        /// <param name="type"> The authentication type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="connectionString"> The connection string to use for authentication. </param>
+        internal OnYourDataConnectionStringAuthenticationOptions(OnYourDataAuthenticationType type, IDictionary<string, BinaryData> serializedAdditionalRawData, string connectionString) : base(type, serializedAdditionalRawData)
+        {
+            ConnectionString = connectionString;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataConnectionStringAuthenticationOptions"/> for deserialization. </summary>
+        internal OnYourDataConnectionStringAuthenticationOptions()
+        {
+        }
+
+        /// <summary> The connection string to use for authentication. </summary>
+        public string ConnectionString { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataContextProperty.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataContextProperty.cs
new file mode 100644
index 000000000000..741585547c4a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataContextProperty.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The context property. </summary>
+    public readonly partial struct OnYourDataContextProperty : IEquatable<OnYourDataContextProperty>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataContextProperty"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public OnYourDataContextProperty(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string CitationsValue = "citations";
+        private const string IntentValue = "intent";
+        private const string AllRetrievedDocumentsValue = "all_retrieved_documents";
+
+        /// <summary> The `citations` property. </summary>
+        public static OnYourDataContextProperty Citations { get; } = new OnYourDataContextProperty(CitationsValue);
+        /// <summary> The `intent` property. </summary>
+        public static OnYourDataContextProperty Intent { get; } = new OnYourDataContextProperty(IntentValue);
+        /// <summary> The `all_retrieved_documents` property. </summary>
+        public static OnYourDataContextProperty AllRetrievedDocuments { get; } = new OnYourDataContextProperty(AllRetrievedDocumentsValue);
+        /// <summary> Determines if two <see cref="OnYourDataContextProperty"/> values are the same. </summary>
+        public static bool operator ==(OnYourDataContextProperty left, OnYourDataContextProperty right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="OnYourDataContextProperty"/> values are not the same. </summary>
+        public static bool operator !=(OnYourDataContextProperty left, OnYourDataContextProperty right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="OnYourDataContextProperty"/>. </summary>
+        public static implicit operator OnYourDataContextProperty(string value) => new OnYourDataContextProperty(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is OnYourDataContextProperty other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(OnYourDataContextProperty other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataDeploymentNameVectorizationSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataDeploymentNameVectorizationSource.Serialization.cs
new file mode 100644
index 000000000000..05a2fb03e7d6
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataDeploymentNameVectorizationSource.Serialization.cs
@@ -0,0 +1,158 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OnYourDataDeploymentNameVectorizationSource : IUtf8JsonSerializable, IJsonModel<OnYourDataDeploymentNameVectorizationSource>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataDeploymentNameVectorizationSource>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataDeploymentNameVectorizationSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataDeploymentNameVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataDeploymentNameVectorizationSource)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("deployment_name"u8);
+            writer.WriteStringValue(DeploymentName);
+            if (Optional.IsDefined(Dimensions))
+            {
+                writer.WritePropertyName("dimensions"u8);
+                writer.WriteNumberValue(Dimensions.Value);
+            }
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataDeploymentNameVectorizationSource IJsonModel<OnYourDataDeploymentNameVectorizationSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataDeploymentNameVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataDeploymentNameVectorizationSource)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataDeploymentNameVectorizationSource(document.RootElement, options);
+        }
+
+        internal static OnYourDataDeploymentNameVectorizationSource DeserializeOnYourDataDeploymentNameVectorizationSource(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string deploymentName = default;
+            int? dimensions = default;
+            OnYourDataVectorizationSourceType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("deployment_name"u8))
+                {
+                    deploymentName = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("dimensions"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    dimensions = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataVectorizationSourceType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OnYourDataDeploymentNameVectorizationSource(type, serializedAdditionalRawData, deploymentName, dimensions);
+        }
+
+        BinaryData IPersistableModel<OnYourDataDeploymentNameVectorizationSource>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataDeploymentNameVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataDeploymentNameVectorizationSource)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataDeploymentNameVectorizationSource IPersistableModel<OnYourDataDeploymentNameVectorizationSource>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataDeploymentNameVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataDeploymentNameVectorizationSource(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataDeploymentNameVectorizationSource)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataDeploymentNameVectorizationSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new OnYourDataDeploymentNameVectorizationSource FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataDeploymentNameVectorizationSource(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataDeploymentNameVectorizationSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataDeploymentNameVectorizationSource.cs
new file mode 100644
index 000000000000..1183ff66cbe4
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataDeploymentNameVectorizationSource.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// The details of a a vectorization source, used by Azure OpenAI On Your Data when applying vector search, that is based
+    /// on an internal embeddings model deployment name in the same Azure OpenAI resource.
+    /// </summary>
+    public partial class OnYourDataDeploymentNameVectorizationSource : OnYourDataVectorizationSource
+    {
+        /// <summary> Initializes a new instance of <see cref="OnYourDataDeploymentNameVectorizationSource"/>. </summary>
+        /// <param name="deploymentName"> The embedding model deployment name within the same Azure OpenAI resource. This enables you to use vector search without Azure OpenAI api-key and without Azure OpenAI public network access. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentName"/> is null. </exception>
+        public OnYourDataDeploymentNameVectorizationSource(string deploymentName)
+        {
+            Argument.AssertNotNull(deploymentName, nameof(deploymentName));
+
+            Type = OnYourDataVectorizationSourceType.DeploymentName;
+            DeploymentName = deploymentName;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataDeploymentNameVectorizationSource"/>. </summary>
+        /// <param name="type"> The type of vectorization source to use. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="deploymentName"> The embedding model deployment name within the same Azure OpenAI resource. This enables you to use vector search without Azure OpenAI api-key and without Azure OpenAI public network access. </param>
+        /// <param name="dimensions"> The number of dimensions the embeddings should have. Only supported in `text-embedding-3` and later models. </param>
+        internal OnYourDataDeploymentNameVectorizationSource(OnYourDataVectorizationSourceType type, IDictionary<string, BinaryData> serializedAdditionalRawData, string deploymentName, int? dimensions) : base(type, serializedAdditionalRawData)
+        {
+            DeploymentName = deploymentName;
+            Dimensions = dimensions;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataDeploymentNameVectorizationSource"/> for deserialization. </summary>
+        internal OnYourDataDeploymentNameVectorizationSource()
+        {
+        }
+
+        /// <summary> The embedding model deployment name within the same Azure OpenAI resource. This enables you to use vector search without Azure OpenAI api-key and without Azure OpenAI public network access. </summary>
+        public string DeploymentName { get; }
+        /// <summary> The number of dimensions the embeddings should have. Only supported in `text-embedding-3` and later models. </summary>
+        public int? Dimensions { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataEncodedApiKeyAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataEncodedApiKeyAuthenticationOptions.Serialization.cs
new file mode 100644
index 000000000000..e9457427c4ed
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataEncodedApiKeyAuthenticationOptions.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OnYourDataEncodedApiKeyAuthenticationOptions : IUtf8JsonSerializable, IJsonModel<OnYourDataEncodedApiKeyAuthenticationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataEncodedApiKeyAuthenticationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataEncodedApiKeyAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataEncodedApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataEncodedApiKeyAuthenticationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("encoded_api_key"u8);
+            writer.WriteStringValue(EncodedApiKey);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataEncodedApiKeyAuthenticationOptions IJsonModel<OnYourDataEncodedApiKeyAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataEncodedApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataEncodedApiKeyAuthenticationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataEncodedApiKeyAuthenticationOptions(document.RootElement, options);
+        }
+
+        internal static OnYourDataEncodedApiKeyAuthenticationOptions DeserializeOnYourDataEncodedApiKeyAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string encodedApiKey = default;
+            OnYourDataAuthenticationType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("encoded_api_key"u8))
+                {
+                    encodedApiKey = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataAuthenticationType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OnYourDataEncodedApiKeyAuthenticationOptions(type, serializedAdditionalRawData, encodedApiKey);
+        }
+
+        BinaryData IPersistableModel<OnYourDataEncodedApiKeyAuthenticationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataEncodedApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataEncodedApiKeyAuthenticationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataEncodedApiKeyAuthenticationOptions IPersistableModel<OnYourDataEncodedApiKeyAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataEncodedApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataEncodedApiKeyAuthenticationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataEncodedApiKeyAuthenticationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataEncodedApiKeyAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new OnYourDataEncodedApiKeyAuthenticationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataEncodedApiKeyAuthenticationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataEncodedApiKeyAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataEncodedApiKeyAuthenticationOptions.cs
new file mode 100644
index 000000000000..927e2e27e169
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataEncodedApiKeyAuthenticationOptions.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The authentication options for Azure OpenAI On Your Data when using an Elasticsearch encoded API key. </summary>
+    public partial class OnYourDataEncodedApiKeyAuthenticationOptions : OnYourDataAuthenticationOptions
+    {
+        /// <summary> Initializes a new instance of <see cref="OnYourDataEncodedApiKeyAuthenticationOptions"/>. </summary>
+        /// <param name="encodedApiKey"> The encoded API key to use for authentication. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="encodedApiKey"/> is null. </exception>
+        public OnYourDataEncodedApiKeyAuthenticationOptions(string encodedApiKey)
+        {
+            Argument.AssertNotNull(encodedApiKey, nameof(encodedApiKey));
+
+            Type = OnYourDataAuthenticationType.EncodedApiKey;
+            EncodedApiKey = encodedApiKey;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataEncodedApiKeyAuthenticationOptions"/>. </summary>
+        /// <param name="type"> The authentication type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="encodedApiKey"> The encoded API key to use for authentication. </param>
+        internal OnYourDataEncodedApiKeyAuthenticationOptions(OnYourDataAuthenticationType type, IDictionary<string, BinaryData> serializedAdditionalRawData, string encodedApiKey) : base(type, serializedAdditionalRawData)
+        {
+            EncodedApiKey = encodedApiKey;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataEncodedApiKeyAuthenticationOptions"/> for deserialization. </summary>
+        internal OnYourDataEncodedApiKeyAuthenticationOptions()
+        {
+        }
+
+        /// <summary> The encoded API key to use for authentication. </summary>
+        public string EncodedApiKey { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataEndpointVectorizationSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataEndpointVectorizationSource.Serialization.cs
new file mode 100644
index 000000000000..8186ceb769ec
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataEndpointVectorizationSource.Serialization.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OnYourDataEndpointVectorizationSource : IUtf8JsonSerializable, IJsonModel<OnYourDataEndpointVectorizationSource>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataEndpointVectorizationSource>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataEndpointVectorizationSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataEndpointVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataEndpointVectorizationSource)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("endpoint"u8);
+            writer.WriteStringValue(Endpoint.AbsoluteUri);
+            writer.WritePropertyName("authentication"u8);
+            writer.WriteObjectValue(Authentication, options);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataEndpointVectorizationSource IJsonModel<OnYourDataEndpointVectorizationSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataEndpointVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataEndpointVectorizationSource)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataEndpointVectorizationSource(document.RootElement, options);
+        }
+
+        internal static OnYourDataEndpointVectorizationSource DeserializeOnYourDataEndpointVectorizationSource(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            Uri endpoint = default;
+            OnYourDataVectorSearchAuthenticationOptions authentication = default;
+            OnYourDataVectorizationSourceType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("endpoint"u8))
+                {
+                    endpoint = new Uri(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("authentication"u8))
+                {
+                    authentication = OnYourDataVectorSearchAuthenticationOptions.DeserializeOnYourDataVectorSearchAuthenticationOptions(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataVectorizationSourceType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OnYourDataEndpointVectorizationSource(type, serializedAdditionalRawData, endpoint, authentication);
+        }
+
+        BinaryData IPersistableModel<OnYourDataEndpointVectorizationSource>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataEndpointVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataEndpointVectorizationSource)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataEndpointVectorizationSource IPersistableModel<OnYourDataEndpointVectorizationSource>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataEndpointVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataEndpointVectorizationSource(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataEndpointVectorizationSource)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataEndpointVectorizationSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new OnYourDataEndpointVectorizationSource FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataEndpointVectorizationSource(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataEndpointVectorizationSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataEndpointVectorizationSource.cs
new file mode 100644
index 000000000000..5ab4f3198354
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataEndpointVectorizationSource.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// The details of a a vectorization source, used by Azure OpenAI On Your Data when applying vector search, that is based
+    /// on a public Azure OpenAI endpoint call for embeddings.
+    /// </summary>
+    public partial class OnYourDataEndpointVectorizationSource : OnYourDataVectorizationSource
+    {
+        /// <summary> Initializes a new instance of <see cref="OnYourDataEndpointVectorizationSource"/>. </summary>
+        /// <param name="endpoint"> Specifies the resource endpoint URL from which embeddings should be retrieved. It should be in the format of https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYMENT_NAME/embeddings. The api-version query parameter is not allowed. </param>
+        /// <param name="authentication">
+        /// Specifies the authentication options to use when retrieving embeddings from the specified endpoint.
+        /// Please note <see cref="OnYourDataVectorSearchAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataVectorSearchAccessTokenAuthenticationOptions"/> and <see cref="OnYourDataVectorSearchApiKeyAuthenticationOptions"/>.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/> or <paramref name="authentication"/> is null. </exception>
+        public OnYourDataEndpointVectorizationSource(Uri endpoint, OnYourDataVectorSearchAuthenticationOptions authentication)
+        {
+            Argument.AssertNotNull(endpoint, nameof(endpoint));
+            Argument.AssertNotNull(authentication, nameof(authentication));
+
+            Type = OnYourDataVectorizationSourceType.Endpoint;
+            Endpoint = endpoint;
+            Authentication = authentication;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataEndpointVectorizationSource"/>. </summary>
+        /// <param name="type"> The type of vectorization source to use. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="endpoint"> Specifies the resource endpoint URL from which embeddings should be retrieved. It should be in the format of https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYMENT_NAME/embeddings. The api-version query parameter is not allowed. </param>
+        /// <param name="authentication">
+        /// Specifies the authentication options to use when retrieving embeddings from the specified endpoint.
+        /// Please note <see cref="OnYourDataVectorSearchAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataVectorSearchAccessTokenAuthenticationOptions"/> and <see cref="OnYourDataVectorSearchApiKeyAuthenticationOptions"/>.
+        /// </param>
+        internal OnYourDataEndpointVectorizationSource(OnYourDataVectorizationSourceType type, IDictionary<string, BinaryData> serializedAdditionalRawData, Uri endpoint, OnYourDataVectorSearchAuthenticationOptions authentication) : base(type, serializedAdditionalRawData)
+        {
+            Endpoint = endpoint;
+            Authentication = authentication;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataEndpointVectorizationSource"/> for deserialization. </summary>
+        internal OnYourDataEndpointVectorizationSource()
+        {
+        }
+
+        /// <summary> Specifies the resource endpoint URL from which embeddings should be retrieved. It should be in the format of https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYMENT_NAME/embeddings. The api-version query parameter is not allowed. </summary>
+        public Uri Endpoint { get; }
+        /// <summary>
+        /// Specifies the authentication options to use when retrieving embeddings from the specified endpoint.
+        /// Please note <see cref="OnYourDataVectorSearchAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataVectorSearchAccessTokenAuthenticationOptions"/> and <see cref="OnYourDataVectorSearchApiKeyAuthenticationOptions"/>.
+        /// </summary>
+        public OnYourDataVectorSearchAuthenticationOptions Authentication { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataIntegratedVectorizationSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataIntegratedVectorizationSource.Serialization.cs
new file mode 100644
index 000000000000..89265a730aa7
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataIntegratedVectorizationSource.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OnYourDataIntegratedVectorizationSource : IUtf8JsonSerializable, IJsonModel<OnYourDataIntegratedVectorizationSource>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataIntegratedVectorizationSource>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataIntegratedVectorizationSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataIntegratedVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataIntegratedVectorizationSource)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataIntegratedVectorizationSource IJsonModel<OnYourDataIntegratedVectorizationSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataIntegratedVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataIntegratedVectorizationSource)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataIntegratedVectorizationSource(document.RootElement, options);
+        }
+
+        internal static OnYourDataIntegratedVectorizationSource DeserializeOnYourDataIntegratedVectorizationSource(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            OnYourDataVectorizationSourceType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataVectorizationSourceType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OnYourDataIntegratedVectorizationSource(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<OnYourDataIntegratedVectorizationSource>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataIntegratedVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataIntegratedVectorizationSource)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataIntegratedVectorizationSource IPersistableModel<OnYourDataIntegratedVectorizationSource>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataIntegratedVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataIntegratedVectorizationSource(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataIntegratedVectorizationSource)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataIntegratedVectorizationSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new OnYourDataIntegratedVectorizationSource FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataIntegratedVectorizationSource(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataIntegratedVectorizationSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataIntegratedVectorizationSource.cs
new file mode 100644
index 000000000000..89325cda307e
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataIntegratedVectorizationSource.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Represents the integrated vectorizer defined within the search resource. </summary>
+    public partial class OnYourDataIntegratedVectorizationSource : OnYourDataVectorizationSource
+    {
+        /// <summary> Initializes a new instance of <see cref="OnYourDataIntegratedVectorizationSource"/>. </summary>
+        public OnYourDataIntegratedVectorizationSource()
+        {
+            Type = OnYourDataVectorizationSourceType.Integrated;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataIntegratedVectorizationSource"/>. </summary>
+        /// <param name="type"> The type of vectorization source to use. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal OnYourDataIntegratedVectorizationSource(OnYourDataVectorizationSourceType type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataKeyAndKeyIdAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataKeyAndKeyIdAuthenticationOptions.Serialization.cs
new file mode 100644
index 000000000000..d6fe020442d7
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataKeyAndKeyIdAuthenticationOptions.Serialization.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OnYourDataKeyAndKeyIdAuthenticationOptions : IUtf8JsonSerializable, IJsonModel<OnYourDataKeyAndKeyIdAuthenticationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataKeyAndKeyIdAuthenticationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataKeyAndKeyIdAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataKeyAndKeyIdAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataKeyAndKeyIdAuthenticationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("key"u8);
+            writer.WriteStringValue(Key);
+            writer.WritePropertyName("key_id"u8);
+            writer.WriteStringValue(KeyId);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataKeyAndKeyIdAuthenticationOptions IJsonModel<OnYourDataKeyAndKeyIdAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataKeyAndKeyIdAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataKeyAndKeyIdAuthenticationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataKeyAndKeyIdAuthenticationOptions(document.RootElement, options);
+        }
+
+        internal static OnYourDataKeyAndKeyIdAuthenticationOptions DeserializeOnYourDataKeyAndKeyIdAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string key = default;
+            string keyId = default;
+            OnYourDataAuthenticationType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("key"u8))
+                {
+                    key = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("key_id"u8))
+                {
+                    keyId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataAuthenticationType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OnYourDataKeyAndKeyIdAuthenticationOptions(type, serializedAdditionalRawData, key, keyId);
+        }
+
+        BinaryData IPersistableModel<OnYourDataKeyAndKeyIdAuthenticationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataKeyAndKeyIdAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataKeyAndKeyIdAuthenticationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataKeyAndKeyIdAuthenticationOptions IPersistableModel<OnYourDataKeyAndKeyIdAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataKeyAndKeyIdAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataKeyAndKeyIdAuthenticationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataKeyAndKeyIdAuthenticationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataKeyAndKeyIdAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new OnYourDataKeyAndKeyIdAuthenticationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataKeyAndKeyIdAuthenticationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataKeyAndKeyIdAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataKeyAndKeyIdAuthenticationOptions.cs
new file mode 100644
index 000000000000..469ac62213b4
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataKeyAndKeyIdAuthenticationOptions.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The authentication options for Azure OpenAI On Your Data when using an Elasticsearch key and key ID pair. </summary>
+    public partial class OnYourDataKeyAndKeyIdAuthenticationOptions : OnYourDataAuthenticationOptions
+    {
+        /// <summary> Initializes a new instance of <see cref="OnYourDataKeyAndKeyIdAuthenticationOptions"/>. </summary>
+        /// <param name="key"> The key to use for authentication. </param>
+        /// <param name="keyId"> The key ID to use for authentication. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="key"/> or <paramref name="keyId"/> is null. </exception>
+        public OnYourDataKeyAndKeyIdAuthenticationOptions(string key, string keyId)
+        {
+            Argument.AssertNotNull(key, nameof(key));
+            Argument.AssertNotNull(keyId, nameof(keyId));
+
+            Type = OnYourDataAuthenticationType.KeyAndKeyId;
+            Key = key;
+            KeyId = keyId;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataKeyAndKeyIdAuthenticationOptions"/>. </summary>
+        /// <param name="type"> The authentication type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="key"> The key to use for authentication. </param>
+        /// <param name="keyId"> The key ID to use for authentication. </param>
+        internal OnYourDataKeyAndKeyIdAuthenticationOptions(OnYourDataAuthenticationType type, IDictionary<string, BinaryData> serializedAdditionalRawData, string key, string keyId) : base(type, serializedAdditionalRawData)
+        {
+            Key = key;
+            KeyId = keyId;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataKeyAndKeyIdAuthenticationOptions"/> for deserialization. </summary>
+        internal OnYourDataKeyAndKeyIdAuthenticationOptions()
+        {
+        }
+
+        /// <summary> The key to use for authentication. </summary>
+        public string Key { get; }
+        /// <summary> The key ID to use for authentication. </summary>
+        public string KeyId { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataModelIdVectorizationSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataModelIdVectorizationSource.Serialization.cs
new file mode 100644
index 000000000000..76c0a9955de5
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataModelIdVectorizationSource.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OnYourDataModelIdVectorizationSource : IUtf8JsonSerializable, IJsonModel<OnYourDataModelIdVectorizationSource>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataModelIdVectorizationSource>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataModelIdVectorizationSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataModelIdVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataModelIdVectorizationSource)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("model_id"u8);
+            writer.WriteStringValue(ModelId);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataModelIdVectorizationSource IJsonModel<OnYourDataModelIdVectorizationSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataModelIdVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataModelIdVectorizationSource)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataModelIdVectorizationSource(document.RootElement, options);
+        }
+
+        internal static OnYourDataModelIdVectorizationSource DeserializeOnYourDataModelIdVectorizationSource(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string modelId = default;
+            OnYourDataVectorizationSourceType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("model_id"u8))
+                {
+                    modelId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataVectorizationSourceType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OnYourDataModelIdVectorizationSource(type, serializedAdditionalRawData, modelId);
+        }
+
+        BinaryData IPersistableModel<OnYourDataModelIdVectorizationSource>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataModelIdVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataModelIdVectorizationSource)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataModelIdVectorizationSource IPersistableModel<OnYourDataModelIdVectorizationSource>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataModelIdVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataModelIdVectorizationSource(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataModelIdVectorizationSource)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataModelIdVectorizationSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new OnYourDataModelIdVectorizationSource FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataModelIdVectorizationSource(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataModelIdVectorizationSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataModelIdVectorizationSource.cs
new file mode 100644
index 000000000000..3db079445dbc
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataModelIdVectorizationSource.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// The details of a a vectorization source, used by Azure OpenAI On Your Data when applying vector search, that is based
+    /// on a search service model ID. Currently only supported by Elasticsearch®.
+    /// </summary>
+    public partial class OnYourDataModelIdVectorizationSource : OnYourDataVectorizationSource
+    {
+        /// <summary> Initializes a new instance of <see cref="OnYourDataModelIdVectorizationSource"/>. </summary>
+        /// <param name="modelId"> The embedding model ID build inside the search service. Currently only supported by Elasticsearch®. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="modelId"/> is null. </exception>
+        public OnYourDataModelIdVectorizationSource(string modelId)
+        {
+            Argument.AssertNotNull(modelId, nameof(modelId));
+
+            Type = OnYourDataVectorizationSourceType.ModelId;
+            ModelId = modelId;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataModelIdVectorizationSource"/>. </summary>
+        /// <param name="type"> The type of vectorization source to use. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="modelId"> The embedding model ID build inside the search service. Currently only supported by Elasticsearch®. </param>
+        internal OnYourDataModelIdVectorizationSource(OnYourDataVectorizationSourceType type, IDictionary<string, BinaryData> serializedAdditionalRawData, string modelId) : base(type, serializedAdditionalRawData)
+        {
+            ModelId = modelId;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataModelIdVectorizationSource"/> for deserialization. </summary>
+        internal OnYourDataModelIdVectorizationSource()
+        {
+        }
+
+        /// <summary> The embedding model ID build inside the search service. Currently only supported by Elasticsearch®. </summary>
+        public string ModelId { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataSystemAssignedManagedIdentityAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataSystemAssignedManagedIdentityAuthenticationOptions.Serialization.cs
new file mode 100644
index 000000000000..a2321ebaf0d7
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataSystemAssignedManagedIdentityAuthenticationOptions.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OnYourDataSystemAssignedManagedIdentityAuthenticationOptions : IUtf8JsonSerializable, IJsonModel<OnYourDataSystemAssignedManagedIdentityAuthenticationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataSystemAssignedManagedIdentityAuthenticationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataSystemAssignedManagedIdentityAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataSystemAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataSystemAssignedManagedIdentityAuthenticationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataSystemAssignedManagedIdentityAuthenticationOptions IJsonModel<OnYourDataSystemAssignedManagedIdentityAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataSystemAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataSystemAssignedManagedIdentityAuthenticationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataSystemAssignedManagedIdentityAuthenticationOptions(document.RootElement, options);
+        }
+
+        internal static OnYourDataSystemAssignedManagedIdentityAuthenticationOptions DeserializeOnYourDataSystemAssignedManagedIdentityAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            OnYourDataAuthenticationType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataAuthenticationType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OnYourDataSystemAssignedManagedIdentityAuthenticationOptions(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<OnYourDataSystemAssignedManagedIdentityAuthenticationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataSystemAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataSystemAssignedManagedIdentityAuthenticationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataSystemAssignedManagedIdentityAuthenticationOptions IPersistableModel<OnYourDataSystemAssignedManagedIdentityAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataSystemAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataSystemAssignedManagedIdentityAuthenticationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataSystemAssignedManagedIdentityAuthenticationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataSystemAssignedManagedIdentityAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new OnYourDataSystemAssignedManagedIdentityAuthenticationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataSystemAssignedManagedIdentityAuthenticationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataSystemAssignedManagedIdentityAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataSystemAssignedManagedIdentityAuthenticationOptions.cs
new file mode 100644
index 000000000000..734ef7b5d70c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataSystemAssignedManagedIdentityAuthenticationOptions.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The authentication options for Azure OpenAI On Your Data when using a system-assigned managed identity. </summary>
+    public partial class OnYourDataSystemAssignedManagedIdentityAuthenticationOptions : OnYourDataAuthenticationOptions
+    {
+        /// <summary> Initializes a new instance of <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>. </summary>
+        public OnYourDataSystemAssignedManagedIdentityAuthenticationOptions()
+        {
+            Type = OnYourDataAuthenticationType.SystemAssignedManagedIdentity;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>. </summary>
+        /// <param name="type"> The authentication type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal OnYourDataSystemAssignedManagedIdentityAuthenticationOptions(OnYourDataAuthenticationType type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataUserAssignedManagedIdentityAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataUserAssignedManagedIdentityAuthenticationOptions.Serialization.cs
new file mode 100644
index 000000000000..85f6f9d26e4a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataUserAssignedManagedIdentityAuthenticationOptions.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OnYourDataUserAssignedManagedIdentityAuthenticationOptions : IUtf8JsonSerializable, IJsonModel<OnYourDataUserAssignedManagedIdentityAuthenticationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataUserAssignedManagedIdentityAuthenticationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataUserAssignedManagedIdentityAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataUserAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataUserAssignedManagedIdentityAuthenticationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("managed_identity_resource_id"u8);
+            writer.WriteStringValue(ManagedIdentityResourceId);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataUserAssignedManagedIdentityAuthenticationOptions IJsonModel<OnYourDataUserAssignedManagedIdentityAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataUserAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataUserAssignedManagedIdentityAuthenticationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataUserAssignedManagedIdentityAuthenticationOptions(document.RootElement, options);
+        }
+
+        internal static OnYourDataUserAssignedManagedIdentityAuthenticationOptions DeserializeOnYourDataUserAssignedManagedIdentityAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string managedIdentityResourceId = default;
+            OnYourDataAuthenticationType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("managed_identity_resource_id"u8))
+                {
+                    managedIdentityResourceId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataAuthenticationType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OnYourDataUserAssignedManagedIdentityAuthenticationOptions(type, serializedAdditionalRawData, managedIdentityResourceId);
+        }
+
+        BinaryData IPersistableModel<OnYourDataUserAssignedManagedIdentityAuthenticationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataUserAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataUserAssignedManagedIdentityAuthenticationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataUserAssignedManagedIdentityAuthenticationOptions IPersistableModel<OnYourDataUserAssignedManagedIdentityAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataUserAssignedManagedIdentityAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataUserAssignedManagedIdentityAuthenticationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataUserAssignedManagedIdentityAuthenticationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataUserAssignedManagedIdentityAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new OnYourDataUserAssignedManagedIdentityAuthenticationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataUserAssignedManagedIdentityAuthenticationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataUserAssignedManagedIdentityAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataUserAssignedManagedIdentityAuthenticationOptions.cs
new file mode 100644
index 000000000000..89ca44bf1441
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataUserAssignedManagedIdentityAuthenticationOptions.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The authentication options for Azure OpenAI On Your Data when using a user-assigned managed identity. </summary>
+    public partial class OnYourDataUserAssignedManagedIdentityAuthenticationOptions : OnYourDataAuthenticationOptions
+    {
+        /// <summary> Initializes a new instance of <see cref="OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/>. </summary>
+        /// <param name="managedIdentityResourceId"> The resource ID of the user-assigned managed identity to use for authentication. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="managedIdentityResourceId"/> is null. </exception>
+        public OnYourDataUserAssignedManagedIdentityAuthenticationOptions(string managedIdentityResourceId)
+        {
+            Argument.AssertNotNull(managedIdentityResourceId, nameof(managedIdentityResourceId));
+
+            Type = OnYourDataAuthenticationType.UserAssignedManagedIdentity;
+            ManagedIdentityResourceId = managedIdentityResourceId;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/>. </summary>
+        /// <param name="type"> The authentication type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="managedIdentityResourceId"> The resource ID of the user-assigned managed identity to use for authentication. </param>
+        internal OnYourDataUserAssignedManagedIdentityAuthenticationOptions(OnYourDataAuthenticationType type, IDictionary<string, BinaryData> serializedAdditionalRawData, string managedIdentityResourceId) : base(type, serializedAdditionalRawData)
+        {
+            ManagedIdentityResourceId = managedIdentityResourceId;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> for deserialization. </summary>
+        internal OnYourDataUserAssignedManagedIdentityAuthenticationOptions()
+        {
+        }
+
+        /// <summary> The resource ID of the user-assigned managed identity to use for authentication. </summary>
+        public string ManagedIdentityResourceId { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataUsernameAndPasswordAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataUsernameAndPasswordAuthenticationOptions.Serialization.cs
new file mode 100644
index 000000000000..1c30927617ad
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataUsernameAndPasswordAuthenticationOptions.Serialization.cs
@@ -0,0 +1,151 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OnYourDataUsernameAndPasswordAuthenticationOptions : IUtf8JsonSerializable, IJsonModel<OnYourDataUsernameAndPasswordAuthenticationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataUsernameAndPasswordAuthenticationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataUsernameAndPasswordAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataUsernameAndPasswordAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataUsernameAndPasswordAuthenticationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("username"u8);
+            writer.WriteStringValue(Username);
+            writer.WritePropertyName("password"u8);
+            writer.WriteStringValue(Password);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataUsernameAndPasswordAuthenticationOptions IJsonModel<OnYourDataUsernameAndPasswordAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataUsernameAndPasswordAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataUsernameAndPasswordAuthenticationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataUsernameAndPasswordAuthenticationOptions(document.RootElement, options);
+        }
+
+        internal static OnYourDataUsernameAndPasswordAuthenticationOptions DeserializeOnYourDataUsernameAndPasswordAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string username = default;
+            string password = default;
+            OnYourDataAuthenticationType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("username"u8))
+                {
+                    username = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("password"u8))
+                {
+                    password = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataAuthenticationType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OnYourDataUsernameAndPasswordAuthenticationOptions(type, serializedAdditionalRawData, username, password);
+        }
+
+        BinaryData IPersistableModel<OnYourDataUsernameAndPasswordAuthenticationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataUsernameAndPasswordAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataUsernameAndPasswordAuthenticationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataUsernameAndPasswordAuthenticationOptions IPersistableModel<OnYourDataUsernameAndPasswordAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataUsernameAndPasswordAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataUsernameAndPasswordAuthenticationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataUsernameAndPasswordAuthenticationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataUsernameAndPasswordAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new OnYourDataUsernameAndPasswordAuthenticationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataUsernameAndPasswordAuthenticationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataUsernameAndPasswordAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataUsernameAndPasswordAuthenticationOptions.cs
new file mode 100644
index 000000000000..3b382f621f00
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataUsernameAndPasswordAuthenticationOptions.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The authentication options for Azure OpenAI On Your Data when using a username and password. </summary>
+    public partial class OnYourDataUsernameAndPasswordAuthenticationOptions : OnYourDataAuthenticationOptions
+    {
+        /// <summary> Initializes a new instance of <see cref="OnYourDataUsernameAndPasswordAuthenticationOptions"/>. </summary>
+        /// <param name="username"> The username. </param>
+        /// <param name="password"> The password. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="username"/> or <paramref name="password"/> is null. </exception>
+        public OnYourDataUsernameAndPasswordAuthenticationOptions(string username, string password)
+        {
+            Argument.AssertNotNull(username, nameof(username));
+            Argument.AssertNotNull(password, nameof(password));
+
+            Type = OnYourDataAuthenticationType.UsernameAndPassword;
+            Username = username;
+            Password = password;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataUsernameAndPasswordAuthenticationOptions"/>. </summary>
+        /// <param name="type"> The authentication type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="username"> The username. </param>
+        /// <param name="password"> The password. </param>
+        internal OnYourDataUsernameAndPasswordAuthenticationOptions(OnYourDataAuthenticationType type, IDictionary<string, BinaryData> serializedAdditionalRawData, string username, string password) : base(type, serializedAdditionalRawData)
+        {
+            Username = username;
+            Password = password;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataUsernameAndPasswordAuthenticationOptions"/> for deserialization. </summary>
+        internal OnYourDataUsernameAndPasswordAuthenticationOptions()
+        {
+        }
+
+        /// <summary> The username. </summary>
+        public string Username { get; }
+        /// <summary> The password. </summary>
+        public string Password { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceApiKeyAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAccessTokenAuthenticationOptions.Serialization.cs
similarity index 51%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceApiKeyAuthenticationOptions.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAccessTokenAuthenticationOptions.Serialization.cs
index 4d448e27cf9e..28a9b7be8b8d 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalAzureChatDataSourceApiKeyAuthenticationOptions.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAccessTokenAuthenticationOptions.Serialization.cs
@@ -1,44 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI
 {
-    internal partial class InternalAzureChatDataSourceApiKeyAuthenticationOptions : IJsonModel<InternalAzureChatDataSourceApiKeyAuthenticationOptions>
+    public partial class OnYourDataVectorSearchAccessTokenAuthenticationOptions : IUtf8JsonSerializable, IJsonModel<OnYourDataVectorSearchAccessTokenAuthenticationOptions>
     {
-        void IJsonModel<InternalAzureChatDataSourceApiKeyAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataVectorSearchAccessTokenAuthenticationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataVectorSearchAccessTokenAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchAccessTokenAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceApiKeyAuthenticationOptions)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(OnYourDataVectorSearchAccessTokenAuthenticationOptions)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("key") != true)
+            writer.WritePropertyName("access_token"u8);
+            writer.WriteStringValue(AccessToken);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                writer.WritePropertyName("key"u8);
-                writer.WriteStringValue(Key);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -53,19 +48,19 @@ void IJsonModel<InternalAzureChatDataSourceApiKeyAuthenticationOptions>.Write(Ut
             writer.WriteEndObject();
         }
 
-        InternalAzureChatDataSourceApiKeyAuthenticationOptions IJsonModel<InternalAzureChatDataSourceApiKeyAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        OnYourDataVectorSearchAccessTokenAuthenticationOptions IJsonModel<OnYourDataVectorSearchAccessTokenAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchAccessTokenAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalAzureChatDataSourceApiKeyAuthenticationOptions)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(OnYourDataVectorSearchAccessTokenAuthenticationOptions)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalAzureChatDataSourceApiKeyAuthenticationOptions(document.RootElement, options);
+            return DeserializeOnYourDataVectorSearchAccessTokenAuthenticationOptions(document.RootElement, options);
         }
 
-        internal static InternalAzureChatDataSourceApiKeyAuthenticationOptions DeserializeInternalAzureChatDataSourceApiKeyAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static OnYourDataVectorSearchAccessTokenAuthenticationOptions DeserializeOnYourDataVectorSearchAccessTokenAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -73,76 +68,76 @@ internal static InternalAzureChatDataSourceApiKeyAuthenticationOptions Deseriali
             {
                 return null;
             }
-            string key = default;
-            string type = default;
+            string accessToken = default;
+            OnYourDataVectorSearchAuthenticationType type = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
             {
-                if (property.NameEquals("key"u8))
+                if (property.NameEquals("access_token"u8))
                 {
-                    key = property.Value.GetString();
+                    accessToken = property.Value.GetString();
                     continue;
                 }
                 if (property.NameEquals("type"u8))
                 {
-                    type = property.Value.GetString();
+                    type = new OnYourDataVectorSearchAuthenticationType(property.Value.GetString());
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new InternalAzureChatDataSourceApiKeyAuthenticationOptions(type, serializedAdditionalRawData, key);
+            return new OnYourDataVectorSearchAccessTokenAuthenticationOptions(type, serializedAdditionalRawData, accessToken);
         }
 
-        BinaryData IPersistableModel<InternalAzureChatDataSourceApiKeyAuthenticationOptions>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<OnYourDataVectorSearchAccessTokenAuthenticationOptions>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchAccessTokenAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceApiKeyAuthenticationOptions)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(OnYourDataVectorSearchAccessTokenAuthenticationOptions)} does not support writing '{options.Format}' format.");
             }
         }
 
-        InternalAzureChatDataSourceApiKeyAuthenticationOptions IPersistableModel<InternalAzureChatDataSourceApiKeyAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        OnYourDataVectorSearchAccessTokenAuthenticationOptions IPersistableModel<OnYourDataVectorSearchAccessTokenAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalAzureChatDataSourceApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchAccessTokenAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalAzureChatDataSourceApiKeyAuthenticationOptions(document.RootElement, options);
+                        return DeserializeOnYourDataVectorSearchAccessTokenAuthenticationOptions(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(InternalAzureChatDataSourceApiKeyAuthenticationOptions)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(OnYourDataVectorSearchAccessTokenAuthenticationOptions)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<InternalAzureChatDataSourceApiKeyAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<OnYourDataVectorSearchAccessTokenAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalAzureChatDataSourceApiKeyAuthenticationOptions FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new OnYourDataVectorSearchAccessTokenAuthenticationOptions FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalAzureChatDataSourceApiKeyAuthenticationOptions(document.RootElement);
+            return DeserializeOnYourDataVectorSearchAccessTokenAuthenticationOptions(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAccessTokenAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAccessTokenAuthenticationOptions.cs
new file mode 100644
index 000000000000..9a6cc8cd23c1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAccessTokenAuthenticationOptions.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The authentication options for Azure OpenAI On Your Data vector search when using access token. </summary>
+    public partial class OnYourDataVectorSearchAccessTokenAuthenticationOptions : OnYourDataVectorSearchAuthenticationOptions
+    {
+        /// <summary> Initializes a new instance of <see cref="OnYourDataVectorSearchAccessTokenAuthenticationOptions"/>. </summary>
+        /// <param name="accessToken"> The access token to use for authentication. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="accessToken"/> is null. </exception>
+        public OnYourDataVectorSearchAccessTokenAuthenticationOptions(string accessToken)
+        {
+            Argument.AssertNotNull(accessToken, nameof(accessToken));
+
+            Type = OnYourDataVectorSearchAuthenticationType.AccessToken;
+            AccessToken = accessToken;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataVectorSearchAccessTokenAuthenticationOptions"/>. </summary>
+        /// <param name="type"> The type of authentication to use. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="accessToken"> The access token to use for authentication. </param>
+        internal OnYourDataVectorSearchAccessTokenAuthenticationOptions(OnYourDataVectorSearchAuthenticationType type, IDictionary<string, BinaryData> serializedAdditionalRawData, string accessToken) : base(type, serializedAdditionalRawData)
+        {
+            AccessToken = accessToken;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataVectorSearchAccessTokenAuthenticationOptions"/> for deserialization. </summary>
+        internal OnYourDataVectorSearchAccessTokenAuthenticationOptions()
+        {
+        }
+
+        /// <summary> The access token to use for authentication. </summary>
+        public string AccessToken { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchApiKeyAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchApiKeyAuthenticationOptions.Serialization.cs
new file mode 100644
index 000000000000..d39da87bc40a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchApiKeyAuthenticationOptions.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OnYourDataVectorSearchApiKeyAuthenticationOptions : IUtf8JsonSerializable, IJsonModel<OnYourDataVectorSearchApiKeyAuthenticationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataVectorSearchApiKeyAuthenticationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataVectorSearchApiKeyAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataVectorSearchApiKeyAuthenticationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("key"u8);
+            writer.WriteStringValue(Key);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataVectorSearchApiKeyAuthenticationOptions IJsonModel<OnYourDataVectorSearchApiKeyAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataVectorSearchApiKeyAuthenticationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataVectorSearchApiKeyAuthenticationOptions(document.RootElement, options);
+        }
+
+        internal static OnYourDataVectorSearchApiKeyAuthenticationOptions DeserializeOnYourDataVectorSearchApiKeyAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string key = default;
+            OnYourDataVectorSearchAuthenticationType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("key"u8))
+                {
+                    key = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataVectorSearchAuthenticationType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OnYourDataVectorSearchApiKeyAuthenticationOptions(type, serializedAdditionalRawData, key);
+        }
+
+        BinaryData IPersistableModel<OnYourDataVectorSearchApiKeyAuthenticationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataVectorSearchApiKeyAuthenticationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataVectorSearchApiKeyAuthenticationOptions IPersistableModel<OnYourDataVectorSearchApiKeyAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchApiKeyAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataVectorSearchApiKeyAuthenticationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataVectorSearchApiKeyAuthenticationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataVectorSearchApiKeyAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new OnYourDataVectorSearchApiKeyAuthenticationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataVectorSearchApiKeyAuthenticationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchApiKeyAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchApiKeyAuthenticationOptions.cs
new file mode 100644
index 000000000000..6cb88743fc8a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchApiKeyAuthenticationOptions.cs
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The authentication options for Azure OpenAI On Your Data when using an API key. </summary>
+    public partial class OnYourDataVectorSearchApiKeyAuthenticationOptions : OnYourDataVectorSearchAuthenticationOptions
+    {
+        /// <summary> Initializes a new instance of <see cref="OnYourDataVectorSearchApiKeyAuthenticationOptions"/>. </summary>
+        /// <param name="key"> The API key to use for authentication. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="key"/> is null. </exception>
+        public OnYourDataVectorSearchApiKeyAuthenticationOptions(string key)
+        {
+            Argument.AssertNotNull(key, nameof(key));
+
+            Type = OnYourDataVectorSearchAuthenticationType.ApiKey;
+            Key = key;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataVectorSearchApiKeyAuthenticationOptions"/>. </summary>
+        /// <param name="type"> The type of authentication to use. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="key"> The API key to use for authentication. </param>
+        internal OnYourDataVectorSearchApiKeyAuthenticationOptions(OnYourDataVectorSearchAuthenticationType type, IDictionary<string, BinaryData> serializedAdditionalRawData, string key) : base(type, serializedAdditionalRawData)
+        {
+            Key = key;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataVectorSearchApiKeyAuthenticationOptions"/> for deserialization. </summary>
+        internal OnYourDataVectorSearchApiKeyAuthenticationOptions()
+        {
+        }
+
+        /// <summary> The API key to use for authentication. </summary>
+        public string Key { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAuthenticationOptions.Serialization.cs
new file mode 100644
index 000000000000..6803f88cfd66
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAuthenticationOptions.Serialization.cs
@@ -0,0 +1,127 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    [PersistableModelProxy(typeof(UnknownOnYourDataVectorSearchAuthenticationOptions))]
+    public partial class OnYourDataVectorSearchAuthenticationOptions : IUtf8JsonSerializable, IJsonModel<OnYourDataVectorSearchAuthenticationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataVectorSearchAuthenticationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataVectorSearchAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataVectorSearchAuthenticationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataVectorSearchAuthenticationOptions IJsonModel<OnYourDataVectorSearchAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataVectorSearchAuthenticationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataVectorSearchAuthenticationOptions(document.RootElement, options);
+        }
+
+        internal static OnYourDataVectorSearchAuthenticationOptions DeserializeOnYourDataVectorSearchAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "access_token": return OnYourDataVectorSearchAccessTokenAuthenticationOptions.DeserializeOnYourDataVectorSearchAccessTokenAuthenticationOptions(element, options);
+                    case "api_key": return OnYourDataVectorSearchApiKeyAuthenticationOptions.DeserializeOnYourDataVectorSearchApiKeyAuthenticationOptions(element, options);
+                }
+            }
+            return UnknownOnYourDataVectorSearchAuthenticationOptions.DeserializeUnknownOnYourDataVectorSearchAuthenticationOptions(element, options);
+        }
+
+        BinaryData IPersistableModel<OnYourDataVectorSearchAuthenticationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataVectorSearchAuthenticationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataVectorSearchAuthenticationOptions IPersistableModel<OnYourDataVectorSearchAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataVectorSearchAuthenticationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataVectorSearchAuthenticationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataVectorSearchAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static OnYourDataVectorSearchAuthenticationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataVectorSearchAuthenticationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAuthenticationOptions.cs
new file mode 100644
index 000000000000..077fa22c2793
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAuthenticationOptions.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// The authentication options for Azure OpenAI On Your Data vector search.
+    /// Please note <see cref="OnYourDataVectorSearchAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="OnYourDataVectorSearchAccessTokenAuthenticationOptions"/> and <see cref="OnYourDataVectorSearchApiKeyAuthenticationOptions"/>.
+    /// </summary>
+    public abstract partial class OnYourDataVectorSearchAuthenticationOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataVectorSearchAuthenticationOptions"/>. </summary>
+        protected OnYourDataVectorSearchAuthenticationOptions()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataVectorSearchAuthenticationOptions"/>. </summary>
+        /// <param name="type"> The type of authentication to use. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal OnYourDataVectorSearchAuthenticationOptions(OnYourDataVectorSearchAuthenticationType type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Type = type;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The type of authentication to use. </summary>
+        internal OnYourDataVectorSearchAuthenticationType Type { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAuthenticationType.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAuthenticationType.cs
new file mode 100644
index 000000000000..5b91b4f56ba1
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorSearchAuthenticationType.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The authentication types supported with Azure OpenAI On Your Data vector search. </summary>
+    internal readonly partial struct OnYourDataVectorSearchAuthenticationType : IEquatable<OnYourDataVectorSearchAuthenticationType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataVectorSearchAuthenticationType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public OnYourDataVectorSearchAuthenticationType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ApiKeyValue = "api_key";
+        private const string AccessTokenValue = "access_token";
+
+        /// <summary> Authentication via API key. </summary>
+        public static OnYourDataVectorSearchAuthenticationType ApiKey { get; } = new OnYourDataVectorSearchAuthenticationType(ApiKeyValue);
+        /// <summary> Authentication via access token. </summary>
+        public static OnYourDataVectorSearchAuthenticationType AccessToken { get; } = new OnYourDataVectorSearchAuthenticationType(AccessTokenValue);
+        /// <summary> Determines if two <see cref="OnYourDataVectorSearchAuthenticationType"/> values are the same. </summary>
+        public static bool operator ==(OnYourDataVectorSearchAuthenticationType left, OnYourDataVectorSearchAuthenticationType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="OnYourDataVectorSearchAuthenticationType"/> values are not the same. </summary>
+        public static bool operator !=(OnYourDataVectorSearchAuthenticationType left, OnYourDataVectorSearchAuthenticationType right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="OnYourDataVectorSearchAuthenticationType"/>. </summary>
+        public static implicit operator OnYourDataVectorSearchAuthenticationType(string value) => new OnYourDataVectorSearchAuthenticationType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is OnYourDataVectorSearchAuthenticationType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(OnYourDataVectorSearchAuthenticationType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorizationSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorizationSource.Serialization.cs
new file mode 100644
index 000000000000..d5ae57970b3c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorizationSource.Serialization.cs
@@ -0,0 +1,129 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    [PersistableModelProxy(typeof(UnknownOnYourDataVectorizationSource))]
+    public partial class OnYourDataVectorizationSource : IUtf8JsonSerializable, IJsonModel<OnYourDataVectorizationSource>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataVectorizationSource>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataVectorizationSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataVectorizationSource)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataVectorizationSource IJsonModel<OnYourDataVectorizationSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataVectorizationSource)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataVectorizationSource(document.RootElement, options);
+        }
+
+        internal static OnYourDataVectorizationSource DeserializeOnYourDataVectorizationSource(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            if (element.TryGetProperty("type", out JsonElement discriminator))
+            {
+                switch (discriminator.GetString())
+                {
+                    case "deployment_name": return OnYourDataDeploymentNameVectorizationSource.DeserializeOnYourDataDeploymentNameVectorizationSource(element, options);
+                    case "endpoint": return OnYourDataEndpointVectorizationSource.DeserializeOnYourDataEndpointVectorizationSource(element, options);
+                    case "integrated": return OnYourDataIntegratedVectorizationSource.DeserializeOnYourDataIntegratedVectorizationSource(element, options);
+                    case "model_id": return OnYourDataModelIdVectorizationSource.DeserializeOnYourDataModelIdVectorizationSource(element, options);
+                }
+            }
+            return UnknownOnYourDataVectorizationSource.DeserializeUnknownOnYourDataVectorizationSource(element, options);
+        }
+
+        BinaryData IPersistableModel<OnYourDataVectorizationSource>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataVectorizationSource)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataVectorizationSource IPersistableModel<OnYourDataVectorizationSource>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataVectorizationSource(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataVectorizationSource)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataVectorizationSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static OnYourDataVectorizationSource FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOnYourDataVectorizationSource(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorizationSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorizationSource.cs
new file mode 100644
index 000000000000..c675da983dd8
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorizationSource.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// An abstract representation of a vectorization source for Azure OpenAI On Your Data with vector search.
+    /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+    /// The available derived classes include <see cref="OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OnYourDataModelIdVectorizationSource"/>.
+    /// </summary>
+    public abstract partial class OnYourDataVectorizationSource
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataVectorizationSource"/>. </summary>
+        protected OnYourDataVectorizationSource()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataVectorizationSource"/>. </summary>
+        /// <param name="type"> The type of vectorization source to use. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal OnYourDataVectorizationSource(OnYourDataVectorizationSourceType type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Type = type;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The type of vectorization source to use. </summary>
+        internal OnYourDataVectorizationSourceType Type { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorizationSourceType.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorizationSourceType.cs
new file mode 100644
index 000000000000..1f951716f33e
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OnYourDataVectorizationSourceType.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// Represents the available sources Azure OpenAI On Your Data can use to configure vectorization of data for use with
+    /// vector search.
+    /// </summary>
+    internal readonly partial struct OnYourDataVectorizationSourceType : IEquatable<OnYourDataVectorizationSourceType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="OnYourDataVectorizationSourceType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public OnYourDataVectorizationSourceType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string EndpointValue = "endpoint";
+        private const string DeploymentNameValue = "deployment_name";
+        private const string ModelIdValue = "model_id";
+        private const string IntegratedValue = "integrated";
+
+        /// <summary> Represents vectorization performed by public service calls to an Azure OpenAI embedding model. </summary>
+        public static OnYourDataVectorizationSourceType Endpoint { get; } = new OnYourDataVectorizationSourceType(EndpointValue);
+        /// <summary>
+        /// Represents an Ada model deployment name to use. This model deployment must be in the same Azure OpenAI resource, but
+        /// On Your Data will use this model deployment via an internal call rather than a public one, which enables vector
+        /// search even in private networks.
+        /// </summary>
+        public static OnYourDataVectorizationSourceType DeploymentName { get; } = new OnYourDataVectorizationSourceType(DeploymentNameValue);
+        /// <summary>
+        /// Represents a specific embedding model ID as defined in the search service.
+        /// Currently only supported by Elasticsearch®.
+        /// </summary>
+        public static OnYourDataVectorizationSourceType ModelId { get; } = new OnYourDataVectorizationSourceType(ModelIdValue);
+        /// <summary> Represents the integrated vectorizer defined within the search resource. </summary>
+        public static OnYourDataVectorizationSourceType Integrated { get; } = new OnYourDataVectorizationSourceType(IntegratedValue);
+        /// <summary> Determines if two <see cref="OnYourDataVectorizationSourceType"/> values are the same. </summary>
+        public static bool operator ==(OnYourDataVectorizationSourceType left, OnYourDataVectorizationSourceType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="OnYourDataVectorizationSourceType"/> values are not the same. </summary>
+        public static bool operator !=(OnYourDataVectorizationSourceType left, OnYourDataVectorizationSourceType right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="OnYourDataVectorizationSourceType"/>. </summary>
+        public static implicit operator OnYourDataVectorizationSourceType(string value) => new OnYourDataVectorizationSourceType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is OnYourDataVectorizationSourceType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(OnYourDataVectorizationSourceType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIClient.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIClient.cs
new file mode 100644
index 000000000000..eb3ffa08498c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIClient.cs
@@ -0,0 +1,2867 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure.Core;
+using Azure.Core.Pipeline;
+
+namespace Azure.AI.OpenAI
+{
+    // Data plane generated client.
+    /// <summary> The OpenAI service client. </summary>
+    public partial class OpenAIClient
+    {
+        private const string AuthorizationHeader = "api-key";
+        private readonly AzureKeyCredential _keyCredential;
+        private static readonly string[] AuthorizationScopes = new string[] { "https://cognitiveservices.azure.com/.default" };
+        private readonly TokenCredential _tokenCredential;
+        private readonly HttpPipeline _pipeline;
+        private readonly Uri _endpoint;
+        private readonly string _apiVersion;
+
+        /// <summary> The ClientDiagnostics is used to provide tracing support for the client library. </summary>
+        internal ClientDiagnostics ClientDiagnostics { get; }
+
+        /// <summary> The HTTP pipeline for sending and receiving REST requests and responses. </summary>
+        public virtual HttpPipeline Pipeline => _pipeline;
+
+        /// <summary> Initializes a new instance of OpenAIClient for mocking. </summary>
+        protected OpenAIClient()
+        {
+        }
+
+        /// <summary> Initializes a new instance of OpenAIClient. </summary>
+        /// <param name="endpoint">
+        /// Supported Cognitive Services endpoints (protocol and hostname, for example:
+        /// https://westus.api.cognitive.microsoft.com).
+        /// </param>
+        /// <param name="credential"> A credential used to authenticate to an Azure Service. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/> or <paramref name="credential"/> is null. </exception>
+        public OpenAIClient(Uri endpoint, AzureKeyCredential credential) : this(endpoint, credential, new OpenAIClientOptions())
+        {
+        }
+
+        /// <summary> Initializes a new instance of OpenAIClient. </summary>
+        /// <param name="endpoint">
+        /// Supported Cognitive Services endpoints (protocol and hostname, for example:
+        /// https://westus.api.cognitive.microsoft.com).
+        /// </param>
+        /// <param name="credential"> A credential used to authenticate to an Azure Service. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/> or <paramref name="credential"/> is null. </exception>
+        public OpenAIClient(Uri endpoint, TokenCredential credential) : this(endpoint, credential, new OpenAIClientOptions())
+        {
+        }
+
+        /// <summary> Initializes a new instance of OpenAIClient. </summary>
+        /// <param name="endpoint">
+        /// Supported Cognitive Services endpoints (protocol and hostname, for example:
+        /// https://westus.api.cognitive.microsoft.com).
+        /// </param>
+        /// <param name="credential"> A credential used to authenticate to an Azure Service. </param>
+        /// <param name="options"> The options for configuring the client. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/> or <paramref name="credential"/> is null. </exception>
+        public OpenAIClient(Uri endpoint, AzureKeyCredential credential, OpenAIClientOptions options)
+        {
+            Argument.AssertNotNull(endpoint, nameof(endpoint));
+            Argument.AssertNotNull(credential, nameof(credential));
+            options ??= new OpenAIClientOptions();
+
+            ClientDiagnostics = new ClientDiagnostics(options, true);
+            _keyCredential = credential;
+            _pipeline = HttpPipelineBuilder.Build(options, Array.Empty<HttpPipelinePolicy>(), new HttpPipelinePolicy[] { new AzureKeyCredentialPolicy(_keyCredential, AuthorizationHeader) }, new ResponseClassifier());
+            _endpoint = endpoint;
+            _apiVersion = options.Version;
+        }
+
+        /// <summary> Initializes a new instance of OpenAIClient. </summary>
+        /// <param name="endpoint">
+        /// Supported Cognitive Services endpoints (protocol and hostname, for example:
+        /// https://westus.api.cognitive.microsoft.com).
+        /// </param>
+        /// <param name="credential"> A credential used to authenticate to an Azure Service. </param>
+        /// <param name="options"> The options for configuring the client. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/> or <paramref name="credential"/> is null. </exception>
+        public OpenAIClient(Uri endpoint, TokenCredential credential, OpenAIClientOptions options)
+        {
+            Argument.AssertNotNull(endpoint, nameof(endpoint));
+            Argument.AssertNotNull(credential, nameof(credential));
+            options ??= new OpenAIClientOptions();
+
+            ClientDiagnostics = new ClientDiagnostics(options, true);
+            _tokenCredential = credential;
+            _pipeline = HttpPipelineBuilder.Build(options, Array.Empty<HttpPipelinePolicy>(), new HttpPipelinePolicy[] { new BearerTokenAuthenticationPolicy(_tokenCredential, AuthorizationScopes) }, new ResponseClassifier());
+            _endpoint = endpoint;
+            _apiVersion = options.Version;
+        }
+
+        /// <summary>
+        /// Gets transcribed text and associated metadata from provided spoken audio data. Audio will be transcribed in the
+        /// written language corresponding to the language it was spoken in.
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body"> The configuration information for an audio transcription request. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<string>> GetAudioTranscriptionAsPlainTextAsync(string deploymentId, AudioTranscriptionOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using MultipartFormDataRequestContent content = body.ToMultipartRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetAudioTranscriptionAsPlainTextAsync(deploymentId, content, content.ContentType, context).ConfigureAwait(false);
+            return Response.FromValue(response.Content.ToString(), response);
+        }
+
+        /// <summary>
+        /// Gets transcribed text and associated metadata from provided spoken audio data. Audio will be transcribed in the
+        /// written language corresponding to the language it was spoken in.
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body"> The configuration information for an audio transcription request. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<string> GetAudioTranscriptionAsPlainText(string deploymentId, AudioTranscriptionOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using MultipartFormDataRequestContent content = body.ToMultipartRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetAudioTranscriptionAsPlainText(deploymentId, content, content.ContentType, context);
+            return Response.FromValue(response.Content.ToString(), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets transcribed text and associated metadata from provided spoken audio data. Audio will be transcribed in the
+        /// written language corresponding to the language it was spoken in.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="contentType"> The content type for the operation. Always multipart/form-data for this operation. Allowed values: "multipart/form-data". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GetAudioTranscriptionAsPlainTextAsync(string deploymentId, RequestContent content, string contentType, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetAudioTranscriptionAsPlainText");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetAudioTranscriptionAsPlainTextRequest(deploymentId, content, contentType, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets transcribed text and associated metadata from provided spoken audio data. Audio will be transcribed in the
+        /// written language corresponding to the language it was spoken in.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="contentType"> The content type for the operation. Always multipart/form-data for this operation. Allowed values: "multipart/form-data". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GetAudioTranscriptionAsPlainText(string deploymentId, RequestContent content, string contentType, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetAudioTranscriptionAsPlainText");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetAudioTranscriptionAsPlainTextRequest(deploymentId, content, contentType, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Gets transcribed text and associated metadata from provided spoken audio data. Audio will be transcribed in the
+        /// written language corresponding to the language it was spoken in.
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body"> The configuration information for an audio transcription request. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<AudioTranscription>> GetAudioTranscriptionAsResponseObjectAsync(string deploymentId, AudioTranscriptionOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using MultipartFormDataRequestContent content = body.ToMultipartRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetAudioTranscriptionAsResponseObjectAsync(deploymentId, content, content.ContentType, context).ConfigureAwait(false);
+            return Response.FromValue(AudioTranscription.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// Gets transcribed text and associated metadata from provided spoken audio data. Audio will be transcribed in the
+        /// written language corresponding to the language it was spoken in.
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body"> The configuration information for an audio transcription request. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<AudioTranscription> GetAudioTranscriptionAsResponseObject(string deploymentId, AudioTranscriptionOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using MultipartFormDataRequestContent content = body.ToMultipartRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetAudioTranscriptionAsResponseObject(deploymentId, content, content.ContentType, context);
+            return Response.FromValue(AudioTranscription.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets transcribed text and associated metadata from provided spoken audio data. Audio will be transcribed in the
+        /// written language corresponding to the language it was spoken in.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="contentType"> The content type for the operation. Always multipart/form-data for this operation. Allowed values: "multipart/form-data". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GetAudioTranscriptionAsResponseObjectAsync(string deploymentId, RequestContent content, string contentType, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetAudioTranscriptionAsResponseObject");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetAudioTranscriptionAsResponseObjectRequest(deploymentId, content, contentType, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets transcribed text and associated metadata from provided spoken audio data. Audio will be transcribed in the
+        /// written language corresponding to the language it was spoken in.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="contentType"> The content type for the operation. Always multipart/form-data for this operation. Allowed values: "multipart/form-data". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GetAudioTranscriptionAsResponseObject(string deploymentId, RequestContent content, string contentType, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetAudioTranscriptionAsResponseObject");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetAudioTranscriptionAsResponseObjectRequest(deploymentId, content, contentType, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Gets English language transcribed text and associated metadata from provided spoken audio data. </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body"> The configuration information for an audio translation request. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<string>> GetAudioTranslationAsPlainTextAsync(string deploymentId, AudioTranslationOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using MultipartFormDataRequestContent content = body.ToMultipartRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetAudioTranslationAsPlainTextAsync(deploymentId, content, content.ContentType, context).ConfigureAwait(false);
+            return Response.FromValue(response.Content.ToString(), response);
+        }
+
+        /// <summary> Gets English language transcribed text and associated metadata from provided spoken audio data. </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body"> The configuration information for an audio translation request. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<string> GetAudioTranslationAsPlainText(string deploymentId, AudioTranslationOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using MultipartFormDataRequestContent content = body.ToMultipartRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetAudioTranslationAsPlainText(deploymentId, content, content.ContentType, context);
+            return Response.FromValue(response.Content.ToString(), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets English language transcribed text and associated metadata from provided spoken audio data.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="contentType"> The content type for the operation. Always multipart/form-data for this operation. Allowed values: "multipart/form-data". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GetAudioTranslationAsPlainTextAsync(string deploymentId, RequestContent content, string contentType, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetAudioTranslationAsPlainText");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetAudioTranslationAsPlainTextRequest(deploymentId, content, contentType, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets English language transcribed text and associated metadata from provided spoken audio data.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="contentType"> The content type for the operation. Always multipart/form-data for this operation. Allowed values: "multipart/form-data". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GetAudioTranslationAsPlainText(string deploymentId, RequestContent content, string contentType, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetAudioTranslationAsPlainText");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetAudioTranslationAsPlainTextRequest(deploymentId, content, contentType, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Gets English language transcribed text and associated metadata from provided spoken audio data. </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body"> The configuration information for an audio translation request. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<AudioTranslation>> GetAudioTranslationAsResponseObjectAsync(string deploymentId, AudioTranslationOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using MultipartFormDataRequestContent content = body.ToMultipartRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetAudioTranslationAsResponseObjectAsync(deploymentId, content, content.ContentType, context).ConfigureAwait(false);
+            return Response.FromValue(AudioTranslation.FromResponse(response), response);
+        }
+
+        /// <summary> Gets English language transcribed text and associated metadata from provided spoken audio data. </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body"> The configuration information for an audio translation request. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<AudioTranslation> GetAudioTranslationAsResponseObject(string deploymentId, AudioTranslationOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using MultipartFormDataRequestContent content = body.ToMultipartRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetAudioTranslationAsResponseObject(deploymentId, content, content.ContentType, context);
+            return Response.FromValue(AudioTranslation.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets English language transcribed text and associated metadata from provided spoken audio data.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="contentType"> The content type for the operation. Always multipart/form-data for this operation. Allowed values: "multipart/form-data". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GetAudioTranslationAsResponseObjectAsync(string deploymentId, RequestContent content, string contentType, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetAudioTranslationAsResponseObject");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetAudioTranslationAsResponseObjectRequest(deploymentId, content, contentType, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets English language transcribed text and associated metadata from provided spoken audio data.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="contentType"> The content type for the operation. Always multipart/form-data for this operation. Allowed values: "multipart/form-data". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GetAudioTranslationAsResponseObject(string deploymentId, RequestContent content, string contentType, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetAudioTranslationAsResponseObject");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetAudioTranslationAsResponseObjectRequest(deploymentId, content, contentType, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Gets completions for the provided input prompts.
+        /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+        /// provided prompt data.
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body">
+        /// The configuration information for a completions request.
+        /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+        /// provided prompt data.
+        /// </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<Completions>> GetCompletionsAsync(string deploymentId, CompletionsOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using RequestContent content = body.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetCompletionsAsync(deploymentId, content, context).ConfigureAwait(false);
+            return Response.FromValue(Completions.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// Gets completions for the provided input prompts.
+        /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+        /// provided prompt data.
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body">
+        /// The configuration information for a completions request.
+        /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+        /// provided prompt data.
+        /// </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<Completions> GetCompletions(string deploymentId, CompletionsOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using RequestContent content = body.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetCompletions(deploymentId, content, context);
+            return Response.FromValue(Completions.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets completions for the provided input prompts.
+        /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+        /// provided prompt data.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GetCompletionsAsync(string deploymentId, RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetCompletions");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetCompletionsRequest(deploymentId, content, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets completions for the provided input prompts.
+        /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+        /// provided prompt data.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GetCompletions(string deploymentId, RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetCompletions");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetCompletionsRequest(deploymentId, content, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Gets chat completions for the provided chat messages.
+        /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+        /// provided prompt data.
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body">
+        /// The configuration information for a chat completions request.
+        /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+        /// provided prompt data.
+        /// </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<ChatCompletions>> GetChatCompletionsAsync(string deploymentId, ChatCompletionsOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using RequestContent content = body.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetChatCompletionsAsync(deploymentId, content, context).ConfigureAwait(false);
+            return Response.FromValue(ChatCompletions.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// Gets chat completions for the provided chat messages.
+        /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+        /// provided prompt data.
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body">
+        /// The configuration information for a chat completions request.
+        /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+        /// provided prompt data.
+        /// </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<ChatCompletions> GetChatCompletions(string deploymentId, ChatCompletionsOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using RequestContent content = body.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetChatCompletions(deploymentId, content, context);
+            return Response.FromValue(ChatCompletions.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets chat completions for the provided chat messages.
+        /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+        /// provided prompt data.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GetChatCompletionsAsync(string deploymentId, RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetChatCompletions");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetChatCompletionsRequest(deploymentId, content, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets chat completions for the provided chat messages.
+        /// Completions support a wide variety of tasks and generate text that continues from or "completes"
+        /// provided prompt data.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GetChatCompletions(string deploymentId, RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetChatCompletions");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetChatCompletionsRequest(deploymentId, content, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Creates an image given a prompt. </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body"> Represents the request data used to generate images. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<ImageGenerations>> GetImageGenerationsAsync(string deploymentId, ImageGenerationOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using RequestContent content = body.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetImageGenerationsAsync(deploymentId, content, context).ConfigureAwait(false);
+            return Response.FromValue(ImageGenerations.FromResponse(response), response);
+        }
+
+        /// <summary> Creates an image given a prompt. </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body"> Represents the request data used to generate images. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<ImageGenerations> GetImageGenerations(string deploymentId, ImageGenerationOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using RequestContent content = body.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetImageGenerations(deploymentId, content, context);
+            return Response.FromValue(ImageGenerations.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Creates an image given a prompt.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GetImageGenerationsAsync(string deploymentId, RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetImageGenerations");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetImageGenerationsRequest(deploymentId, content, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Creates an image given a prompt.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GetImageGenerations(string deploymentId, RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetImageGenerations");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetImageGenerationsRequest(deploymentId, content, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Generates text-to-speech audio from the input text. </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body"> A representation of the request options that control the behavior of a text-to-speech operation. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<BinaryData>> GenerateSpeechFromTextAsync(string deploymentId, SpeechGenerationOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using RequestContent content = body.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GenerateSpeechFromTextAsync(deploymentId, content, context).ConfigureAwait(false);
+            return Response.FromValue(response.Content, response);
+        }
+
+        /// <summary> Generates text-to-speech audio from the input text. </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body"> A representation of the request options that control the behavior of a text-to-speech operation. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<BinaryData> GenerateSpeechFromText(string deploymentId, SpeechGenerationOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using RequestContent content = body.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GenerateSpeechFromText(deploymentId, content, context);
+            return Response.FromValue(response.Content, response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Generates text-to-speech audio from the input text.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GenerateSpeechFromTextAsync(string deploymentId, RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GenerateSpeechFromText");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGenerateSpeechFromTextRequest(deploymentId, content, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Generates text-to-speech audio from the input text.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GenerateSpeechFromText(string deploymentId, RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GenerateSpeechFromText");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGenerateSpeechFromTextRequest(deploymentId, content, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Return the embeddings for a given prompt. </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body">
+        /// The configuration information for an embeddings request.
+        /// Embeddings measure the relatedness of text strings and are commonly used for search, clustering,
+        /// recommendations, and other similar scenarios.
+        /// </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<OpenAI.Embeddings>> GetEmbeddingsAsync(string deploymentId, EmbeddingsOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using RequestContent content = body.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetEmbeddingsAsync(deploymentId, content, context).ConfigureAwait(false);
+            return Response.FromValue(OpenAI.Embeddings.FromResponse(response), response);
+        }
+
+        /// <summary> Return the embeddings for a given prompt. </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="body">
+        /// The configuration information for an embeddings request.
+        /// Embeddings measure the relatedness of text strings and are commonly used for search, clustering,
+        /// recommendations, and other similar scenarios.
+        /// </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="body"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<OpenAI.Embeddings> GetEmbeddings(string deploymentId, EmbeddingsOptions body, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(body, nameof(body));
+
+            using RequestContent content = body.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetEmbeddings(deploymentId, content, context);
+            return Response.FromValue(OpenAI.Embeddings.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Return the embeddings for a given prompt.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GetEmbeddingsAsync(string deploymentId, RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetEmbeddings");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetEmbeddingsRequest(deploymentId, content, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Return the embeddings for a given prompt.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="deploymentId"> Specifies either the model deployment name (when using Azure OpenAI) or model name (when using non-Azure OpenAI) to use for this request. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="deploymentId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="deploymentId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GetEmbeddings(string deploymentId, RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(deploymentId, nameof(deploymentId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetEmbeddings");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetEmbeddingsRequest(deploymentId, content, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Gets a list of previously uploaded files. </summary>
+        /// <param name="purpose"> A value that, when provided, limits list results to files matching the corresponding purpose. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        public virtual async Task<Response<FileListResponse>> GetFilesAsync(FilePurpose? purpose = null, CancellationToken cancellationToken = default)
+        {
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetFilesAsync(purpose?.ToString(), context).ConfigureAwait(false);
+            return Response.FromValue(FileListResponse.FromResponse(response), response);
+        }
+
+        /// <summary> Gets a list of previously uploaded files. </summary>
+        /// <param name="purpose"> A value that, when provided, limits list results to files matching the corresponding purpose. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        public virtual Response<FileListResponse> GetFiles(FilePurpose? purpose = null, CancellationToken cancellationToken = default)
+        {
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetFiles(purpose?.ToString(), context);
+            return Response.FromValue(FileListResponse.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets a list of previously uploaded files.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="purpose"> A value that, when provided, limits list results to files matching the corresponding purpose. Allowed values: "fine-tune" | "fine-tune-results" | "assistants" | "assistants_output" | "batch" | "batch_output" | "vision". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GetFilesAsync(string purpose, RequestContext context)
+        {
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetFiles");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetFilesRequest(purpose, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets a list of previously uploaded files.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="purpose"> A value that, when provided, limits list results to files matching the corresponding purpose. Allowed values: "fine-tune" | "fine-tune-results" | "assistants" | "assistants_output" | "batch" | "batch_output" | "vision". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GetFiles(string purpose, RequestContext context)
+        {
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetFiles");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetFilesRequest(purpose, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Uploads a file for use by other operations. </summary>
+        /// <param name="data"> The file data (not filename) to upload. </param>
+        /// <param name="purpose"> The intended purpose of the file. </param>
+        /// <param name="filename"> A filename to associate with the uploaded data. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
+        public virtual async Task<Response<OpenAIFile>> UploadFileAsync(Stream data, FilePurpose purpose, string filename = null, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNull(data, nameof(data));
+
+            UploadFileRequest uploadFileRequest = new UploadFileRequest(data, purpose, filename, null);
+            using MultipartFormDataRequestContent content = uploadFileRequest.ToMultipartRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await UploadFileAsync(content, content.ContentType, context).ConfigureAwait(false);
+            return Response.FromValue(OpenAIFile.FromResponse(response), response);
+        }
+
+        /// <summary> Uploads a file for use by other operations. </summary>
+        /// <param name="data"> The file data (not filename) to upload. </param>
+        /// <param name="purpose"> The intended purpose of the file. </param>
+        /// <param name="filename"> A filename to associate with the uploaded data. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
+        public virtual Response<OpenAIFile> UploadFile(Stream data, FilePurpose purpose, string filename = null, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNull(data, nameof(data));
+
+            UploadFileRequest uploadFileRequest = new UploadFileRequest(data, purpose, filename, null);
+            using MultipartFormDataRequestContent content = uploadFileRequest.ToMultipartRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = UploadFile(content, content.ContentType, context);
+            return Response.FromValue(OpenAIFile.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Uploads a file for use by other operations.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="contentType"> The 'content-type' header value, always 'multipart/format-data' for this operation. Allowed values: "multipart/form-data". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> UploadFileAsync(RequestContent content, string contentType, RequestContext context = null)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.UploadFile");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateUploadFileRequest(content, contentType, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Uploads a file for use by other operations.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="contentType"> The 'content-type' header value, always 'multipart/format-data' for this operation. Allowed values: "multipart/form-data". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response UploadFile(RequestContent content, string contentType, RequestContext context = null)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.UploadFile");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateUploadFileRequest(content, contentType, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Delete a previously uploaded file. </summary>
+        /// <param name="fileId"> The ID of the file to delete. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<FileDeletionStatus>> DeleteFileAsync(string fileId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await DeleteFileAsync(fileId, context).ConfigureAwait(false);
+            return Response.FromValue(FileDeletionStatus.FromResponse(response), response);
+        }
+
+        /// <summary> Delete a previously uploaded file. </summary>
+        /// <param name="fileId"> The ID of the file to delete. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<FileDeletionStatus> DeleteFile(string fileId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = DeleteFile(fileId, context);
+            return Response.FromValue(FileDeletionStatus.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Delete a previously uploaded file.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="fileId"> The ID of the file to delete. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> DeleteFileAsync(string fileId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.DeleteFile");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateDeleteFileRequest(fileId, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Delete a previously uploaded file.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="fileId"> The ID of the file to delete. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response DeleteFile(string fileId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.DeleteFile");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateDeleteFileRequest(fileId, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Returns information about a specific file. Does not retrieve file content. </summary>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<OpenAIFile>> GetFileAsync(string fileId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetFileAsync(fileId, context).ConfigureAwait(false);
+            return Response.FromValue(OpenAIFile.FromResponse(response), response);
+        }
+
+        /// <summary> Returns information about a specific file. Does not retrieve file content. </summary>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<OpenAIFile> GetFile(string fileId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetFile(fileId, context);
+            return Response.FromValue(OpenAIFile.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Returns information about a specific file. Does not retrieve file content.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GetFileAsync(string fileId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetFile");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetFileRequest(fileId, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Returns information about a specific file. Does not retrieve file content.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GetFile(string fileId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetFile");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetFileRequest(fileId, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Returns information about a specific file. Does not retrieve file content. </summary>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<BinaryData>> GetFileContentAsync(string fileId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetFileContentAsync(fileId, context).ConfigureAwait(false);
+            return Response.FromValue(response.Content, response);
+        }
+
+        /// <summary> Returns information about a specific file. Does not retrieve file content. </summary>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<BinaryData> GetFileContent(string fileId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetFileContent(fileId, context);
+            return Response.FromValue(response.Content, response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Returns information about a specific file. Does not retrieve file content.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GetFileContentAsync(string fileId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetFileContent");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetFileContentRequest(fileId, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Returns information about a specific file. Does not retrieve file content.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="fileId"> The ID of the file to retrieve. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="fileId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="fileId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GetFileContent(string fileId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(fileId, nameof(fileId));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetFileContent");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetFileContentRequest(fileId, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Gets a list of all batches owned by the Azure OpenAI resource. </summary>
+        /// <param name="after"> Identifier for the last event from the previous pagination request. </param>
+        /// <param name="limit"> Number of batches to retrieve. Defaults to 20. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        public virtual async Task<Response<OpenAIPageableListOfBatch>> GetBatchesAsync(string after = null, int? limit = null, CancellationToken cancellationToken = default)
+        {
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetBatchesAsync(after, limit, context).ConfigureAwait(false);
+            return Response.FromValue(OpenAIPageableListOfBatch.FromResponse(response), response);
+        }
+
+        /// <summary> Gets a list of all batches owned by the Azure OpenAI resource. </summary>
+        /// <param name="after"> Identifier for the last event from the previous pagination request. </param>
+        /// <param name="limit"> Number of batches to retrieve. Defaults to 20. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        public virtual Response<OpenAIPageableListOfBatch> GetBatches(string after = null, int? limit = null, CancellationToken cancellationToken = default)
+        {
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetBatches(after, limit, context);
+            return Response.FromValue(OpenAIPageableListOfBatch.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets a list of all batches owned by the Azure OpenAI resource.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="after"> Identifier for the last event from the previous pagination request. </param>
+        /// <param name="limit"> Number of batches to retrieve. Defaults to 20. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GetBatchesAsync(string after, int? limit, RequestContext context)
+        {
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetBatches");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetBatchesRequest(after, limit, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets a list of all batches owned by the Azure OpenAI resource.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="after"> Identifier for the last event from the previous pagination request. </param>
+        /// <param name="limit"> Number of batches to retrieve. Defaults to 20. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GetBatches(string after, int? limit, RequestContext context)
+        {
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetBatches");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetBatchesRequest(after, limit, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Creates and executes a batch from an uploaded file of requests.
+        /// Response includes details of the enqueued job including job status.
+        /// The ID of the result file is added to the response once complete.
+        /// </summary>
+        /// <param name="createBatchRequest"> The specification of the batch to create and execute. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="createBatchRequest"/> is null. </exception>
+        public virtual async Task<Response<OpenAI.Batch>> CreateBatchAsync(BatchCreateRequest createBatchRequest, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNull(createBatchRequest, nameof(createBatchRequest));
+
+            using RequestContent content = createBatchRequest.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await CreateBatchAsync(content, context).ConfigureAwait(false);
+            return Response.FromValue(OpenAI.Batch.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// Creates and executes a batch from an uploaded file of requests.
+        /// Response includes details of the enqueued job including job status.
+        /// The ID of the result file is added to the response once complete.
+        /// </summary>
+        /// <param name="createBatchRequest"> The specification of the batch to create and execute. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="createBatchRequest"/> is null. </exception>
+        public virtual Response<OpenAI.Batch> CreateBatch(BatchCreateRequest createBatchRequest, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNull(createBatchRequest, nameof(createBatchRequest));
+
+            using RequestContent content = createBatchRequest.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = CreateBatch(content, context);
+            return Response.FromValue(OpenAI.Batch.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Creates and executes a batch from an uploaded file of requests.
+        /// Response includes details of the enqueued job including job status.
+        /// The ID of the result file is added to the response once complete.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> CreateBatchAsync(RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.CreateBatch");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCreateBatchRequest(content, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Creates and executes a batch from an uploaded file of requests.
+        /// Response includes details of the enqueued job including job status.
+        /// The ID of the result file is added to the response once complete.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response CreateBatch(RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.CreateBatch");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCreateBatchRequest(content, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Gets details for a single batch specified by the given batchID. </summary>
+        /// <param name="batchId"> The identifier of the batch. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<OpenAI.Batch>> GetBatchAsync(string batchId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetBatchAsync(batchId, context).ConfigureAwait(false);
+            return Response.FromValue(OpenAI.Batch.FromResponse(response), response);
+        }
+
+        /// <summary> Gets details for a single batch specified by the given batchID. </summary>
+        /// <param name="batchId"> The identifier of the batch. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<OpenAI.Batch> GetBatch(string batchId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetBatch(batchId, context);
+            return Response.FromValue(OpenAI.Batch.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets details for a single batch specified by the given batchID.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="batchId"> The identifier of the batch. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> GetBatchAsync(string batchId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetBatch");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetBatchRequest(batchId, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets details for a single batch specified by the given batchID.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="batchId"> The identifier of the batch. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response GetBatch(string batchId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.GetBatch");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetBatchRequest(batchId, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Gets details for a single batch specified by the given batchID. </summary>
+        /// <param name="batchId"> The identifier of the batch. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<OpenAI.Batch>> CancelBatchAsync(string batchId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await CancelBatchAsync(batchId, context).ConfigureAwait(false);
+            return Response.FromValue(OpenAI.Batch.FromResponse(response), response);
+        }
+
+        /// <summary> Gets details for a single batch specified by the given batchID. </summary>
+        /// <param name="batchId"> The identifier of the batch. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<OpenAI.Batch> CancelBatch(string batchId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = CancelBatch(batchId, context);
+            return Response.FromValue(OpenAI.Batch.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets details for a single batch specified by the given batchID.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="batchId"> The identifier of the batch. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> CancelBatchAsync(string batchId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.CancelBatch");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCancelBatchRequest(batchId, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Gets details for a single batch specified by the given batchID.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="batchId"> The identifier of the batch. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="batchId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="batchId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response CancelBatch(string batchId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(batchId, nameof(batchId));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.CancelBatch");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCancelBatchRequest(batchId, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Creates an intermediate Upload object that you can add Parts to. Currently, an Upload can accept at most 8 GB in total and expires after an hour after you create it.
+        ///
+        /// Once you complete the Upload, we will create a File object that contains all the parts you uploaded. This File is usable in the rest of our platform as a regular File object.
+        ///
+        /// For certain purposes, the correct mime_type must be specified. Please refer to documentation for the supported MIME types for your use case.
+        ///
+        /// For guidance on the proper filename extensions for each purpose, please follow the documentation on creating a File.
+        /// </summary>
+        /// <param name="requestBody"> The request body for the operation options. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="requestBody"/> is null. </exception>
+        public virtual async Task<Response<Upload>> CreateUploadAsync(CreateUploadRequest requestBody, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNull(requestBody, nameof(requestBody));
+
+            using RequestContent content = requestBody.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await CreateUploadAsync(content, context).ConfigureAwait(false);
+            return Response.FromValue(Upload.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// Creates an intermediate Upload object that you can add Parts to. Currently, an Upload can accept at most 8 GB in total and expires after an hour after you create it.
+        ///
+        /// Once you complete the Upload, we will create a File object that contains all the parts you uploaded. This File is usable in the rest of our platform as a regular File object.
+        ///
+        /// For certain purposes, the correct mime_type must be specified. Please refer to documentation for the supported MIME types for your use case.
+        ///
+        /// For guidance on the proper filename extensions for each purpose, please follow the documentation on creating a File.
+        /// </summary>
+        /// <param name="requestBody"> The request body for the operation options. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="requestBody"/> is null. </exception>
+        public virtual Response<Upload> CreateUpload(CreateUploadRequest requestBody, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNull(requestBody, nameof(requestBody));
+
+            using RequestContent content = requestBody.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = CreateUpload(content, context);
+            return Response.FromValue(Upload.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Creates an intermediate Upload object that you can add Parts to. Currently, an Upload can accept at most 8 GB in total and expires after an hour after you create it.
+        ///
+        /// Once you complete the Upload, we will create a File object that contains all the parts you uploaded. This File is usable in the rest of our platform as a regular File object.
+        ///
+        /// For certain purposes, the correct mime_type must be specified. Please refer to documentation for the supported MIME types for your use case.
+        ///
+        /// For guidance on the proper filename extensions for each purpose, please follow the documentation on creating a File.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> CreateUploadAsync(RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.CreateUpload");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCreateUploadRequest(content, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Creates an intermediate Upload object that you can add Parts to. Currently, an Upload can accept at most 8 GB in total and expires after an hour after you create it.
+        ///
+        /// Once you complete the Upload, we will create a File object that contains all the parts you uploaded. This File is usable in the rest of our platform as a regular File object.
+        ///
+        /// For certain purposes, the correct mime_type must be specified. Please refer to documentation for the supported MIME types for your use case.
+        ///
+        /// For guidance on the proper filename extensions for each purpose, please follow the documentation on creating a File.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response CreateUpload(RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.CreateUpload");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCreateUploadRequest(content, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Adds a Part to an Upload object. A Part represents a chunk of bytes from the file you are trying to upload.
+        ///
+        /// Each Part can be at most 64 MB, and you can add Parts until you hit the Upload maximum of 8 GB.
+        ///
+        /// It is possible to add multiple Parts in parallel. You can decide the intended order of the Parts when you complete the Upload.
+        /// </summary>
+        /// <param name="uploadId"> The ID of the upload associated with this operation. </param>
+        /// <param name="requestBody"> The request body data payload for the operation. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="uploadId"/> or <paramref name="requestBody"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="uploadId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<UploadPart>> AddUploadPartAsync(string uploadId, AddUploadPartRequest requestBody, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(uploadId, nameof(uploadId));
+            Argument.AssertNotNull(requestBody, nameof(requestBody));
+
+            using MultipartFormDataRequestContent content = requestBody.ToMultipartRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await AddUploadPartAsync(uploadId, content, content.ContentType, context).ConfigureAwait(false);
+            return Response.FromValue(UploadPart.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// Adds a Part to an Upload object. A Part represents a chunk of bytes from the file you are trying to upload.
+        ///
+        /// Each Part can be at most 64 MB, and you can add Parts until you hit the Upload maximum of 8 GB.
+        ///
+        /// It is possible to add multiple Parts in parallel. You can decide the intended order of the Parts when you complete the Upload.
+        /// </summary>
+        /// <param name="uploadId"> The ID of the upload associated with this operation. </param>
+        /// <param name="requestBody"> The request body data payload for the operation. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="uploadId"/> or <paramref name="requestBody"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="uploadId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<UploadPart> AddUploadPart(string uploadId, AddUploadPartRequest requestBody, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(uploadId, nameof(uploadId));
+            Argument.AssertNotNull(requestBody, nameof(requestBody));
+
+            using MultipartFormDataRequestContent content = requestBody.ToMultipartRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = AddUploadPart(uploadId, content, content.ContentType, context);
+            return Response.FromValue(UploadPart.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Adds a Part to an Upload object. A Part represents a chunk of bytes from the file you are trying to upload.
+        ///
+        /// Each Part can be at most 64 MB, and you can add Parts until you hit the Upload maximum of 8 GB.
+        ///
+        /// It is possible to add multiple Parts in parallel. You can decide the intended order of the Parts when you complete the Upload.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="uploadId"> The ID of the upload associated with this operation. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="contentType"> The multipart/form-data content-type header for the operation. Allowed values: "multipart/form-data". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="uploadId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="uploadId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> AddUploadPartAsync(string uploadId, RequestContent content, string contentType, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(uploadId, nameof(uploadId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.AddUploadPart");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateAddUploadPartRequest(uploadId, content, contentType, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Adds a Part to an Upload object. A Part represents a chunk of bytes from the file you are trying to upload.
+        ///
+        /// Each Part can be at most 64 MB, and you can add Parts until you hit the Upload maximum of 8 GB.
+        ///
+        /// It is possible to add multiple Parts in parallel. You can decide the intended order of the Parts when you complete the Upload.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="uploadId"> The ID of the upload associated with this operation. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="contentType"> The multipart/form-data content-type header for the operation. Allowed values: "multipart/form-data". </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="uploadId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="uploadId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response AddUploadPart(string uploadId, RequestContent content, string contentType, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(uploadId, nameof(uploadId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.AddUploadPart");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateAddUploadPartRequest(uploadId, content, contentType, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Completes the Upload.
+        ///
+        /// Within the returned Upload object, there is a nested File object that is ready to use in the rest of the platform.
+        ///
+        /// You can specify the order of the Parts by passing in an ordered list of the Part IDs.
+        ///
+        /// The number of bytes uploaded upon completion must match the number of bytes initially specified when creating the Upload object. No Parts may be added after an Upload is completed.
+        /// </summary>
+        /// <param name="uploadId"> The ID of the upload associated with this operation. </param>
+        /// <param name="requestBody"> The request body for the completion operation. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="uploadId"/> or <paramref name="requestBody"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="uploadId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<Upload>> CompleteUploadAsync(string uploadId, CompleteUploadRequest requestBody, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(uploadId, nameof(uploadId));
+            Argument.AssertNotNull(requestBody, nameof(requestBody));
+
+            using RequestContent content = requestBody.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await CompleteUploadAsync(uploadId, content, context).ConfigureAwait(false);
+            return Response.FromValue(Upload.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// Completes the Upload.
+        ///
+        /// Within the returned Upload object, there is a nested File object that is ready to use in the rest of the platform.
+        ///
+        /// You can specify the order of the Parts by passing in an ordered list of the Part IDs.
+        ///
+        /// The number of bytes uploaded upon completion must match the number of bytes initially specified when creating the Upload object. No Parts may be added after an Upload is completed.
+        /// </summary>
+        /// <param name="uploadId"> The ID of the upload associated with this operation. </param>
+        /// <param name="requestBody"> The request body for the completion operation. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="uploadId"/> or <paramref name="requestBody"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="uploadId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<Upload> CompleteUpload(string uploadId, CompleteUploadRequest requestBody, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(uploadId, nameof(uploadId));
+            Argument.AssertNotNull(requestBody, nameof(requestBody));
+
+            using RequestContent content = requestBody.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = CompleteUpload(uploadId, content, context);
+            return Response.FromValue(Upload.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Completes the Upload.
+        ///
+        /// Within the returned Upload object, there is a nested File object that is ready to use in the rest of the platform.
+        ///
+        /// You can specify the order of the Parts by passing in an ordered list of the Part IDs.
+        ///
+        /// The number of bytes uploaded upon completion must match the number of bytes initially specified when creating the Upload object. No Parts may be added after an Upload is completed.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="uploadId"> The ID of the upload associated with this operation. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="uploadId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="uploadId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> CompleteUploadAsync(string uploadId, RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(uploadId, nameof(uploadId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.CompleteUpload");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCompleteUploadRequest(uploadId, content, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Completes the Upload.
+        ///
+        /// Within the returned Upload object, there is a nested File object that is ready to use in the rest of the platform.
+        ///
+        /// You can specify the order of the Parts by passing in an ordered list of the Part IDs.
+        ///
+        /// The number of bytes uploaded upon completion must match the number of bytes initially specified when creating the Upload object. No Parts may be added after an Upload is completed.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="uploadId"> The ID of the upload associated with this operation. </param>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="uploadId"/> or <paramref name="content"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="uploadId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response CompleteUpload(string uploadId, RequestContent content, RequestContext context = null)
+        {
+            Argument.AssertNotNullOrEmpty(uploadId, nameof(uploadId));
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.CompleteUpload");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCompleteUploadRequest(uploadId, content, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary> Cancels the Upload. No Parts may be added after an Upload is cancelled. </summary>
+        /// <param name="uploadId"> The ID of the upload associated with this operation. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="uploadId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="uploadId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<Upload>> CancelUploadAsync(string uploadId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(uploadId, nameof(uploadId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await CancelUploadAsync(uploadId, context).ConfigureAwait(false);
+            return Response.FromValue(Upload.FromResponse(response), response);
+        }
+
+        /// <summary> Cancels the Upload. No Parts may be added after an Upload is cancelled. </summary>
+        /// <param name="uploadId"> The ID of the upload associated with this operation. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="uploadId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="uploadId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<Upload> CancelUpload(string uploadId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(uploadId, nameof(uploadId));
+
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = CancelUpload(uploadId, context);
+            return Response.FromValue(Upload.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Cancels the Upload. No Parts may be added after an Upload is cancelled.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="uploadId"> The ID of the upload associated with this operation. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="uploadId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="uploadId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual async Task<Response> CancelUploadAsync(string uploadId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(uploadId, nameof(uploadId));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.CancelUpload");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCancelUploadRequest(uploadId, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Cancels the Upload. No Parts may be added after an Upload is cancelled.
+        /// <list type="bullet">
+        /// <item>
+        /// <description>
+        /// This <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/ProtocolMethods.md">protocol method</see> allows explicit creation of the request and processing of the response for advanced scenarios.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="uploadId"> The ID of the upload associated with this operation. </param>
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="uploadId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="uploadId"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="RequestFailedException"> Service returned a non-success status code. </exception>
+        /// <returns> The response returned from the service. </returns>
+        internal virtual Response CancelUpload(string uploadId, RequestContext context)
+        {
+            Argument.AssertNotNullOrEmpty(uploadId, nameof(uploadId));
+
+            using var scope = ClientDiagnostics.CreateScope("OpenAIClient.CancelUpload");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCancelUploadRequest(uploadId, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        internal HttpMessage CreateGetAudioTranscriptionAsPlainTextRequest(string deploymentId, RequestContent content, string contentType, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/deployments/", false);
+            uri.AppendPath(deploymentId, true);
+            uri.AppendPath("/audio/transcriptions", false);
+            uri.AppendQuery("api-version", _apiVersion, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "text/plain");
+            request.Headers.Add("Content-Type", contentType);
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateGetAudioTranscriptionAsResponseObjectRequest(string deploymentId, RequestContent content, string contentType, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/deployments/", false);
+            uri.AppendPath(deploymentId, true);
+            uri.AppendPath("/audio/transcriptions", false);
+            uri.AppendQuery("api-version", _apiVersion, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", contentType);
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateGetAudioTranslationAsPlainTextRequest(string deploymentId, RequestContent content, string contentType, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/deployments/", false);
+            uri.AppendPath(deploymentId, true);
+            uri.AppendPath("/audio/translations", false);
+            uri.AppendQuery("api-version", _apiVersion, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "text/plain");
+            request.Headers.Add("Content-Type", contentType);
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateGetAudioTranslationAsResponseObjectRequest(string deploymentId, RequestContent content, string contentType, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/deployments/", false);
+            uri.AppendPath(deploymentId, true);
+            uri.AppendPath("/audio/translations", false);
+            uri.AppendQuery("api-version", _apiVersion, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", contentType);
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateGetCompletionsRequest(string deploymentId, RequestContent content, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/deployments/", false);
+            uri.AppendPath(deploymentId, true);
+            uri.AppendPath("/completions", false);
+            uri.AppendQuery("api-version", _apiVersion, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", "application/json");
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateGetChatCompletionsRequest(string deploymentId, RequestContent content, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/deployments/", false);
+            uri.AppendPath(deploymentId, true);
+            uri.AppendPath("/chat/completions", false);
+            uri.AppendQuery("api-version", _apiVersion, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", "application/json");
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateGetImageGenerationsRequest(string deploymentId, RequestContent content, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/deployments/", false);
+            uri.AppendPath(deploymentId, true);
+            uri.AppendPath("/images/generations", false);
+            uri.AppendQuery("api-version", _apiVersion, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", "application/json");
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateGenerateSpeechFromTextRequest(string deploymentId, RequestContent content, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/deployments/", false);
+            uri.AppendPath(deploymentId, true);
+            uri.AppendPath("/audio/speech", false);
+            uri.AppendQuery("api-version", _apiVersion, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/octet-stream");
+            request.Headers.Add("Content-Type", "application/json");
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateGetEmbeddingsRequest(string deploymentId, RequestContent content, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/deployments/", false);
+            uri.AppendPath(deploymentId, true);
+            uri.AppendPath("/embeddings", false);
+            uri.AppendQuery("api-version", _apiVersion, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", "application/json");
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateGetFilesRequest(string purpose, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Get;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/files", false);
+            if (purpose != null)
+            {
+                uri.AppendQuery("purpose", purpose, true);
+            }
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateUploadFileRequest(RequestContent content, string contentType, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/files", false);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", contentType);
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateDeleteFileRequest(string fileId, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Delete;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/files/", false);
+            uri.AppendPath(fileId, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateGetFileRequest(string fileId, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Get;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/files/", false);
+            uri.AppendPath(fileId, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateGetFileContentRequest(string fileId, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Get;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/files/", false);
+            uri.AppendPath(fileId, true);
+            uri.AppendPath("/content", false);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateGetBatchesRequest(string after, int? limit, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Get;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/batches", false);
+            if (after != null)
+            {
+                uri.AppendQuery("after", after, true);
+            }
+            if (limit != null)
+            {
+                uri.AppendQuery("limit", limit.Value, true);
+            }
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateCreateBatchRequest(RequestContent content, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier201);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/batches", false);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", "application/json");
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateGetBatchRequest(string batchId, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Get;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/batches/", false);
+            uri.AppendPath(batchId, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateCancelBatchRequest(string batchId, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/batches/", false);
+            uri.AppendPath(batchId, true);
+            uri.AppendPath("/cancel", false);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        internal HttpMessage CreateCreateUploadRequest(RequestContent content, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/uploads", false);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", "application/json");
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateAddUploadPartRequest(string uploadId, RequestContent content, string contentType, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/uploads/", false);
+            uri.AppendPath(uploadId, true);
+            uri.AppendPath("/parts", false);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", contentType);
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateCompleteUploadRequest(string uploadId, RequestContent content, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/uploads/", false);
+            uri.AppendPath(uploadId, true);
+            uri.AppendPath("/complete", false);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            request.Headers.Add("Content-Type", "application/json");
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateCancelUploadRequest(string uploadId, RequestContext context)
+        {
+            var message = _pipeline.CreateMessage(context, ResponseClassifier200);
+            var request = message.Request;
+            request.Method = RequestMethod.Post;
+            var uri = new RawRequestUriBuilder();
+            uri.Reset(_endpoint);
+            uri.AppendRaw("/openai", false);
+            uri.AppendPath("/uploads/", false);
+            uri.AppendPath(uploadId, true);
+            uri.AppendPath("/cancel", false);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            return message;
+        }
+
+        private static RequestContext DefaultRequestContext = new RequestContext();
+        internal static RequestContext FromCancellationToken(CancellationToken cancellationToken = default)
+        {
+            if (!cancellationToken.CanBeCanceled)
+            {
+                return DefaultRequestContext;
+            }
+
+            return new RequestContext() { CancellationToken = cancellationToken };
+        }
+
+        private static ResponseClassifier _responseClassifier200;
+        private static ResponseClassifier ResponseClassifier200 => _responseClassifier200 ??= new StatusCodeClassifier(stackalloc ushort[] { 200 });
+        private static ResponseClassifier _responseClassifier201;
+        private static ResponseClassifier ResponseClassifier201 => _responseClassifier201 ??= new StatusCodeClassifier(stackalloc ushort[] { 201 });
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIClientOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIClientOptions.cs
new file mode 100644
index 000000000000..1aa87f12833e
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIClientOptions.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Client options for OpenAIClient. </summary>
+    public partial class OpenAIClientOptions : ClientOptions
+    {
+        private const ServiceVersion LatestVersion = ServiceVersion.V2024_09_01_Preview;
+
+        /// <summary> The version of the service to use. </summary>
+        public enum ServiceVersion
+        {
+            /// <summary> Service version "2022-12-01". </summary>
+            V2022_12_01 = 1,
+            /// <summary> Service version "2023-05-15". </summary>
+            V2023_05_15 = 2,
+            /// <summary> Service version "2023-06-01-preview". </summary>
+            V2023_06_01_Preview = 3,
+            /// <summary> Service version "2023-07-01-preview". </summary>
+            V2023_07_01_Preview = 4,
+            /// <summary> Service version "2024-02-01". </summary>
+            V2024_02_01 = 5,
+            /// <summary> Service version "2024-02-15-preview". </summary>
+            V2024_02_15_Preview = 6,
+            /// <summary> Service version "2024-03-01-preview". </summary>
+            V2024_03_01_Preview = 7,
+            /// <summary> Service version "2024-04-01-preview". </summary>
+            V2024_04_01_Preview = 8,
+            /// <summary> Service version "2024-05-01-preview". </summary>
+            V2024_05_01_Preview = 9,
+            /// <summary> Service version "2024-06-01". </summary>
+            V2024_06_01 = 10,
+            /// <summary> Service version "2024-07-01-preview". </summary>
+            V2024_07_01_Preview = 11,
+            /// <summary> Service version "2024-08-01-preview". </summary>
+            V2024_08_01_Preview = 12,
+            /// <summary> Service version "2024-09-01-preview". </summary>
+            V2024_09_01_Preview = 13,
+        }
+
+        internal string Version { get; }
+
+        /// <summary> Initializes new instance of OpenAIClientOptions. </summary>
+        public OpenAIClientOptions(ServiceVersion version = LatestVersion)
+        {
+            Version = version switch
+            {
+                ServiceVersion.V2022_12_01 => "2022-12-01",
+                ServiceVersion.V2023_05_15 => "2023-05-15",
+                ServiceVersion.V2023_06_01_Preview => "2023-06-01-preview",
+                ServiceVersion.V2023_07_01_Preview => "2023-07-01-preview",
+                ServiceVersion.V2024_02_01 => "2024-02-01",
+                ServiceVersion.V2024_02_15_Preview => "2024-02-15-preview",
+                ServiceVersion.V2024_03_01_Preview => "2024-03-01-preview",
+                ServiceVersion.V2024_04_01_Preview => "2024-04-01-preview",
+                ServiceVersion.V2024_05_01_Preview => "2024-05-01-preview",
+                ServiceVersion.V2024_06_01 => "2024-06-01",
+                ServiceVersion.V2024_07_01_Preview => "2024-07-01-preview",
+                ServiceVersion.V2024_08_01_Preview => "2024-08-01-preview",
+                ServiceVersion.V2024_09_01_Preview => "2024-09-01-preview",
+                _ => throw new NotSupportedException()
+            };
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIFile.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIFile.Serialization.cs
new file mode 100644
index 000000000000..a15be530ce6d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIFile.Serialization.cs
@@ -0,0 +1,210 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OpenAIFile : IUtf8JsonSerializable, IJsonModel<OpenAIFile>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OpenAIFile>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OpenAIFile>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIFile>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OpenAIFile)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("object"u8);
+            writer.WriteStringValue(Object.ToString());
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("bytes"u8);
+            writer.WriteNumberValue(Bytes);
+            writer.WritePropertyName("filename"u8);
+            writer.WriteStringValue(Filename);
+            writer.WritePropertyName("created_at"u8);
+            writer.WriteNumberValue(CreatedAt, "U");
+            writer.WritePropertyName("purpose"u8);
+            writer.WriteStringValue(Purpose.ToString());
+            if (Optional.IsDefined(Status))
+            {
+                writer.WritePropertyName("status"u8);
+                writer.WriteStringValue(Status.Value.ToString());
+            }
+            if (Optional.IsDefined(StatusDetails))
+            {
+                writer.WritePropertyName("status_details"u8);
+                writer.WriteStringValue(StatusDetails);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OpenAIFile IJsonModel<OpenAIFile>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIFile>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OpenAIFile)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOpenAIFile(document.RootElement, options);
+        }
+
+        internal static OpenAIFile DeserializeOpenAIFile(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            OpenAIFileObject @object = default;
+            string id = default;
+            int bytes = default;
+            string filename = default;
+            DateTimeOffset createdAt = default;
+            FilePurpose purpose = default;
+            FileState? status = default;
+            string statusDetails = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("object"u8))
+                {
+                    @object = new OpenAIFileObject(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("bytes"u8))
+                {
+                    bytes = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("filename"u8))
+                {
+                    filename = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("created_at"u8))
+                {
+                    createdAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("purpose"u8))
+                {
+                    purpose = new FilePurpose(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("status"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    status = new FileState(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("status_details"u8))
+                {
+                    statusDetails = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OpenAIFile(
+                @object,
+                id,
+                bytes,
+                filename,
+                createdAt,
+                purpose,
+                status,
+                statusDetails,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<OpenAIFile>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIFile>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OpenAIFile)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OpenAIFile IPersistableModel<OpenAIFile>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIFile>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOpenAIFile(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OpenAIFile)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OpenAIFile>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static OpenAIFile FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOpenAIFile(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantFile.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIFile.cs
similarity index 51%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantFile.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIFile.cs
index 119a216efc63..a9eddeb3b1c6 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/AssistantFile.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIFile.cs
@@ -8,10 +8,10 @@
 using System;
 using System.Collections.Generic;
 
-namespace Azure.AI.OpenAI.Assistants
+namespace Azure.AI.OpenAI
 {
-    /// <summary> Information about a file attached to an assistant, as used by tools that can read files. </summary>
-    public partial class AssistantFile
+    /// <summary> Represents an assistant that can call the model and use tools. </summary>
+    public partial class OpenAIFile
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,47 +45,69 @@ public partial class AssistantFile
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="AssistantFile"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="OpenAIFile"/>. </summary>
         /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
+        /// <param name="bytes"> The size of the file, in bytes. </param>
+        /// <param name="filename"> The name of the file. </param>
         /// <param name="createdAt"> The Unix timestamp, in seconds, representing when this object was created. </param>
-        /// <param name="assistantId"> The assistant ID that the file is attached to. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="id"/> or <paramref name="assistantId"/> is null. </exception>
-        internal AssistantFile(string id, DateTimeOffset createdAt, string assistantId)
+        /// <param name="purpose"> The intended purpose of a file. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> or <paramref name="filename"/> is null. </exception>
+        internal OpenAIFile(string id, int bytes, string filename, DateTimeOffset createdAt, FilePurpose purpose)
         {
             Argument.AssertNotNull(id, nameof(id));
-            Argument.AssertNotNull(assistantId, nameof(assistantId));
+            Argument.AssertNotNull(filename, nameof(filename));
 
             Id = id;
+            Bytes = bytes;
+            Filename = filename;
             CreatedAt = createdAt;
-            AssistantId = assistantId;
+            Purpose = purpose;
         }
 
-        /// <summary> Initializes a new instance of <see cref="AssistantFile"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="OpenAIFile"/>. </summary>
+        /// <param name="object"> The object type, which is always 'file'. </param>
         /// <param name="id"> The identifier, which can be referenced in API endpoints. </param>
-        /// <param name="object"> The object type, which is always 'assistant.file'. </param>
+        /// <param name="bytes"> The size of the file, in bytes. </param>
+        /// <param name="filename"> The name of the file. </param>
         /// <param name="createdAt"> The Unix timestamp, in seconds, representing when this object was created. </param>
-        /// <param name="assistantId"> The assistant ID that the file is attached to. </param>
+        /// <param name="purpose"> The intended purpose of a file. </param>
+        /// <param name="status"> The state of the file. This field is available in Azure OpenAI only. </param>
+        /// <param name="statusDetails"> The error message with details in case processing of this file failed. This field is available in Azure OpenAI only. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AssistantFile(string id, string @object, DateTimeOffset createdAt, string assistantId, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal OpenAIFile(OpenAIFileObject @object, string id, int bytes, string filename, DateTimeOffset createdAt, FilePurpose purpose, FileState? status, string statusDetails, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
-            Id = id;
             Object = @object;
+            Id = id;
+            Bytes = bytes;
+            Filename = filename;
             CreatedAt = createdAt;
-            AssistantId = assistantId;
+            Purpose = purpose;
+            Status = status;
+            StatusDetails = statusDetails;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="AssistantFile"/> for deserialization. </summary>
-        internal AssistantFile()
+        /// <summary> Initializes a new instance of <see cref="OpenAIFile"/> for deserialization. </summary>
+        internal OpenAIFile()
         {
         }
 
+        /// <summary> The object type, which is always 'file'. </summary>
+        public OpenAIFileObject Object { get; } = OpenAIFileObject.File;
+
         /// <summary> The identifier, which can be referenced in API endpoints. </summary>
         public string Id { get; }
-
+        /// <summary> The size of the file, in bytes. </summary>
+        public int Bytes { get; }
+        /// <summary> The name of the file. </summary>
+        public string Filename { get; }
         /// <summary> The Unix timestamp, in seconds, representing when this object was created. </summary>
         public DateTimeOffset CreatedAt { get; }
-        /// <summary> The assistant ID that the file is attached to. </summary>
-        public string AssistantId { get; }
+        /// <summary> The intended purpose of a file. </summary>
+        public FilePurpose Purpose { get; }
+        /// <summary> The state of the file. This field is available in Azure OpenAI only. </summary>
+        public FileState? Status { get; }
+        /// <summary> The error message with details in case processing of this file failed. This field is available in Azure OpenAI only. </summary>
+        public string StatusDetails { get; }
     }
 }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIFileObject.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIFileObject.cs
new file mode 100644
index 000000000000..8268140265ee
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIFileObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The OpenAIFile_object. </summary>
+    public readonly partial struct OpenAIFileObject : IEquatable<OpenAIFileObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="OpenAIFileObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public OpenAIFileObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string FileValue = "file";
+
+        /// <summary> file. </summary>
+        public static OpenAIFileObject File { get; } = new OpenAIFileObject(FileValue);
+        /// <summary> Determines if two <see cref="OpenAIFileObject"/> values are the same. </summary>
+        public static bool operator ==(OpenAIFileObject left, OpenAIFileObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="OpenAIFileObject"/> values are not the same. </summary>
+        public static bool operator !=(OpenAIFileObject left, OpenAIFileObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="OpenAIFileObject"/>. </summary>
+        public static implicit operator OpenAIFileObject(string value) => new OpenAIFileObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is OpenAIFileObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(OpenAIFileObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIPageableListOfBatch.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIPageableListOfBatch.Serialization.cs
new file mode 100644
index 000000000000..f783cbe928a4
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIPageableListOfBatch.Serialization.cs
@@ -0,0 +1,203 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class OpenAIPageableListOfBatch : IUtf8JsonSerializable, IJsonModel<OpenAIPageableListOfBatch>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OpenAIPageableListOfBatch>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OpenAIPageableListOfBatch>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIPageableListOfBatch>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OpenAIPageableListOfBatch)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("object"u8);
+            writer.WriteStringValue(Object.ToString());
+            if (Optional.IsCollectionDefined(Data))
+            {
+                writer.WritePropertyName("data"u8);
+                writer.WriteStartArray();
+                foreach (var item in Data)
+                {
+                    writer.WriteObjectValue<OpenAI.Batch>(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsDefined(FirstId))
+            {
+                writer.WritePropertyName("first_id"u8);
+                writer.WriteStringValue(FirstId);
+            }
+            if (Optional.IsDefined(LastId))
+            {
+                writer.WritePropertyName("last_id"u8);
+                writer.WriteStringValue(LastId);
+            }
+            if (Optional.IsDefined(HasMore))
+            {
+                writer.WritePropertyName("has_more"u8);
+                writer.WriteBooleanValue(HasMore.Value);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OpenAIPageableListOfBatch IJsonModel<OpenAIPageableListOfBatch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIPageableListOfBatch>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OpenAIPageableListOfBatch)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOpenAIPageableListOfBatch(document.RootElement, options);
+        }
+
+        internal static OpenAIPageableListOfBatch DeserializeOpenAIPageableListOfBatch(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            OpenAIPageableListOfBatchObject @object = default;
+            IReadOnlyList<OpenAI.Batch> data = default;
+            string firstId = default;
+            string lastId = default;
+            bool? hasMore = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("object"u8))
+                {
+                    @object = new OpenAIPageableListOfBatchObject(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("data"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<OpenAI.Batch> array = new List<OpenAI.Batch>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(OpenAI.Batch.DeserializeBatch(item, options));
+                    }
+                    data = array;
+                    continue;
+                }
+                if (property.NameEquals("first_id"u8))
+                {
+                    firstId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("last_id"u8))
+                {
+                    lastId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("has_more"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    hasMore = property.Value.GetBoolean();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new OpenAIPageableListOfBatch(
+                @object,
+                data ?? new ChangeTrackingList<OpenAI.Batch>(),
+                firstId,
+                lastId,
+                hasMore,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<OpenAIPageableListOfBatch>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIPageableListOfBatch>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OpenAIPageableListOfBatch)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OpenAIPageableListOfBatch IPersistableModel<OpenAIPageableListOfBatch>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OpenAIPageableListOfBatch>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOpenAIPageableListOfBatch(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OpenAIPageableListOfBatch)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OpenAIPageableListOfBatch>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static OpenAIPageableListOfBatch FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeOpenAIPageableListOfBatch(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIPageableListOfBatch.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIPageableListOfBatch.cs
new file mode 100644
index 000000000000..16be6cb0109c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIPageableListOfBatch.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The response data for a requested list of items. </summary>
+    public partial class OpenAIPageableListOfBatch
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="OpenAIPageableListOfBatch"/>. </summary>
+        internal OpenAIPageableListOfBatch()
+        {
+            Data = new ChangeTrackingList<OpenAI.Batch>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="OpenAIPageableListOfBatch"/>. </summary>
+        /// <param name="object"> The object type, which is always list. </param>
+        /// <param name="data"> The requested list of items. </param>
+        /// <param name="firstId"> The first ID represented in this list. </param>
+        /// <param name="lastId"> The last ID represented in this list. </param>
+        /// <param name="hasMore"> A value indicating whether there are additional values available not captured in this list. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal OpenAIPageableListOfBatch(OpenAIPageableListOfBatchObject @object, IReadOnlyList<OpenAI.Batch> data, string firstId, string lastId, bool? hasMore, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Object = @object;
+            Data = data;
+            FirstId = firstId;
+            LastId = lastId;
+            HasMore = hasMore;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The object type, which is always list. </summary>
+        public OpenAIPageableListOfBatchObject Object { get; } = OpenAIPageableListOfBatchObject.List;
+
+        /// <summary> The requested list of items. </summary>
+        public IReadOnlyList<OpenAI.Batch> Data { get; }
+        /// <summary> The first ID represented in this list. </summary>
+        public string FirstId { get; }
+        /// <summary> The last ID represented in this list. </summary>
+        public string LastId { get; }
+        /// <summary> A value indicating whether there are additional values available not captured in this list. </summary>
+        public bool? HasMore { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIPageableListOfBatchObject.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIPageableListOfBatchObject.cs
new file mode 100644
index 000000000000..db12e107d15c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/OpenAIPageableListOfBatchObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The OpenAIPageableListOfBatch_object. </summary>
+    public readonly partial struct OpenAIPageableListOfBatchObject : IEquatable<OpenAIPageableListOfBatchObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="OpenAIPageableListOfBatchObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public OpenAIPageableListOfBatchObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string ListValue = "list";
+
+        /// <summary> list. </summary>
+        public static OpenAIPageableListOfBatchObject List { get; } = new OpenAIPageableListOfBatchObject(ListValue);
+        /// <summary> Determines if two <see cref="OpenAIPageableListOfBatchObject"/> values are the same. </summary>
+        public static bool operator ==(OpenAIPageableListOfBatchObject left, OpenAIPageableListOfBatchObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="OpenAIPageableListOfBatchObject"/> values are not the same. </summary>
+        public static bool operator !=(OpenAIPageableListOfBatchObject left, OpenAIPageableListOfBatchObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="OpenAIPageableListOfBatchObject"/>. </summary>
+        public static implicit operator OpenAIPageableListOfBatchObject(string value) => new OpenAIPageableListOfBatchObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is OpenAIPageableListOfBatchObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(OpenAIPageableListOfBatchObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatDataSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatDataSource.Serialization.cs
deleted file mode 100644
index ca7bb2911d1c..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatDataSource.Serialization.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    public partial class PineconeChatDataSource : IJsonModel<PineconeChatDataSource>
-    {
-        void IJsonModel<PineconeChatDataSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PineconeChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(PineconeChatDataSource)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("parameters") != true)
-            {
-                writer.WritePropertyName("parameters"u8);
-                writer.WriteObjectValue<InternalPineconeChatDataSourceParameters>(InternalParameters, options);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        PineconeChatDataSource IJsonModel<PineconeChatDataSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PineconeChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(PineconeChatDataSource)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializePineconeChatDataSource(document.RootElement, options);
-        }
-
-        internal static PineconeChatDataSource DeserializePineconeChatDataSource(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            InternalPineconeChatDataSourceParameters parameters = default;
-            string type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("parameters"u8))
-                {
-                    parameters = InternalPineconeChatDataSourceParameters.DeserializeInternalPineconeChatDataSourceParameters(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new PineconeChatDataSource(type, serializedAdditionalRawData, parameters);
-        }
-
-        BinaryData IPersistableModel<PineconeChatDataSource>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PineconeChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(PineconeChatDataSource)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        PineconeChatDataSource IPersistableModel<PineconeChatDataSource>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<PineconeChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializePineconeChatDataSource(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(PineconeChatDataSource)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<PineconeChatDataSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new PineconeChatDataSource FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializePineconeChatDataSource(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatDataSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatDataSource.cs
deleted file mode 100644
index 213c4559cc44..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatDataSource.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI.Chat
-{
-    /// <summary> The PineconeChatDataSource. </summary>
-    public partial class PineconeChatDataSource : ChatDataSource
-    {
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatExtensionConfiguration.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatExtensionConfiguration.Serialization.cs
new file mode 100644
index 000000000000..506936da82dc
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatExtensionConfiguration.Serialization.cs
@@ -0,0 +1,143 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class PineconeChatExtensionConfiguration : IUtf8JsonSerializable, IJsonModel<PineconeChatExtensionConfiguration>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<PineconeChatExtensionConfiguration>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<PineconeChatExtensionConfiguration>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<PineconeChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(PineconeChatExtensionConfiguration)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("parameters"u8);
+            writer.WriteObjectValue(Parameters, options);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        PineconeChatExtensionConfiguration IJsonModel<PineconeChatExtensionConfiguration>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<PineconeChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(PineconeChatExtensionConfiguration)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializePineconeChatExtensionConfiguration(document.RootElement, options);
+        }
+
+        internal static PineconeChatExtensionConfiguration DeserializePineconeChatExtensionConfiguration(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            PineconeChatExtensionParameters parameters = default;
+            AzureChatExtensionType type = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("parameters"u8))
+                {
+                    parameters = PineconeChatExtensionParameters.DeserializePineconeChatExtensionParameters(property.Value, options);
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new AzureChatExtensionType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new PineconeChatExtensionConfiguration(type, serializedAdditionalRawData, parameters);
+        }
+
+        BinaryData IPersistableModel<PineconeChatExtensionConfiguration>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<PineconeChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(PineconeChatExtensionConfiguration)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        PineconeChatExtensionConfiguration IPersistableModel<PineconeChatExtensionConfiguration>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<PineconeChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializePineconeChatExtensionConfiguration(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(PineconeChatExtensionConfiguration)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<PineconeChatExtensionConfiguration>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new PineconeChatExtensionConfiguration FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializePineconeChatExtensionConfiguration(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatExtensionConfiguration.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatExtensionConfiguration.cs
new file mode 100644
index 000000000000..047937523042
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatExtensionConfiguration.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary>
+    /// A specific representation of configurable options for Pinecone when using it as an Azure OpenAI chat
+    /// extension.
+    /// </summary>
+    public partial class PineconeChatExtensionConfiguration : AzureChatExtensionConfiguration
+    {
+        /// <summary> Initializes a new instance of <see cref="PineconeChatExtensionConfiguration"/>. </summary>
+        /// <param name="parameters"> The parameters to use when configuring Azure OpenAI chat extensions. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="parameters"/> is null. </exception>
+        public PineconeChatExtensionConfiguration(PineconeChatExtensionParameters parameters)
+        {
+            Argument.AssertNotNull(parameters, nameof(parameters));
+
+            Type = AzureChatExtensionType.Pinecone;
+            Parameters = parameters;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="PineconeChatExtensionConfiguration"/>. </summary>
+        /// <param name="type">
+        ///   The label for the type of an Azure chat extension. This typically corresponds to a matching Azure resource.
+        ///   Azure chat extensions are only compatible with Azure OpenAI.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="parameters"> The parameters to use when configuring Azure OpenAI chat extensions. </param>
+        internal PineconeChatExtensionConfiguration(AzureChatExtensionType type, IDictionary<string, BinaryData> serializedAdditionalRawData, PineconeChatExtensionParameters parameters) : base(type, serializedAdditionalRawData)
+        {
+            Parameters = parameters;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="PineconeChatExtensionConfiguration"/> for deserialization. </summary>
+        internal PineconeChatExtensionConfiguration()
+        {
+        }
+
+        /// <summary> The parameters to use when configuring Azure OpenAI chat extensions. </summary>
+        public PineconeChatExtensionParameters Parameters { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalPineconeChatDataSourceParameters.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatExtensionParameters.Serialization.cs
similarity index 54%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/InternalPineconeChatDataSourceParameters.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatExtensionParameters.Serialization.cs
index 9e985538ecb7..5ad877e32bf8 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalPineconeChatDataSourceParameters.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatExtensionParameters.Serialization.cs
@@ -1,94 +1,83 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI
 {
-    internal partial class InternalPineconeChatDataSourceParameters : IJsonModel<InternalPineconeChatDataSourceParameters>
+    public partial class PineconeChatExtensionParameters : IUtf8JsonSerializable, IJsonModel<PineconeChatExtensionParameters>
     {
-        void IJsonModel<InternalPineconeChatDataSourceParameters>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<PineconeChatExtensionParameters>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<PineconeChatExtensionParameters>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalPineconeChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<PineconeChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalPineconeChatDataSourceParameters)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(PineconeChatExtensionParameters)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("top_n_documents") != true && Optional.IsDefined(TopNDocuments))
+            if (Optional.IsDefined(DocumentCount))
             {
                 writer.WritePropertyName("top_n_documents"u8);
-                writer.WriteNumberValue(TopNDocuments.Value);
+                writer.WriteNumberValue(DocumentCount.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("in_scope") != true && Optional.IsDefined(InScope))
+            if (Optional.IsDefined(ShouldRestrictResultScope))
             {
                 writer.WritePropertyName("in_scope"u8);
-                writer.WriteBooleanValue(InScope.Value);
+                writer.WriteBooleanValue(ShouldRestrictResultScope.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("strictness") != true && Optional.IsDefined(Strictness))
+            if (Optional.IsDefined(Strictness))
             {
                 writer.WritePropertyName("strictness"u8);
                 writer.WriteNumberValue(Strictness.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("max_search_queries") != true && Optional.IsDefined(MaxSearchQueries))
+            if (Optional.IsDefined(MaxSearchQueries))
             {
                 writer.WritePropertyName("max_search_queries"u8);
                 writer.WriteNumberValue(MaxSearchQueries.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("allow_partial_result") != true && Optional.IsDefined(AllowPartialResult))
+            if (Optional.IsDefined(AllowPartialResult))
             {
                 writer.WritePropertyName("allow_partial_result"u8);
                 writer.WriteBooleanValue(AllowPartialResult.Value);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("include_contexts") != true && Optional.IsCollectionDefined(_internalIncludeContexts))
+            if (Optional.IsCollectionDefined(IncludeContexts))
             {
                 writer.WritePropertyName("include_contexts"u8);
                 writer.WriteStartArray();
-                foreach (var item in _internalIncludeContexts)
+                foreach (var item in IncludeContexts)
                 {
-                    writer.WriteStringValue(item);
+                    writer.WriteStringValue(item.ToString());
                 }
                 writer.WriteEndArray();
             }
-            if (SerializedAdditionalRawData?.ContainsKey("environment") != true)
-            {
-                writer.WritePropertyName("environment"u8);
-                writer.WriteStringValue(Environment);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("index_name") != true)
-            {
-                writer.WritePropertyName("index_name"u8);
-                writer.WriteStringValue(IndexName);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("authentication") != true)
+            if (Optional.IsDefined(Authentication))
             {
                 writer.WritePropertyName("authentication"u8);
-                writer.WriteObjectValue<DataSourceAuthentication>(Authentication, options);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("embedding_dependency") != true)
-            {
-                writer.WritePropertyName("embedding_dependency"u8);
-                writer.WriteObjectValue<DataSourceVectorizer>(VectorizationSource, options);
+                writer.WriteObjectValue(Authentication, options);
             }
-            if (SerializedAdditionalRawData?.ContainsKey("fields_mapping") != true)
+            writer.WritePropertyName("environment"u8);
+            writer.WriteStringValue(EnvironmentName);
+            writer.WritePropertyName("index_name"u8);
+            writer.WriteStringValue(IndexName);
+            writer.WritePropertyName("fields_mapping"u8);
+            writer.WriteObjectValue(FieldMappingOptions, options);
+            writer.WritePropertyName("embedding_dependency"u8);
+            writer.WriteObjectValue(EmbeddingDependency, options);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                writer.WritePropertyName("fields_mapping"u8);
-                writer.WriteObjectValue<DataSourceFieldMappings>(FieldMappings, options);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -103,19 +92,19 @@ void IJsonModel<InternalPineconeChatDataSourceParameters>.Write(Utf8JsonWriter w
             writer.WriteEndObject();
         }
 
-        InternalPineconeChatDataSourceParameters IJsonModel<InternalPineconeChatDataSourceParameters>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        PineconeChatExtensionParameters IJsonModel<PineconeChatExtensionParameters>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalPineconeChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<PineconeChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(InternalPineconeChatDataSourceParameters)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(PineconeChatExtensionParameters)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeInternalPineconeChatDataSourceParameters(document.RootElement, options);
+            return DeserializePineconeChatExtensionParameters(document.RootElement, options);
         }
 
-        internal static InternalPineconeChatDataSourceParameters DeserializeInternalPineconeChatDataSourceParameters(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static PineconeChatExtensionParameters DeserializePineconeChatExtensionParameters(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -128,12 +117,12 @@ internal static InternalPineconeChatDataSourceParameters DeserializeInternalPine
             int? strictness = default;
             int? maxSearchQueries = default;
             bool? allowPartialResult = default;
-            IList<string> includeContexts = default;
+            IList<OnYourDataContextProperty> includeContexts = default;
+            OnYourDataAuthenticationOptions authentication = default;
             string environment = default;
             string indexName = default;
-            DataSourceAuthentication authentication = default;
-            DataSourceVectorizer embeddingDependency = default;
-            DataSourceFieldMappings fieldsMapping = default;
+            PineconeFieldMappingOptions fieldsMapping = default;
+            OnYourDataVectorizationSource embeddingDependency = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -189,14 +178,23 @@ internal static InternalPineconeChatDataSourceParameters DeserializeInternalPine
                     {
                         continue;
                     }
-                    List<string> array = new List<string>();
+                    List<OnYourDataContextProperty> array = new List<OnYourDataContextProperty>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(item.GetString());
+                        array.Add(new OnYourDataContextProperty(item.GetString()));
                     }
                     includeContexts = array;
                     continue;
                 }
+                if (property.NameEquals("authentication"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    authentication = OnYourDataAuthenticationOptions.DeserializeOnYourDataAuthenticationOptions(property.Value, options);
+                    continue;
+                }
                 if (property.NameEquals("environment"u8))
                 {
                     environment = property.Value.GetString();
@@ -207,87 +205,82 @@ internal static InternalPineconeChatDataSourceParameters DeserializeInternalPine
                     indexName = property.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("authentication"u8))
+                if (property.NameEquals("fields_mapping"u8))
                 {
-                    authentication = DataSourceAuthentication.DeserializeDataSourceAuthentication(property.Value, options);
+                    fieldsMapping = PineconeFieldMappingOptions.DeserializePineconeFieldMappingOptions(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("embedding_dependency"u8))
                 {
-                    embeddingDependency = DataSourceVectorizer.DeserializeDataSourceVectorizer(property.Value, options);
-                    continue;
-                }
-                if (property.NameEquals("fields_mapping"u8))
-                {
-                    fieldsMapping = DataSourceFieldMappings.DeserializeDataSourceFieldMappings(property.Value, options);
+                    embeddingDependency = OnYourDataVectorizationSource.DeserializeOnYourDataVectorizationSource(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new InternalPineconeChatDataSourceParameters(
+            return new PineconeChatExtensionParameters(
                 topNDocuments,
                 inScope,
                 strictness,
                 maxSearchQueries,
                 allowPartialResult,
-                includeContexts ?? new ChangeTrackingList<string>(),
+                includeContexts ?? new ChangeTrackingList<OnYourDataContextProperty>(),
+                authentication,
                 environment,
                 indexName,
-                authentication,
-                embeddingDependency,
                 fieldsMapping,
+                embeddingDependency,
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<InternalPineconeChatDataSourceParameters>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<PineconeChatExtensionParameters>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalPineconeChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<PineconeChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(InternalPineconeChatDataSourceParameters)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(PineconeChatExtensionParameters)} does not support writing '{options.Format}' format.");
             }
         }
 
-        InternalPineconeChatDataSourceParameters IPersistableModel<InternalPineconeChatDataSourceParameters>.Create(BinaryData data, ModelReaderWriterOptions options)
+        PineconeChatExtensionParameters IPersistableModel<PineconeChatExtensionParameters>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<InternalPineconeChatDataSourceParameters>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<PineconeChatExtensionParameters>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeInternalPineconeChatDataSourceParameters(document.RootElement, options);
+                        return DeserializePineconeChatExtensionParameters(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(InternalPineconeChatDataSourceParameters)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(PineconeChatExtensionParameters)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<InternalPineconeChatDataSourceParameters>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<PineconeChatExtensionParameters>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static InternalPineconeChatDataSourceParameters FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static PineconeChatExtensionParameters FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalPineconeChatDataSourceParameters(document.RootElement);
+            return DeserializePineconeChatExtensionParameters(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
         {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatExtensionParameters.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatExtensionParameters.cs
new file mode 100644
index 000000000000..7f1a38f68a42
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeChatExtensionParameters.cs
@@ -0,0 +1,165 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Parameters for configuring Azure OpenAI Pinecone chat extensions. The supported authentication type is APIKey. </summary>
+    public partial class PineconeChatExtensionParameters
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="PineconeChatExtensionParameters"/>. </summary>
+        /// <param name="environmentName"> The environment name of Pinecone. </param>
+        /// <param name="indexName"> The name of the Pinecone database index. </param>
+        /// <param name="fieldMappingOptions"> Customized field mapping behavior to use when interacting with the search index. </param>
+        /// <param name="embeddingDependency">
+        /// The embedding dependency for vector search.
+        /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OnYourDataModelIdVectorizationSource"/>.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="environmentName"/>, <paramref name="indexName"/>, <paramref name="fieldMappingOptions"/> or <paramref name="embeddingDependency"/> is null. </exception>
+        public PineconeChatExtensionParameters(string environmentName, string indexName, PineconeFieldMappingOptions fieldMappingOptions, OnYourDataVectorizationSource embeddingDependency)
+        {
+            Argument.AssertNotNull(environmentName, nameof(environmentName));
+            Argument.AssertNotNull(indexName, nameof(indexName));
+            Argument.AssertNotNull(fieldMappingOptions, nameof(fieldMappingOptions));
+            Argument.AssertNotNull(embeddingDependency, nameof(embeddingDependency));
+
+            IncludeContexts = new ChangeTrackingList<OnYourDataContextProperty>();
+            EnvironmentName = environmentName;
+            IndexName = indexName;
+            FieldMappingOptions = fieldMappingOptions;
+            EmbeddingDependency = embeddingDependency;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="PineconeChatExtensionParameters"/>. </summary>
+        /// <param name="documentCount"> The configured top number of documents to feature for the configured query. </param>
+        /// <param name="shouldRestrictResultScope"> Whether queries should be restricted to use of indexed data. </param>
+        /// <param name="strictness"> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </param>
+        /// <param name="maxSearchQueries">
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </param>
+        /// <param name="allowPartialResult">
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </param>
+        /// <param name="includeContexts"> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </param>
+        /// <param name="authentication">
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// Please note <see cref="OnYourDataAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataAccessTokenAuthenticationOptions"/>, <see cref="OnYourDataApiKeyAuthenticationOptions"/>, <see cref="OnYourDataConnectionStringAuthenticationOptions"/>, <see cref="OnYourDataEncodedApiKeyAuthenticationOptions"/>, <see cref="OnYourDataKeyAndKeyIdAuthenticationOptions"/>, <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>, <see cref="OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> and <see cref="OnYourDataUsernameAndPasswordAuthenticationOptions"/>.
+        /// </param>
+        /// <param name="environmentName"> The environment name of Pinecone. </param>
+        /// <param name="indexName"> The name of the Pinecone database index. </param>
+        /// <param name="fieldMappingOptions"> Customized field mapping behavior to use when interacting with the search index. </param>
+        /// <param name="embeddingDependency">
+        /// The embedding dependency for vector search.
+        /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OnYourDataModelIdVectorizationSource"/>.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal PineconeChatExtensionParameters(int? documentCount, bool? shouldRestrictResultScope, int? strictness, int? maxSearchQueries, bool? allowPartialResult, IList<OnYourDataContextProperty> includeContexts, OnYourDataAuthenticationOptions authentication, string environmentName, string indexName, PineconeFieldMappingOptions fieldMappingOptions, OnYourDataVectorizationSource embeddingDependency, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            DocumentCount = documentCount;
+            ShouldRestrictResultScope = shouldRestrictResultScope;
+            Strictness = strictness;
+            MaxSearchQueries = maxSearchQueries;
+            AllowPartialResult = allowPartialResult;
+            IncludeContexts = includeContexts;
+            Authentication = authentication;
+            EnvironmentName = environmentName;
+            IndexName = indexName;
+            FieldMappingOptions = fieldMappingOptions;
+            EmbeddingDependency = embeddingDependency;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="PineconeChatExtensionParameters"/> for deserialization. </summary>
+        internal PineconeChatExtensionParameters()
+        {
+        }
+
+        /// <summary> The configured top number of documents to feature for the configured query. </summary>
+        public int? DocumentCount { get; set; }
+        /// <summary> Whether queries should be restricted to use of indexed data. </summary>
+        public bool? ShouldRestrictResultScope { get; set; }
+        /// <summary> The configured strictness of the search relevance filtering. The higher of strictness, the higher of the precision but lower recall of the answer. </summary>
+        public int? Strictness { get; set; }
+        /// <summary>
+        /// The max number of rewritten queries should be send to search provider for one user message. If not specified,
+        /// the system will decide the number of queries to send.
+        /// </summary>
+        public int? MaxSearchQueries { get; set; }
+        /// <summary>
+        /// If specified as true, the system will allow partial search results to be used and the request fails if all the queries fail.
+        /// If not specified, or specified as false, the request will fail if any search query fails.
+        /// </summary>
+        public bool? AllowPartialResult { get; set; }
+        /// <summary> The included properties of the output context. If not specified, the default value is `citations` and `intent`. </summary>
+        public IList<OnYourDataContextProperty> IncludeContexts { get; }
+        /// <summary>
+        /// The authentication method to use when accessing the defined data source.
+        /// Each data source type supports a specific set of available authentication methods; please see the documentation of
+        /// the data source for supported mechanisms.
+        /// If not otherwise provided, On Your Data will attempt to use System Managed Identity (default credential)
+        /// authentication.
+        /// Please note <see cref="OnYourDataAuthenticationOptions"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataAccessTokenAuthenticationOptions"/>, <see cref="OnYourDataApiKeyAuthenticationOptions"/>, <see cref="OnYourDataConnectionStringAuthenticationOptions"/>, <see cref="OnYourDataEncodedApiKeyAuthenticationOptions"/>, <see cref="OnYourDataKeyAndKeyIdAuthenticationOptions"/>, <see cref="OnYourDataSystemAssignedManagedIdentityAuthenticationOptions"/>, <see cref="OnYourDataUserAssignedManagedIdentityAuthenticationOptions"/> and <see cref="OnYourDataUsernameAndPasswordAuthenticationOptions"/>.
+        /// </summary>
+        public OnYourDataAuthenticationOptions Authentication { get; set; }
+        /// <summary> The environment name of Pinecone. </summary>
+        public string EnvironmentName { get; }
+        /// <summary> The name of the Pinecone database index. </summary>
+        public string IndexName { get; }
+        /// <summary> Customized field mapping behavior to use when interacting with the search index. </summary>
+        public PineconeFieldMappingOptions FieldMappingOptions { get; }
+        /// <summary>
+        /// The embedding dependency for vector search.
+        /// Please note <see cref="OnYourDataVectorizationSource"/> is the base class. According to the scenario, a derived class of the base class might need to be assigned here, or this property needs to be casted to one of the possible derived classes.
+        /// The available derived classes include <see cref="OnYourDataDeploymentNameVectorizationSource"/>, <see cref="OnYourDataEndpointVectorizationSource"/>, <see cref="OnYourDataIntegratedVectorizationSource"/> and <see cref="OnYourDataModelIdVectorizationSource"/>.
+        /// </summary>
+        public OnYourDataVectorizationSource EmbeddingDependency { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeFieldMappingOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeFieldMappingOptions.Serialization.cs
new file mode 100644
index 000000000000..1706fe6ec228
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeFieldMappingOptions.Serialization.cs
@@ -0,0 +1,195 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class PineconeFieldMappingOptions : IUtf8JsonSerializable, IJsonModel<PineconeFieldMappingOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<PineconeFieldMappingOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<PineconeFieldMappingOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<PineconeFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(PineconeFieldMappingOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(TitleFieldName))
+            {
+                writer.WritePropertyName("title_field"u8);
+                writer.WriteStringValue(TitleFieldName);
+            }
+            if (Optional.IsDefined(UrlFieldName))
+            {
+                writer.WritePropertyName("url_field"u8);
+                writer.WriteStringValue(UrlFieldName);
+            }
+            if (Optional.IsDefined(FilepathFieldName))
+            {
+                writer.WritePropertyName("filepath_field"u8);
+                writer.WriteStringValue(FilepathFieldName);
+            }
+            writer.WritePropertyName("content_fields"u8);
+            writer.WriteStartArray();
+            foreach (var item in ContentFieldNames)
+            {
+                writer.WriteStringValue(item);
+            }
+            writer.WriteEndArray();
+            if (Optional.IsDefined(ContentFieldSeparator))
+            {
+                writer.WritePropertyName("content_fields_separator"u8);
+                writer.WriteStringValue(ContentFieldSeparator);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        PineconeFieldMappingOptions IJsonModel<PineconeFieldMappingOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<PineconeFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(PineconeFieldMappingOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializePineconeFieldMappingOptions(document.RootElement, options);
+        }
+
+        internal static PineconeFieldMappingOptions DeserializePineconeFieldMappingOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string titleField = default;
+            string urlField = default;
+            string filepathField = default;
+            IList<string> contentFields = default;
+            string contentFieldsSeparator = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("title_field"u8))
+                {
+                    titleField = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("url_field"u8))
+                {
+                    urlField = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("filepath_field"u8))
+                {
+                    filepathField = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("content_fields"u8))
+                {
+                    List<string> array = new List<string>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(item.GetString());
+                    }
+                    contentFields = array;
+                    continue;
+                }
+                if (property.NameEquals("content_fields_separator"u8))
+                {
+                    contentFieldsSeparator = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new PineconeFieldMappingOptions(
+                titleField,
+                urlField,
+                filepathField,
+                contentFields,
+                contentFieldsSeparator,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<PineconeFieldMappingOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<PineconeFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(PineconeFieldMappingOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        PineconeFieldMappingOptions IPersistableModel<PineconeFieldMappingOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<PineconeFieldMappingOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializePineconeFieldMappingOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(PineconeFieldMappingOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<PineconeFieldMappingOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static PineconeFieldMappingOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializePineconeFieldMappingOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeFieldMappingOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeFieldMappingOptions.cs
new file mode 100644
index 000000000000..4d3d569a6533
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/PineconeFieldMappingOptions.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Optional settings to control how fields are processed when using a configured Pinecone resource. </summary>
+    public partial class PineconeFieldMappingOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="PineconeFieldMappingOptions"/>. </summary>
+        /// <param name="contentFieldNames"> The names of index fields that should be treated as content. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="contentFieldNames"/> is null. </exception>
+        public PineconeFieldMappingOptions(IEnumerable<string> contentFieldNames)
+        {
+            Argument.AssertNotNull(contentFieldNames, nameof(contentFieldNames));
+
+            ContentFieldNames = contentFieldNames.ToList();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="PineconeFieldMappingOptions"/>. </summary>
+        /// <param name="titleFieldName"> The name of the index field to use as a title. </param>
+        /// <param name="urlFieldName"> The name of the index field to use as a URL. </param>
+        /// <param name="filepathFieldName"> The name of the index field to use as a filepath. </param>
+        /// <param name="contentFieldNames"> The names of index fields that should be treated as content. </param>
+        /// <param name="contentFieldSeparator"> The separator pattern that content fields should use. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal PineconeFieldMappingOptions(string titleFieldName, string urlFieldName, string filepathFieldName, IList<string> contentFieldNames, string contentFieldSeparator, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            TitleFieldName = titleFieldName;
+            UrlFieldName = urlFieldName;
+            FilepathFieldName = filepathFieldName;
+            ContentFieldNames = contentFieldNames;
+            ContentFieldSeparator = contentFieldSeparator;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="PineconeFieldMappingOptions"/> for deserialization. </summary>
+        internal PineconeFieldMappingOptions()
+        {
+        }
+
+        /// <summary> The name of the index field to use as a title. </summary>
+        public string TitleFieldName { get; set; }
+        /// <summary> The name of the index field to use as a URL. </summary>
+        public string UrlFieldName { get; set; }
+        /// <summary> The name of the index field to use as a filepath. </summary>
+        public string FilepathFieldName { get; set; }
+        /// <summary> The names of index fields that should be treated as content. </summary>
+        public IList<string> ContentFieldNames { get; }
+        /// <summary> The separator pattern that content fields should use. </summary>
+        public string ContentFieldSeparator { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/RequestContentFilterResult.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/RequestContentFilterResult.Serialization.cs
deleted file mode 100644
index 030bb75bd3c8..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/RequestContentFilterResult.Serialization.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace Azure.AI.OpenAI
-{
-    public partial class RequestContentFilterResult : IJsonModel<RequestContentFilterResult>
-    {
-        void IJsonModel<RequestContentFilterResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RequestContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(RequestContentFilterResult)} does not support writing '{format}' format.");
-            }
-
-            writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("prompt_index") != true && Optional.IsDefined(PromptIndex))
-            {
-                writer.WritePropertyName("prompt_index"u8);
-                writer.WriteNumberValue(PromptIndex.Value);
-            }
-            if (SerializedAdditionalRawData?.ContainsKey("content_filter_results") != true && Optional.IsDefined(InternalResults))
-            {
-                writer.WritePropertyName("content_filter_results"u8);
-                writer.WriteObjectValue<InternalAzureContentFilterResultForPromptContentFilterResults>(InternalResults, options);
-            }
-            if (SerializedAdditionalRawData != null)
-            {
-                foreach (var item in SerializedAdditionalRawData)
-                {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-            writer.WriteEndObject();
-        }
-
-        RequestContentFilterResult IJsonModel<RequestContentFilterResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RequestContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(RequestContentFilterResult)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeRequestContentFilterResult(document.RootElement, options);
-        }
-
-        internal static RequestContentFilterResult DeserializeRequestContentFilterResult(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            int? promptIndex = default;
-            InternalAzureContentFilterResultForPromptContentFilterResults contentFilterResults = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("prompt_index"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    promptIndex = property.Value.GetInt32();
-                    continue;
-                }
-                if (property.NameEquals("content_filter_results"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    contentFilterResults = InternalAzureContentFilterResultForPromptContentFilterResults.DeserializeInternalAzureContentFilterResultForPromptContentFilterResults(property.Value, options);
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new RequestContentFilterResult(promptIndex, contentFilterResults, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<RequestContentFilterResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RequestContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(RequestContentFilterResult)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        RequestContentFilterResult IPersistableModel<RequestContentFilterResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RequestContentFilterResult>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeRequestContentFilterResult(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(RequestContentFilterResult)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<RequestContentFilterResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static RequestContentFilterResult FromResponse(PipelineResponse response)
-        {
-            using var document = JsonDocument.Parse(response.Content);
-            return DeserializeRequestContentFilterResult(document.RootElement);
-        }
-
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal virtual BinaryContent ToBinaryContent()
-        {
-            return BinaryContent.Create(this, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/RequestImageContentFilterResult.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/RequestImageContentFilterResult.cs
deleted file mode 100644
index e41fc322b0ee..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/RequestImageContentFilterResult.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI
-{
-    /// <summary> A content filter result for an image generation operation's input request content. </summary>
-    public partial class RequestImageContentFilterResult : ResponseImageContentFilterResult
-    {
-        /// <summary> Initializes a new instance of <see cref="RequestImageContentFilterResult"/>. </summary>
-        /// <param name="jailbreak">
-        /// A detection result that describes user prompt injection attacks, where malicious users deliberately exploit
-        /// system vulnerabilities to elicit unauthorized behavior from the LLM. This could lead to inappropriate content
-        /// generation or violations of system-imposed restrictions.
-        /// </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="jailbreak"/> is null. </exception>
-        internal RequestImageContentFilterResult(ContentFilterDetectionResult jailbreak)
-        {
-            Argument.AssertNotNull(jailbreak, nameof(jailbreak));
-
-            Jailbreak = jailbreak;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="RequestImageContentFilterResult"/>. </summary>
-        /// <param name="sexual">
-        /// A content filter category for language related to anatomical organs and genitals, romantic relationships, acts
-        /// portrayed in erotic or affectionate terms, pregnancy, physical sexual acts, including those portrayed as an
-        /// assault or a forced sexual violent act against one's will, prostitution, pornography, and abuse.
-        /// </param>
-        /// <param name="violence">
-        /// A content filter category for language related to physical actions intended to hurt, injure, damage, or kill
-        /// someone or something; describes weapons, guns and related entities, such as manufactures, associations,
-        /// legislation, and so on.
-        /// </param>
-        /// <param name="hate">
-        /// A content filter category that can refer to any content that attacks or uses pejorative or discriminatory
-        /// language with reference to a person or identity group based on certain differentiating attributes of these groups
-        /// including but not limited to race, ethnicity, nationality, gender identity and expression, sexual orientation,
-        /// religion, immigration status, ability status, personal appearance, and body size.
-        /// </param>
-        /// <param name="selfHarm">
-        /// A content filter category that describes language related to physical actions intended to purposely hurt, injure,
-        /// damage one's body or kill oneself.
-        /// </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        /// <param name="profanity">
-        /// A detection result that identifies whether crude, vulgar, or otherwise objection language is present in the
-        /// content.
-        /// </param>
-        /// <param name="customBlocklists"> A collection of binary filtering outcomes for configured custom blocklists. </param>
-        /// <param name="jailbreak">
-        /// A detection result that describes user prompt injection attacks, where malicious users deliberately exploit
-        /// system vulnerabilities to elicit unauthorized behavior from the LLM. This could lead to inappropriate content
-        /// generation or violations of system-imposed restrictions.
-        /// </param>
-        internal RequestImageContentFilterResult(ContentFilterSeverityResult sexual, ContentFilterSeverityResult violence, ContentFilterSeverityResult hate, ContentFilterSeverityResult selfHarm, IDictionary<string, BinaryData> serializedAdditionalRawData, ContentFilterDetectionResult profanity, ContentFilterBlocklistResult customBlocklists, ContentFilterDetectionResult jailbreak) : base(sexual, violence, hate, selfHarm, serializedAdditionalRawData)
-        {
-            Profanity = profanity;
-            CustomBlocklists = customBlocklists;
-            Jailbreak = jailbreak;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="RequestImageContentFilterResult"/> for deserialization. </summary>
-        internal RequestImageContentFilterResult()
-        {
-        }
-
-        /// <summary>
-        /// A detection result that identifies whether crude, vulgar, or otherwise objection language is present in the
-        /// content.
-        /// </summary>
-        public ContentFilterDetectionResult Profanity { get; }
-        /// <summary> A collection of binary filtering outcomes for configured custom blocklists. </summary>
-        public ContentFilterBlocklistResult CustomBlocklists { get; }
-        /// <summary>
-        /// A detection result that describes user prompt injection attacks, where malicious users deliberately exploit
-        /// system vulnerabilities to elicit unauthorized behavior from the LLM. This could lead to inappropriate content
-        /// generation or violations of system-imposed restrictions.
-        /// </summary>
-        public ContentFilterDetectionResult Jailbreak { get; }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ResponseContentFilterResult.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ResponseContentFilterResult.cs
deleted file mode 100644
index be77b4567b3d..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ResponseContentFilterResult.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI
-{
-    /// <summary> A content filter result for a single response item produced by a generative AI system. </summary>
-    public partial class ResponseContentFilterResult
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="ResponseContentFilterResult"/>. </summary>
-        internal ResponseContentFilterResult()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResponseContentFilterResult"/>. </summary>
-        /// <param name="sexual">
-        /// A content filter category for language related to anatomical organs and genitals, romantic relationships, acts
-        /// portrayed in erotic or affectionate terms, pregnancy, physical sexual acts, including those portrayed as an
-        /// assault or a forced sexual violent act against one's will, prostitution, pornography, and abuse.
-        /// </param>
-        /// <param name="hate">
-        /// A content filter category that can refer to any content that attacks or uses pejorative or discriminatory
-        /// language with reference to a person or identity group based on certain differentiating attributes of these groups
-        /// including but not limited to race, ethnicity, nationality, gender identity and expression, sexual orientation,
-        /// religion, immigration status, ability status, personal appearance, and body size.
-        /// </param>
-        /// <param name="violence">
-        /// A content filter category for language related to physical actions intended to hurt, injure, damage, or kill
-        /// someone or something; describes weapons, guns and related entities, such as manufactures, associations,
-        /// legislation, and so on.
-        /// </param>
-        /// <param name="selfHarm">
-        /// A content filter category that describes language related to physical actions intended to purposely hurt, injure,
-        /// damage one's body or kill oneself.
-        /// </param>
-        /// <param name="profanity">
-        /// A detection result that identifies whether crude, vulgar, or otherwise objection language is present in the
-        /// content.
-        /// </param>
-        /// <param name="customBlocklists"> A collection of binary filtering outcomes for configured custom blocklists. </param>
-        /// <param name="error"> If present, details about an error that prevented content filtering from completing its evaluation. </param>
-        /// <param name="protectedMaterialText"> A detection result that describes a match against text protected under copyright or other status. </param>
-        /// <param name="protectedMaterialCode"> A detection result that describes a match against licensed code or other protected source material. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResponseContentFilterResult(ContentFilterSeverityResult sexual, ContentFilterSeverityResult hate, ContentFilterSeverityResult violence, ContentFilterSeverityResult selfHarm, ContentFilterDetectionResult profanity, ContentFilterBlocklistResult customBlocklists, InternalAzureContentFilterResultForPromptContentFilterResultsError error, ContentFilterDetectionResult protectedMaterialText, ContentFilterProtectedMaterialResult protectedMaterialCode, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Sexual = sexual;
-            Hate = hate;
-            Violence = violence;
-            SelfHarm = selfHarm;
-            Profanity = profanity;
-            CustomBlocklists = customBlocklists;
-            Error = error;
-            ProtectedMaterialText = protectedMaterialText;
-            ProtectedMaterialCode = protectedMaterialCode;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary>
-        /// A content filter category for language related to anatomical organs and genitals, romantic relationships, acts
-        /// portrayed in erotic or affectionate terms, pregnancy, physical sexual acts, including those portrayed as an
-        /// assault or a forced sexual violent act against one's will, prostitution, pornography, and abuse.
-        /// </summary>
-        public ContentFilterSeverityResult Sexual { get; }
-        /// <summary>
-        /// A content filter category that can refer to any content that attacks or uses pejorative or discriminatory
-        /// language with reference to a person or identity group based on certain differentiating attributes of these groups
-        /// including but not limited to race, ethnicity, nationality, gender identity and expression, sexual orientation,
-        /// religion, immigration status, ability status, personal appearance, and body size.
-        /// </summary>
-        public ContentFilterSeverityResult Hate { get; }
-        /// <summary>
-        /// A content filter category for language related to physical actions intended to hurt, injure, damage, or kill
-        /// someone or something; describes weapons, guns and related entities, such as manufactures, associations,
-        /// legislation, and so on.
-        /// </summary>
-        public ContentFilterSeverityResult Violence { get; }
-        /// <summary>
-        /// A content filter category that describes language related to physical actions intended to purposely hurt, injure,
-        /// damage one's body or kill oneself.
-        /// </summary>
-        public ContentFilterSeverityResult SelfHarm { get; }
-        /// <summary>
-        /// A detection result that identifies whether crude, vulgar, or otherwise objection language is present in the
-        /// content.
-        /// </summary>
-        public ContentFilterDetectionResult Profanity { get; }
-        /// <summary> A collection of binary filtering outcomes for configured custom blocklists. </summary>
-        public ContentFilterBlocklistResult CustomBlocklists { get; }
-        /// <summary> A detection result that describes a match against text protected under copyright or other status. </summary>
-        public ContentFilterDetectionResult ProtectedMaterialText { get; }
-        /// <summary> A detection result that describes a match against licensed code or other protected source material. </summary>
-        public ContentFilterProtectedMaterialResult ProtectedMaterialCode { get; }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/ResponseImageContentFilterResult.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/ResponseImageContentFilterResult.cs
deleted file mode 100644
index 2a5b21055925..000000000000
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/ResponseImageContentFilterResult.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.AI.OpenAI
-{
-    /// <summary> A content filter result for an image generation operation's output response content. </summary>
-    public partial class ResponseImageContentFilterResult
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        internal IDictionary<string, BinaryData> SerializedAdditionalRawData { get; set; }
-        /// <summary> Initializes a new instance of <see cref="ResponseImageContentFilterResult"/>. </summary>
-        internal ResponseImageContentFilterResult()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="ResponseImageContentFilterResult"/>. </summary>
-        /// <param name="sexual">
-        /// A content filter category for language related to anatomical organs and genitals, romantic relationships, acts
-        /// portrayed in erotic or affectionate terms, pregnancy, physical sexual acts, including those portrayed as an
-        /// assault or a forced sexual violent act against one's will, prostitution, pornography, and abuse.
-        /// </param>
-        /// <param name="violence">
-        /// A content filter category for language related to physical actions intended to hurt, injure, damage, or kill
-        /// someone or something; describes weapons, guns and related entities, such as manufactures, associations,
-        /// legislation, and so on.
-        /// </param>
-        /// <param name="hate">
-        /// A content filter category that can refer to any content that attacks or uses pejorative or discriminatory
-        /// language with reference to a person or identity group based on certain differentiating attributes of these groups
-        /// including but not limited to race, ethnicity, nationality, gender identity and expression, sexual orientation,
-        /// religion, immigration status, ability status, personal appearance, and body size.
-        /// </param>
-        /// <param name="selfHarm">
-        /// A content filter category that describes language related to physical actions intended to purposely hurt, injure,
-        /// damage one's body or kill oneself.
-        /// </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResponseImageContentFilterResult(ContentFilterSeverityResult sexual, ContentFilterSeverityResult violence, ContentFilterSeverityResult hate, ContentFilterSeverityResult selfHarm, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            Sexual = sexual;
-            Violence = violence;
-            Hate = hate;
-            SelfHarm = selfHarm;
-            SerializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary>
-        /// A content filter category for language related to anatomical organs and genitals, romantic relationships, acts
-        /// portrayed in erotic or affectionate terms, pregnancy, physical sexual acts, including those portrayed as an
-        /// assault or a forced sexual violent act against one's will, prostitution, pornography, and abuse.
-        /// </summary>
-        public ContentFilterSeverityResult Sexual { get; }
-        /// <summary>
-        /// A content filter category for language related to physical actions intended to hurt, injure, damage, or kill
-        /// someone or something; describes weapons, guns and related entities, such as manufactures, associations,
-        /// legislation, and so on.
-        /// </summary>
-        public ContentFilterSeverityResult Violence { get; }
-        /// <summary>
-        /// A content filter category that can refer to any content that attacks or uses pejorative or discriminatory
-        /// language with reference to a person or identity group based on certain differentiating attributes of these groups
-        /// including but not limited to race, ethnicity, nationality, gender identity and expression, sexual orientation,
-        /// religion, immigration status, ability status, personal appearance, and body size.
-        /// </summary>
-        public ContentFilterSeverityResult Hate { get; }
-        /// <summary>
-        /// A content filter category that describes language related to physical actions intended to purposely hurt, injure,
-        /// damage one's body or kill oneself.
-        /// </summary>
-        public ContentFilterSeverityResult SelfHarm { get; }
-    }
-}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/SpeechGenerationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/SpeechGenerationOptions.Serialization.cs
new file mode 100644
index 000000000000..d3db8e2ebef5
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/SpeechGenerationOptions.Serialization.cs
@@ -0,0 +1,190 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class SpeechGenerationOptions : IUtf8JsonSerializable, IJsonModel<SpeechGenerationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SpeechGenerationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<SpeechGenerationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<SpeechGenerationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SpeechGenerationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("input"u8);
+            writer.WriteStringValue(Input);
+            writer.WritePropertyName("voice"u8);
+            writer.WriteStringValue(Voice.ToString());
+            if (Optional.IsDefined(ResponseFormat))
+            {
+                writer.WritePropertyName("response_format"u8);
+                writer.WriteStringValue(ResponseFormat.Value.ToString());
+            }
+            if (Optional.IsDefined(Speed))
+            {
+                writer.WritePropertyName("speed"u8);
+                writer.WriteNumberValue(Speed.Value);
+            }
+            if (Optional.IsDefined(DeploymentName))
+            {
+                writer.WritePropertyName("model"u8);
+                writer.WriteStringValue(DeploymentName);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        SpeechGenerationOptions IJsonModel<SpeechGenerationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<SpeechGenerationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SpeechGenerationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeSpeechGenerationOptions(document.RootElement, options);
+        }
+
+        internal static SpeechGenerationOptions DeserializeSpeechGenerationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string input = default;
+            SpeechVoice voice = default;
+            SpeechGenerationResponseFormat? responseFormat = default;
+            float? speed = default;
+            string model = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("input"u8))
+                {
+                    input = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("voice"u8))
+                {
+                    voice = new SpeechVoice(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("response_format"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    responseFormat = new SpeechGenerationResponseFormat(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("speed"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    speed = property.Value.GetSingle();
+                    continue;
+                }
+                if (property.NameEquals("model"u8))
+                {
+                    model = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new SpeechGenerationOptions(
+                input,
+                voice,
+                responseFormat,
+                speed,
+                model,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<SpeechGenerationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<SpeechGenerationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(SpeechGenerationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        SpeechGenerationOptions IPersistableModel<SpeechGenerationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<SpeechGenerationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeSpeechGenerationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(SpeechGenerationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<SpeechGenerationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static SpeechGenerationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeSpeechGenerationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/SpeechGenerationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/SpeechGenerationOptions.cs
new file mode 100644
index 000000000000..21f6b6fd2888
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/SpeechGenerationOptions.cs
@@ -0,0 +1,93 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> A representation of the request options that control the behavior of a text-to-speech operation. </summary>
+    public partial class SpeechGenerationOptions
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="SpeechGenerationOptions"/>. </summary>
+        /// <param name="input"> The text to generate audio for. The maximum length is 4096 characters. </param>
+        /// <param name="voice"> The voice to use for text-to-speech. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="input"/> is null. </exception>
+        public SpeechGenerationOptions(string input, SpeechVoice voice)
+        {
+            Argument.AssertNotNull(input, nameof(input));
+
+            Input = input;
+            Voice = voice;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SpeechGenerationOptions"/>. </summary>
+        /// <param name="input"> The text to generate audio for. The maximum length is 4096 characters. </param>
+        /// <param name="voice"> The voice to use for text-to-speech. </param>
+        /// <param name="responseFormat"> The audio output format for the spoken text. By default, the MP3 format will be used. </param>
+        /// <param name="speed"> The speed of speech for generated audio. Values are valid in the range from 0.25 to 4.0, with 1.0 the default and higher values corresponding to faster speech. </param>
+        /// <param name="deploymentName"> The model to use for this text-to-speech request. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal SpeechGenerationOptions(string input, SpeechVoice voice, SpeechGenerationResponseFormat? responseFormat, float? speed, string deploymentName, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Input = input;
+            Voice = voice;
+            ResponseFormat = responseFormat;
+            Speed = speed;
+            DeploymentName = deploymentName;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SpeechGenerationOptions"/> for deserialization. </summary>
+        internal SpeechGenerationOptions()
+        {
+        }
+
+        /// <summary> The text to generate audio for. The maximum length is 4096 characters. </summary>
+        public string Input { get; }
+        /// <summary> The voice to use for text-to-speech. </summary>
+        public SpeechVoice Voice { get; }
+        /// <summary> The audio output format for the spoken text. By default, the MP3 format will be used. </summary>
+        public SpeechGenerationResponseFormat? ResponseFormat { get; set; }
+        /// <summary> The speed of speech for generated audio. Values are valid in the range from 0.25 to 4.0, with 1.0 the default and higher values corresponding to faster speech. </summary>
+        public float? Speed { get; set; }
+        /// <summary> The model to use for this text-to-speech request. </summary>
+        public string DeploymentName { get; set; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/SpeechGenerationResponseFormat.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/SpeechGenerationResponseFormat.cs
new file mode 100644
index 000000000000..e2af864d093b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/SpeechGenerationResponseFormat.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The supported audio output formats for text-to-speech. </summary>
+    public readonly partial struct SpeechGenerationResponseFormat : IEquatable<SpeechGenerationResponseFormat>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="SpeechGenerationResponseFormat"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public SpeechGenerationResponseFormat(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string Mp3Value = "mp3";
+        private const string OpusValue = "opus";
+        private const string AacValue = "aac";
+        private const string FlacValue = "flac";
+        private const string WavValue = "wav";
+        private const string PcmValue = "pcm";
+
+        /// <summary> Use MP3 as the audio output format. MP3 is the default, general-purpose format. </summary>
+        public static SpeechGenerationResponseFormat Mp3 { get; } = new SpeechGenerationResponseFormat(Mp3Value);
+        /// <summary> Use Opus as the audio output format. Opus is optimized for internet streaming and low latency. </summary>
+        public static SpeechGenerationResponseFormat Opus { get; } = new SpeechGenerationResponseFormat(OpusValue);
+        /// <summary> Use AAC as the audio output format. AAC is optimized for digital audio compression and is preferred by YouTube, Android, and iOS. </summary>
+        public static SpeechGenerationResponseFormat Aac { get; } = new SpeechGenerationResponseFormat(AacValue);
+        /// <summary> Use FLAC as the audio output format. FLAC is a fully lossless format optimized for maximum quality at the expense of size. </summary>
+        public static SpeechGenerationResponseFormat Flac { get; } = new SpeechGenerationResponseFormat(FlacValue);
+        /// <summary> Use uncompressed WAV as the audio output format, suitable for low-latency applications to avoid decoding overhead. </summary>
+        public static SpeechGenerationResponseFormat Wav { get; } = new SpeechGenerationResponseFormat(WavValue);
+        /// <summary> Use uncompressed PCM as the audio output format, which is similar to WAV but contains raw samples in 24kHz (16-bit signed, low-endian), without the header. </summary>
+        public static SpeechGenerationResponseFormat Pcm { get; } = new SpeechGenerationResponseFormat(PcmValue);
+        /// <summary> Determines if two <see cref="SpeechGenerationResponseFormat"/> values are the same. </summary>
+        public static bool operator ==(SpeechGenerationResponseFormat left, SpeechGenerationResponseFormat right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="SpeechGenerationResponseFormat"/> values are not the same. </summary>
+        public static bool operator !=(SpeechGenerationResponseFormat left, SpeechGenerationResponseFormat right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="SpeechGenerationResponseFormat"/>. </summary>
+        public static implicit operator SpeechGenerationResponseFormat(string value) => new SpeechGenerationResponseFormat(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is SpeechGenerationResponseFormat other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(SpeechGenerationResponseFormat other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/SpeechVoice.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/SpeechVoice.cs
new file mode 100644
index 000000000000..a4b9c07a167f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/SpeechVoice.cs
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The available voices for text-to-speech. </summary>
+    public readonly partial struct SpeechVoice : IEquatable<SpeechVoice>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="SpeechVoice"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public SpeechVoice(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string AlloyValue = "alloy";
+        private const string EchoValue = "echo";
+        private const string FableValue = "fable";
+        private const string OnyxValue = "onyx";
+        private const string NovaValue = "nova";
+        private const string ShimmerValue = "shimmer";
+
+        /// <summary> The Alloy voice. </summary>
+        public static SpeechVoice Alloy { get; } = new SpeechVoice(AlloyValue);
+        /// <summary> The Echo voice. </summary>
+        public static SpeechVoice Echo { get; } = new SpeechVoice(EchoValue);
+        /// <summary> The Fable voice. </summary>
+        public static SpeechVoice Fable { get; } = new SpeechVoice(FableValue);
+        /// <summary> The Onyx voice. </summary>
+        public static SpeechVoice Onyx { get; } = new SpeechVoice(OnyxValue);
+        /// <summary> The Nova voice. </summary>
+        public static SpeechVoice Nova { get; } = new SpeechVoice(NovaValue);
+        /// <summary> The Shimmer voice. </summary>
+        public static SpeechVoice Shimmer { get; } = new SpeechVoice(ShimmerValue);
+        /// <summary> Determines if two <see cref="SpeechVoice"/> values are the same. </summary>
+        public static bool operator ==(SpeechVoice left, SpeechVoice right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="SpeechVoice"/> values are not the same. </summary>
+        public static bool operator !=(SpeechVoice left, SpeechVoice right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="SpeechVoice"/>. </summary>
+        public static implicit operator SpeechVoice(string value) => new SpeechVoice(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is SpeechVoice other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(SpeechVoice other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownAzureChatExtensionConfiguration.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownAzureChatExtensionConfiguration.Serialization.cs
new file mode 100644
index 000000000000..2a797b740019
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownAzureChatExtensionConfiguration.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class UnknownAzureChatExtensionConfiguration : IUtf8JsonSerializable, IJsonModel<AzureChatExtensionConfiguration>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AzureChatExtensionConfiguration>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<AzureChatExtensionConfiguration>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureChatExtensionConfiguration)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        AzureChatExtensionConfiguration IJsonModel<AzureChatExtensionConfiguration>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(AzureChatExtensionConfiguration)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeAzureChatExtensionConfiguration(document.RootElement, options);
+        }
+
+        internal static UnknownAzureChatExtensionConfiguration DeserializeUnknownAzureChatExtensionConfiguration(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            AzureChatExtensionType type = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = new AzureChatExtensionType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownAzureChatExtensionConfiguration(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<AzureChatExtensionConfiguration>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(AzureChatExtensionConfiguration)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        AzureChatExtensionConfiguration IPersistableModel<AzureChatExtensionConfiguration>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<AzureChatExtensionConfiguration>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeAzureChatExtensionConfiguration(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(AzureChatExtensionConfiguration)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<AzureChatExtensionConfiguration>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownAzureChatExtensionConfiguration FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownAzureChatExtensionConfiguration(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<AzureChatExtensionConfiguration>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownAzureChatExtensionConfiguration.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownAzureChatExtensionConfiguration.cs
new file mode 100644
index 000000000000..c9f09702aa3a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownAzureChatExtensionConfiguration.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Unknown version of AzureChatExtensionConfiguration. </summary>
+    internal partial class UnknownAzureChatExtensionConfiguration : AzureChatExtensionConfiguration
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownAzureChatExtensionConfiguration"/>. </summary>
+        /// <param name="type">
+        ///   The label for the type of an Azure chat extension. This typically corresponds to a matching Azure resource.
+        ///   Azure chat extensions are only compatible with Azure OpenAI.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownAzureChatExtensionConfiguration(AzureChatExtensionType type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownAzureChatExtensionConfiguration"/> for deserialization. </summary>
+        internal UnknownAzureChatExtensionConfiguration()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsNamedToolSelection.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsNamedToolSelection.Serialization.cs
new file mode 100644
index 000000000000..54e661b18f0f
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsNamedToolSelection.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class UnknownChatCompletionsNamedToolSelection : IUtf8JsonSerializable, IJsonModel<ChatCompletionsNamedToolSelection>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsNamedToolSelection>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsNamedToolSelection>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsNamedToolSelection)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsNamedToolSelection IJsonModel<ChatCompletionsNamedToolSelection>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsNamedToolSelection)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsNamedToolSelection(document.RootElement, options);
+        }
+
+        internal static UnknownChatCompletionsNamedToolSelection DeserializeUnknownChatCompletionsNamedToolSelection(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string type = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownChatCompletionsNamedToolSelection(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsNamedToolSelection>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsNamedToolSelection)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsNamedToolSelection IPersistableModel<ChatCompletionsNamedToolSelection>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsNamedToolSelection(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsNamedToolSelection)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsNamedToolSelection>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownChatCompletionsNamedToolSelection FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownChatCompletionsNamedToolSelection(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<ChatCompletionsNamedToolSelection>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsNamedToolSelection.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsNamedToolSelection.cs
new file mode 100644
index 000000000000..f3a885278854
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsNamedToolSelection.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Unknown version of ChatCompletionsNamedToolSelection. </summary>
+    internal partial class UnknownChatCompletionsNamedToolSelection : ChatCompletionsNamedToolSelection
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownChatCompletionsNamedToolSelection"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownChatCompletionsNamedToolSelection(string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownChatCompletionsNamedToolSelection"/> for deserialization. </summary>
+        internal UnknownChatCompletionsNamedToolSelection()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsResponseFormat.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsResponseFormat.Serialization.cs
new file mode 100644
index 000000000000..eae4d2f85468
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsResponseFormat.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class UnknownChatCompletionsResponseFormat : IUtf8JsonSerializable, IJsonModel<ChatCompletionsResponseFormat>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsResponseFormat>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsResponseFormat>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsResponseFormat)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsResponseFormat IJsonModel<ChatCompletionsResponseFormat>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsResponseFormat)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsResponseFormat(document.RootElement, options);
+        }
+
+        internal static UnknownChatCompletionsResponseFormat DeserializeUnknownChatCompletionsResponseFormat(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string type = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownChatCompletionsResponseFormat(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsResponseFormat>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsResponseFormat)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsResponseFormat IPersistableModel<ChatCompletionsResponseFormat>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsResponseFormat>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsResponseFormat(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsResponseFormat)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsResponseFormat>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownChatCompletionsResponseFormat FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownChatCompletionsResponseFormat(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<ChatCompletionsResponseFormat>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsResponseFormat.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsResponseFormat.cs
new file mode 100644
index 000000000000..1b7ad649a682
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsResponseFormat.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Unknown version of ChatCompletionsResponseFormat. </summary>
+    internal partial class UnknownChatCompletionsResponseFormat : ChatCompletionsResponseFormat
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownChatCompletionsResponseFormat"/>. </summary>
+        /// <param name="type"> The discriminated type for the response format. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownChatCompletionsResponseFormat(string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownChatCompletionsResponseFormat"/> for deserialization. </summary>
+        internal UnknownChatCompletionsResponseFormat()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RetrievalToolDefinition.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsToolCall.Serialization.cs
similarity index 62%
rename from sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RetrievalToolDefinition.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsToolCall.Serialization.cs
index dd67f9ec7c3e..8af7d6bd1d11 100644
--- a/sdk/openai/Azure.AI.OpenAI.Assistants/src/Generated/RetrievalToolDefinition.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsToolCall.Serialization.cs
@@ -11,23 +11,25 @@
 using System.Text.Json;
 using Azure.Core;
 
-namespace Azure.AI.OpenAI.Assistants
+namespace Azure.AI.OpenAI
 {
-    public partial class RetrievalToolDefinition : IUtf8JsonSerializable, IJsonModel<RetrievalToolDefinition>
+    internal partial class UnknownChatCompletionsToolCall : IUtf8JsonSerializable, IJsonModel<ChatCompletionsToolCall>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RetrievalToolDefinition>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsToolCall>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<RetrievalToolDefinition>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<ChatCompletionsToolCall>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<RetrievalToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolCall>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(RetrievalToolDefinition)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(ChatCompletionsToolCall)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
             writer.WritePropertyName("type"u8);
             writer.WriteStringValue(Type);
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -46,19 +48,19 @@ void IJsonModel<RetrievalToolDefinition>.Write(Utf8JsonWriter writer, ModelReade
             writer.WriteEndObject();
         }
 
-        RetrievalToolDefinition IJsonModel<RetrievalToolDefinition>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        ChatCompletionsToolCall IJsonModel<ChatCompletionsToolCall>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<RetrievalToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolCall>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(RetrievalToolDefinition)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(ChatCompletionsToolCall)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeRetrievalToolDefinition(document.RootElement, options);
+            return DeserializeChatCompletionsToolCall(document.RootElement, options);
         }
 
-        internal static RetrievalToolDefinition DeserializeRetrievalToolDefinition(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static UnknownChatCompletionsToolCall DeserializeUnknownChatCompletionsToolCall(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -66,7 +68,8 @@ internal static RetrievalToolDefinition DeserializeRetrievalToolDefinition(JsonE
             {
                 return null;
             }
-            string type = default;
+            string type = "Unknown";
+            string id = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -76,59 +79,64 @@ internal static RetrievalToolDefinition DeserializeRetrievalToolDefinition(JsonE
                     type = property.Value.GetString();
                     continue;
                 }
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
                 if (options.Format != "W")
                 {
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new RetrievalToolDefinition(type, serializedAdditionalRawData);
+            return new UnknownChatCompletionsToolCall(type, id, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<RetrievalToolDefinition>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<ChatCompletionsToolCall>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<RetrievalToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolCall>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(RetrievalToolDefinition)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ChatCompletionsToolCall)} does not support writing '{options.Format}' format.");
             }
         }
 
-        RetrievalToolDefinition IPersistableModel<RetrievalToolDefinition>.Create(BinaryData data, ModelReaderWriterOptions options)
+        ChatCompletionsToolCall IPersistableModel<ChatCompletionsToolCall>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<RetrievalToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolCall>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeRetrievalToolDefinition(document.RootElement, options);
+                        return DeserializeChatCompletionsToolCall(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(RetrievalToolDefinition)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ChatCompletionsToolCall)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<RetrievalToolDefinition>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ChatCompletionsToolCall>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
         /// <param name="response"> The response to deserialize the model from. </param>
-        internal static new RetrievalToolDefinition FromResponse(Response response)
+        internal static new UnknownChatCompletionsToolCall FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeRetrievalToolDefinition(document.RootElement);
+            return DeserializeUnknownChatCompletionsToolCall(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
         internal override RequestContent ToRequestContent()
         {
             var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            content.JsonWriter.WriteObjectValue<ChatCompletionsToolCall>(this, ModelSerializationExtensions.WireOptions);
             return content;
         }
     }
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsToolCall.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsToolCall.cs
new file mode 100644
index 000000000000..88be20fa0524
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsToolCall.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Unknown version of ChatCompletionsToolCall. </summary>
+    internal partial class UnknownChatCompletionsToolCall : ChatCompletionsToolCall
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownChatCompletionsToolCall"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="id"> The ID of the tool call. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownChatCompletionsToolCall(string type, string id, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, id, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownChatCompletionsToolCall"/> for deserialization. </summary>
+        internal UnknownChatCompletionsToolCall()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsToolDefinition.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsToolDefinition.Serialization.cs
new file mode 100644
index 000000000000..a858ba0d3fb0
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsToolDefinition.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class UnknownChatCompletionsToolDefinition : IUtf8JsonSerializable, IJsonModel<ChatCompletionsToolDefinition>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsToolDefinition>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatCompletionsToolDefinition>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsToolDefinition)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatCompletionsToolDefinition IJsonModel<ChatCompletionsToolDefinition>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatCompletionsToolDefinition)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatCompletionsToolDefinition(document.RootElement, options);
+        }
+
+        internal static UnknownChatCompletionsToolDefinition DeserializeUnknownChatCompletionsToolDefinition(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string type = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownChatCompletionsToolDefinition(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatCompletionsToolDefinition>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsToolDefinition)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatCompletionsToolDefinition IPersistableModel<ChatCompletionsToolDefinition>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatCompletionsToolDefinition(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatCompletionsToolDefinition)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatCompletionsToolDefinition>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownChatCompletionsToolDefinition FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownChatCompletionsToolDefinition(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<ChatCompletionsToolDefinition>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsToolDefinition.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsToolDefinition.cs
new file mode 100644
index 000000000000..5b671919dd47
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatCompletionsToolDefinition.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Unknown version of ChatCompletionsToolDefinition. </summary>
+    internal partial class UnknownChatCompletionsToolDefinition : ChatCompletionsToolDefinition
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownChatCompletionsToolDefinition"/>. </summary>
+        /// <param name="type"> The object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownChatCompletionsToolDefinition(string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownChatCompletionsToolDefinition"/> for deserialization. </summary>
+        internal UnknownChatCompletionsToolDefinition()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatMessageContentItem.Serialization.cs
similarity index 50%
rename from sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSource.Serialization.cs
rename to sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatMessageContentItem.Serialization.cs
index bb4da7e040a3..41d2676b1bc6 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Generated/InternalUnknownAzureChatDataSource.Serialization.cs
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatMessageContentItem.Serialization.cs
@@ -1,39 +1,37 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 // <auto-generated/>
 
 #nullable disable
 
 using System;
-using System.ClientModel;
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
+using Azure.Core;
 
-namespace Azure.AI.OpenAI.Chat
+namespace Azure.AI.OpenAI
 {
-    internal partial class InternalUnknownAzureChatDataSource : IJsonModel<ChatDataSource>
+    internal partial class UnknownChatMessageContentItem : IUtf8JsonSerializable, IJsonModel<ChatMessageContentItem>
     {
-        void IJsonModel<ChatDataSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatMessageContentItem>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatMessageContentItem>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageContentItem>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatDataSource)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(ChatMessageContentItem)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            if (SerializedAdditionalRawData?.ContainsKey("type") != true)
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(Type);
-            }
-            if (SerializedAdditionalRawData != null)
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type);
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
-                foreach (var item in SerializedAdditionalRawData)
+                foreach (var item in _serializedAdditionalRawData)
                 {
-                    if (ModelSerializationExtensions.IsSentinelValue(item.Value))
-                    {
-                        continue;
-                    }
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
 				writer.WriteRawValue(item.Value);
@@ -48,19 +46,19 @@ void IJsonModel<ChatDataSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOp
             writer.WriteEndObject();
         }
 
-        ChatDataSource IJsonModel<ChatDataSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        ChatMessageContentItem IJsonModel<ChatMessageContentItem>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageContentItem>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatDataSource)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(ChatMessageContentItem)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeChatDataSource(document.RootElement, options);
+            return DeserializeChatMessageContentItem(document.RootElement, options);
         }
 
-        internal static InternalUnknownAzureChatDataSource DeserializeInternalUnknownAzureChatDataSource(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static UnknownChatMessageContentItem DeserializeUnknownChatMessageContentItem(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -80,58 +78,58 @@ internal static InternalUnknownAzureChatDataSource DeserializeInternalUnknownAzu
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary ??= new Dictionary<string, BinaryData>();
                     rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new InternalUnknownAzureChatDataSource(type, serializedAdditionalRawData);
+            return new UnknownChatMessageContentItem(type, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<ChatDataSource>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<ChatMessageContentItem>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageContentItem>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options);
                 default:
-                    throw new FormatException($"The model {nameof(ChatDataSource)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ChatMessageContentItem)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ChatDataSource IPersistableModel<ChatDataSource>.Create(BinaryData data, ModelReaderWriterOptions options)
+        ChatMessageContentItem IPersistableModel<ChatMessageContentItem>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatDataSource>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatMessageContentItem>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeChatDataSource(document.RootElement, options);
+                        return DeserializeChatMessageContentItem(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(ChatDataSource)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ChatMessageContentItem)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ChatDataSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ChatMessageContentItem>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
         /// <summary> Deserializes the model from a raw response. </summary>
-        /// <param name="response"> The result to deserialize the model from. </param>
-        internal static new InternalUnknownAzureChatDataSource FromResponse(PipelineResponse response)
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownChatMessageContentItem FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeInternalUnknownAzureChatDataSource(document.RootElement);
+            return DeserializeUnknownChatMessageContentItem(document.RootElement);
         }
 
-        /// <summary> Convert into a <see cref="BinaryContent"/>. </summary>
-        internal override BinaryContent ToBinaryContent()
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
         {
-            return BinaryContent.Create<ChatDataSource>(this, ModelSerializationExtensions.WireOptions);
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<ChatMessageContentItem>(this, ModelSerializationExtensions.WireOptions);
+            return content;
         }
     }
 }
-
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatMessageContentItem.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatMessageContentItem.cs
new file mode 100644
index 000000000000..7407e7520c34
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatMessageContentItem.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Unknown version of ChatMessageContentItem. </summary>
+    internal partial class UnknownChatMessageContentItem : ChatMessageContentItem
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownChatMessageContentItem"/>. </summary>
+        /// <param name="type"> The discriminated object type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownChatMessageContentItem(string type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownChatMessageContentItem"/> for deserialization. </summary>
+        internal UnknownChatMessageContentItem()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatRequestMessage.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatRequestMessage.Serialization.cs
new file mode 100644
index 000000000000..1318dcfb89db
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatRequestMessage.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class UnknownChatRequestMessage : IUtf8JsonSerializable, IJsonModel<ChatRequestMessage>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatRequestMessage>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<ChatRequestMessage>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatRequestMessage)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("role"u8);
+            writer.WriteStringValue(Role.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        ChatRequestMessage IJsonModel<ChatRequestMessage>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestMessage>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(ChatRequestMessage)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeChatRequestMessage(document.RootElement, options);
+        }
+
+        internal static UnknownChatRequestMessage DeserializeUnknownChatRequestMessage(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            ChatRole role = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("role"u8))
+                {
+                    role = new ChatRole(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownChatRequestMessage(role, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<ChatRequestMessage>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(ChatRequestMessage)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        ChatRequestMessage IPersistableModel<ChatRequestMessage>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<ChatRequestMessage>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeChatRequestMessage(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(ChatRequestMessage)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<ChatRequestMessage>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownChatRequestMessage FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownChatRequestMessage(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<ChatRequestMessage>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatRequestMessage.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatRequestMessage.cs
new file mode 100644
index 000000000000..16ce3943613b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownChatRequestMessage.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Unknown version of ChatRequestMessage. </summary>
+    internal partial class UnknownChatRequestMessage : ChatRequestMessage
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownChatRequestMessage"/>. </summary>
+        /// <param name="role"> The chat role associated with this message. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownChatRequestMessage(ChatRole role, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(role, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownChatRequestMessage"/> for deserialization. </summary>
+        internal UnknownChatRequestMessage()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataAuthenticationOptions.Serialization.cs
new file mode 100644
index 000000000000..182251a16716
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataAuthenticationOptions.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class UnknownOnYourDataAuthenticationOptions : IUtf8JsonSerializable, IJsonModel<OnYourDataAuthenticationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataAuthenticationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataAuthenticationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataAuthenticationOptions IJsonModel<OnYourDataAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataAuthenticationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataAuthenticationOptions(document.RootElement, options);
+        }
+
+        internal static UnknownOnYourDataAuthenticationOptions DeserializeUnknownOnYourDataAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            OnYourDataAuthenticationType type = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataAuthenticationType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownOnYourDataAuthenticationOptions(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<OnYourDataAuthenticationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataAuthenticationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataAuthenticationOptions IPersistableModel<OnYourDataAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataAuthenticationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataAuthenticationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownOnYourDataAuthenticationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownOnYourDataAuthenticationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<OnYourDataAuthenticationOptions>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataAuthenticationOptions.cs
new file mode 100644
index 000000000000..3d47c4f32f51
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataAuthenticationOptions.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Unknown version of OnYourDataAuthenticationOptions. </summary>
+    internal partial class UnknownOnYourDataAuthenticationOptions : OnYourDataAuthenticationOptions
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownOnYourDataAuthenticationOptions"/>. </summary>
+        /// <param name="type"> The authentication type. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownOnYourDataAuthenticationOptions(OnYourDataAuthenticationType type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownOnYourDataAuthenticationOptions"/> for deserialization. </summary>
+        internal UnknownOnYourDataAuthenticationOptions()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataVectorSearchAuthenticationOptions.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataVectorSearchAuthenticationOptions.Serialization.cs
new file mode 100644
index 000000000000..019071860dd7
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataVectorSearchAuthenticationOptions.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class UnknownOnYourDataVectorSearchAuthenticationOptions : IUtf8JsonSerializable, IJsonModel<OnYourDataVectorSearchAuthenticationOptions>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataVectorSearchAuthenticationOptions>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataVectorSearchAuthenticationOptions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataVectorSearchAuthenticationOptions)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataVectorSearchAuthenticationOptions IJsonModel<OnYourDataVectorSearchAuthenticationOptions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataVectorSearchAuthenticationOptions)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataVectorSearchAuthenticationOptions(document.RootElement, options);
+        }
+
+        internal static UnknownOnYourDataVectorSearchAuthenticationOptions DeserializeUnknownOnYourDataVectorSearchAuthenticationOptions(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            OnYourDataVectorSearchAuthenticationType type = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataVectorSearchAuthenticationType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownOnYourDataVectorSearchAuthenticationOptions(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<OnYourDataVectorSearchAuthenticationOptions>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataVectorSearchAuthenticationOptions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataVectorSearchAuthenticationOptions IPersistableModel<OnYourDataVectorSearchAuthenticationOptions>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorSearchAuthenticationOptions>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataVectorSearchAuthenticationOptions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataVectorSearchAuthenticationOptions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataVectorSearchAuthenticationOptions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownOnYourDataVectorSearchAuthenticationOptions FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownOnYourDataVectorSearchAuthenticationOptions(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<OnYourDataVectorSearchAuthenticationOptions>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataVectorSearchAuthenticationOptions.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataVectorSearchAuthenticationOptions.cs
new file mode 100644
index 000000000000..13d87a07efb2
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataVectorSearchAuthenticationOptions.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Unknown version of OnYourDataVectorSearchAuthenticationOptions. </summary>
+    internal partial class UnknownOnYourDataVectorSearchAuthenticationOptions : OnYourDataVectorSearchAuthenticationOptions
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownOnYourDataVectorSearchAuthenticationOptions"/>. </summary>
+        /// <param name="type"> The type of authentication to use. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownOnYourDataVectorSearchAuthenticationOptions(OnYourDataVectorSearchAuthenticationType type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownOnYourDataVectorSearchAuthenticationOptions"/> for deserialization. </summary>
+        internal UnknownOnYourDataVectorSearchAuthenticationOptions()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataVectorizationSource.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataVectorizationSource.Serialization.cs
new file mode 100644
index 000000000000..db021dc1f917
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataVectorizationSource.Serialization.cs
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class UnknownOnYourDataVectorizationSource : IUtf8JsonSerializable, IJsonModel<OnYourDataVectorizationSource>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<OnYourDataVectorizationSource>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<OnYourDataVectorizationSource>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataVectorizationSource)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        OnYourDataVectorizationSource IJsonModel<OnYourDataVectorizationSource>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(OnYourDataVectorizationSource)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeOnYourDataVectorizationSource(document.RootElement, options);
+        }
+
+        internal static UnknownOnYourDataVectorizationSource DeserializeUnknownOnYourDataVectorizationSource(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            OnYourDataVectorizationSourceType type = "Unknown";
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("type"u8))
+                {
+                    type = new OnYourDataVectorizationSourceType(property.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UnknownOnYourDataVectorizationSource(type, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<OnYourDataVectorizationSource>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataVectorizationSource)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        OnYourDataVectorizationSource IPersistableModel<OnYourDataVectorizationSource>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<OnYourDataVectorizationSource>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeOnYourDataVectorizationSource(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(OnYourDataVectorizationSource)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<OnYourDataVectorizationSource>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static new UnknownOnYourDataVectorizationSource FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUnknownOnYourDataVectorizationSource(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal override RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue<OnYourDataVectorizationSource>(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataVectorizationSource.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataVectorizationSource.cs
new file mode 100644
index 000000000000..2bf5702ab3fd
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UnknownOnYourDataVectorizationSource.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> Unknown version of OnYourDataVectorizationSource. </summary>
+    internal partial class UnknownOnYourDataVectorizationSource : OnYourDataVectorizationSource
+    {
+        /// <summary> Initializes a new instance of <see cref="UnknownOnYourDataVectorizationSource"/>. </summary>
+        /// <param name="type"> The type of vectorization source to use. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UnknownOnYourDataVectorizationSource(OnYourDataVectorizationSourceType type, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(type, serializedAdditionalRawData)
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UnknownOnYourDataVectorizationSource"/> for deserialization. </summary>
+        internal UnknownOnYourDataVectorizationSource()
+        {
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Upload.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Upload.Serialization.cs
new file mode 100644
index 000000000000..a453778dce17
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Upload.Serialization.cs
@@ -0,0 +1,231 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class Upload : IUtf8JsonSerializable, IJsonModel<Upload>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<Upload>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<Upload>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<Upload>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(Upload)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("created_at"u8);
+            writer.WriteNumberValue(CreatedAt, "U");
+            writer.WritePropertyName("filename"u8);
+            writer.WriteStringValue(Filename);
+            writer.WritePropertyName("bytes"u8);
+            writer.WriteNumberValue(Bytes);
+            writer.WritePropertyName("purpose"u8);
+            writer.WriteStringValue(Purpose.ToString());
+            writer.WritePropertyName("status"u8);
+            writer.WriteStringValue(Status.ToString());
+            writer.WritePropertyName("expires_at"u8);
+            writer.WriteNumberValue(ExpiresAt, "U");
+            if (Optional.IsDefined(Object))
+            {
+                writer.WritePropertyName("object"u8);
+                writer.WriteStringValue(Object.Value.ToString());
+            }
+            if (Optional.IsDefined(File))
+            {
+                if (File != null)
+                {
+                    writer.WritePropertyName("file"u8);
+                    writer.WriteObjectValue(File, options);
+                }
+                else
+                {
+                    writer.WriteNull("file");
+                }
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        Upload IJsonModel<Upload>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<Upload>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(Upload)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeUpload(document.RootElement, options);
+        }
+
+        internal static Upload DeserializeUpload(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string id = default;
+            DateTimeOffset createdAt = default;
+            string filename = default;
+            long bytes = default;
+            UploadPurpose purpose = default;
+            UploadStatus status = default;
+            DateTimeOffset expiresAt = default;
+            UploadObject? @object = default;
+            OpenAIFile file = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("created_at"u8))
+                {
+                    createdAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("filename"u8))
+                {
+                    filename = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("bytes"u8))
+                {
+                    bytes = property.Value.GetInt64();
+                    continue;
+                }
+                if (property.NameEquals("purpose"u8))
+                {
+                    purpose = new UploadPurpose(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("status"u8))
+                {
+                    status = new UploadStatus(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("expires_at"u8))
+                {
+                    expiresAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("object"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    @object = new UploadObject(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("file"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        file = null;
+                        continue;
+                    }
+                    file = OpenAIFile.DeserializeOpenAIFile(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new Upload(
+                id,
+                createdAt,
+                filename,
+                bytes,
+                purpose,
+                status,
+                expiresAt,
+                @object,
+                file,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<Upload>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<Upload>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(Upload)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        Upload IPersistableModel<Upload>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<Upload>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeUpload(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(Upload)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<Upload>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static Upload FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUpload(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/Upload.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/Upload.cs
new file mode 100644
index 000000000000..ac29382c966a
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/Upload.cs
@@ -0,0 +1,120 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The Upload object can accept byte chunks in the form of Parts. </summary>
+    public partial class Upload
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="Upload"/>. </summary>
+        /// <param name="id"> The Upload unique identifier, which can be referenced in API endpoints. </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the Upload was created. </param>
+        /// <param name="filename"> The name of the file to be uploaded. </param>
+        /// <param name="bytes"> The intended number of bytes to be uploaded. </param>
+        /// <param name="purpose"> The intended purpose of the file. </param>
+        /// <param name="status"> The status of the Upload. </param>
+        /// <param name="expiresAt"> The Unix timestamp (in seconds) for when the Upload was created. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> or <paramref name="filename"/> is null. </exception>
+        internal Upload(string id, DateTimeOffset createdAt, string filename, long bytes, UploadPurpose purpose, UploadStatus status, DateTimeOffset expiresAt)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+            Argument.AssertNotNull(filename, nameof(filename));
+
+            Id = id;
+            CreatedAt = createdAt;
+            Filename = filename;
+            Bytes = bytes;
+            Purpose = purpose;
+            Status = status;
+            ExpiresAt = expiresAt;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Upload"/>. </summary>
+        /// <param name="id"> The Upload unique identifier, which can be referenced in API endpoints. </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the Upload was created. </param>
+        /// <param name="filename"> The name of the file to be uploaded. </param>
+        /// <param name="bytes"> The intended number of bytes to be uploaded. </param>
+        /// <param name="purpose"> The intended purpose of the file. </param>
+        /// <param name="status"> The status of the Upload. </param>
+        /// <param name="expiresAt"> The Unix timestamp (in seconds) for when the Upload was created. </param>
+        /// <param name="object"> The object type, which is always "upload". </param>
+        /// <param name="file"> The ready File object after the Upload is completed. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal Upload(string id, DateTimeOffset createdAt, string filename, long bytes, UploadPurpose purpose, UploadStatus status, DateTimeOffset expiresAt, UploadObject? @object, OpenAIFile file, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            CreatedAt = createdAt;
+            Filename = filename;
+            Bytes = bytes;
+            Purpose = purpose;
+            Status = status;
+            ExpiresAt = expiresAt;
+            Object = @object;
+            File = file;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Upload"/> for deserialization. </summary>
+        internal Upload()
+        {
+        }
+
+        /// <summary> The Upload unique identifier, which can be referenced in API endpoints. </summary>
+        public string Id { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the Upload was created. </summary>
+        public DateTimeOffset CreatedAt { get; }
+        /// <summary> The name of the file to be uploaded. </summary>
+        public string Filename { get; }
+        /// <summary> The intended number of bytes to be uploaded. </summary>
+        public long Bytes { get; }
+        /// <summary> The intended purpose of the file. </summary>
+        public UploadPurpose Purpose { get; }
+        /// <summary> The status of the Upload. </summary>
+        public UploadStatus Status { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the Upload was created. </summary>
+        public DateTimeOffset ExpiresAt { get; }
+        /// <summary> The object type, which is always "upload". </summary>
+        public UploadObject? Object { get; }
+        /// <summary> The ready File object after the Upload is completed. </summary>
+        public OpenAIFile File { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadFileRequest.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadFileRequest.Serialization.cs
new file mode 100644
index 000000000000..d0fba1b9ef17
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadFileRequest.Serialization.cs
@@ -0,0 +1,191 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    internal partial class UploadFileRequest : IUtf8JsonSerializable, IJsonModel<UploadFileRequest>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<UploadFileRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<UploadFileRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UploadFileRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(UploadFileRequest)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("file"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(global::System.BinaryData.FromStream(Data));
+#else
+            using (JsonDocument document = JsonDocument.Parse(BinaryData.FromStream(Data)))
+            {
+                JsonSerializer.Serialize(writer, document.RootElement);
+            }
+#endif
+            writer.WritePropertyName("purpose"u8);
+            writer.WriteStringValue(Purpose.ToString());
+            if (Optional.IsDefined(Filename))
+            {
+                writer.WritePropertyName("filename"u8);
+                writer.WriteStringValue(Filename);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        UploadFileRequest IJsonModel<UploadFileRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UploadFileRequest>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(UploadFileRequest)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeUploadFileRequest(document.RootElement, options);
+        }
+
+        internal static UploadFileRequest DeserializeUploadFileRequest(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            Stream file = default;
+            FilePurpose purpose = default;
+            string filename = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("file"u8))
+                {
+                    file = BinaryData.FromString(property.Value.GetRawText()).ToStream();
+                    continue;
+                }
+                if (property.NameEquals("purpose"u8))
+                {
+                    purpose = new FilePurpose(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("filename"u8))
+                {
+                    filename = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UploadFileRequest(file, purpose, filename, serializedAdditionalRawData);
+        }
+
+        private BinaryData SerializeMultipart(ModelReaderWriterOptions options)
+        {
+            using MultipartFormDataRequestContent content = ToMultipartRequestContent();
+            using MemoryStream stream = new MemoryStream();
+            content.WriteTo(stream);
+            if (stream.Position > int.MaxValue)
+            {
+                return BinaryData.FromStream(stream);
+            }
+            else
+            {
+                return new BinaryData(stream.GetBuffer().AsMemory(0, (int)stream.Position));
+            }
+        }
+
+        internal virtual MultipartFormDataRequestContent ToMultipartRequestContent()
+        {
+            MultipartFormDataRequestContent content = new MultipartFormDataRequestContent();
+            content.Add(Data, "file", "file", "application/octet-stream");
+            content.Add(Purpose.ToString(), "purpose");
+            if (Optional.IsDefined(Filename))
+            {
+                content.Add(Filename, "filename");
+            }
+            return content;
+        }
+
+        BinaryData IPersistableModel<UploadFileRequest>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UploadFileRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                case "MFD":
+                    return SerializeMultipart(options);
+                default:
+                    throw new FormatException($"The model {nameof(UploadFileRequest)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        UploadFileRequest IPersistableModel<UploadFileRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UploadFileRequest>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeUploadFileRequest(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(UploadFileRequest)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<UploadFileRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "MFD";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static UploadFileRequest FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUploadFileRequest(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadFileRequest.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadFileRequest.cs
new file mode 100644
index 000000000000..a39f8a840ef4
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadFileRequest.cs
@@ -0,0 +1,86 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The UploadFileRequest. </summary>
+    internal partial class UploadFileRequest
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="UploadFileRequest"/>. </summary>
+        /// <param name="data"> The file data (not filename) to upload. </param>
+        /// <param name="purpose"> The intended purpose of the file. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
+        internal UploadFileRequest(Stream data, FilePurpose purpose)
+        {
+            Argument.AssertNotNull(data, nameof(data));
+
+            Data = data;
+            Purpose = purpose;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UploadFileRequest"/>. </summary>
+        /// <param name="data"> The file data (not filename) to upload. </param>
+        /// <param name="purpose"> The intended purpose of the file. </param>
+        /// <param name="filename"> A filename to associate with the uploaded data. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UploadFileRequest(Stream data, FilePurpose purpose, string filename, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Data = data;
+            Purpose = purpose;
+            Filename = filename;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UploadFileRequest"/> for deserialization. </summary>
+        internal UploadFileRequest()
+        {
+        }
+
+        /// <summary> The file data (not filename) to upload. </summary>
+        public Stream Data { get; }
+        /// <summary> The intended purpose of the file. </summary>
+        public FilePurpose Purpose { get; }
+        /// <summary> A filename to associate with the uploaded data. </summary>
+        public string Filename { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadObject.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadObject.cs
new file mode 100644
index 000000000000..649a57ce5a4c
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The Upload_object. </summary>
+    public readonly partial struct UploadObject : IEquatable<UploadObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="UploadObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public UploadObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string UploadValue = "upload";
+
+        /// <summary> upload. </summary>
+        public static UploadObject Upload { get; } = new UploadObject(UploadValue);
+        /// <summary> Determines if two <see cref="UploadObject"/> values are the same. </summary>
+        public static bool operator ==(UploadObject left, UploadObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="UploadObject"/> values are not the same. </summary>
+        public static bool operator !=(UploadObject left, UploadObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="UploadObject"/>. </summary>
+        public static implicit operator UploadObject(string value) => new UploadObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is UploadObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(UploadObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadPart.Serialization.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadPart.Serialization.cs
new file mode 100644
index 000000000000..62b0a1e9de71
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadPart.Serialization.cs
@@ -0,0 +1,176 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.OpenAI
+{
+    public partial class UploadPart : IUtf8JsonSerializable, IJsonModel<UploadPart>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<UploadPart>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<UploadPart>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UploadPart>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(UploadPart)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            writer.WritePropertyName("created_at"u8);
+            writer.WriteNumberValue(CreatedAt, "U");
+            writer.WritePropertyName("upload_id"u8);
+            writer.WriteStringValue(UploadId);
+            writer.WritePropertyName("object"u8);
+            writer.WriteStringValue(Object.ToString());
+            if (Optional.IsDefined(AzureBlockId))
+            {
+                writer.WritePropertyName("azure_block_id"u8);
+                writer.WriteStringValue(AzureBlockId);
+            }
+            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            {
+                foreach (var item in _serializedAdditionalRawData)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+            writer.WriteEndObject();
+        }
+
+        UploadPart IJsonModel<UploadPart>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UploadPart>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(UploadPart)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeUploadPart(document.RootElement, options);
+        }
+
+        internal static UploadPart DeserializeUploadPart(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string id = default;
+            DateTimeOffset createdAt = default;
+            string uploadId = default;
+            UploadPartObject @object = default;
+            string azureBlockId = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("created_at"u8))
+                {
+                    createdAt = DateTimeOffset.FromUnixTimeSeconds(property.Value.GetInt64());
+                    continue;
+                }
+                if (property.NameEquals("upload_id"u8))
+                {
+                    uploadId = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("object"u8))
+                {
+                    @object = new UploadPartObject(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("azure_block_id"u8))
+                {
+                    azureBlockId = property.Value.GetString();
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+            return new UploadPart(
+                id,
+                createdAt,
+                uploadId,
+                @object,
+                azureBlockId,
+                serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<UploadPart>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UploadPart>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(UploadPart)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        UploadPart IPersistableModel<UploadPart>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<UploadPart>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeUploadPart(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(UploadPart)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<UploadPart>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <summary> Deserializes the model from a raw response. </summary>
+        /// <param name="response"> The response to deserialize the model from. </param>
+        internal static UploadPart FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeUploadPart(document.RootElement);
+        }
+
+        /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
+        internal virtual RequestContent ToRequestContent()
+        {
+            var content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadPart.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadPart.cs
new file mode 100644
index 000000000000..2706e3f8f9cc
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadPart.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The upload Part represents a chunk of bytes we can add to an Upload object. </summary>
+    public partial class UploadPart
+    {
+        /// <summary>
+        /// Keeps track of any properties unknown to the library.
+        /// <para>
+        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
+        /// </para>
+        /// <para>
+        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
+        /// </para>
+        /// <para>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson("foo")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("\"foo\"")</term>
+        /// <description>Creates a payload of "foo".</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// <item>
+        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
+        /// <description>Creates a payload of { "key": "value" }.</description>
+        /// </item>
+        /// </list>
+        /// </para>
+        /// </summary>
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+
+        /// <summary> Initializes a new instance of <see cref="UploadPart"/>. </summary>
+        /// <param name="id"> The upload Part unique identifier, which can be referenced in API endpoints. </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the Part was created. </param>
+        /// <param name="uploadId"> The ID of the Upload object that this Part was added to. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> or <paramref name="uploadId"/> is null. </exception>
+        internal UploadPart(string id, DateTimeOffset createdAt, string uploadId)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+            Argument.AssertNotNull(uploadId, nameof(uploadId));
+
+            Id = id;
+            CreatedAt = createdAt;
+            UploadId = uploadId;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UploadPart"/>. </summary>
+        /// <param name="id"> The upload Part unique identifier, which can be referenced in API endpoints. </param>
+        /// <param name="createdAt"> The Unix timestamp (in seconds) for when the Part was created. </param>
+        /// <param name="uploadId"> The ID of the Upload object that this Part was added to. </param>
+        /// <param name="object"> The object type, which is always `upload.part`. </param>
+        /// <param name="azureBlockId"> Azure only field. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal UploadPart(string id, DateTimeOffset createdAt, string uploadId, UploadPartObject @object, string azureBlockId, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            CreatedAt = createdAt;
+            UploadId = uploadId;
+            Object = @object;
+            AzureBlockId = azureBlockId;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="UploadPart"/> for deserialization. </summary>
+        internal UploadPart()
+        {
+        }
+
+        /// <summary> The upload Part unique identifier, which can be referenced in API endpoints. </summary>
+        public string Id { get; }
+        /// <summary> The Unix timestamp (in seconds) for when the Part was created. </summary>
+        public DateTimeOffset CreatedAt { get; }
+        /// <summary> The ID of the Upload object that this Part was added to. </summary>
+        public string UploadId { get; }
+        /// <summary> The object type, which is always `upload.part`. </summary>
+        public UploadPartObject Object { get; } = UploadPartObject.UploadPart;
+
+        /// <summary> Azure only field. </summary>
+        public string AzureBlockId { get; }
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadPartObject.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadPartObject.cs
new file mode 100644
index 000000000000..d161f3e609de
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadPartObject.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The UploadPart_object. </summary>
+    public readonly partial struct UploadPartObject : IEquatable<UploadPartObject>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="UploadPartObject"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public UploadPartObject(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string UploadPartValue = "upload.part";
+
+        /// <summary> upload.part. </summary>
+        public static UploadPartObject UploadPart { get; } = new UploadPartObject(UploadPartValue);
+        /// <summary> Determines if two <see cref="UploadPartObject"/> values are the same. </summary>
+        public static bool operator ==(UploadPartObject left, UploadPartObject right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="UploadPartObject"/> values are not the same. </summary>
+        public static bool operator !=(UploadPartObject left, UploadPartObject right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="UploadPartObject"/>. </summary>
+        public static implicit operator UploadPartObject(string value) => new UploadPartObject(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is UploadPartObject other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(UploadPartObject other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadPurpose.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadPurpose.cs
new file mode 100644
index 000000000000..69f7e4ccfb6b
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadPurpose.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The UploadPurpose. </summary>
+    public readonly partial struct UploadPurpose : IEquatable<UploadPurpose>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="UploadPurpose"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public UploadPurpose(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string BatchValue = "batch";
+        private const string BatchOutputValue = "batch_output";
+        private const string FineTuneValue = "fine-tune";
+        private const string FineTuneResultsValue = "fine-tune-results";
+        private const string AssistantsValue = "assistants";
+        private const string AssistantsOutputValue = "assistants_output";
+        private const string VisionValue = "vision";
+
+        /// <summary> batch. </summary>
+        public static UploadPurpose Batch { get; } = new UploadPurpose(BatchValue);
+        /// <summary> batch_output. </summary>
+        public static UploadPurpose BatchOutput { get; } = new UploadPurpose(BatchOutputValue);
+        /// <summary> fine-tune. </summary>
+        public static UploadPurpose FineTune { get; } = new UploadPurpose(FineTuneValue);
+        /// <summary> fine-tune-results. </summary>
+        public static UploadPurpose FineTuneResults { get; } = new UploadPurpose(FineTuneResultsValue);
+        /// <summary> assistants. </summary>
+        public static UploadPurpose Assistants { get; } = new UploadPurpose(AssistantsValue);
+        /// <summary> assistants_output. </summary>
+        public static UploadPurpose AssistantsOutput { get; } = new UploadPurpose(AssistantsOutputValue);
+        /// <summary> vision. </summary>
+        public static UploadPurpose Vision { get; } = new UploadPurpose(VisionValue);
+        /// <summary> Determines if two <see cref="UploadPurpose"/> values are the same. </summary>
+        public static bool operator ==(UploadPurpose left, UploadPurpose right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="UploadPurpose"/> values are not the same. </summary>
+        public static bool operator !=(UploadPurpose left, UploadPurpose right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="UploadPurpose"/>. </summary>
+        public static implicit operator UploadPurpose(string value) => new UploadPurpose(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is UploadPurpose other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(UploadPurpose other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadStatus.cs b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadStatus.cs
new file mode 100644
index 000000000000..bdb03110818d
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/src/Generated/UploadStatus.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ComponentModel;
+
+namespace Azure.AI.OpenAI
+{
+    /// <summary> The UploadStatus. </summary>
+    public readonly partial struct UploadStatus : IEquatable<UploadStatus>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="UploadStatus"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public UploadStatus(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string PendingValue = "pending";
+        private const string CompletedValue = "completed";
+        private const string CancelledValue = "cancelled";
+        private const string ExpiredValue = "expired";
+
+        /// <summary> pending. </summary>
+        public static UploadStatus Pending { get; } = new UploadStatus(PendingValue);
+        /// <summary> completed. </summary>
+        public static UploadStatus Completed { get; } = new UploadStatus(CompletedValue);
+        /// <summary> cancelled. </summary>
+        public static UploadStatus Cancelled { get; } = new UploadStatus(CancelledValue);
+        /// <summary> expired. </summary>
+        public static UploadStatus Expired { get; } = new UploadStatus(ExpiredValue);
+        /// <summary> Determines if two <see cref="UploadStatus"/> values are the same. </summary>
+        public static bool operator ==(UploadStatus left, UploadStatus right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="UploadStatus"/> values are not the same. </summary>
+        public static bool operator !=(UploadStatus left, UploadStatus right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="UploadStatus"/>. </summary>
+        public static implicit operator UploadStatus(string value) => new UploadStatus(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is UploadStatus other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(UploadStatus other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
+        /// <inheritdoc />
+        public override string ToString() => _value;
+    }
+}
diff --git a/sdk/openai/Azure.AI.OpenAI/tsp-location.yaml b/sdk/openai/Azure.AI.OpenAI/tsp-location.yaml
new file mode 100644
index 000000000000..955ea883ccf2
--- /dev/null
+++ b/sdk/openai/Azure.AI.OpenAI/tsp-location.yaml
@@ -0,0 +1,4 @@
+directory: specification/cognitiveservices/OpenAI.Inference
+commit: cc338f96a11ef2749b5cdf4a1ec0b69208763cc9
+repo: Azure/azure-rest-api-specs
+additionalDirectories: