diff --git a/.vscode/cspell.json b/.vscode/cspell.json
index d4dbf858e8fb..f5ab450da763 100644
--- a/.vscode/cspell.json
+++ b/.vscode/cspell.json
@@ -183,6 +183,12 @@
         "warnaserror"
       ]
     },
+    {
+      "filename": "**/sdk/ai/**/*.cs",
+      "words": [
+        "Ubinary"
+      ]
+    },
     {
       "filename": "**/sdk/analysisservices/**/*.cs",
       "words": [
diff --git a/sdk/ai/Azure.AI.Inference/CHANGELOG.md b/sdk/ai/Azure.AI.Inference/CHANGELOG.md
index 9e7a664d7747..5e3a0ad0a239 100644
--- a/sdk/ai/Azure.AI.Inference/CHANGELOG.md
+++ b/sdk/ai/Azure.AI.Inference/CHANGELOG.md
@@ -1,14 +1,27 @@
 # Release History
 
-## 1.0.0-beta.2 (Unreleased)
+## 1.0.0-beta.2 (2024-10-24)
 
 ### Features Added
+- Added new `EmbeddingsClient`, to provide support for generating text embeddings using supported models.
+- Add support for passing a string file path on disk in order to provide an image for chat completions.
 
 ### Breaking Changes
+- `ChatCompletionsClientOptions` has been renamed to `AzureAIInferenceClientOptions`.
+- `ChatCompletions` response object has been flattened. `ChatCompletions.Choices` has been removed, and the underlying properties have been bubbled up to be on the `ChatCompletions` object instead.
+- `ChatCompletionsFunctionToolCall` has been replaced with `ChatCompletionsToolCall`.
+- `ChatCompletionsFunctionToolDefinition` has been replaced with `ChatCompletionsToolDefinition`.
+- `ChatCompletionsToolSelectionPreset` has been replaced with `ChatCompletionsToolChoicePreset`.
+- `ChatCompletionsNamedFunctionToolSelection` has been replaced with `ChatCompletionsNamedToolChoice`.
+- `ChatCompletionsFunctionToolSelection` has been replaced with `ChatCompletionsNamedToolChoiceFunction`.
+- `StreamingChatCompletionsUpdate.AuthorName` has been removed
+- Removed `extraParams` from the `complete` and `completeAsync` methods. It is now set implicitly if `additionalProperties` is provided in the options object.
 
 ### Bugs Fixed
+- Fixed support for chat completions streaming while using tools.
 
 ### Other Changes
+- Removed the need to manually provide an `api-key` header when talking to Azure OpenAI.
 
 ## 1.0.0-beta.1 (2024-08-06)
 ### Features Added
diff --git a/sdk/ai/Azure.AI.Inference/README.md b/sdk/ai/Azure.AI.Inference/README.md
index 7849ea1c1d19..06fa6cae04ab 100644
--- a/sdk/ai/Azure.AI.Inference/README.md
+++ b/sdk/ai/Azure.AI.Inference/README.md
@@ -53,7 +53,7 @@ The package includes `ChatCompletionsClient` <!-- and `EmbeddingsClient`and `Ima
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 ```
 
 <!--
@@ -90,7 +90,7 @@ All clients provide a `get_model_info` method to retrive AI model information. T
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 Response<ModelInfo> modelInfo = client.GetModelInfo();
 
 Console.WriteLine($"Model name: {modelInfo.Value.ModelName}");
@@ -106,13 +106,13 @@ The `ChatCompletionsClient` has a method named `complete`. The method makes a RE
 
 See simple chat completion examples below. More can be found in the [samples](https://aka.ms/azsdk/azure-ai-inference/csharp/samples) folder.
 
-<!--
 ### Text Embeddings
 
-The `EmbeddingsClient` has a method named `embedding`. The method makes a REST API call to the `/embeddings` route on the provided endpoint, as documented in [the REST API reference](https://learn.microsoft.com/azure/ai-studio/reference/reference-model-inference-embeddings).
+The `EmbeddingsClient` has a method named `embed`. The method makes a REST API call to the `/embeddings` route on the provided endpoint, as documented in [the REST API reference](https://learn.microsoft.com/azure/ai-studio/reference/reference-model-inference-embeddings).
 
 See simple text embedding example below. More can be found in the [samples](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/ai/azure-ai-inference/samples) folder.
 
+<!--
 ### Image Embeddings
 
 TODO: Add overview and link to explain image embeddings.
@@ -150,7 +150,7 @@ In the following sections you will find simple examples of:
 * [Chat completions](#chat-completions-example)
 * [Streaming chat completions](#streaming-chat-completions-example)
 * [Chat completions with additional model-specific parameters](#chat-completions-with-additional-model-specific-parameters)
-<!-- * [Text Embeddings](#text-embeddings-example) -->
+* [Text Embeddings](#text-embeddings-example)
 <!-- * [Image Embeddings](#image-embeddings-example) -->
 
 The examples create a client as mentioned in [Create and authenticate a client directly, using key](#create-and-authenticate-a-client-directly-using-key). Only mandatory input settings are shown for simplicity.
@@ -165,7 +165,7 @@ This example demonstrates how to generate a single chat completions, with key au
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
 var requestOptions = new ChatCompletionsOptions()
 {
@@ -177,12 +177,12 @@ var requestOptions = new ChatCompletionsOptions()
 };
 
 Response<ChatCompletions> response = client.Complete(requestOptions);
-System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+System.Console.WriteLine(response.Value.Content);
 ```
 
 The following types or messages are supported: `SystemMessage`,`UserMessage`, `AssistantMessage`, `ToolMessage`. See also samples:
 
-* [Sample5_ChatCompletionsWithImageUrl.md](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/ai/Azure.AI.Inference/samples/Sample5_ChatCompletionsWithImageUrl.md) for usage of `UserMessage` that includes sending an image URL.
+* [Sample5_ChatCompletionsWithImages.md](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/ai/Azure.AI.Inference/samples/Sample5_ChatCompletionsWithImages.md) for usage of `UserMessage` that includes sending an image URL or image data from a local file.
 * [Sample7_ChatCompletionsWithTools.md](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/ai/Azure.AI.Inference/samples/Sample7_ChatCompletionsWithTools.md) for usage of `ToolMessage`.
 
 Alternatively, you can read a `BinaryData` object based on a JSON string instead of using the strongly typed classes like `ChatRequestSystemMessage` and `ChatRequestUserMessage`:
@@ -191,7 +191,7 @@ Alternatively, you can read a `BinaryData` object based on a JSON string instead
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
 var requestOptions = new ChatCompletionsOptions()
 {
@@ -207,7 +207,7 @@ BinaryData messages = BinaryData.FromString(jsonMessages);
 requestOptions = ModelReaderWriter.Read<ChatCompletionsOptions>(messages);
 
 Response<ChatCompletions> response = client.Complete(requestOptions);
-System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+System.Console.WriteLine(response.Value.Content);
 ```
 
 To generate completions for additional messages, simply call `client.Complete` multiple times using the same `client`.
@@ -220,7 +220,7 @@ This example demonstrates how to generate a single chat completions with streami
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
 var requestOptions = new ChatCompletionsOptions()
 {
@@ -255,15 +255,13 @@ In this example, extra JSON elements are inserted at the root of the request bod
 
 Note that by default, the service will reject any request payload that includes unknown parameters (ones that are not defined in the REST API [Request Body table](https://learn.microsoft.com/azure/ai-studio/reference/reference-model-inference-chat-completions#request-body)). In order to change the default service behaviour, when the `Complete` method includes `AdditonalProperties`, the client library will automatically add the HTTP request header `"unknown_params": "pass-through"`.
 
-<!-- The input argument `Additional` is not restricted to chat completions. It is suppored on other client methods as well. -->
-
 Azure_AI_Inference_ChatCompletionsWithAdditionalPropertiesScenario
 
 ```C# Snippet:Azure_AI_Inference_ChatCompletionsWithAdditionalPropertiesScenario
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
 var requestOptions = new ChatCompletionsOptions()
 {
@@ -278,13 +276,25 @@ Response<ChatCompletions> response = client.Complete(requestOptions);
 System.Console.WriteLine(response.Value.Choices[0].Message.Content);
 ```
 
-<!--
 ### Text Embeddings example
 
 This example demonstrates how to get text embeddings, with key authentication, assuming `endpoint` and `key` are already defined.
 
-```C#
+```C# Snippet:Azure_AI_Inference_BasicEmbedding
+var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_EMBEDDINGS_ENDPOINT"));
+var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_EMBEDDINGS_KEY"));
 
+var client = new EmbeddingsClient(endpoint, credential, new AzureAIInferenceClientOptions());
+
+var input = new List<string> { "King", "Queen", "Jack", "Page" };
+var requestOptions = new EmbeddingsOptions(input);
+
+Response<EmbeddingsResult> response = client.Embed(requestOptions);
+foreach (EmbeddingItem item in response.Value.Data)
+{
+    List<float> embedding = item.Embedding.ToObjectFromJson<List<float>>();
+    Console.WriteLine($"Index: {item.Index}, Embedding: <{string.Join(", ", embedding)}>");
+}
 ```
 
 The length of the embedding vector depends on the model, but you should see something like this:
@@ -296,7 +306,6 @@ data[2]: length=1024, [0.04196167, 0.029083252, ..., -0.0027484894, 0.0073127747
 ```
 
 To generate embeddings for additional phrases, simply call `client.embed` multiple times using the same `client`.
--->
 
 <!--
 ### Image Embeddings example
diff --git a/sdk/ai/Azure.AI.Inference/api/Azure.AI.Inference.netstandard2.0.cs b/sdk/ai/Azure.AI.Inference/api/Azure.AI.Inference.netstandard2.0.cs
index 0065da90f426..1be0bf8968a8 100644
--- a/sdk/ai/Azure.AI.Inference/api/Azure.AI.Inference.netstandard2.0.cs
+++ b/sdk/ai/Azure.AI.Inference/api/Azure.AI.Inference.netstandard2.0.cs
@@ -3,17 +3,30 @@ namespace Azure.AI.Inference
     public static partial class AIInferenceModelFactory
     {
         public static Azure.AI.Inference.ChatChoice ChatChoice(int index = 0, Azure.AI.Inference.CompletionsFinishReason? finishReason = default(Azure.AI.Inference.CompletionsFinishReason?), Azure.AI.Inference.ChatResponseMessage message = null) { throw null; }
-        public static Azure.AI.Inference.ChatCompletions ChatCompletions(string id = null, System.DateTimeOffset created = default(System.DateTimeOffset), string model = null, Azure.AI.Inference.CompletionsUsage usage = null, System.Collections.Generic.IEnumerable<Azure.AI.Inference.ChatChoice> choices = null) { throw null; }
-        public static Azure.AI.Inference.ChatCompletionsFunctionToolDefinition ChatCompletionsFunctionToolDefinition(Azure.AI.Inference.FunctionDefinition function = null) { throw null; }
-        public static Azure.AI.Inference.ChatCompletionsNamedFunctionToolSelection ChatCompletionsNamedFunctionToolSelection(Azure.AI.Inference.ChatCompletionsFunctionToolSelection function = null) { throw null; }
+        public static Azure.AI.Inference.ChatCompletionsNamedToolChoice ChatCompletionsNamedToolChoice(Azure.AI.Inference.ChatCompletionsNamedToolChoiceType type = default(Azure.AI.Inference.ChatCompletionsNamedToolChoiceType), Azure.AI.Inference.ChatCompletionsNamedToolChoiceFunction function = null) { throw null; }
+        public static Azure.AI.Inference.ChatCompletionsToolCall ChatCompletionsToolCall(string id = null, Azure.AI.Inference.ChatCompletionsToolCallType type = default(Azure.AI.Inference.ChatCompletionsToolCallType), Azure.AI.Inference.FunctionCall function = null) { throw null; }
+        public static Azure.AI.Inference.ChatCompletionsToolDefinition ChatCompletionsToolDefinition(Azure.AI.Inference.ChatCompletionsToolDefinitionType type = default(Azure.AI.Inference.ChatCompletionsToolDefinitionType), Azure.AI.Inference.FunctionDefinition function = null) { throw null; }
         public static Azure.AI.Inference.ChatMessageTextContentItem ChatMessageTextContentItem(string text = null) { throw null; }
         public static Azure.AI.Inference.ChatRequestSystemMessage ChatRequestSystemMessage(string content = null) { throw null; }
         public static Azure.AI.Inference.ChatRequestToolMessage ChatRequestToolMessage(string content = null, string toolCallId = null) { throw null; }
         public static Azure.AI.Inference.ChatResponseMessage ChatResponseMessage(Azure.AI.Inference.ChatRole role = default(Azure.AI.Inference.ChatRole), string content = null, System.Collections.Generic.IEnumerable<Azure.AI.Inference.ChatCompletionsToolCall> toolCalls = null) { throw null; }
         public static Azure.AI.Inference.CompletionsUsage CompletionsUsage(int completionTokens = 0, int promptTokens = 0, int totalTokens = 0) { throw null; }
+        public static Azure.AI.Inference.EmbeddingItem EmbeddingItem(System.BinaryData embedding = null, int index = 0) { throw null; }
+        public static Azure.AI.Inference.EmbeddingsResult EmbeddingsResult(string id = null, System.Collections.Generic.IEnumerable<Azure.AI.Inference.EmbeddingItem> data = null, Azure.AI.Inference.EmbeddingsUsage usage = null, string model = null) { throw null; }
+        public static Azure.AI.Inference.EmbeddingsUsage EmbeddingsUsage(int promptTokens = 0, int totalTokens = 0) { throw null; }
         public static Azure.AI.Inference.ModelInfo ModelInfo(string modelName = null, Azure.AI.Inference.ModelType modelType = default(Azure.AI.Inference.ModelType), string modelProviderName = null) { throw null; }
-        public static Azure.AI.Inference.StreamingChatChoiceUpdate StreamingChatChoiceUpdate(int index = 0, Azure.AI.Inference.CompletionsFinishReason? finishReason = default(Azure.AI.Inference.CompletionsFinishReason?), Azure.AI.Inference.ChatResponseMessage delta = null) { throw null; }
+        public static Azure.AI.Inference.StreamingChatChoiceUpdate StreamingChatChoiceUpdate(int index = 0, Azure.AI.Inference.CompletionsFinishReason? finishReason = default(Azure.AI.Inference.CompletionsFinishReason?), Azure.AI.Inference.StreamingChatResponseMessageUpdate delta = null) { throw null; }
         public static Azure.AI.Inference.StreamingChatCompletionsUpdate StreamingChatCompletionsUpdate(string id = null, System.DateTimeOffset created = default(System.DateTimeOffset), string model = null, Azure.AI.Inference.CompletionsUsage usage = null, System.Collections.Generic.IEnumerable<Azure.AI.Inference.StreamingChatChoiceUpdate> choices = null) { throw null; }
+        public static Azure.AI.Inference.StreamingChatResponseMessageUpdate StreamingChatResponseMessageUpdate(Azure.AI.Inference.ChatRole? role = default(Azure.AI.Inference.ChatRole?), string content = null, System.Collections.Generic.IEnumerable<Azure.AI.Inference.StreamingChatResponseToolCallUpdate> toolCalls = null) { throw null; }
+        public static Azure.AI.Inference.StreamingChatResponseToolCallUpdate StreamingChatResponseToolCallUpdate(string id = null, Azure.AI.Inference.FunctionCall function = null) { throw null; }
+    }
+    public partial class AzureAIInferenceClientOptions : Azure.Core.ClientOptions
+    {
+        public AzureAIInferenceClientOptions(Azure.AI.Inference.AzureAIInferenceClientOptions.ServiceVersion version = Azure.AI.Inference.AzureAIInferenceClientOptions.ServiceVersion.V2024_05_01_Preview) { }
+        public enum ServiceVersion
+        {
+            V2024_05_01_Preview = 1,
+        }
     }
     public partial class ChatChoice : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatChoice>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatChoice>
     {
@@ -30,27 +43,31 @@ internal ChatChoice() { }
     public partial class ChatCompletions : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletions>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletions>
     {
         internal ChatCompletions() { }
-        public System.Collections.Generic.IReadOnlyList<Azure.AI.Inference.ChatChoice> Choices { get { throw null; } }
+        public string Content { get { throw null; } }
         public System.DateTimeOffset Created { get { throw null; } }
+        public Azure.AI.Inference.CompletionsFinishReason? FinishReason { get { throw null; } }
         public string Id { get { throw null; } }
         public string Model { get { throw null; } }
+        public Azure.AI.Inference.ChatRole Role { get { throw null; } }
+        public System.Collections.Generic.IReadOnlyList<Azure.AI.Inference.ChatCompletionsToolCall> ToolCalls { get { throw null; } }
         public Azure.AI.Inference.CompletionsUsage Usage { get { throw null; } }
         Azure.AI.Inference.ChatCompletions System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletions>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
         void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletions>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
         Azure.AI.Inference.ChatCompletions System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletions>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
         string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletions>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
         System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletions>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        public override string ToString() { throw null; }
     }
     public partial class ChatCompletionsClient
     {
         protected ChatCompletionsClient() { }
         public ChatCompletionsClient(System.Uri endpoint, Azure.AzureKeyCredential credential) { }
-        public ChatCompletionsClient(System.Uri endpoint, Azure.AzureKeyCredential credential, Azure.AI.Inference.ChatCompletionsClientOptions options) { }
+        public ChatCompletionsClient(System.Uri endpoint, Azure.AzureKeyCredential credential, Azure.AI.Inference.AzureAIInferenceClientOptions options) { }
         public ChatCompletionsClient(System.Uri endpoint, Azure.Core.TokenCredential credential) { }
-        public ChatCompletionsClient(System.Uri endpoint, Azure.Core.TokenCredential credential, Azure.AI.Inference.ChatCompletionsClientOptions options) { }
+        public ChatCompletionsClient(System.Uri endpoint, Azure.Core.TokenCredential credential, Azure.AI.Inference.AzureAIInferenceClientOptions options) { }
         public virtual Azure.Core.Pipeline.HttpPipeline Pipeline { get { throw null; } }
-        public virtual Azure.Response<Azure.AI.Inference.ChatCompletions> Complete(Azure.AI.Inference.ChatCompletionsOptions chatCompletionsOptions, Azure.AI.Inference.ExtraParameters? extraParams = default(Azure.AI.Inference.ExtraParameters?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.AI.Inference.ChatCompletions>> CompleteAsync(Azure.AI.Inference.ChatCompletionsOptions chatCompletionsOptions, Azure.AI.Inference.ExtraParameters? extraParams = default(Azure.AI.Inference.ExtraParameters?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.AI.Inference.ChatCompletions> Complete(Azure.AI.Inference.ChatCompletionsOptions chatCompletionsOptions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.AI.Inference.ChatCompletions>> CompleteAsync(Azure.AI.Inference.ChatCompletionsOptions chatCompletionsOptions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AI.Inference.StreamingResponse<Azure.AI.Inference.StreamingChatCompletionsUpdate> CompleteStreaming(Azure.AI.Inference.ChatCompletionsOptions chatCompletionsOptions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.AI.Inference.StreamingResponse<Azure.AI.Inference.StreamingChatCompletionsUpdate>> CompleteStreamingAsync(Azure.AI.Inference.ChatCompletionsOptions chatCompletionsOptions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response GetModelInfo(Azure.RequestContext context) { throw null; }
@@ -58,68 +75,43 @@ public ChatCompletionsClient(System.Uri endpoint, Azure.Core.TokenCredential cre
         public virtual System.Threading.Tasks.Task<Azure.Response> GetModelInfoAsync(Azure.RequestContext context) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.AI.Inference.ModelInfo>> GetModelInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ChatCompletionsClientOptions : Azure.Core.ClientOptions
+    public partial class ChatCompletionsNamedToolChoice : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsNamedToolChoice>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedToolChoice>
     {
-        public ChatCompletionsClientOptions(Azure.AI.Inference.ChatCompletionsClientOptions.ServiceVersion version = Azure.AI.Inference.ChatCompletionsClientOptions.ServiceVersion.V2024_05_01_Preview) { }
-        public enum ServiceVersion
-        {
-            V2024_05_01_Preview = 1,
-        }
+        public ChatCompletionsNamedToolChoice(Azure.AI.Inference.ChatCompletionsNamedToolChoiceFunction function) { }
+        public Azure.AI.Inference.ChatCompletionsNamedToolChoiceFunction Function { get { throw null; } }
+        public Azure.AI.Inference.ChatCompletionsNamedToolChoiceType Type { get { throw null; } }
+        Azure.AI.Inference.ChatCompletionsNamedToolChoice System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsNamedToolChoice>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsNamedToolChoice>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
+        Azure.AI.Inference.ChatCompletionsNamedToolChoice System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedToolChoice>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedToolChoice>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedToolChoice>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
     }
-    public partial class ChatCompletionsFunctionToolCall : Azure.AI.Inference.ChatCompletionsToolCall, System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsFunctionToolCall>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsFunctionToolCall>
+    public partial class ChatCompletionsNamedToolChoiceFunction : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsNamedToolChoiceFunction>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedToolChoiceFunction>
     {
-        public ChatCompletionsFunctionToolCall(string id, Azure.AI.Inference.FunctionCall function) : base (default(string)) { }
-        public ChatCompletionsFunctionToolCall(string id, string name, string arguments) : base (default(string)) { }
-        public string Arguments { get { throw null; } set { } }
-        public string Name { get { throw null; } set { } }
-        Azure.AI.Inference.ChatCompletionsFunctionToolCall System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsFunctionToolCall>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsFunctionToolCall>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
-        Azure.AI.Inference.ChatCompletionsFunctionToolCall System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsFunctionToolCall>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsFunctionToolCall>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsFunctionToolCall>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-    }
-    public partial class ChatCompletionsFunctionToolDefinition : Azure.AI.Inference.ChatCompletionsToolDefinition, System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsFunctionToolDefinition>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsFunctionToolDefinition>
-    {
-        public ChatCompletionsFunctionToolDefinition() { }
-        public ChatCompletionsFunctionToolDefinition(Azure.AI.Inference.FunctionDefinition function) { }
-        public string Description { get { throw null; } set { } }
-        public Azure.AI.Inference.FunctionDefinition Function { get { throw null; } }
-        public string Name { get { throw null; } set { } }
-        public System.BinaryData Parameters { get { throw null; } set { } }
-        Azure.AI.Inference.ChatCompletionsFunctionToolDefinition System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsFunctionToolDefinition>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsFunctionToolDefinition>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
-        Azure.AI.Inference.ChatCompletionsFunctionToolDefinition System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsFunctionToolDefinition>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsFunctionToolDefinition>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsFunctionToolDefinition>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        public ChatCompletionsNamedToolChoiceFunction(string name) { }
+        public string Name { get { throw null; } }
+        Azure.AI.Inference.ChatCompletionsNamedToolChoiceFunction System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsNamedToolChoiceFunction>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsNamedToolChoiceFunction>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
+        Azure.AI.Inference.ChatCompletionsNamedToolChoiceFunction System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedToolChoiceFunction>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedToolChoiceFunction>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedToolChoiceFunction>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
     }
-    public partial class ChatCompletionsFunctionToolSelection : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsFunctionToolSelection>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsFunctionToolSelection>
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct ChatCompletionsNamedToolChoiceType : System.IEquatable<Azure.AI.Inference.ChatCompletionsNamedToolChoiceType>
     {
-        public ChatCompletionsFunctionToolSelection(string name) { }
-        public string Name { get { throw null; } }
-        Azure.AI.Inference.ChatCompletionsFunctionToolSelection System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsFunctionToolSelection>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsFunctionToolSelection>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
-        Azure.AI.Inference.ChatCompletionsFunctionToolSelection System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsFunctionToolSelection>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsFunctionToolSelection>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsFunctionToolSelection>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-    }
-    public partial class ChatCompletionsNamedFunctionToolSelection : Azure.AI.Inference.ChatCompletionsNamedToolSelection, System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsNamedFunctionToolSelection>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedFunctionToolSelection>
-    {
-        public ChatCompletionsNamedFunctionToolSelection(Azure.AI.Inference.ChatCompletionsFunctionToolSelection function) { }
-        public Azure.AI.Inference.ChatCompletionsFunctionToolSelection Function { get { throw null; } }
-        Azure.AI.Inference.ChatCompletionsNamedFunctionToolSelection System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsNamedFunctionToolSelection>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsNamedFunctionToolSelection>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
-        Azure.AI.Inference.ChatCompletionsNamedFunctionToolSelection System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedFunctionToolSelection>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedFunctionToolSelection>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedFunctionToolSelection>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-    }
-    public abstract partial class ChatCompletionsNamedToolSelection : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsNamedToolSelection>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedToolSelection>
-    {
-        protected ChatCompletionsNamedToolSelection() { }
-        Azure.AI.Inference.ChatCompletionsNamedToolSelection System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsNamedToolSelection>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsNamedToolSelection>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
-        Azure.AI.Inference.ChatCompletionsNamedToolSelection System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedToolSelection>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedToolSelection>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
-        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsNamedToolSelection>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        private readonly object _dummy;
+        private readonly int _dummyPrimitive;
+        public ChatCompletionsNamedToolChoiceType(string value) { throw null; }
+        public static Azure.AI.Inference.ChatCompletionsNamedToolChoiceType Function { get { throw null; } }
+        public bool Equals(Azure.AI.Inference.ChatCompletionsNamedToolChoiceType other) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public override bool Equals(object obj) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public override int GetHashCode() { throw null; }
+        public static bool operator ==(Azure.AI.Inference.ChatCompletionsNamedToolChoiceType left, Azure.AI.Inference.ChatCompletionsNamedToolChoiceType right) { throw null; }
+        public static implicit operator Azure.AI.Inference.ChatCompletionsNamedToolChoiceType (string value) { throw null; }
+        public static bool operator !=(Azure.AI.Inference.ChatCompletionsNamedToolChoiceType left, Azure.AI.Inference.ChatCompletionsNamedToolChoiceType right) { throw null; }
+        public override string ToString() { throw null; }
     }
     public partial class ChatCompletionsOptions : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsOptions>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsOptions>
     {
@@ -128,7 +120,7 @@ public ChatCompletionsOptions(System.Collections.Generic.IEnumerable<Azure.AI.In
         public System.Collections.Generic.IDictionary<string, System.BinaryData> AdditionalProperties { get { throw null; } }
         public float? FrequencyPenalty { get { throw null; } set { } }
         public int? MaxTokens { get { throw null; } set { } }
-        public System.Collections.Generic.IList<Azure.AI.Inference.ChatRequestMessage> Messages { get { throw null; } }
+        public System.Collections.Generic.IList<Azure.AI.Inference.ChatRequestMessage> Messages { get { throw null; } set { } }
         public string Model { get { throw null; } set { } }
         public float? NucleusSamplingFactor { get { throw null; } set { } }
         public float? PresencePenalty { get { throw null; } set { } }
@@ -171,29 +163,75 @@ public ChatCompletionsResponseFormatText() { }
         string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsResponseFormatText>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
         System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsResponseFormatText>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
     }
-    public abstract partial class ChatCompletionsToolCall : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsToolCall>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsToolCall>
+    public partial class ChatCompletionsToolCall : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsToolCall>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsToolCall>
     {
-        protected ChatCompletionsToolCall(string id) { }
+        public ChatCompletionsToolCall(string id, Azure.AI.Inference.FunctionCall function) { }
+        public string Arguments { get { throw null; } set { } }
+        public Azure.AI.Inference.FunctionCall Function { get { throw null; } set { } }
         public string Id { get { throw null; } set { } }
+        public string Name { get { throw null; } set { } }
+        public Azure.AI.Inference.ChatCompletionsToolCallType Type { get { throw null; } }
+        public static Azure.AI.Inference.ChatCompletionsToolCall CreateFunctionToolCall(string toolCallId, string functionName, string functionArguments) { throw null; }
         Azure.AI.Inference.ChatCompletionsToolCall System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsToolCall>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
         void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsToolCall>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
         Azure.AI.Inference.ChatCompletionsToolCall System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsToolCall>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
         string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsToolCall>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
         System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsToolCall>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
     }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct ChatCompletionsToolCallType : System.IEquatable<Azure.AI.Inference.ChatCompletionsToolCallType>
+    {
+        private readonly object _dummy;
+        private readonly int _dummyPrimitive;
+        public ChatCompletionsToolCallType(string value) { throw null; }
+        public static Azure.AI.Inference.ChatCompletionsToolCallType Function { get { throw null; } }
+        public bool Equals(Azure.AI.Inference.ChatCompletionsToolCallType other) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public override bool Equals(object obj) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public override int GetHashCode() { throw null; }
+        public static bool operator ==(Azure.AI.Inference.ChatCompletionsToolCallType left, Azure.AI.Inference.ChatCompletionsToolCallType right) { throw null; }
+        public static implicit operator Azure.AI.Inference.ChatCompletionsToolCallType (string value) { throw null; }
+        public static bool operator !=(Azure.AI.Inference.ChatCompletionsToolCallType left, Azure.AI.Inference.ChatCompletionsToolCallType right) { throw null; }
+        public override string ToString() { throw null; }
+    }
     public partial class ChatCompletionsToolChoice
     {
         public static readonly Azure.AI.Inference.ChatCompletionsToolChoice Auto;
         public static readonly Azure.AI.Inference.ChatCompletionsToolChoice None;
         public static readonly Azure.AI.Inference.ChatCompletionsToolChoice Required;
-        public ChatCompletionsToolChoice(Azure.AI.Inference.ChatCompletionsFunctionToolDefinition functionToolDefinition) { }
+        public ChatCompletionsToolChoice(Azure.AI.Inference.ChatCompletionsToolDefinition functionToolDefinition) { }
         public ChatCompletionsToolChoice(Azure.AI.Inference.FunctionDefinition functionDefinition) { }
-        public static implicit operator Azure.AI.Inference.ChatCompletionsToolChoice (Azure.AI.Inference.ChatCompletionsFunctionToolDefinition functionToolDefinition) { throw null; }
+        public static implicit operator Azure.AI.Inference.ChatCompletionsToolChoice (Azure.AI.Inference.ChatCompletionsToolDefinition functionToolDefinition) { throw null; }
         public static implicit operator Azure.AI.Inference.ChatCompletionsToolChoice (Azure.AI.Inference.FunctionDefinition functionDefinition) { throw null; }
     }
-    public abstract partial class ChatCompletionsToolDefinition : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsToolDefinition>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsToolDefinition>
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct ChatCompletionsToolChoicePreset : System.IEquatable<Azure.AI.Inference.ChatCompletionsToolChoicePreset>
+    {
+        private readonly object _dummy;
+        private readonly int _dummyPrimitive;
+        public ChatCompletionsToolChoicePreset(string value) { throw null; }
+        public static Azure.AI.Inference.ChatCompletionsToolChoicePreset Auto { get { throw null; } }
+        public static Azure.AI.Inference.ChatCompletionsToolChoicePreset None { get { throw null; } }
+        public static Azure.AI.Inference.ChatCompletionsToolChoicePreset Required { get { throw null; } }
+        public bool Equals(Azure.AI.Inference.ChatCompletionsToolChoicePreset other) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public override bool Equals(object obj) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public override int GetHashCode() { throw null; }
+        public static bool operator ==(Azure.AI.Inference.ChatCompletionsToolChoicePreset left, Azure.AI.Inference.ChatCompletionsToolChoicePreset right) { throw null; }
+        public static implicit operator Azure.AI.Inference.ChatCompletionsToolChoicePreset (string value) { throw null; }
+        public static bool operator !=(Azure.AI.Inference.ChatCompletionsToolChoicePreset left, Azure.AI.Inference.ChatCompletionsToolChoicePreset right) { throw null; }
+        public override string ToString() { throw null; }
+    }
+    public partial class ChatCompletionsToolDefinition : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsToolDefinition>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsToolDefinition>
     {
-        protected ChatCompletionsToolDefinition() { }
+        public ChatCompletionsToolDefinition(Azure.AI.Inference.FunctionDefinition function) { }
+        public string Description { get { throw null; } set { } }
+        public Azure.AI.Inference.FunctionDefinition Function { get { throw null; } }
+        public string Name { get { throw null; } set { } }
+        public System.BinaryData Parameters { get { throw null; } set { } }
+        public Azure.AI.Inference.ChatCompletionsToolDefinitionType Type { get { throw null; } }
         Azure.AI.Inference.ChatCompletionsToolDefinition System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsToolDefinition>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
         void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatCompletionsToolDefinition>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
         Azure.AI.Inference.ChatCompletionsToolDefinition System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsToolDefinition>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
@@ -201,22 +239,20 @@ protected ChatCompletionsToolDefinition() { }
         System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatCompletionsToolDefinition>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct ChatCompletionsToolSelectionPreset : System.IEquatable<Azure.AI.Inference.ChatCompletionsToolSelectionPreset>
+    public readonly partial struct ChatCompletionsToolDefinitionType : System.IEquatable<Azure.AI.Inference.ChatCompletionsToolDefinitionType>
     {
         private readonly object _dummy;
         private readonly int _dummyPrimitive;
-        public ChatCompletionsToolSelectionPreset(string value) { throw null; }
-        public static Azure.AI.Inference.ChatCompletionsToolSelectionPreset Auto { get { throw null; } }
-        public static Azure.AI.Inference.ChatCompletionsToolSelectionPreset None { get { throw null; } }
-        public static Azure.AI.Inference.ChatCompletionsToolSelectionPreset Required { get { throw null; } }
-        public bool Equals(Azure.AI.Inference.ChatCompletionsToolSelectionPreset other) { throw null; }
+        public ChatCompletionsToolDefinitionType(string value) { throw null; }
+        public static Azure.AI.Inference.ChatCompletionsToolDefinitionType Function { get { throw null; } }
+        public bool Equals(Azure.AI.Inference.ChatCompletionsToolDefinitionType other) { throw null; }
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         public override bool Equals(object obj) { throw null; }
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
         public override int GetHashCode() { throw null; }
-        public static bool operator ==(Azure.AI.Inference.ChatCompletionsToolSelectionPreset left, Azure.AI.Inference.ChatCompletionsToolSelectionPreset right) { throw null; }
-        public static implicit operator Azure.AI.Inference.ChatCompletionsToolSelectionPreset (string value) { throw null; }
-        public static bool operator !=(Azure.AI.Inference.ChatCompletionsToolSelectionPreset left, Azure.AI.Inference.ChatCompletionsToolSelectionPreset right) { throw null; }
+        public static bool operator ==(Azure.AI.Inference.ChatCompletionsToolDefinitionType left, Azure.AI.Inference.ChatCompletionsToolDefinitionType right) { throw null; }
+        public static implicit operator Azure.AI.Inference.ChatCompletionsToolDefinitionType (string value) { throw null; }
+        public static bool operator !=(Azure.AI.Inference.ChatCompletionsToolDefinitionType left, Azure.AI.Inference.ChatCompletionsToolDefinitionType right) { throw null; }
         public override string ToString() { throw null; }
     }
     public abstract partial class ChatMessageContentItem : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatMessageContentItem>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatMessageContentItem>
@@ -232,6 +268,7 @@ public partial class ChatMessageImageContentItem : Azure.AI.Inference.ChatMessag
     {
         public ChatMessageImageContentItem(System.BinaryData bytes, string mimeType, Azure.AI.Inference.ChatMessageImageDetailLevel? detailLevel = default(Azure.AI.Inference.ChatMessageImageDetailLevel?)) { }
         public ChatMessageImageContentItem(System.IO.Stream stream, string mimeType, Azure.AI.Inference.ChatMessageImageDetailLevel? detailLevel = default(Azure.AI.Inference.ChatMessageImageDetailLevel?)) { }
+        public ChatMessageImageContentItem(string imageFilePath, string mimeType, Azure.AI.Inference.ChatMessageImageDetailLevel? detailLevel = default(Azure.AI.Inference.ChatMessageImageDetailLevel?)) { }
         public ChatMessageImageContentItem(System.Uri imageUri, Azure.AI.Inference.ChatMessageImageDetailLevel? detailLevel = default(Azure.AI.Inference.ChatMessageImageDetailLevel?)) { }
         Azure.AI.Inference.ChatMessageImageContentItem System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatMessageImageContentItem>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
         void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatMessageImageContentItem>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
@@ -270,9 +307,11 @@ public ChatMessageTextContentItem(string text) { }
     }
     public partial class ChatRequestAssistantMessage : Azure.AI.Inference.ChatRequestMessage, System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatRequestAssistantMessage>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.ChatRequestAssistantMessage>
     {
-        public ChatRequestAssistantMessage() { }
-        public ChatRequestAssistantMessage(Azure.AI.Inference.ChatResponseMessage responseMessage) { }
+        public ChatRequestAssistantMessage(Azure.AI.Inference.ChatCompletions chatCompletions) { }
+        public ChatRequestAssistantMessage(System.Collections.Generic.IEnumerable<Azure.AI.Inference.ChatCompletionsToolCall> toolCalls, string content = null) { }
+        public ChatRequestAssistantMessage(string content) { }
         public string Content { get { throw null; } set { } }
+        public string ParticipantName { get { throw null; } set { } }
         public System.Collections.Generic.IList<Azure.AI.Inference.ChatCompletionsToolCall> ToolCalls { get { throw null; } }
         Azure.AI.Inference.ChatRequestAssistantMessage System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatRequestAssistantMessage>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
         void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.ChatRequestAssistantMessage>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
@@ -388,6 +427,114 @@ internal CompletionsUsage() { }
         System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.CompletionsUsage>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
     }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct EmbeddingEncodingFormat : System.IEquatable<Azure.AI.Inference.EmbeddingEncodingFormat>
+    {
+        private readonly object _dummy;
+        private readonly int _dummyPrimitive;
+        public EmbeddingEncodingFormat(string value) { throw null; }
+        public static Azure.AI.Inference.EmbeddingEncodingFormat Base64 { get { throw null; } }
+        public static Azure.AI.Inference.EmbeddingEncodingFormat Binary { get { throw null; } }
+        public static Azure.AI.Inference.EmbeddingEncodingFormat Byte { get { throw null; } }
+        public static Azure.AI.Inference.EmbeddingEncodingFormat SByte { get { throw null; } }
+        public static Azure.AI.Inference.EmbeddingEncodingFormat Single { get { throw null; } }
+        public static Azure.AI.Inference.EmbeddingEncodingFormat Ubinary { get { throw null; } }
+        public bool Equals(Azure.AI.Inference.EmbeddingEncodingFormat other) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public override bool Equals(object obj) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public override int GetHashCode() { throw null; }
+        public static bool operator ==(Azure.AI.Inference.EmbeddingEncodingFormat left, Azure.AI.Inference.EmbeddingEncodingFormat right) { throw null; }
+        public static implicit operator Azure.AI.Inference.EmbeddingEncodingFormat (string value) { throw null; }
+        public static bool operator !=(Azure.AI.Inference.EmbeddingEncodingFormat left, Azure.AI.Inference.EmbeddingEncodingFormat right) { throw null; }
+        public override string ToString() { throw null; }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
+    public readonly partial struct EmbeddingInputType : System.IEquatable<Azure.AI.Inference.EmbeddingInputType>
+    {
+        private readonly object _dummy;
+        private readonly int _dummyPrimitive;
+        public EmbeddingInputType(string value) { throw null; }
+        public static Azure.AI.Inference.EmbeddingInputType Document { get { throw null; } }
+        public static Azure.AI.Inference.EmbeddingInputType Query { get { throw null; } }
+        public static Azure.AI.Inference.EmbeddingInputType Text { get { throw null; } }
+        public bool Equals(Azure.AI.Inference.EmbeddingInputType other) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public override bool Equals(object obj) { throw null; }
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        public override int GetHashCode() { throw null; }
+        public static bool operator ==(Azure.AI.Inference.EmbeddingInputType left, Azure.AI.Inference.EmbeddingInputType right) { throw null; }
+        public static implicit operator Azure.AI.Inference.EmbeddingInputType (string value) { throw null; }
+        public static bool operator !=(Azure.AI.Inference.EmbeddingInputType left, Azure.AI.Inference.EmbeddingInputType right) { throw null; }
+        public override string ToString() { throw null; }
+    }
+    public partial class EmbeddingItem : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.EmbeddingItem>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingItem>
+    {
+        internal EmbeddingItem() { }
+        public System.BinaryData Embedding { get { throw null; } }
+        public int Index { get { throw null; } }
+        Azure.AI.Inference.EmbeddingItem System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.EmbeddingItem>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.EmbeddingItem>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
+        Azure.AI.Inference.EmbeddingItem System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingItem>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingItem>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingItem>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+    }
+    public partial class EmbeddingsClient
+    {
+        protected EmbeddingsClient() { }
+        public EmbeddingsClient(System.Uri endpoint, Azure.AzureKeyCredential credential) { }
+        public EmbeddingsClient(System.Uri endpoint, Azure.AzureKeyCredential credential, Azure.AI.Inference.AzureAIInferenceClientOptions options) { }
+        public EmbeddingsClient(System.Uri endpoint, Azure.Core.TokenCredential credential) { }
+        public EmbeddingsClient(System.Uri endpoint, Azure.Core.TokenCredential credential, Azure.AI.Inference.AzureAIInferenceClientOptions options) { }
+        public virtual Azure.Core.Pipeline.HttpPipeline Pipeline { get { throw null; } }
+        public virtual Azure.Response<Azure.AI.Inference.EmbeddingsResult> Embed(Azure.AI.Inference.EmbeddingsOptions embeddingsOptions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response Embed(Azure.Core.RequestContent content, string extraParams = null, Azure.RequestContext context = null) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.AI.Inference.EmbeddingsResult>> EmbedAsync(Azure.AI.Inference.EmbeddingsOptions embeddingsOptions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> EmbedAsync(Azure.Core.RequestContent content, string extraParams = null, Azure.RequestContext context = null) { throw null; }
+        public virtual Azure.Response GetModelInfo(Azure.RequestContext context) { throw null; }
+        public virtual Azure.Response<Azure.AI.Inference.ModelInfo> GetModelInfo(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> GetModelInfoAsync(Azure.RequestContext context) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.AI.Inference.ModelInfo>> GetModelInfoAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class EmbeddingsOptions : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.EmbeddingsOptions>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingsOptions>
+    {
+        public EmbeddingsOptions(System.Collections.Generic.IEnumerable<string> input) { }
+        public System.Collections.Generic.IDictionary<string, System.BinaryData> AdditionalProperties { get { throw null; } }
+        public int? Dimensions { get { throw null; } set { } }
+        public Azure.AI.Inference.EmbeddingEncodingFormat? EncodingFormat { get { throw null; } set { } }
+        public System.Collections.Generic.IList<string> Input { get { throw null; } }
+        public Azure.AI.Inference.EmbeddingInputType? InputType { get { throw null; } set { } }
+        public string Model { get { throw null; } set { } }
+        Azure.AI.Inference.EmbeddingsOptions System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.EmbeddingsOptions>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.EmbeddingsOptions>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
+        Azure.AI.Inference.EmbeddingsOptions System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingsOptions>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingsOptions>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingsOptions>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+    }
+    public partial class EmbeddingsResult : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.EmbeddingsResult>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingsResult>
+    {
+        internal EmbeddingsResult() { }
+        public System.Collections.Generic.IReadOnlyList<Azure.AI.Inference.EmbeddingItem> Data { get { throw null; } }
+        public string Id { get { throw null; } }
+        public string Model { get { throw null; } }
+        public Azure.AI.Inference.EmbeddingsUsage Usage { get { throw null; } }
+        Azure.AI.Inference.EmbeddingsResult System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.EmbeddingsResult>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.EmbeddingsResult>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
+        Azure.AI.Inference.EmbeddingsResult System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingsResult>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingsResult>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingsResult>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+    }
+    public partial class EmbeddingsUsage : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.EmbeddingsUsage>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingsUsage>
+    {
+        internal EmbeddingsUsage() { }
+        public int PromptTokens { get { throw null; } }
+        public int TotalTokens { get { throw null; } }
+        Azure.AI.Inference.EmbeddingsUsage System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.EmbeddingsUsage>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.EmbeddingsUsage>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
+        Azure.AI.Inference.EmbeddingsUsage System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingsUsage>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingsUsage>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.EmbeddingsUsage>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+    }
+    [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct ExtraParameters : System.IEquatable<Azure.AI.Inference.ExtraParameters>
     {
         private readonly object _dummy;
@@ -470,7 +617,7 @@ internal ModelInfo() { }
     public partial class StreamingChatChoiceUpdate : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.StreamingChatChoiceUpdate>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.StreamingChatChoiceUpdate>
     {
         internal StreamingChatChoiceUpdate() { }
-        public Azure.AI.Inference.ChatResponseMessage Delta { get { throw null; } }
+        public Azure.AI.Inference.StreamingChatResponseMessageUpdate Delta { get { throw null; } }
         public Azure.AI.Inference.CompletionsFinishReason? FinishReason { get { throw null; } }
         public int Index { get { throw null; } }
         Azure.AI.Inference.StreamingChatChoiceUpdate System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.StreamingChatChoiceUpdate>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
@@ -482,17 +629,14 @@ internal StreamingChatChoiceUpdate() { }
     public partial class StreamingChatCompletionsUpdate : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.StreamingChatCompletionsUpdate>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.StreamingChatCompletionsUpdate>
     {
         internal StreamingChatCompletionsUpdate() { }
-        public string AuthorName { get { throw null; } }
         public System.Collections.Generic.IReadOnlyList<Azure.AI.Inference.StreamingChatChoiceUpdate> Choices { get { throw null; } }
         public string ContentUpdate { get { throw null; } }
         public System.DateTimeOffset Created { get { throw null; } }
         public Azure.AI.Inference.CompletionsFinishReason? FinishReason { get { throw null; } }
-        public string FunctionArgumentsUpdate { get { throw null; } }
-        public string FunctionName { get { throw null; } }
         public string Id { get { throw null; } }
         public string Model { get { throw null; } }
         public Azure.AI.Inference.ChatRole? Role { get { throw null; } }
-        public Azure.AI.Inference.StreamingToolCallUpdate ToolCallUpdate { get { throw null; } }
+        public Azure.AI.Inference.StreamingChatResponseToolCallUpdate ToolCallUpdate { get { throw null; } }
         public Azure.AI.Inference.CompletionsUsage Usage { get { throw null; } }
         Azure.AI.Inference.StreamingChatCompletionsUpdate System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.StreamingChatCompletionsUpdate>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
         void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.StreamingChatCompletionsUpdate>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
@@ -500,6 +644,29 @@ internal StreamingChatCompletionsUpdate() { }
         string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.StreamingChatCompletionsUpdate>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
         System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.StreamingChatCompletionsUpdate>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
     }
+    public partial class StreamingChatResponseMessageUpdate : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.StreamingChatResponseMessageUpdate>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.StreamingChatResponseMessageUpdate>
+    {
+        internal StreamingChatResponseMessageUpdate() { }
+        public string Content { get { throw null; } }
+        public Azure.AI.Inference.ChatRole? Role { get { throw null; } }
+        public System.Collections.Generic.IReadOnlyList<Azure.AI.Inference.StreamingChatResponseToolCallUpdate> ToolCalls { get { throw null; } set { } }
+        Azure.AI.Inference.StreamingChatResponseMessageUpdate System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.StreamingChatResponseMessageUpdate>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.StreamingChatResponseMessageUpdate>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
+        Azure.AI.Inference.StreamingChatResponseMessageUpdate System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.StreamingChatResponseMessageUpdate>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.StreamingChatResponseMessageUpdate>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.StreamingChatResponseMessageUpdate>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+    }
+    public partial class StreamingChatResponseToolCallUpdate : System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.StreamingChatResponseToolCallUpdate>, System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.StreamingChatResponseToolCallUpdate>
+    {
+        internal StreamingChatResponseToolCallUpdate() { }
+        public Azure.AI.Inference.FunctionCall Function { get { throw null; } }
+        public string Id { get { throw null; } }
+        Azure.AI.Inference.StreamingChatResponseToolCallUpdate System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.StreamingChatResponseToolCallUpdate>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        void System.ClientModel.Primitives.IJsonModel<Azure.AI.Inference.StreamingChatResponseToolCallUpdate>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { }
+        Azure.AI.Inference.StreamingChatResponseToolCallUpdate System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.StreamingChatResponseToolCallUpdate>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        string System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.StreamingChatResponseToolCallUpdate>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Azure.AI.Inference.StreamingChatResponseToolCallUpdate>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; }
+    }
     public partial class StreamingFunctionToolCallUpdate : Azure.AI.Inference.StreamingToolCallUpdate
     {
         internal StreamingFunctionToolCallUpdate() { }
@@ -527,8 +694,11 @@ namespace Microsoft.Extensions.Azure
 {
     public static partial class AIInferenceClientBuilderExtensions
     {
-        public static Azure.Core.Extensions.IAzureClientBuilder<Azure.AI.Inference.ChatCompletionsClient, Azure.AI.Inference.ChatCompletionsClientOptions> AddChatCompletionsClient<TBuilder>(this TBuilder builder, System.Uri endpoint) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilderWithCredential { throw null; }
-        public static Azure.Core.Extensions.IAzureClientBuilder<Azure.AI.Inference.ChatCompletionsClient, Azure.AI.Inference.ChatCompletionsClientOptions> AddChatCompletionsClient<TBuilder>(this TBuilder builder, System.Uri endpoint, Azure.AzureKeyCredential credential) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilder { throw null; }
-        public static Azure.Core.Extensions.IAzureClientBuilder<Azure.AI.Inference.ChatCompletionsClient, Azure.AI.Inference.ChatCompletionsClientOptions> AddChatCompletionsClient<TBuilder, TConfiguration>(this TBuilder builder, TConfiguration configuration) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilderWithConfiguration<TConfiguration> { throw null; }
+        public static Azure.Core.Extensions.IAzureClientBuilder<Azure.AI.Inference.ChatCompletionsClient, Azure.AI.Inference.AzureAIInferenceClientOptions> AddChatCompletionsClient<TBuilder>(this TBuilder builder, System.Uri endpoint) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilderWithCredential { throw null; }
+        public static Azure.Core.Extensions.IAzureClientBuilder<Azure.AI.Inference.ChatCompletionsClient, Azure.AI.Inference.AzureAIInferenceClientOptions> AddChatCompletionsClient<TBuilder>(this TBuilder builder, System.Uri endpoint, Azure.AzureKeyCredential credential) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilder { throw null; }
+        public static Azure.Core.Extensions.IAzureClientBuilder<Azure.AI.Inference.ChatCompletionsClient, Azure.AI.Inference.AzureAIInferenceClientOptions> AddChatCompletionsClient<TBuilder, TConfiguration>(this TBuilder builder, TConfiguration configuration) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilderWithConfiguration<TConfiguration> { throw null; }
+        public static Azure.Core.Extensions.IAzureClientBuilder<Azure.AI.Inference.EmbeddingsClient, Azure.AI.Inference.AzureAIInferenceClientOptions> AddEmbeddingsClient<TBuilder>(this TBuilder builder, System.Uri endpoint) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilderWithCredential { throw null; }
+        public static Azure.Core.Extensions.IAzureClientBuilder<Azure.AI.Inference.EmbeddingsClient, Azure.AI.Inference.AzureAIInferenceClientOptions> AddEmbeddingsClient<TBuilder>(this TBuilder builder, System.Uri endpoint, Azure.AzureKeyCredential credential) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilder { throw null; }
+        public static Azure.Core.Extensions.IAzureClientBuilder<Azure.AI.Inference.EmbeddingsClient, Azure.AI.Inference.AzureAIInferenceClientOptions> AddEmbeddingsClient<TBuilder, TConfiguration>(this TBuilder builder, TConfiguration configuration) where TBuilder : Azure.Core.Extensions.IAzureClientFactoryBuilderWithConfiguration<TConfiguration> { throw null; }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/assets.json b/sdk/ai/Azure.AI.Inference/assets.json
index d0eac6ecace6..f41193522b64 100644
--- a/sdk/ai/Azure.AI.Inference/assets.json
+++ b/sdk/ai/Azure.AI.Inference/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "net",
   "TagPrefix": "net/ai/Azure.AI.Inference",
-  "Tag": "net/ai/Azure.AI.Inference_99a4be5ef1"
+  "Tag": "net/ai/Azure.AI.Inference_4a960298fb"
 }
diff --git a/sdk/ai/Azure.AI.Inference/samples/README.md b/sdk/ai/Azure.AI.Inference/samples/README.md
index 7d351583c2f6..704f40ef2210 100644
--- a/sdk/ai/Azure.AI.Inference/samples/README.md
+++ b/sdk/ai/Azure.AI.Inference/samples/README.md
@@ -17,6 +17,9 @@ description: Samples for the Azure.AI.Inference client library.
 | [Sample2_ChatCompletionsWithAoai](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/ai/Azure.AI.Inference/samples/Sample2_ChatCompletionsWithAoai.md) | Chat completions targeting Azure OpenAI. |
 | [Sample3_ChatCompletionsStreaming](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/ai/Azure.AI.Inference/samples/Sample3_ChatCompletionsStreaming.md) | Chat completions with streaming responses. |
 | [Sample4_ChatCompletionsWithHistory](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/ai/Azure.AI.Inference/samples/Sample4_ChatCompletionsWithHistory.md) | Chat completions using chat history. |
-| [Sample5_ChatCompletionsWithImageUrl](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/ai/Azure.AI.Inference/samples/Sample5_ChatCompletionsWithImageUrl.md) | Chat completions providing an image url. |
+| [Sample5_ChatCompletionsWithImages](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/ai/Azure.AI.Inference/samples/Sample5_ChatCompletionsWithImages.md) | Chat completions providing an image url. |
 | [Sample6_ChatCompletionsWithAdditionalProperties](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/ai/Azure.AI.Inference/samples/Sample6_ChatCompletionsWithAdditionalProperties.md) | Chat completions providing additional model specific properties. |
 | [Sample7_ChatCompletionsWithTools](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/ai/Azure.AI.Inference/samples/Sample7_ChatCompletionsWithTools.md) | Chat completions using tools. |
+| [Sample8_ChatCompletionsWithOpenTelemetry](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/ai/Azure.AI.Inference/samples/Sample8_ChatCompletionsWithOpenTelemetry.md) | Chat completions using Open Telemetry for tracing. |
+| [Sample9_Embeddings](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/ai/Azure.AI.Inference/samples/Sample9_Embeddings.md) | Basic text embeddings. |
+| [Sample10_EmbeddingsWithAoai](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/ai/Azure.AI.Inference/samples/Sample10_EmbeddingsWithAoai.md) | Text embeddings targetting Azure OpenAi. |
diff --git a/sdk/ai/Azure.AI.Inference/samples/Sample10_EmbeddingsWithAoai.md b/sdk/ai/Azure.AI.Inference/samples/Sample10_EmbeddingsWithAoai.md
new file mode 100644
index 000000000000..62bf2db7a29a
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/samples/Sample10_EmbeddingsWithAoai.md
@@ -0,0 +1,117 @@
+# Simple Embeddings Using Azure OpenAI
+
+This sample demonstrates how to get text embeddings for a list of sentences using a synchronous client, with an Azure OpenAI (AOAI) endpoint. Two types of authentications are shown: key authentication and Entra ID authentication.
+
+## Usage
+
+Set these two environment variables before running the sample:
+
+1. AZURE_OPENAI_EMBEDDINGS_ENDPOINT - Your endpoint URL, in the form `https://your-deployment-name.your-azure-region.inference.ai.azure.com` where `your-deployment-name` is your unique AI Model deployment name, and `your-azure-region` is the Azure region where your model is deployed.
+
+2. AZURE_OPENAI_EMBEDDINGS_KEY - Your model key (a 32-character string). Keep it secret.
+
+In order to target AOAI, the auth key must currently be provided as a separate header. This can be done by creating a `HttpPipelinePolicy` like below:
+
+```C# Snippet:Azure_AI_Inference_AoaiAuthHeaderPolicy
+private class AddAoaiAuthHeaderPolicy : HttpPipelinePolicy
+{
+    public string AoaiKey { get; }
+
+    public AddAoaiAuthHeaderPolicy(string key)
+    {
+        AoaiKey = key;
+    }
+
+    public override void Process(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
+    {
+        // Add your desired header name and value
+        message.Request.Headers.Add("api-key", AoaiKey);
+
+        ProcessNext(message, pipeline);
+    }
+
+    public override ValueTask ProcessAsync(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
+    {
+        // Add your desired header name and value
+        message.Request.Headers.Add("api-key", AoaiKey);
+
+        return ProcessNextAsync(message, pipeline);
+    }
+}
+```
+
+The policy can then be added to the `AzureAIInferenceClientOptions` object, to configure the client to add the header at runtime.
+
+```C# Snippet:Azure_AI_Inference_BasicEmbeddingAoaiScenarioClientCreate
+var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_OPENAI_EMBEDDINGS_ENDPOINT"));
+var key = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_EMBEDDINGS_KEY");
+
+// For AOAI, currently the key is passed via a different header not directly handled by the client, however
+// the credential object is still required. So create with a dummy value.
+var credential = new AzureKeyCredential("foo");
+
+AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+clientOptions.AddPolicy(new AddAoaiAuthHeaderPolicy(key), HttpPipelinePosition.PerCall);
+
+var client = new EmbeddingsClient(endpoint, credential, clientOptions);
+```
+
+Alternatively, you can use EntraId to authenticate. This does not require the header policy, but it does currently require a separate built-in policy, `BearerTokenAuthenticationPolicy`, to apply the correct token scope.
+
+```C# Snippet:Azure_AI_Inference_EmbeddingWithEntraIdClientCreate
+var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_OPENAI_EMBEDDINGS_ENDPOINT"));
+var credential = new DefaultAzureCredential(includeInteractiveCredentials: true);
+AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+
+BearerTokenAuthenticationPolicy tokenPolicy = new BearerTokenAuthenticationPolicy(credential, new string[] { "https://cognitiveservices.azure.com/.default" });
+clientOptions.AddPolicy(tokenPolicy, HttpPipelinePosition.PerRetry);
+
+var client = new EmbeddingsClient(endpoint, credential, clientOptions);
+```
+
+After the client is created, you can make completion requests with it as shown
+
+```C# Snippet:Azure_AI_Inference_BasicEmbeddingAoai
+var input = new List<string> { "King", "Queen", "Jack", "Page" };
+var requestOptions = new EmbeddingsOptions(input);
+
+Response<EmbeddingsResult> response = client.Embed(requestOptions);
+foreach (EmbeddingItem item in response.Value.Data)
+{
+    List<float> embedding = item.Embedding.ToObjectFromJson<List<float>>();
+    Console.WriteLine($"Index: {item.Index}, Embedding: <{string.Join(", ", embedding)}>");
+}
+```
+
+An `async` option is also available.
+
+```C# Snippet:Azure_AI_Inference_BasicEmbeddingAoaiAsync
+var input = new List<string> { "King", "Queen", "Jack", "Page" };
+var requestOptions = new EmbeddingsOptions(input);
+
+Response<EmbeddingsResult> response = await client.EmbedAsync(requestOptions);
+foreach (EmbeddingItem item in response.Value.Data)
+{
+    List<float> embedding = item.Embedding.ToObjectFromJson<List<float>>();
+    Console.WriteLine($"Index: {item.Index}, Embedding: <{string.Join(", ", embedding)}>");
+}
+```
+
+### Alternative Response Type
+
+It is also possible to request embeddings as base64 encoded strings, instead of the service default of lists of floats.
+
+```C# Snippet:Azure_AI_Inference_Base64Embedding
+var input = new List<string> { "King", "Queen", "Jack", "Page" };
+var requestOptions = new EmbeddingsOptions(input)
+{
+    EncodingFormat = EmbeddingEncodingFormat.Base64,
+};
+
+Response<EmbeddingsResult> response = client.Embed(requestOptions);
+foreach (EmbeddingItem item in response.Value.Data)
+{
+    string embedding = item.Embedding.ToObjectFromJson<string>();
+    Console.WriteLine($"Index: {item.Index}, Embedding: {embedding}");
+}
+```
diff --git a/sdk/ai/Azure.AI.Inference/samples/Sample1_ChatCompletions.md b/sdk/ai/Azure.AI.Inference/samples/Sample1_ChatCompletions.md
index 6764e60eecfd..12b08f872cca 100644
--- a/sdk/ai/Azure.AI.Inference/samples/Sample1_ChatCompletions.md
+++ b/sdk/ai/Azure.AI.Inference/samples/Sample1_ChatCompletions.md
@@ -14,7 +14,7 @@ Set these two environment variables before running the sample:
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
 var requestOptions = new ChatCompletionsOptions()
 {
@@ -26,7 +26,7 @@ var requestOptions = new ChatCompletionsOptions()
 };
 
 Response<ChatCompletions> response = client.Complete(requestOptions);
-System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+System.Console.WriteLine(response.Value.Content);
 ```
 
 An `async` option is also available.
@@ -35,7 +35,7 @@ An `async` option is also available.
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
 var requestOptions = new ChatCompletionsOptions()
 {
@@ -47,5 +47,5 @@ var requestOptions = new ChatCompletionsOptions()
 };
 
 Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
-System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+System.Console.WriteLine(response.Value.Content);
 ```
diff --git a/sdk/ai/Azure.AI.Inference/samples/Sample2_ChatCompletionsWithAoai.md b/sdk/ai/Azure.AI.Inference/samples/Sample2_ChatCompletionsWithAoai.md
index 54164a175e00..92d69a45595b 100644
--- a/sdk/ai/Azure.AI.Inference/samples/Sample2_ChatCompletionsWithAoai.md
+++ b/sdk/ai/Azure.AI.Inference/samples/Sample2_ChatCompletionsWithAoai.md
@@ -49,7 +49,7 @@ var key = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_CHAT_KEY");
 // the credential object is still required. So create with a dummy value.
 var credential = new AzureKeyCredential("foo");
 
-ChatCompletionsClientOptions clientOptions = new ChatCompletionsClientOptions();
+AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
 clientOptions.AddPolicy(new AddAoaiAuthHeaderPolicy(key), HttpPipelinePosition.PerCall);
 
 var client = new ChatCompletionsClient(endpoint, credential, clientOptions);
@@ -61,7 +61,7 @@ Alternatively, you can use EntraId to authenticate. This does not require the he
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_OPENAI_CHAT_ENDPOINT"));
 var credential = new DefaultAzureCredential(includeInteractiveCredentials: true);
 
-ChatCompletionsClientOptions clientOptions = new ChatCompletionsClientOptions();
+AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
 
 BearerTokenAuthenticationPolicy tokenPolicy = new BearerTokenAuthenticationPolicy(credential, new string[] { "https://cognitiveservices.azure.com/.default" });
 clientOptions.AddPolicy(tokenPolicy, HttpPipelinePosition.PerRetry);
@@ -82,7 +82,7 @@ var requestOptions = new ChatCompletionsOptions()
 };
 
 Response<ChatCompletions> response = client.Complete(requestOptions);
-System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+System.Console.WriteLine(response.Value.Content);
 ```
 
 An `async` option is also available.
@@ -98,5 +98,5 @@ var requestOptions = new ChatCompletionsOptions()
 };
 
 Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
-System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+System.Console.WriteLine(response.Value.Content);
 ```
diff --git a/sdk/ai/Azure.AI.Inference/samples/Sample3_ChatCompletionsStreaming.md b/sdk/ai/Azure.AI.Inference/samples/Sample3_ChatCompletionsStreaming.md
index ecf15e57bf87..81558e6dcb2f 100644
--- a/sdk/ai/Azure.AI.Inference/samples/Sample3_ChatCompletionsStreaming.md
+++ b/sdk/ai/Azure.AI.Inference/samples/Sample3_ChatCompletionsStreaming.md
@@ -14,7 +14,7 @@ Set these two environment variables before running the sample:
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
 var requestOptions = new ChatCompletionsOptions()
 {
@@ -48,7 +48,7 @@ An `async` option is also available for the initial streaming call.
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
 var requestOptions = new ChatCompletionsOptions()
 {
diff --git a/sdk/ai/Azure.AI.Inference/samples/Sample4_ChatCompletionsWithHistory.md b/sdk/ai/Azure.AI.Inference/samples/Sample4_ChatCompletionsWithHistory.md
index 3f3225f27d79..23370dee1955 100644
--- a/sdk/ai/Azure.AI.Inference/samples/Sample4_ChatCompletionsWithHistory.md
+++ b/sdk/ai/Azure.AI.Inference/samples/Sample4_ChatCompletionsWithHistory.md
@@ -14,7 +14,7 @@ Set these two environment variables before running the sample:
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 var messages = new List<ChatRequestMessage>()
 {
     new ChatRequestSystemMessage("You are an AI assistant that helps people find information. Your replies are short, no more than two sentences."),
@@ -24,14 +24,14 @@ var messages = new List<ChatRequestMessage>()
 var requestOptions = new ChatCompletionsOptions(messages);
 
 Response<ChatCompletions> response = client.Complete(requestOptions);
-System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+System.Console.WriteLine(response.Value.Content);
 
-messages.Add(new ChatRequestAssistantMessage(response.Value.Choices[0].Message));
+messages.Add(new ChatRequestAssistantMessage(response.Value));
 messages.Add(new ChatRequestUserMessage("And what was the estimated cost to build it?"));
 
 requestOptions = new ChatCompletionsOptions(messages);
 response = client.Complete(requestOptions);
-System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+System.Console.WriteLine(response.Value.Content);
 ```
 
 An `async` option is also available.
@@ -40,7 +40,7 @@ An `async` option is also available.
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 var messages = new List<ChatRequestMessage>()
 {
     new ChatRequestSystemMessage("You are an AI assistant that helps people find information. Your replies are short, no more than two sentences."),
@@ -50,12 +50,12 @@ var messages = new List<ChatRequestMessage>()
 var requestOptions = new ChatCompletionsOptions(messages);
 
 Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
-System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+System.Console.WriteLine(response.Value.Content);
 
-messages.Add(new ChatRequestAssistantMessage(response.Value.Choices[0].Message));
+messages.Add(new ChatRequestAssistantMessage(response.Value));
 messages.Add(new ChatRequestUserMessage("And what was the estimated cost to build it?"));
 
 requestOptions = new ChatCompletionsOptions(messages);
 response = await client.CompleteAsync(requestOptions);
-System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+System.Console.WriteLine(response.Value.Content);
 ```
diff --git a/sdk/ai/Azure.AI.Inference/samples/Sample5_ChatCompletionsWithImageUrl.md b/sdk/ai/Azure.AI.Inference/samples/Sample5_ChatCompletionsWithImages.md
similarity index 63%
rename from sdk/ai/Azure.AI.Inference/samples/Sample5_ChatCompletionsWithImageUrl.md
rename to sdk/ai/Azure.AI.Inference/samples/Sample5_ChatCompletionsWithImages.md
index b17b2b90134d..13f14fee9dcb 100644
--- a/sdk/ai/Azure.AI.Inference/samples/Sample5_ChatCompletionsWithImageUrl.md
+++ b/sdk/ai/Azure.AI.Inference/samples/Sample5_ChatCompletionsWithImages.md
@@ -1,6 +1,6 @@
-# Chat Completions with an Image URL Input
+# Chat Completions with an Image Input
 
-This sample demonstrates how to get a chat completions response from the service using a synchronous call. It shows how to include an image URL in the input chat messages.
+This sample demonstrates how to get a chat completions response from the service using a synchronous call. It shows different ways to include an image in the input chat messages.
 
 This sample will only work on AI models that support image input.
 
@@ -16,7 +16,7 @@ Set these two environment variables before running the sample:
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
 ChatMessageImageContentItem imageContentItem =
     new ChatMessageImageContentItem(
@@ -36,7 +36,7 @@ var requestOptions = new ChatCompletionsOptions()
 };
 
 Response<ChatCompletions> response = client.Complete(requestOptions);
-System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+System.Console.WriteLine(response.Value.Content);
 ```
 
 An `async` option is also available.
@@ -45,7 +45,7 @@ An `async` option is also available.
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
 ChatMessageImageContentItem imageContentItem =
     new ChatMessageImageContentItem(
@@ -65,5 +65,43 @@ var requestOptions = new ChatCompletionsOptions()
 };
 
 Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
-System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+System.Console.WriteLine(response.Value.Content);
+```
+
+Alternatively, you can provide a Stream object:
+
+```C# Snippet:Azure_AI_Inference_ChatCompletionsWithImageStreamScenario
+Stream imageStream = File.OpenRead("sample_image_path");
+
+ChatMessageImageContentItem imageContentItem =
+    new ChatMessageImageContentItem(
+        imageStream,
+        "image/jpg",
+        ChatMessageImageDetailLevel.Low
+    );
+
+var requestOptions = new ChatCompletionsOptions()
+{
+    Messages =
+    {
+        new ChatRequestSystemMessage("You are a helpful assistant that helps describe images."),
+        new ChatRequestUserMessage(
+            new ChatMessageTextContentItem("describe this image"),
+            imageContentItem),
+    },
+};
+
+Response<ChatCompletions> response = client.Complete(requestOptions);
+System.Console.WriteLine(response.Value.Content);
+```
+
+Or a direct pointer to a file on disk:
+
+```C# Snippet:Azure_AI_Inference_ChatCompletionsWithImagePathScenario
+ChatMessageImageContentItem imageContentItem =
+    new ChatMessageImageContentItem(
+        "sample_image_path",
+        "image/jpg",
+        ChatMessageImageDetailLevel.Low
+    );
 ```
diff --git a/sdk/ai/Azure.AI.Inference/samples/Sample6_ChatCompletionsWithAdditionalProperties.md b/sdk/ai/Azure.AI.Inference/samples/Sample6_ChatCompletionsWithAdditionalProperties.md
index bdd6b165fe87..a84ac304f02f 100644
--- a/sdk/ai/Azure.AI.Inference/samples/Sample6_ChatCompletionsWithAdditionalProperties.md
+++ b/sdk/ai/Azure.AI.Inference/samples/Sample6_ChatCompletionsWithAdditionalProperties.md
@@ -14,7 +14,7 @@ Set these two environment variables before running the sample:
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
 var requestOptions = new ChatCompletionsOptions()
 {
@@ -29,19 +29,13 @@ Response<ChatCompletions> response = client.Complete(requestOptions);
 System.Console.WriteLine(response.Value.Choices[0].Message.Content);
 ```
 
-You can optionally configure the behavior of the service when receiving `AdditionalProperties` using the `extraParams` parameter of the `Complete` method. `ExtraParameters.PassThrough` is the default behavior.
-
-```C# Snippet:Azure_AI_Inference_ChatCompletionsWithAdditionalPropertiesScenarioExtraParams
-response = client.Complete(requestOptions, extraParams: ExtraParameters.PassThrough);
-```
-
 An `async` option is also available.
 
 ```C# Snippet:Azure_AI_Inference_ChatCompletionsWithAdditionalPropertiesScenarioAsync
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
 var requestOptions = new ChatCompletionsOptions()
 {
@@ -55,7 +49,3 @@ var requestOptions = new ChatCompletionsOptions()
 Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
 System.Console.WriteLine(response.Value.Choices[0].Message.Content);
 ```
-
-```C# Snippet:Azure_AI_Inference_ChatCompletionsWithAdditionalPropertiesScenarioExtraParamsAsync
-response = await client.CompleteAsync(requestOptions, extraParams: ExtraParameters.PassThrough);
-```
diff --git a/sdk/ai/Azure.AI.Inference/samples/Sample7_ChatCompletionsWithTools.md b/sdk/ai/Azure.AI.Inference/samples/Sample7_ChatCompletionsWithTools.md
index 59b31f4f4ac5..55c433c972de 100644
--- a/sdk/ai/Azure.AI.Inference/samples/Sample7_ChatCompletionsWithTools.md
+++ b/sdk/ai/Azure.AI.Inference/samples/Sample7_ChatCompletionsWithTools.md
@@ -14,7 +14,7 @@ Set these two environment variables before running the sample:
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
 FunctionDefinition futureTemperatureFunction = new FunctionDefinition("get_future_temperature")
 {
@@ -39,7 +39,7 @@ FunctionDefinition futureTemperatureFunction = new FunctionDefinition("get_futur
     },
     new JsonSerializerOptions() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase })
 };
-ChatCompletionsFunctionToolDefinition functionToolDef = new ChatCompletionsFunctionToolDefinition(futureTemperatureFunction);
+ChatCompletionsToolDefinition functionToolDef = new ChatCompletionsToolDefinition(futureTemperatureFunction);
 
 var requestOptions = new ChatCompletionsOptions()
 {
@@ -52,10 +52,9 @@ var requestOptions = new ChatCompletionsOptions()
 };
 
 Response<ChatCompletions> response = client.Complete(requestOptions);
-System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+System.Console.WriteLine(response.Value.Content);
 
-ChatResponseMessage responseMessage = response.Value.Choices[0].Message;
-ChatCompletionsFunctionToolCall functionToolCall = responseMessage.ToolCalls[0] as ChatCompletionsFunctionToolCall;
+ChatCompletionsToolCall functionToolCall = response.Value.ToolCalls[0];
 
 ChatCompletionsOptions followupOptions = new()
 {
@@ -69,7 +68,7 @@ foreach (ChatRequestMessage originalMessage in requestOptions.Messages)
 }
 
 // Add the tool call message just received back from the assistant
-followupOptions.Messages.Add(new ChatRequestAssistantMessage(responseMessage));
+followupOptions.Messages.Add(new ChatRequestAssistantMessage(response.Value));
 
 // And also the tool message that resolves the tool call
 followupOptions.Messages.Add(new ChatRequestToolMessage(
@@ -77,7 +76,7 @@ followupOptions.Messages.Add(new ChatRequestToolMessage(
     content: "31 celsius"));
 
 Response<ChatCompletions> followupResponse = client.Complete(followupOptions);
-System.Console.WriteLine(followupResponse.Value.Choices[0].Message.Content);
+System.Console.WriteLine(followupResponse.Value.Content);
 ```
 
 An `async` option is also available.
@@ -86,7 +85,7 @@ An `async` option is also available.
 var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
 var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
 
-var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
 FunctionDefinition futureTemperatureFunction = new FunctionDefinition("get_future_temperature")
 {
@@ -111,7 +110,7 @@ FunctionDefinition futureTemperatureFunction = new FunctionDefinition("get_futur
     },
     new JsonSerializerOptions() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase })
 };
-ChatCompletionsFunctionToolDefinition functionToolDef = new ChatCompletionsFunctionToolDefinition(futureTemperatureFunction);
+ChatCompletionsToolDefinition functionToolDef = new ChatCompletionsToolDefinition(futureTemperatureFunction);
 
 var requestOptions = new ChatCompletionsOptions()
 {
@@ -124,10 +123,9 @@ var requestOptions = new ChatCompletionsOptions()
 };
 
 Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
-System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+System.Console.WriteLine(response.Value.Content);
 
-ChatResponseMessage responseMessage = response.Value.Choices[0].Message;
-ChatCompletionsFunctionToolCall functionToolCall = responseMessage.ToolCalls[0] as ChatCompletionsFunctionToolCall;
+ChatCompletionsToolCall functionToolCall = response.Value.ToolCalls[0];
 
 ChatCompletionsOptions followupOptions = new()
 {
@@ -141,7 +139,7 @@ foreach (ChatRequestMessage originalMessage in requestOptions.Messages)
 }
 
 // Add the tool call message just received back from the assistant
-followupOptions.Messages.Add(new ChatRequestAssistantMessage(responseMessage));
+followupOptions.Messages.Add(new ChatRequestAssistantMessage(response.Value));
 
 // And also the tool message that resolves the tool call
 followupOptions.Messages.Add(new ChatRequestToolMessage(
@@ -149,5 +147,5 @@ followupOptions.Messages.Add(new ChatRequestToolMessage(
     content: "31 celsius"));
 
 Response<ChatCompletions> followupResponse = await client.CompleteAsync(followupOptions);
-System.Console.WriteLine(followupResponse.Value.Choices[0].Message.Content);
+System.Console.WriteLine(followupResponse.Value.Content);
 ```
diff --git a/sdk/ai/Azure.AI.Inference/samples/Sample8_ChatCompletionsWithOpenTelemetry.md b/sdk/ai/Azure.AI.Inference/samples/Sample8_ChatCompletionsWithOpenTelemetry.md
index 9ef364484f90..d6d24ef717cb 100644
--- a/sdk/ai/Azure.AI.Inference/samples/Sample8_ChatCompletionsWithOpenTelemetry.md
+++ b/sdk/ai/Azure.AI.Inference/samples/Sample8_ChatCompletionsWithOpenTelemetry.md
@@ -80,7 +80,7 @@ any additional code.
 var client = new ChatCompletionsClient(
     endpoint,
     credential,
-    new ChatCompletionsClientOptions());
+    new AzureAIInferenceClientOptions());
 
 var requestOptions = new ChatCompletionsOptions()
 {
diff --git a/sdk/ai/Azure.AI.Inference/samples/Sample9_Embeddings.md b/sdk/ai/Azure.AI.Inference/samples/Sample9_Embeddings.md
new file mode 100644
index 000000000000..ade0458bd9e1
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/samples/Sample9_Embeddings.md
@@ -0,0 +1,68 @@
+# Simple Embeddings
+
+This sample demonstrates how to get text embeddings for a list of sentences. Here we use the service default of returning embeddings as a list of floating point values.
+
+This sample assumes the AI model is hosted on a Serverless API or Managed Compute endpoint. For GitHub Models or Azure OpenAI endpoints, the client constructor needs to be modified. See package documentation for details.
+
+## Usage
+
+Set these two environment variables before running the sample:
+
+1. AZURE_AI_EMBEDDINGS_ENDPOINT - Your endpoint URL, in the form `https://your-deployment-name.your-azure-region.inference.ai.azure.com` where `your-deployment-name` is your unique AI Model deployment name, and `your-azure-region` is the Azure region where your model is deployed.
+
+2. AZURE_AI_EMBEDDINGS_KEY - Your model key (a 32-character string). Keep it secret.
+
+```C# Snippet:Azure_AI_Inference_BasicEmbedding
+var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_EMBEDDINGS_ENDPOINT"));
+var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_EMBEDDINGS_KEY"));
+
+var client = new EmbeddingsClient(endpoint, credential, new AzureAIInferenceClientOptions());
+
+var input = new List<string> { "King", "Queen", "Jack", "Page" };
+var requestOptions = new EmbeddingsOptions(input);
+
+Response<EmbeddingsResult> response = client.Embed(requestOptions);
+foreach (EmbeddingItem item in response.Value.Data)
+{
+    List<float> embedding = item.Embedding.ToObjectFromJson<List<float>>();
+    Console.WriteLine($"Index: {item.Index}, Embedding: <{string.Join(", ", embedding)}>");
+}
+```
+
+An `async` option is also available.
+
+```C# Snippet:Azure_AI_Inference_BasicEmbeddingAsync
+var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_EMBEDDINGS_ENDPOINT"));
+var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_EMBEDDINGS_KEY"));
+
+var client = new EmbeddingsClient(endpoint, credential, new AzureAIInferenceClientOptions());
+
+var input = new List<string> { "King", "Queen", "Jack", "Page" };
+var requestOptions = new EmbeddingsOptions(input);
+
+Response<EmbeddingsResult> response = await client.EmbedAsync(requestOptions);
+foreach (EmbeddingItem item in response.Value.Data)
+{
+    List<float> embedding = item.Embedding.ToObjectFromJson<List<float>>();
+    Console.WriteLine($"Index: {item.Index}, Embedding: <{string.Join(", ", embedding)}>");
+}
+```
+
+### Alternative Response Type
+
+It is also possible to request embeddings as base64 encoded strings, instead of the service default of lists of floats.
+
+```C# Snippet:Azure_AI_Inference_Base64Embedding
+var input = new List<string> { "King", "Queen", "Jack", "Page" };
+var requestOptions = new EmbeddingsOptions(input)
+{
+    EncodingFormat = EmbeddingEncodingFormat.Base64,
+};
+
+Response<EmbeddingsResult> response = client.Embed(requestOptions);
+foreach (EmbeddingItem item in response.Value.Data)
+{
+    string embedding = item.Embedding.ToObjectFromJson<string>();
+    Console.WriteLine($"Index: {item.Index}, Embedding: {embedding}");
+}
+```
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletions.cs b/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletions.cs
new file mode 100644
index 000000000000..09efdd87d73d
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletions.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using Azure.Core;
+
+namespace Azure.AI.Inference
+{
+    public partial class ChatCompletions
+    {
+        // CUSTOM: Made internal. We only get back a single choice, and instead we flatten the structure for usability.
+        /// <summary> A list of chat completion choices. Can be more than one if `n` is greater than 1. </summary>
+        internal IReadOnlyList<ChatChoice> Choices { get; }
+
+        // CUSTOM: Flattened choice property.
+        /// <summary>
+        /// The reason the model stopped generating tokens. This will be `stop` if the model hit a natural stop point or a provided stop sequence,
+        /// `length` if the maximum number of tokens specified in the request was reached,
+        /// `content_filter` if content was omitted due to a flag from our content filters,
+        /// `tool_calls` if the model called a tool, or `function_call` (deprecated) if the model called a function.
+        /// </summary>
+        public CompletionsFinishReason? FinishReason => Choices[0].FinishReason;
+
+        // CUSTOM: Flattened choice message property.
+        /// <summary>
+        /// The role of the author of this message.
+        /// </summary>
+        public ChatRole Role => Choices[0].Message.Role;
+
+        // CUSTOM: Flattened choice message property.
+        /// <summary>
+        /// The contents of the message.
+        /// </summary>
+        public string Content => Choices[0].Message.Content;
+
+        // CUSTOM: Flattened choice message property.
+        /// <summary>
+        /// The tool calls.
+        /// </summary>
+        public IReadOnlyList<ChatCompletionsToolCall> ToolCalls => Choices[0].Message.ToolCalls;
+
+        /// <summary>
+        /// Returns text representation of the first part of the first choice.
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString() => Content != null ? Content
+            : ToolCalls.Count > 0 ? ModelReaderWriter.Write(ToolCalls[0]).ToString()
+            : null;
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsClient.cs b/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsClient.cs
index e659b8b70201..ae38e6b47cb4 100644
--- a/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsClient.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsClient.cs
@@ -16,8 +16,31 @@ namespace Azure.AI.Inference
     //   Modified code for the ChatCompletionsClient
 
     /// <summary> The ChatCompletions service client. </summary>
+
+    [CodeGenSuppress("Complete", typeof(ChatCompletionsOptions), typeof(ExtraParameters?), typeof(CancellationToken))]
+    [CodeGenSuppress("CompleteAsync", typeof(ChatCompletionsOptions), typeof(ExtraParameters?), typeof(CancellationToken))]
     public partial class ChatCompletionsClient
     {
+        /// <summary> Initializes a new instance of ChatCompletionsClient. </summary>
+        /// <param name="endpoint"> The <see cref="Uri"/> to use. </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 ChatCompletionsClient(Uri endpoint, AzureKeyCredential credential, AzureAIInferenceClientOptions options)
+        {
+            Argument.AssertNotNull(endpoint, nameof(endpoint));
+            Argument.AssertNotNull(credential, nameof(credential));
+            options ??= new AzureAIInferenceClientOptions();
+            credential.Deconstruct(out var key);
+            options.AddPolicy(new AddApiKeyHeaderPolicy(key), HttpPipelinePosition.PerCall);
+
+            ClientDiagnostics = new ClientDiagnostics(options, true);
+            _keyCredential = credential;
+            _pipeline = HttpPipelineBuilder.Build(options, Array.Empty<HttpPipelinePolicy>(), new HttpPipelinePolicy[] { new AzureKeyCredentialPolicy(_keyCredential, AuthorizationHeader, AuthorizationApiKeyPrefix) }, new ResponseClassifier());
+            _endpoint = endpoint;
+            _apiVersion = options.Version;
+        }
+
         /// <summary>
         /// Gets chat completions for the provided chat messages.
         /// Completions support a wide variety of tasks and generate text that continues from or "completes"
@@ -29,15 +52,12 @@ public partial class ChatCompletionsClient
         /// Completions support a wide variety of tasks and generate text that continues from or "completes"
         /// provided prompt data.
         /// </param>
-        /// <param name="extraParams">
-        /// Controls what happens if extra parameters are passed in the JSON request payload.
-        /// This sets the HTTP request header `extra-parameters`.
-        /// </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="chatCompletionsOptions"/> is null. </exception>
-        public virtual async Task<Response<ChatCompletions>> CompleteAsync(ChatCompletionsOptions chatCompletionsOptions, ExtraParameters? extraParams = null, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<ChatCompletions>> CompleteAsync(ChatCompletionsOptions chatCompletionsOptions, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(chatCompletionsOptions, nameof(chatCompletionsOptions));
+            ExtraParameters? extraParams = null;
 
             // CUSTOM CODE NOTE:
             //   If AdditionalProperties are provided, the decision has been made to default extraParams to "PassThrough"
@@ -76,15 +96,12 @@ public virtual async Task<Response<ChatCompletions>> CompleteAsync(ChatCompletio
         /// Completions support a wide variety of tasks and generate text that continues from or "completes"
         /// provided prompt data.
         /// </param>
-        /// <param name="extraParams">
-        /// Controls what happens if extra parameters are passed in the JSON request payload.
-        /// This sets the HTTP request header `extra-parameters`.
-        /// </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="chatCompletionsOptions"/> is null. </exception>
-        public virtual Response<ChatCompletions> Complete(ChatCompletionsOptions chatCompletionsOptions, ExtraParameters? extraParams = null, CancellationToken cancellationToken = default)
+        public virtual Response<ChatCompletions> Complete(ChatCompletionsOptions chatCompletionsOptions, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(chatCompletionsOptions, nameof(chatCompletionsOptions));
+            ExtraParameters? extraParams = null;
 
             // CUSTOM CODE NOTE:
             //   If AdditionalProperties are provided, the decision has been made to default extraParams to "PassThrough"
@@ -227,6 +244,90 @@ public virtual StreamingResponse<StreamingChatCompletionsUpdate> CompleteStreami
                         ));
         }
 
+        /// <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. The method makes a REST API call to the `/chat/completions` route
+        /// on the given 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="CompleteAsync(ChatCompletionsOptions,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="extraParams"> The <see cref="string"/> to use. Allowed values: "error" | "drop" | "pass-through". </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> CompleteAsync(RequestContent content, string extraParams = null, RequestContext context = null)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("ChatCompletionsClient.Complete");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCompleteRequest(content, extraParams, 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. The method makes a REST API call to the `/chat/completions` route
+        /// on the given 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="Complete(ChatCompletionsOptions,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="extraParams"> The <see cref="string"/> to use. Allowed values: "error" | "drop" | "pass-through". </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 Complete(RequestContent content, string extraParams = null, RequestContext context = null)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("ChatCompletionsClient.Complete");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateCompleteRequest(content, extraParams, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
         internal HttpMessage CreatePostRequestMessage(
             ChatCompletionsOptions chatCompletionsOptions,
             RequestContent content,
@@ -254,5 +355,31 @@ internal HttpMessage CreatePostRequestMessage(
             request.Content = content;
             return message;
         }
+
+        private class AddApiKeyHeaderPolicy : HttpPipelinePolicy
+        {
+            public string Token { get; }
+
+            public AddApiKeyHeaderPolicy(string token)
+            {
+                Token = token;
+            }
+
+            public override void Process(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
+            {
+                // Add your desired header name and value
+                message.Request.Headers.Add("api-key", Token);
+
+                ProcessNext(message, pipeline);
+            }
+
+            public override ValueTask ProcessAsync(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
+            {
+                // Add your desired header name and value
+                message.Request.Headers.Add("api-key", Token);
+
+                return ProcessNextAsync(message, pipeline);
+            }
+        }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsFunctionToolCall.cs b/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsFunctionToolCall.cs
deleted file mode 100644
index d3022cfc3555..000000000000
--- a/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsFunctionToolCall.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-namespace Azure.AI.Inference
-{
-    public partial class ChatCompletionsFunctionToolCall : ChatCompletionsToolCall
-    {
-        // CUSTOM CODE NOTE:
-        //   This code allows the concrete tool call type to directly pass through use of its underlying function
-        //   rather than having a separate layer of indirection.
-
-        /// <inheritdoc cref="FunctionCall.Name"/>
-        public string Name
-        {
-            get => Function.Name;
-            set => Function.Name = value;
-        }
-
-        /// <inheritdoc cref="FunctionCall.Arguments"/>
-        public string Arguments
-        {
-            get => Function.Arguments;
-            set => Function.Arguments = value;
-        }
-
-        internal FunctionCall Function { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of <see cref="ChatCompletionsFunctionToolCall"/>.
-        /// </summary>
-        /// <param name="id"> The ID of the function tool call. </param>
-        /// <param name="name"> The name of the function that is called by the tool. </param>
-        /// <param name="arguments"> The arguments to the function that is called by the tool. </param>
-        /// <remarks>
-        /// This constructor is intended for use with <see cref="ChatRequestAssistantMessage"/> when constructing request
-        /// messages for conversation history from accumulated streaming tool call updates.
-        /// </remarks>
-        public ChatCompletionsFunctionToolCall(string id, string name, string arguments) : base(id)
-        {
-            Argument.AssertNotNull(name, nameof(name));
-            Argument.AssertNotNull(arguments, nameof(arguments));
-            Type = "function";
-            Function = new(name, arguments);
-        }
-    }
-}
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsOptions.cs b/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsOptions.cs
index 1498870da8bd..7c7c8257a42d 100644
--- a/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsOptions.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsOptions.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Collections.Generic;
 using Azure.Core;
 
 namespace Azure.AI.Inference
@@ -32,6 +33,16 @@ public partial class ChatCompletionsOptions
         /// <summary> A value indicating whether chat completions should be streamed for this request. </summary>
         internal bool? InternalShouldStreamResponse { get; set; }
 
+        /// <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="ChatRequestSystemMessage"/>, <see cref="ChatRequestToolMessage"/> and <see cref="ChatRequestUserMessage"/>.
+        /// </summary>
+        public IList<ChatRequestMessage> Messages { get; set; }
+
         /// <summary> Initializes a new instance of <see cref="ChatCompletionsOptions"/>. </summary>
         public ChatCompletionsOptions()
         {
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsToolCall.cs b/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsToolCall.cs
new file mode 100644
index 000000000000..3142e7fdfbc6
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsToolCall.cs
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+
+namespace Azure.AI.Inference
+{
+    public partial class ChatCompletionsToolCall
+    {
+        // CUSTOM CODE NOTE:
+        //   This code allows the concrete tool call type to directly pass through use of its underlying function
+        //   rather than having a separate layer of indirection.
+
+        /// <inheritdoc cref="FunctionCall.Name"/>
+        public string Name
+        {
+            get => Function.Name;
+            set => Function.Name = value;
+        }
+
+        /// <inheritdoc cref="FunctionCall.Arguments"/>
+        public string Arguments
+        {
+            get => Function.Arguments;
+            set => Function.Arguments = value;
+        }
+
+        /// <summary> Creates a new <see cref="ChatCompletionsToolCall"/> representing a function call made by the model. </summary>
+        /// <param name="toolCallId"> The ID of the tool call. </param>
+        /// <param name="functionName"> The name of the function that model is calling. </param>
+        /// <param name="functionArguments">
+        ///     The arguments that model is calling the function with, which are 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="toolCallId"/>, <paramref name="functionName"/> or <paramref name="functionArguments"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="toolCallId"/>, <paramref name="functionName"/> or <paramref name="functionArguments"/> is an empty string, and was expected to be non-empty. </exception>
+        public static ChatCompletionsToolCall CreateFunctionToolCall(string toolCallId, string functionName, string functionArguments)
+        {
+            Argument.AssertNotNullOrEmpty(toolCallId, nameof(toolCallId));
+            Argument.AssertNotNullOrEmpty(functionName, nameof(functionName));
+            Argument.AssertNotNullOrEmpty(functionArguments, nameof(functionArguments));
+
+            FunctionCall function = new(functionName, functionArguments);
+
+            return new(
+                id: toolCallId,
+                type: ChatCompletionsToolCallType.Function,
+                function: function,
+                serializedAdditionalRawData: null);
+        }
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsToolChoice.cs b/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsToolChoice.cs
index 256efdf93035..91aef699f619 100644
--- a/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsToolChoice.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsToolChoice.cs
@@ -21,7 +21,7 @@ namespace Azure.AI.Inference
     ///     determine if, and which, tools should be called instead of generating a message.
     /// </item>
     /// <item>
-    ///     Providing a <see cref="FunctionDefinition"/> or <see cref="ChatCompletionsFunctionToolDefinition"/> will
+    ///     Providing a <see cref="FunctionDefinition"/> or <see cref="ChatCompletionsToolDefinition"/> will
     ///     request that the model constrains its response to only calling the specified function tool.
     /// </item>
     /// </list>
@@ -30,22 +30,21 @@ namespace Azure.AI.Inference
     /// </remarks>
     public partial class ChatCompletionsToolChoice
     {
-        /// <inheritdoc cref="ChatCompletionsToolSelectionPreset.Auto"/>
-        public static readonly ChatCompletionsToolChoice Auto = new(ChatCompletionsToolSelectionPreset.Auto);
+        /// <inheritdoc cref="ChatCompletionsToolChoicePreset.Auto"/>
+        public static readonly ChatCompletionsToolChoice Auto = new(ChatCompletionsToolChoicePreset.Auto);
 
-        /// <inheritdoc cref="ChatCompletionsToolSelectionPreset.None"/>
-        public static readonly ChatCompletionsToolChoice None = new(ChatCompletionsToolSelectionPreset.None);
+        /// <inheritdoc cref="ChatCompletionsToolChoicePreset.None"/>
+        public static readonly ChatCompletionsToolChoice None = new(ChatCompletionsToolChoicePreset.None);
 
-        /// <inheritdoc cref="ChatCompletionsToolSelectionPreset.Required"/>
-        public static readonly ChatCompletionsToolChoice Required = new(ChatCompletionsToolSelectionPreset.Required);
+        /// <inheritdoc cref="ChatCompletionsToolChoicePreset.Required"/>
+        public static readonly ChatCompletionsToolChoice Required = new(ChatCompletionsToolChoicePreset.Required);
 
         public static implicit operator ChatCompletionsToolChoice(FunctionDefinition functionDefinition)
         {
             return new(functionDefinition);
         }
 
-        public static implicit operator ChatCompletionsToolChoice(
-            ChatCompletionsFunctionToolDefinition functionToolDefinition)
+        public static implicit operator ChatCompletionsToolChoice(ChatCompletionsToolDefinition functionToolDefinition)
         {
             return new(functionToolDefinition);
         }
@@ -74,25 +73,25 @@ public ChatCompletionsToolChoice(FunctionDefinition functionDefinition)
         /// <see cref="FunctionDefinition"/>.
         /// </summary>
         /// <param name="functionToolDefinition">
-        ///     A <see cref="ChatCompletionsFunctionToolDefinition"/> with a name that matches the function tool to which
+        ///     A <see cref="ChatCompletionsToolDefinition"/> with a name that matches the function tool to which
         ///     model responses should be constrained.
         /// </param>
         /// <exception cref="ArgumentNullException">
         ///     <paramref name="functionToolDefinition"/> is null.
         /// </exception>
-        public ChatCompletionsToolChoice(ChatCompletionsFunctionToolDefinition functionToolDefinition)
+        public ChatCompletionsToolChoice(ChatCompletionsToolDefinition functionToolDefinition)
         {
             Argument.AssertNotNull(functionToolDefinition, nameof(functionToolDefinition));
             Function = functionToolDefinition.Function;
         }
 
-        internal ChatCompletionsToolChoice(ChatCompletionsToolSelectionPreset preset)
+        internal ChatCompletionsToolChoice(ChatCompletionsToolChoicePreset preset)
         {
             Preset = preset;
         }
 
         internal FunctionDefinition Function { get; }
 
-        internal ChatCompletionsToolSelectionPreset Preset { get; }
+        internal ChatCompletionsToolChoicePreset Preset { get; }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsFunctionToolDefinition.cs b/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsToolDefinition.cs
similarity index 75%
rename from sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsFunctionToolDefinition.cs
rename to sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsToolDefinition.cs
index 6199e7668c13..5b0aec561597 100644
--- a/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsFunctionToolDefinition.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/ChatCompletionsToolDefinition.cs
@@ -2,19 +2,15 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Collections.Generic;
 
 namespace Azure.AI.Inference {
-    public partial class ChatCompletionsFunctionToolDefinition : ChatCompletionsToolDefinition
+    public partial class ChatCompletionsToolDefinition
     {
         // CUSTOM CODE NOTE:
         //   This code allows the concrete tool type to directly pass through use of its underlying function
         //   definition rather than having a separate layer of indirection.
 
-        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolDefinition"/>. </summary>
-        public ChatCompletionsFunctionToolDefinition()
-            : this(new FunctionDefinition())
-        { }
-
         /// <inheritdoc cref="FunctionDefinition.Name"/>
         public string Name
         {
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/ChatMessageImageContentItem.cs b/sdk/ai/Azure.AI.Inference/src/Customized/ChatMessageImageContentItem.cs
index 17a5a532081c..e0eef284b2d0 100644
--- a/sdk/ai/Azure.AI.Inference/src/Customized/ChatMessageImageContentItem.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/ChatMessageImageContentItem.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Runtime.InteropServices.ComTypes;
 
 namespace Azure.AI.Inference
 {
@@ -50,6 +51,21 @@ public ChatMessageImageContentItem(Stream stream, string mimeType, ChatMessageIm
             : this(new ChatMessageImageUrl(stream, mimeType, detailLevel))
         { }
 
+        /// <summary>
+        /// Initializes a new instance of ChatMessageImageContentItem from a file pointer to an image
+        /// in a known format.
+        /// </summary>
+        /// <param name="imageFilePath"> The path to the image to use. </param>
+        /// <param name="mimeType"> The MIME type, e.g. <c>image/png</c>, matching the format of the image data. </param>
+        /// <param name="detailLevel"> The image detail level the model should use when evaluating the image. </param>
+        public ChatMessageImageContentItem(string imageFilePath, string mimeType, ChatMessageImageDetailLevel? detailLevel = null)
+        {
+            Stream fileStream = File.OpenRead(imageFilePath);
+
+            Type = "image_url";
+            ImageUrl = new ChatMessageImageUrl(fileStream, mimeType, detailLevel);
+        }
+
         /// <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>
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/ChatRequestAssistantMessage.cs b/sdk/ai/Azure.AI.Inference/src/Customized/ChatRequestAssistantMessage.cs
index 86018f4e0626..685533f8ff56 100644
--- a/sdk/ai/Azure.AI.Inference/src/Customized/ChatRequestAssistantMessage.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/ChatRequestAssistantMessage.cs
@@ -2,34 +2,93 @@
 // Licensed under the MIT License.
 
 using System;
+using Azure.Core;
+using System.Collections.Generic;
 
 namespace Azure.AI.Inference
 {
-    public partial class ChatRequestAssistantMessage
+    public partial class ChatRequestAssistantMessage : ChatRequestMessage
     {
         /// <summary>
-        /// Initializes a new instance of <see cref="ChatRequestAssistantMessage"/> from a prior <see cref="ChatResponseMessage"/>
-        /// instance from the Assistant.
+        /// Creates a new instance of <see cref="ChatRequestAssistantMessage"/> that represents ordinary text content and
+        /// does not feature tool or function calls.
         /// </summary>
-        /// <param name="responseMessage"> The <see cref="ChatResponseMessage"/> to replicate from. </param>
+        /// <param name="content"> The text content of the message. </param>
+        public ChatRequestAssistantMessage(string content)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            Role = ChatRole.Assistant;
+            Content = content;
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="ChatRequestAssistantMessage"/> that represents <c>tool_calls</c> that
+        /// were provided by the model.
+        /// </summary>
+        /// <param name="toolCalls"> The <c>tool_calls</c> made by the model. </param>
+        /// <param name="content"> Optional text content associated with the message. </param>
+        public ChatRequestAssistantMessage(IEnumerable<ChatCompletionsToolCall> toolCalls, string content = null)
+        {
+            Argument.AssertNotNull(toolCalls, nameof(toolCalls));
+
+            Role = ChatRole.Assistant;
+            Content = content;
+
+            foreach (ChatCompletionsToolCall toolCall in toolCalls)
+            {
+                ToolCalls.Add(toolCall);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new instance of <see cref="ChatRequestAssistantMessage"/> from a <see cref="ChatCompletions"/> with
+        /// an <c>assistant</c> role response.
+        /// </summary>
+        /// <remarks>
+        ///     This constructor will copy the <c>content</c>, <c>tool_calls</c>, and <c>function_call</c> from a chat
+        ///     completion response into a new <c>assistant</c> role request message.
+        /// </remarks>
+        /// <param name="chatCompletions">
+        ///     The <see cref="ChatCompletions"/> from which the conversation history request message should be created.
+        /// </param>
         /// <exception cref="ArgumentException">
-        ///     <paramref name="responseMessage"/> is not a valid response message to use.
+        ///     The <c>role</c> of the provided chat completion response was not <see cref="ChatRole.Assistant"/>.
         /// </exception>
-        public ChatRequestAssistantMessage(ChatResponseMessage responseMessage)
+        public ChatRequestAssistantMessage(ChatCompletions chatCompletions)
         {
-            if (responseMessage.Role != ChatRole.Assistant)
+            Argument.AssertNotNull(chatCompletions, nameof(chatCompletions));
+
+            if (chatCompletions.Role != ChatRole.Assistant)
             {
-                throw new ArgumentException($"Assistant message request messages may only be instantiated from response "
-                    + $"message instances of the Assistant role.");
+                throw new NotSupportedException($"Cannot instantiate an {nameof(ChatRequestAssistantMessage)} from a {nameof(ChatCompletions)} with role: {chatCompletions.Role}.");
             }
 
             Role = ChatRole.Assistant;
-            Content = responseMessage.Content;
-            ToolCalls = new ChangeTrackingList<ChatCompletionsToolCall>();
-            foreach (ChatCompletionsToolCall chatCompletionsToolCall in responseMessage.ToolCalls)
+            Content = chatCompletions.Content;
+
+            if (chatCompletions.ToolCalls != null)
             {
-                ToolCalls.Add(chatCompletionsToolCall);
+                foreach (ChatCompletionsToolCall toolCall in chatCompletions.ToolCalls)
+                {
+                    ToolCalls.Add(toolCall);
+                }
             }
         }
+
+        // CUSTOM: Renamed.
+        /// <summary>
+        /// An optional <c>name</c> associated with the assistant message. This is typically defined with a <c>system</c>
+        /// message and is used to differentiate between multiple participants of the same role.
+        /// </summary>
+        [CodeGenMember("Name")]
+        public string ParticipantName { get; set; }
+
+        // CUSTOM: Common initialization for input model collection property.
+        [CodeGenMember("ToolCalls")]
+        public IList<ChatCompletionsToolCall> ToolCalls { get; } = new ChangeTrackingList<ChatCompletionsToolCall>();
+
+        // CUSTOM: Made internal.
+        internal ChatRequestAssistantMessage() { }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/EmbeddingEncodingFormat.cs b/sdk/ai/Azure.AI.Inference/src/Customized/EmbeddingEncodingFormat.cs
new file mode 100644
index 000000000000..aee50afbdd23
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/EmbeddingEncodingFormat.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.ComponentModel;
+using Azure.Core;
+
+namespace Azure.AI.Inference
+{
+    /// <summary>
+    /// The format of the embeddings result.
+    /// Returns a 422 error if the model doesn't support the value or parameter.
+    /// </summary>
+    public readonly partial struct EmbeddingEncodingFormat : IEquatable<EmbeddingEncodingFormat>
+    {
+        /// <summary> Floating point. </summary>
+        [CodeGenMember("Float")]
+        public static EmbeddingEncodingFormat Single { get; } = new EmbeddingEncodingFormat(SingleValue);
+        /// <summary> Signed 8-bit integer. </summary>
+        [CodeGenMember("Int8")]
+        public static EmbeddingEncodingFormat SByte { get; } = new EmbeddingEncodingFormat(SByteValue);
+        /// <summary> Unsigned 8-bit integer. </summary>
+        [CodeGenMember("Uint8")]
+        public static EmbeddingEncodingFormat Byte { get; } = new EmbeddingEncodingFormat(ByteValue);
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/EmbeddingsClient.cs b/sdk/ai/Azure.AI.Inference/src/Customized/EmbeddingsClient.cs
new file mode 100644
index 000000000000..a332c531f8da
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/EmbeddingsClient.cs
@@ -0,0 +1,208 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using System.Threading;
+using Azure.Core;
+using Azure.Core.Pipeline;
+
+namespace Azure.AI.Inference
+{
+    // CUSTOM CODE NOTE:
+    //   Modified code for the ChatCompletionsClient
+
+    /// <summary> The Embeddings service client. </summary>
+    [CodeGenSuppress("Embed", typeof(EmbeddingsOptions), typeof(ExtraParameters?), typeof(CancellationToken))]
+    [CodeGenSuppress("EmbedAsync", typeof(EmbeddingsOptions), typeof(ExtraParameters?), typeof(CancellationToken))]
+    public partial class EmbeddingsClient
+    {
+        /// <summary> Initializes a new instance of EmbeddingsClient. </summary>
+        /// <param name="endpoint"> The <see cref="Uri"/> to use. </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 EmbeddingsClient(Uri endpoint, AzureKeyCredential credential, AzureAIInferenceClientOptions options)
+        {
+            Argument.AssertNotNull(endpoint, nameof(endpoint));
+            Argument.AssertNotNull(credential, nameof(credential));
+            options ??= new AzureAIInferenceClientOptions();
+            credential.Deconstruct(out var key);
+            options.AddPolicy(new AddApiKeyHeaderPolicy(key), HttpPipelinePosition.PerCall);
+
+            ClientDiagnostics = new ClientDiagnostics(options, true);
+            _keyCredential = credential;
+            _pipeline = HttpPipelineBuilder.Build(options, Array.Empty<HttpPipelinePolicy>(), new HttpPipelinePolicy[] { new AzureKeyCredentialPolicy(_keyCredential, AuthorizationHeader, AuthorizationApiKeyPrefix) }, new ResponseClassifier());
+            _endpoint = endpoint;
+            _apiVersion = options.Version;
+        }
+
+        /// <summary>
+        /// Return the embedding vectors for given text prompts.
+        /// The method makes a REST API call to the `/embeddings` route on the given endpoint.
+        /// </summary>
+        /// <param name="embeddingsOptions"></param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="embeddingsOptions"/> is null. </exception>
+        /// <include file="../Generated/Docs/EmbeddingsClient.xml" path="doc/members/member[@name='EmbedAsync(EmbeddingsOptions,ExtraParameters?,CancellationToken)']/*" />
+        public virtual async Task<Response<EmbeddingsResult>> EmbedAsync(EmbeddingsOptions embeddingsOptions, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNull(embeddingsOptions, nameof(embeddingsOptions));
+            ExtraParameters? extraParams = null;
+
+            // CUSTOM CODE NOTE:
+            //   If AdditionalProperties are provided, the decision has been made to default extraParams to "PassThrough"
+            if (embeddingsOptions.AdditionalProperties != null && embeddingsOptions.AdditionalProperties.Count > 0)
+            {
+                extraParams ??= ExtraParameters.PassThrough;
+            }
+
+            using RequestContent content = embeddingsOptions.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await EmbedAsync(content, extraParams?.ToString(), context).ConfigureAwait(false);
+            return Response.FromValue(EmbeddingsResult.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// Return the embedding vectors for given text prompts.
+        /// The method makes a REST API call to the `/embeddings` route on the given endpoint.
+        /// </summary>
+        /// <param name="embeddingsOptions"></param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="embeddingsOptions"/> is null. </exception>
+        /// <include file="../Generated/Docs/EmbeddingsClient.xml" path="doc/members/member[@name='Embed(EmbeddingsOptions,ExtraParameters?,CancellationToken)']/*" />
+        public virtual Response<EmbeddingsResult> Embed(EmbeddingsOptions embeddingsOptions, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNull(embeddingsOptions, nameof(embeddingsOptions));
+            ExtraParameters? extraParams = null;
+
+            // CUSTOM CODE NOTE:
+            //   If AdditionalProperties are provided, the decision has been made to default extraParams to "PassThrough"
+            if (embeddingsOptions.AdditionalProperties != null && embeddingsOptions.AdditionalProperties.Count > 0)
+            {
+                extraParams ??= ExtraParameters.PassThrough;
+            }
+
+            using RequestContent content = embeddingsOptions.ToRequestContent();
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = Embed(content, extraParams?.ToString(), context);
+            return Response.FromValue(EmbeddingsResult.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Return the embedding vectors for given text prompts.
+        /// The method makes a REST API call to the `/embeddings` route on the given 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="EmbedAsync(EmbeddingsOptions,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="extraParams">
+        /// Controls what happens if extra parameters, undefined by the REST API,
+        /// are passed in the JSON request payload.
+        /// This sets the HTTP request header `extra-parameters`. Allowed values: "error" | "drop" | "pass-through"
+        /// </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>
+        public virtual async Task<Response> EmbedAsync(RequestContent content, string extraParams = null, RequestContext context = null)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("EmbeddingsClient.Embed");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateEmbedRequest(content, extraParams, context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Return the embedding vectors for given text prompts.
+        /// The method makes a REST API call to the `/embeddings` route on the given 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="Embed(EmbeddingsOptions,CancellationToken)"/> convenience overload with strongly typed models first.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="content"> The content to send as the body of the request. </param>
+        /// <param name="extraParams">
+        /// Controls what happens if extra parameters, undefined by the REST API,
+        /// are passed in the JSON request payload.
+        /// This sets the HTTP request header `extra-parameters`. Allowed values: "error" | "drop" | "pass-through"
+        /// </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>
+        public virtual Response Embed(RequestContent content, string extraParams = null, RequestContext context = null)
+        {
+            Argument.AssertNotNull(content, nameof(content));
+
+            using var scope = ClientDiagnostics.CreateScope("EmbeddingsClient.Embed");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateEmbedRequest(content, extraParams, context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        private class AddApiKeyHeaderPolicy : HttpPipelinePolicy
+        {
+            public string Token { get; }
+
+            public AddApiKeyHeaderPolicy(string token)
+            {
+                Token = token;
+            }
+
+            public override void Process(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
+            {
+                // Add your desired header name and value
+                message.Request.Headers.Add("api-key", Token);
+
+                ProcessNext(message, pipeline);
+            }
+
+            public override ValueTask ProcessAsync(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
+            {
+                // Add your desired header name and value
+                message.Request.Headers.Add("api-key", Token);
+
+                return ProcessNextAsync(message, pipeline);
+            }
+        }
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/FunctionDefinition.cs b/sdk/ai/Azure.AI.Inference/src/Customized/FunctionDefinition.cs
index 0e0ce3234e82..445b94493478 100644
--- a/sdk/ai/Azure.AI.Inference/src/Customized/FunctionDefinition.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/FunctionDefinition.cs
@@ -10,17 +10,17 @@ public partial class FunctionDefinition
         //     accessible setters
         //   - These changes merge "presets" into static class members for ease of use
 
-        /// <inheritdoc cref="ChatCompletionsToolSelectionPreset.Auto"/>
+        /// <inheritdoc cref="ChatCompletionsToolChoicePreset.Auto"/>
         public static FunctionDefinition Auto
-            = CreatePredefinedFunctionDefinition(ChatCompletionsToolSelectionPreset.Auto.ToString());
+            = CreatePredefinedFunctionDefinition(ChatCompletionsToolChoicePreset.Auto.ToString());
 
-        /// <inheritdoc cref="ChatCompletionsToolSelectionPreset.None"/>
+        /// <inheritdoc cref="ChatCompletionsToolChoicePreset.None"/>
         public static FunctionDefinition None
-            = CreatePredefinedFunctionDefinition(ChatCompletionsToolSelectionPreset.None.ToString());
+            = CreatePredefinedFunctionDefinition(ChatCompletionsToolChoicePreset.None.ToString());
 
-        /// <inheritdoc cref="ChatCompletionsToolSelectionPreset.Required"/>
+        /// <inheritdoc cref="ChatCompletionsToolChoicePreset.Required"/>
         public static FunctionDefinition Required
-            = CreatePredefinedFunctionDefinition(ChatCompletionsToolSelectionPreset.Required.ToString());
+            = CreatePredefinedFunctionDefinition(ChatCompletionsToolChoicePreset.Required.ToString());
 
         /// <summary>
         /// Initializes a new instance of FunctionDefinition.
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatChoiceUpdate.cs b/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatChoiceUpdate.cs
new file mode 100644
index 000000000000..96b43fea7307
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatChoiceUpdate.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+
+namespace Azure.AI.Inference
+{
+    /// <summary>
+    /// Represents an update to a single prompt completion when the service is streaming updates
+    /// using Server Sent Events (SSE).
+    /// 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 StreamingChatChoiceUpdate
+    {
+        /// <summary> An update to the chat message for a given chat completions prompt. </summary>
+        public StreamingChatResponseMessageUpdate Delta { get; } = StreamingChatResponseMessageUpdate.Empty;
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatCompletionsUpdate.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatCompletionsUpdate.Serialization.cs
index 04b32dc0be8c..2f97192aa84b 100644
--- a/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatCompletionsUpdate.Serialization.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatCompletionsUpdate.Serialization.cs
@@ -26,7 +26,7 @@ internal static List<StreamingChatCompletionsUpdate> DeserializeStreamingChatCom
             string model = default;
             DateTimeOffset created = default;
             string systemFingerprint = null;
-            List<StreamingChoiceData> choiceEntries = new();
+            List<StreamingChatChoiceUpdate> choiceEntries = new();
             CompletionsUsage completionsUsage = null;
 
             foreach (JsonProperty property in element.EnumerateObject())
@@ -55,7 +55,7 @@ internal static List<StreamingChatCompletionsUpdate> DeserializeStreamingChatCom
                 {
                     foreach (JsonElement choiceElement in property.Value.EnumerateArray())
                     {
-                        choiceEntries.Add(StreamingChoiceData.DeserializeStreamingChoiceData(choiceElement));
+                        choiceEntries.Add(StreamingChatChoiceUpdate.DeserializeStreamingChatChoiceUpdate(choiceElement));
                     }
                 }
                 if (property.NameEquals("usage"u8))
@@ -67,7 +67,7 @@ internal static List<StreamingChatCompletionsUpdate> DeserializeStreamingChatCom
             // If a chunk has no choices, we infer an empty one to aid traversal/expansion
             if (choiceEntries.Count == 0)
             {
-                choiceEntries.Add(StreamingChoiceData.Empty);
+                choiceEntries.Add(new StreamingChatChoiceUpdate());
             }
 
             // We inflate the possible combination of information into one StreamingChatCompletionsUpdate per tool
@@ -75,20 +75,17 @@ internal static List<StreamingChatCompletionsUpdate> DeserializeStreamingChatCom
 
             List<StreamingChatCompletionsUpdate> results = new();
 
-            foreach (StreamingChoiceData choiceData in choiceEntries)
+            foreach (StreamingChatChoiceUpdate choiceData in choiceEntries)
             {
-                foreach (StreamingToolCallUpdate toolCallUpdate in choiceData.Delta.ToolCallUpdates)
+                foreach (StreamingChatResponseToolCallUpdate toolCallUpdate in choiceData.Delta.ToolCalls)
                 {
                     results.Add(new(
                         id,
                         model,
                         created,
                         choiceData.Delta.Role,
-                        choiceData.Delta.AuthorName,
-                        choiceData.Delta.ContentUpdate,
+                        choiceData.Delta.Content,
                         choiceData.FinishReason,
-                        choiceData.Delta.FunctionName,
-                        choiceData.Delta.FunctionArgumentsUpdate,
                         toolCallUpdate,
                         completionsUsage
                         ));
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatCompletionsUpdate.cs b/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatCompletionsUpdate.cs
index aff136743809..fb0963157b22 100644
--- a/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatCompletionsUpdate.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatCompletionsUpdate.cs
@@ -68,65 +68,19 @@ public partial class StreamingChatCompletionsUpdate
         /// </remarks>
         public string ContentUpdate { get; }
 
-        /// <summary>
-        /// Gets the name of a function to be called.
-        /// </summary>
-        /// <remarks>
-        /// Corresponds to e.g. $.choices[0].delta.function_call.name in the underlying REST schema.
-        /// </remarks>
-        public string FunctionName { get; }
-
-        /// <summary>
-        /// Gets a function arguments fragment associated with this update.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// Corresponds to e.g. $.choices[0].delta.function_call.arguments in the underlying REST schema.
-        /// </para>
-        ///
-        /// <para>
-        /// Each update contains only a small number of tokens. When presenting or reconstituting a full, streamed
-        /// arguments body, all <see cref="FunctionArgumentsUpdate"/> values for the same index should be combined.
-        /// </para>
-        ///
-        /// <para>
-        /// As is the case for non-streaming <see cref="FunctionCall.Arguments"/>, the content provided for function
-        /// arguments is not guaranteed to be well-formed JSON or to contain expected data. Callers should validate
-        /// function arguments before using them.
-        /// </para>
-        /// </remarks>
-        public string FunctionArgumentsUpdate { get; }
-
         /// <summary>
         /// An incremental update payload for a tool call that is part of this response.
         /// </summary>
         /// <remarks>
         /// <para>
-        /// Corresponds to e.g. $.choices[0].delta.tool_calls[0].index in the REST API schema.
+        /// Corresponds to e.g. $.choices[0].delta.tool_calls[0] in the REST API schema.
         /// </para>
         /// <para>
         /// To differentiate between parallel streaming tool calls within a single streaming choice, use the value of the
-        /// <see cref="StreamingToolCallUpdate.ToolCallIndex"/> property.
-        /// </para>
-        /// <para>
-        /// Please note <see cref="StreamingToolCallUpdate"/> 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="StreamingFunctionToolCallUpdate"/>.
-        /// </para>
-        /// </remarks>
-        public StreamingToolCallUpdate ToolCallUpdate { get; }
-
-        /// <summary>
-        /// Gets an optional name associated with the role of the streamed Chat Completion, typically as previously
-        /// specified in a system message.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// Corresponds to e.g. $.choices[0].delta.name in the underlying REST schema.
+        /// <see cref="StreamingChatResponseToolCallUpdate.Id"/> property.
         /// </para>
         /// </remarks>
-        public string AuthorName { get; }
+        public StreamingChatResponseToolCallUpdate ToolCallUpdate { get; }
 
         /// <summary>
         /// Gets the <see cref="CompletionsFinishReason"/> associated with this update.
@@ -147,23 +101,17 @@ internal StreamingChatCompletionsUpdate(
             string model,
             DateTimeOffset created,
             ChatRole? role = null,
-            string authorName = null,
             string contentUpdate = null,
             CompletionsFinishReason? finishReason = null,
-            string functionName = null,
-            string functionArgumentsUpdate = null,
-            StreamingToolCallUpdate toolCallUpdate = null,
+            StreamingChatResponseToolCallUpdate toolCallUpdate = null,
             CompletionsUsage usage = null)
         {
             Id = id;
             Model = model;
             Created = created;
             Role = role;
-            AuthorName = authorName;
             ContentUpdate = contentUpdate;
             FinishReason = finishReason;
-            FunctionName = functionName;
-            FunctionArgumentsUpdate = functionArgumentsUpdate;
             ToolCallUpdate = toolCallUpdate;
             Usage = usage;
         }
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatResponseMessageUpdate.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatResponseMessageUpdate.Serialization.cs
new file mode 100644
index 000000000000..711f21fec968
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatResponseMessageUpdate.Serialization.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.Core;
+
+namespace Azure.AI.Inference
+{
+    public partial class StreamingChatResponseMessageUpdate : IUtf8JsonSerializable, IJsonModel<StreamingChatResponseMessageUpdate>
+    {
+        internal static StreamingChatResponseMessageUpdate DeserializeStreamingChatResponseMessageUpdate(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            ChatRole? role = default;
+            string content = default;
+            List<StreamingChatResponseToolCallUpdate> toolCalls = new List<StreamingChatResponseToolCallUpdate>();
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                if (property.NameEquals("role"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    role = new ChatRole(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("content"u8))
+                {
+                    content = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("tool_calls"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<StreamingChatResponseToolCallUpdate> array = new List<StreamingChatResponseToolCallUpdate>();
+                    foreach (var item in property.Value.EnumerateArray())
+                    {
+                        array.Add(StreamingChatResponseToolCallUpdate.DeserializeStreamingChatResponseToolCallUpdate(item, options));
+                    }
+                    toolCalls = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                }
+            }
+            serializedAdditionalRawData = rawDataDictionary;
+
+            if (toolCalls.Count == 0)
+            {
+                toolCalls.Add(null);
+            }
+
+            return new StreamingChatResponseMessageUpdate(role, content, toolCalls, serializedAdditionalRawData);
+        }
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatResponseMessageUpdate.cs b/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatResponseMessageUpdate.cs
new file mode 100644
index 000000000000..bd792264ad07
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Customized/StreamingChatResponseMessageUpdate.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using static Azure.AI.Inference.StreamingChatCompletionsUpdate;
+
+namespace Azure.AI.Inference
+{
+    /// <summary> A representation of a chat message update as received in a streaming response. </summary>
+    public partial class StreamingChatResponseMessageUpdate
+    {
+        /// <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.
+        /// </summary>
+        public IReadOnlyList<StreamingChatResponseToolCallUpdate> ToolCalls { get; set; } = new List<StreamingChatResponseToolCallUpdate>();
+
+        internal static StreamingChatResponseMessageUpdate Empty { get; } = new()
+        {
+            ToolCalls = new List<StreamingChatResponseToolCallUpdate>() { null },
+        };
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/AIInferenceClientBuilderExtensions.cs b/sdk/ai/Azure.AI.Inference/src/Generated/AIInferenceClientBuilderExtensions.cs
index 3348bd6a13c2..5ef054431019 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/AIInferenceClientBuilderExtensions.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/AIInferenceClientBuilderExtensions.cs
@@ -12,35 +12,62 @@
 
 namespace Microsoft.Extensions.Azure
 {
-    /// <summary> Extension methods to add <see cref="ChatCompletionsClient"/> to client builder. </summary>
+    /// <summary> Extension methods to add <see cref="ChatCompletionsClient"/>, <see cref="EmbeddingsClient"/> to client builder. </summary>
     public static partial class AIInferenceClientBuilderExtensions
     {
         /// <summary> Registers a <see cref="ChatCompletionsClient"/> instance. </summary>
         /// <param name="builder"> The builder to register with. </param>
         /// <param name="endpoint"> Service host. </param>
         /// <param name="credential"> A credential used to authenticate to an Azure Service. </param>
-        public static IAzureClientBuilder<ChatCompletionsClient, ChatCompletionsClientOptions> AddChatCompletionsClient<TBuilder>(this TBuilder builder, Uri endpoint, AzureKeyCredential credential)
+        public static IAzureClientBuilder<ChatCompletionsClient, AzureAIInferenceClientOptions> AddChatCompletionsClient<TBuilder>(this TBuilder builder, Uri endpoint, AzureKeyCredential credential)
         where TBuilder : IAzureClientFactoryBuilder
         {
-            return builder.RegisterClientFactory<ChatCompletionsClient, ChatCompletionsClientOptions>((options) => new ChatCompletionsClient(endpoint, credential, options));
+            return builder.RegisterClientFactory<ChatCompletionsClient, AzureAIInferenceClientOptions>((options) => new ChatCompletionsClient(endpoint, credential, options));
         }
 
         /// <summary> Registers a <see cref="ChatCompletionsClient"/> instance. </summary>
         /// <param name="builder"> The builder to register with. </param>
         /// <param name="endpoint"> Service host. </param>
-        public static IAzureClientBuilder<ChatCompletionsClient, ChatCompletionsClientOptions> AddChatCompletionsClient<TBuilder>(this TBuilder builder, Uri endpoint)
+        public static IAzureClientBuilder<ChatCompletionsClient, AzureAIInferenceClientOptions> AddChatCompletionsClient<TBuilder>(this TBuilder builder, Uri endpoint)
         where TBuilder : IAzureClientFactoryBuilderWithCredential
         {
-            return builder.RegisterClientFactory<ChatCompletionsClient, ChatCompletionsClientOptions>((options, cred) => new ChatCompletionsClient(endpoint, cred, options));
+            return builder.RegisterClientFactory<ChatCompletionsClient, AzureAIInferenceClientOptions>((options, cred) => new ChatCompletionsClient(endpoint, cred, options));
+        }
+
+        /// <summary> Registers a <see cref="EmbeddingsClient"/> instance. </summary>
+        /// <param name="builder"> The builder to register with. </param>
+        /// <param name="endpoint"> Service host. </param>
+        /// <param name="credential"> A credential used to authenticate to an Azure Service. </param>
+        public static IAzureClientBuilder<EmbeddingsClient, AzureAIInferenceClientOptions> AddEmbeddingsClient<TBuilder>(this TBuilder builder, Uri endpoint, AzureKeyCredential credential)
+        where TBuilder : IAzureClientFactoryBuilder
+        {
+            return builder.RegisterClientFactory<EmbeddingsClient, AzureAIInferenceClientOptions>((options) => new EmbeddingsClient(endpoint, credential, options));
+        }
+
+        /// <summary> Registers a <see cref="EmbeddingsClient"/> instance. </summary>
+        /// <param name="builder"> The builder to register with. </param>
+        /// <param name="endpoint"> Service host. </param>
+        public static IAzureClientBuilder<EmbeddingsClient, AzureAIInferenceClientOptions> AddEmbeddingsClient<TBuilder>(this TBuilder builder, Uri endpoint)
+        where TBuilder : IAzureClientFactoryBuilderWithCredential
+        {
+            return builder.RegisterClientFactory<EmbeddingsClient, AzureAIInferenceClientOptions>((options, cred) => new EmbeddingsClient(endpoint, cred, options));
         }
 
         /// <summary> Registers a <see cref="ChatCompletionsClient"/> instance. </summary>
         /// <param name="builder"> The builder to register with. </param>
         /// <param name="configuration"> The configuration values. </param>
-        public static IAzureClientBuilder<ChatCompletionsClient, ChatCompletionsClientOptions> AddChatCompletionsClient<TBuilder, TConfiguration>(this TBuilder builder, TConfiguration configuration)
+        public static IAzureClientBuilder<ChatCompletionsClient, AzureAIInferenceClientOptions> AddChatCompletionsClient<TBuilder, TConfiguration>(this TBuilder builder, TConfiguration configuration)
+        where TBuilder : IAzureClientFactoryBuilderWithConfiguration<TConfiguration>
+        {
+            return builder.RegisterClientFactory<ChatCompletionsClient, AzureAIInferenceClientOptions>(configuration);
+        }
+        /// <summary> Registers a <see cref="EmbeddingsClient"/> instance. </summary>
+        /// <param name="builder"> The builder to register with. </param>
+        /// <param name="configuration"> The configuration values. </param>
+        public static IAzureClientBuilder<EmbeddingsClient, AzureAIInferenceClientOptions> AddEmbeddingsClient<TBuilder, TConfiguration>(this TBuilder builder, TConfiguration configuration)
         where TBuilder : IAzureClientFactoryBuilderWithConfiguration<TConfiguration>
         {
-            return builder.RegisterClientFactory<ChatCompletionsClient, ChatCompletionsClientOptions>(configuration);
+            return builder.RegisterClientFactory<EmbeddingsClient, AzureAIInferenceClientOptions>(configuration);
         }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/AIInferenceModelFactory.cs b/sdk/ai/Azure.AI.Inference/src/Generated/AIInferenceModelFactory.cs
index ac2d15b79149..b69b4ab3c432 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/AIInferenceModelFactory.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/AIInferenceModelFactory.cs
@@ -30,6 +30,16 @@ public static ChatMessageTextContentItem ChatMessageTextContentItem(string text
             return new ChatMessageTextContentItem("text", serializedAdditionalRawData: null, text);
         }
 
+        /// <summary> Initializes a new instance of <see cref="Inference.ChatCompletionsToolCall"/>. </summary>
+        /// <param name="id"> The ID of the tool call. </param>
+        /// <param name="type"> The type of tool call. Currently, only `function` is supported. </param>
+        /// <param name="function"> The details of the function call requested by the AI model. </param>
+        /// <returns> A new <see cref="Inference.ChatCompletionsToolCall"/> instance for mocking. </returns>
+        public static ChatCompletionsToolCall ChatCompletionsToolCall(string id = null, ChatCompletionsToolCallType type = default, FunctionCall function = null)
+        {
+            return new ChatCompletionsToolCall(id, type, function, serializedAdditionalRawData: null);
+        }
+
         /// <summary> Initializes a new instance of <see cref="Inference.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>
@@ -39,47 +49,22 @@ public static ChatRequestToolMessage ChatRequestToolMessage(string content = nul
             return new ChatRequestToolMessage(ChatRole.Tool, serializedAdditionalRawData: null, content, toolCallId);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Inference.ChatCompletionsFunctionToolDefinition"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Inference.ChatCompletionsToolDefinition"/>. </summary>
+        /// <param name="type"> The type of the tool. Currently, only `function` is supported. </param>
         /// <param name="function"> The function definition details for the function tool. </param>
-        /// <returns> A new <see cref="Inference.ChatCompletionsFunctionToolDefinition"/> instance for mocking. </returns>
-        public static ChatCompletionsFunctionToolDefinition ChatCompletionsFunctionToolDefinition(FunctionDefinition function = null)
+        /// <returns> A new <see cref="Inference.ChatCompletionsToolDefinition"/> instance for mocking. </returns>
+        public static ChatCompletionsToolDefinition ChatCompletionsToolDefinition(ChatCompletionsToolDefinitionType type = default, FunctionDefinition function = null)
         {
-            return new ChatCompletionsFunctionToolDefinition("function", serializedAdditionalRawData: null, function);
+            return new ChatCompletionsToolDefinition(type, function, serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Inference.ChatCompletionsNamedFunctionToolSelection"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Inference.ChatCompletionsNamedToolChoice"/>. </summary>
+        /// <param name="type"> The type of the tool. Currently, only `function` is supported. </param>
         /// <param name="function"> The function that should be called. </param>
-        /// <returns> A new <see cref="Inference.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="Inference.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="model"> The model used for the chat completion. </param>
-        /// <param name="usage"> Usage information for tokens processed and generated as part of this completions operation. </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>
-        /// <returns> A new <see cref="Inference.ChatCompletions"/> instance for mocking. </returns>
-        public static ChatCompletions ChatCompletions(string id = null, DateTimeOffset created = default, string model = null, CompletionsUsage usage = null, IEnumerable<ChatChoice> choices = null)
+        /// <returns> A new <see cref="Inference.ChatCompletionsNamedToolChoice"/> instance for mocking. </returns>
+        public static ChatCompletionsNamedToolChoice ChatCompletionsNamedToolChoice(ChatCompletionsNamedToolChoiceType type = default, ChatCompletionsNamedToolChoiceFunction function = null)
         {
-            choices ??= new List<ChatChoice>();
-
-            return new ChatCompletions(
-                id,
-                created,
-                model,
-                usage,
-                choices?.ToList(),
-                serializedAdditionalRawData: null);
+            return new ChatCompletionsNamedToolChoice(type, function, serializedAdditionalRawData: null);
         }
 
         /// <summary> Initializes a new instance of <see cref="Inference.CompletionsUsage"/>. </summary>
@@ -108,8 +93,6 @@ public static ChatChoice ChatChoice(int index = default, CompletionsFinishReason
         /// <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>
         /// <returns> A new <see cref="Inference.ChatResponseMessage"/> instance for mocking. </returns>
         public static ChatResponseMessage ChatResponseMessage(ChatRole role = default, string content = null, IEnumerable<ChatCompletionsToolCall> toolCalls = null)
@@ -129,6 +112,43 @@ public static ModelInfo ModelInfo(string modelName = null, ModelType modelType =
             return new ModelInfo(modelName, modelType, modelProviderName, serializedAdditionalRawData: null);
         }
 
+        /// <summary> Initializes a new instance of <see cref="Inference.EmbeddingsResult"/>. </summary>
+        /// <param name="id"> Unique identifier for the embeddings result. </param>
+        /// <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="model"> The model ID used to generate this result. </param>
+        /// <returns> A new <see cref="Inference.EmbeddingsResult"/> instance for mocking. </returns>
+        public static EmbeddingsResult EmbeddingsResult(string id = null, IEnumerable<EmbeddingItem> data = null, EmbeddingsUsage usage = null, string model = null)
+        {
+            data ??= new List<EmbeddingItem>();
+
+            return new EmbeddingsResult(id, data?.ToList(), usage, model, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Inference.EmbeddingItem"/>. </summary>
+        /// <param name="embedding">
+        /// List of embedding values for the input prompt. These represent a measurement of the
+        /// vector-based relatedness of the provided input. Or a base64 encoded string of the embedding vector.
+        /// </param>
+        /// <param name="index"> Index of the prompt to which the EmbeddingItem corresponds. </param>
+        /// <returns> A new <see cref="Inference.EmbeddingItem"/> instance for mocking. </returns>
+        public static EmbeddingItem EmbeddingItem(BinaryData embedding = null, int index = default)
+        {
+            return new EmbeddingItem(embedding, index, serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Inference.EmbeddingsUsage"/>. </summary>
+        /// <param name="promptTokens"> Number of tokens in the request. </param>
+        /// <param name="totalTokens">
+        /// Total number of tokens transacted in this request/response. Should equal the
+        /// number of tokens in the request.
+        /// </param>
+        /// <returns> A new <see cref="Inference.EmbeddingsUsage"/> instance for mocking. </returns>
+        public static EmbeddingsUsage EmbeddingsUsage(int promptTokens = default, int totalTokens = default)
+        {
+            return new EmbeddingsUsage(promptTokens, totalTokens, serializedAdditionalRawData: null);
+        }
+
         /// <summary> Initializes a new instance of <see cref="Inference.StreamingChatCompletionsUpdate"/>. </summary>
         /// <param name="id"> A unique identifier associated with this chat completions response. </param>
         /// <param name="created">
@@ -161,9 +181,33 @@ public static StreamingChatCompletionsUpdate StreamingChatCompletionsUpdate(stri
         /// <param name="finishReason"> The reason that this chat completions choice completed its generated. </param>
         /// <param name="delta"> An update to the chat message for a given chat completions prompt. </param>
         /// <returns> A new <see cref="Inference.StreamingChatChoiceUpdate"/> instance for mocking. </returns>
-        public static StreamingChatChoiceUpdate StreamingChatChoiceUpdate(int index = default, CompletionsFinishReason? finishReason = null, ChatResponseMessage delta = null)
+        public static StreamingChatChoiceUpdate StreamingChatChoiceUpdate(int index = default, CompletionsFinishReason? finishReason = null, StreamingChatResponseMessageUpdate delta = null)
         {
             return new StreamingChatChoiceUpdate(index, finishReason, delta, serializedAdditionalRawData: null);
         }
+
+        /// <summary> Initializes a new instance of <see cref="Inference.StreamingChatResponseMessageUpdate"/>. </summary>
+        /// <param name="role"> The chat role associated with the message. If present, should always be 'assistant'. </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.
+        /// </param>
+        /// <returns> A new <see cref="Inference.StreamingChatResponseMessageUpdate"/> instance for mocking. </returns>
+        public static StreamingChatResponseMessageUpdate StreamingChatResponseMessageUpdate(ChatRole? role = null, string content = null, IEnumerable<StreamingChatResponseToolCallUpdate> toolCalls = null)
+        {
+            toolCalls ??= new List<StreamingChatResponseToolCallUpdate>();
+
+            return new StreamingChatResponseMessageUpdate(role, content, toolCalls?.ToList(), serializedAdditionalRawData: null);
+        }
+
+        /// <summary> Initializes a new instance of <see cref="Inference.StreamingChatResponseToolCallUpdate"/>. </summary>
+        /// <param name="id"> The ID of the tool call. </param>
+        /// <param name="function"> Updates to the function call requested by the AI model. </param>
+        /// <returns> A new <see cref="Inference.StreamingChatResponseToolCallUpdate"/> instance for mocking. </returns>
+        public static StreamingChatResponseToolCallUpdate StreamingChatResponseToolCallUpdate(string id = null, FunctionCall function = null)
+        {
+            return new StreamingChatResponseToolCallUpdate(id, function, serializedAdditionalRawData: null);
+        }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsClientOptions.cs b/sdk/ai/Azure.AI.Inference/src/Generated/AzureAIInferenceClientOptions.cs
similarity index 70%
rename from sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsClientOptions.cs
rename to sdk/ai/Azure.AI.Inference/src/Generated/AzureAIInferenceClientOptions.cs
index e68f1c4ec7fb..46dcb4716cad 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsClientOptions.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/AzureAIInferenceClientOptions.cs
@@ -10,8 +10,8 @@
 
 namespace Azure.AI.Inference
 {
-    /// <summary> Client options for ChatCompletionsClient. </summary>
-    public partial class ChatCompletionsClientOptions : ClientOptions
+    /// <summary> Client options for Azure.AI.Inference library clients. </summary>
+    public partial class AzureAIInferenceClientOptions : ClientOptions
     {
         private const ServiceVersion LatestVersion = ServiceVersion.V2024_05_01_Preview;
 
@@ -24,8 +24,8 @@ public enum ServiceVersion
 
         internal string Version { get; }
 
-        /// <summary> Initializes new instance of ChatCompletionsClientOptions. </summary>
-        public ChatCompletionsClientOptions(ServiceVersion version = LatestVersion)
+        /// <summary> Initializes new instance of AzureAIInferenceClientOptions. </summary>
+        public AzureAIInferenceClientOptions(ServiceVersion version = LatestVersion)
         {
             Version = version switch
             {
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletions.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletions.Serialization.cs
index b0b5616558df..903d8e9cdb94 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletions.Serialization.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletions.Serialization.cs
@@ -38,7 +38,7 @@ void IJsonModel<ChatCompletions>.Write(Utf8JsonWriter writer, ModelReaderWriterO
             writer.WriteStartArray();
             foreach (var item in Choices)
             {
-                writer.WriteObjectValue(item, options);
+                writer.WriteObjectValue<ChatChoice>(item, options);
             }
             writer.WriteEndArray();
             if (options.Format != "W" && _serializedAdditionalRawData != null)
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletions.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletions.cs
index bff7645a4563..1861a3df65f8 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletions.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletions.cs
@@ -118,11 +118,5 @@ internal ChatCompletions()
         public string Model { get; }
         /// <summary> Usage information for tokens processed and generated as part of this completions operation. </summary>
         public CompletionsUsage Usage { 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; }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsClient.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsClient.cs
index ec0f78d16f1c..89ce6729a893 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsClient.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsClient.cs
@@ -42,7 +42,7 @@ protected ChatCompletionsClient()
         /// <param name="endpoint"> Service host. </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 ChatCompletionsClient(Uri endpoint, AzureKeyCredential credential) : this(endpoint, credential, new ChatCompletionsClientOptions())
+        public ChatCompletionsClient(Uri endpoint, AzureKeyCredential credential) : this(endpoint, credential, new AzureAIInferenceClientOptions())
         {
         }
 
@@ -50,7 +50,7 @@ protected ChatCompletionsClient()
         /// <param name="endpoint"> Service host. </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 ChatCompletionsClient(Uri endpoint, TokenCredential credential) : this(endpoint, credential, new ChatCompletionsClientOptions())
+        public ChatCompletionsClient(Uri endpoint, TokenCredential credential) : this(endpoint, credential, new AzureAIInferenceClientOptions())
         {
         }
 
@@ -59,29 +59,11 @@ protected ChatCompletionsClient()
         /// <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 ChatCompletionsClient(Uri endpoint, AzureKeyCredential credential, ChatCompletionsClientOptions options)
+        public ChatCompletionsClient(Uri endpoint, TokenCredential credential, AzureAIInferenceClientOptions options)
         {
             Argument.AssertNotNull(endpoint, nameof(endpoint));
             Argument.AssertNotNull(credential, nameof(credential));
-            options ??= new ChatCompletionsClientOptions();
-
-            ClientDiagnostics = new ClientDiagnostics(options, true);
-            _keyCredential = credential;
-            _pipeline = HttpPipelineBuilder.Build(options, Array.Empty<HttpPipelinePolicy>(), new HttpPipelinePolicy[] { new AzureKeyCredentialPolicy(_keyCredential, AuthorizationHeader, AuthorizationApiKeyPrefix) }, new ResponseClassifier());
-            _endpoint = endpoint;
-            _apiVersion = options.Version;
-        }
-
-        /// <summary> Initializes a new instance of ChatCompletionsClient. </summary>
-        /// <param name="endpoint"> Service host. </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 ChatCompletionsClient(Uri endpoint, TokenCredential credential, ChatCompletionsClientOptions options)
-        {
-            Argument.AssertNotNull(endpoint, nameof(endpoint));
-            Argument.AssertNotNull(credential, nameof(credential));
-            options ??= new ChatCompletionsClientOptions();
+            options ??= new AzureAIInferenceClientOptions();
 
             ClientDiagnostics = new ClientDiagnostics(options, true);
             _tokenCredential = credential;
@@ -90,93 +72,11 @@ public ChatCompletionsClient(Uri endpoint, TokenCredential credential, ChatCompl
             _apiVersion = options.Version;
         }
 
-        /// <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. The method makes a REST API call to the `/chat/completions` route
-        /// on the given 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="CompleteAsync(ChatCompletionsOptions,ExtraParameters?,CancellationToken)"/> convenience overload with strongly typed models first.
-        /// </description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="content"> The content to send as the body of the request. </param>
-        /// <param name="extraParams"> The <see cref="string"/> to use. Allowed values: "error" | "drop" | "pass-through". </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> CompleteAsync(RequestContent content, string extraParams = null, RequestContext context = null)
-        {
-            Argument.AssertNotNull(content, nameof(content));
-
-            using var scope = ClientDiagnostics.CreateScope("ChatCompletionsClient.Complete");
-            scope.Start();
-            try
-            {
-                using HttpMessage message = CreateCompleteRequest(content, extraParams, 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. The method makes a REST API call to the `/chat/completions` route
-        /// on the given 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="Complete(ChatCompletionsOptions,ExtraParameters?,CancellationToken)"/> convenience overload with strongly typed models first.
-        /// </description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="content"> The content to send as the body of the request. </param>
-        /// <param name="extraParams"> The <see cref="string"/> to use. Allowed values: "error" | "drop" | "pass-through". </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 Complete(RequestContent content, string extraParams = null, RequestContext context = null)
-        {
-            Argument.AssertNotNull(content, nameof(content));
-
-            using var scope = ClientDiagnostics.CreateScope("ChatCompletionsClient.Complete");
-            scope.Start();
-            try
-            {
-                using HttpMessage message = CreateCompleteRequest(content, extraParams, context);
-                return _pipeline.ProcessMessage(message, context);
-            }
-            catch (Exception e)
-            {
-                scope.Failed(e);
-                throw;
-            }
-        }
-
         /// <summary>
         /// Returns information about the AI model.
         /// The method makes a REST API call to the `/info` route on the given endpoint.
+        /// This method will only work when using Serverless API or Managed Compute endpoint.
+        /// It will not work for GitHub Models endpoint or Azure OpenAI endpoint.
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <include file="Docs/ChatCompletionsClient.xml" path="doc/members/member[@name='GetModelInfoAsync(CancellationToken)']/*" />
@@ -190,6 +90,8 @@ public virtual async Task<Response<ModelInfo>> GetModelInfoAsync(CancellationTok
         /// <summary>
         /// Returns information about the AI model.
         /// The method makes a REST API call to the `/info` route on the given endpoint.
+        /// This method will only work when using Serverless API or Managed Compute endpoint.
+        /// It will not work for GitHub Models endpoint or Azure OpenAI endpoint.
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <include file="Docs/ChatCompletionsClient.xml" path="doc/members/member[@name='GetModelInfo(CancellationToken)']/*" />
@@ -203,6 +105,8 @@ public virtual Response<ModelInfo> GetModelInfo(CancellationToken cancellationTo
         /// <summary>
         /// [Protocol Method] Returns information about the AI model.
         /// The method makes a REST API call to the `/info` route on the given endpoint.
+        /// This method will only work when using Serverless API or Managed Compute endpoint.
+        /// It will not work for GitHub Models endpoint or Azure OpenAI endpoint.
         /// <list type="bullet">
         /// <item>
         /// <description>
@@ -239,6 +143,8 @@ public virtual async Task<Response> GetModelInfoAsync(RequestContext context)
         /// <summary>
         /// [Protocol Method] Returns information about the AI model.
         /// The method makes a REST API call to the `/info` route on the given endpoint.
+        /// This method will only work when using Serverless API or Managed Compute endpoint.
+        /// It will not work for GitHub Models endpoint or Azure OpenAI endpoint.
         /// <list type="bullet">
         /// <item>
         /// <description>
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolCall.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolCall.cs
deleted file mode 100644
index 1092f6ab4297..000000000000
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolCall.cs
+++ /dev/null
@@ -1,47 +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.Inference
-{
-    /// <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()
-        {
-        }
-    }
-}
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolDefinition.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolDefinition.cs
deleted file mode 100644
index d719101dfc61..000000000000
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolDefinition.cs
+++ /dev/null
@@ -1,39 +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.Inference
-{
-    /// <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(FunctionDefinition 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, FunctionDefinition function) : base(type, serializedAdditionalRawData)
-        {
-            Function = function;
-        }
-
-        /// <summary> The function definition details for the function tool. </summary>
-        public FunctionDefinition Function { get; }
-    }
-}
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedFunctionToolSelection.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedFunctionToolSelection.Serialization.cs
deleted file mode 100644
index 96cea7708042..000000000000
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedFunctionToolSelection.Serialization.cs
+++ /dev/null
@@ -1,143 +0,0 @@
-// 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.Inference
-{
-    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/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedFunctionToolSelection.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedFunctionToolSelection.cs
deleted file mode 100644
index b6f3d48262b2..000000000000
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedFunctionToolSelection.cs
+++ /dev/null
@@ -1,44 +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.Inference
-{
-    /// <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/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolDefinition.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoice.Serialization.cs
similarity index 58%
rename from sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolDefinition.Serialization.cs
rename to sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoice.Serialization.cs
index 637a0ded9872..0a675eb3e901 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolDefinition.Serialization.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoice.Serialization.cs
@@ -13,23 +13,23 @@
 
 namespace Azure.AI.Inference
 {
-    public partial class ChatCompletionsFunctionToolDefinition : IUtf8JsonSerializable, IJsonModel<ChatCompletionsFunctionToolDefinition>
+    public partial class ChatCompletionsNamedToolChoice : IUtf8JsonSerializable, IJsonModel<ChatCompletionsNamedToolChoice>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsFunctionToolDefinition>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsNamedToolChoice>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<ChatCompletionsFunctionToolDefinition>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<ChatCompletionsNamedToolChoice>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolChoice>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolDefinition)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(ChatCompletionsNamedToolChoice)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
             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)
@@ -48,19 +48,19 @@ void IJsonModel<ChatCompletionsFunctionToolDefinition>.Write(Utf8JsonWriter writ
             writer.WriteEndObject();
         }
 
-        ChatCompletionsFunctionToolDefinition IJsonModel<ChatCompletionsFunctionToolDefinition>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        ChatCompletionsNamedToolChoice IJsonModel<ChatCompletionsNamedToolChoice>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolChoice>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolDefinition)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(ChatCompletionsNamedToolChoice)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeChatCompletionsFunctionToolDefinition(document.RootElement, options);
+            return DeserializeChatCompletionsNamedToolChoice(document.RootElement, options);
         }
 
-        internal static ChatCompletionsFunctionToolDefinition DeserializeChatCompletionsFunctionToolDefinition(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static ChatCompletionsNamedToolChoice DeserializeChatCompletionsNamedToolChoice(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -68,20 +68,20 @@ internal static ChatCompletionsFunctionToolDefinition DeserializeChatCompletions
             {
                 return null;
             }
-            FunctionDefinition function = default;
-            string type = default;
+            ChatCompletionsNamedToolChoiceType type = default;
+            ChatCompletionsNamedToolChoiceFunction function = 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.NameEquals("type"u8))
                 {
-                    function = FunctionDefinition.DeserializeFunctionDefinition(property.Value, options);
+                    type = new ChatCompletionsNamedToolChoiceType(property.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("type"u8))
+                if (property.NameEquals("function"u8))
                 {
-                    type = property.Value.GetString();
+                    function = ChatCompletionsNamedToolChoiceFunction.DeserializeChatCompletionsNamedToolChoiceFunction(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
@@ -90,50 +90,50 @@ internal static ChatCompletionsFunctionToolDefinition DeserializeChatCompletions
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new ChatCompletionsFunctionToolDefinition(type, serializedAdditionalRawData, function);
+            return new ChatCompletionsNamedToolChoice(type, function, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<ChatCompletionsFunctionToolDefinition>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<ChatCompletionsNamedToolChoice>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolChoice>)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.");
+                    throw new FormatException($"The model {nameof(ChatCompletionsNamedToolChoice)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ChatCompletionsFunctionToolDefinition IPersistableModel<ChatCompletionsFunctionToolDefinition>.Create(BinaryData data, ModelReaderWriterOptions options)
+        ChatCompletionsNamedToolChoice IPersistableModel<ChatCompletionsNamedToolChoice>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolChoice>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeChatCompletionsFunctionToolDefinition(document.RootElement, options);
+                        return DeserializeChatCompletionsNamedToolChoice(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolDefinition)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ChatCompletionsNamedToolChoice)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ChatCompletionsFunctionToolDefinition>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ChatCompletionsNamedToolChoice>.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)
+        internal static ChatCompletionsNamedToolChoice FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeChatCompletionsFunctionToolDefinition(document.RootElement);
+            return DeserializeChatCompletionsNamedToolChoice(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
+        internal virtual RequestContent ToRequestContent()
         {
             var content = new Utf8JsonRequestContent();
             content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoice.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoice.cs
new file mode 100644
index 000000000000..7c8d17876b52
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoice.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.Inference
+{
+    /// <summary> A tool selection of a specific, named function tool that will limit chat completions to using the named function. </summary>
+    public partial class ChatCompletionsNamedToolChoice
+    {
+        /// <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="ChatCompletionsNamedToolChoice"/>. </summary>
+        /// <param name="function"> The function that should be called. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="function"/> is null. </exception>
+        public ChatCompletionsNamedToolChoice(ChatCompletionsNamedToolChoiceFunction function)
+        {
+            Argument.AssertNotNull(function, nameof(function));
+
+            Function = function;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsNamedToolChoice"/>. </summary>
+        /// <param name="type"> The type of the tool. Currently, only `function` is supported. </param>
+        /// <param name="function"> The function that should be called. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal ChatCompletionsNamedToolChoice(ChatCompletionsNamedToolChoiceType type, ChatCompletionsNamedToolChoiceFunction function, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Type = type;
+            Function = function;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsNamedToolChoice"/> for deserialization. </summary>
+        internal ChatCompletionsNamedToolChoice()
+        {
+        }
+
+        /// <summary> The type of the tool. Currently, only `function` is supported. </summary>
+        public ChatCompletionsNamedToolChoiceType Type { get; } = ChatCompletionsNamedToolChoiceType.Function;
+
+        /// <summary> The function that should be called. </summary>
+        public ChatCompletionsNamedToolChoiceFunction Function { get; }
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolSelection.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoiceFunction.Serialization.cs
similarity index 61%
rename from sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolSelection.Serialization.cs
rename to sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoiceFunction.Serialization.cs
index 027b88cab389..4481e25d2789 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolSelection.Serialization.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoiceFunction.Serialization.cs
@@ -13,16 +13,16 @@
 
 namespace Azure.AI.Inference
 {
-    public partial class ChatCompletionsFunctionToolSelection : IUtf8JsonSerializable, IJsonModel<ChatCompletionsFunctionToolSelection>
+    public partial class ChatCompletionsNamedToolChoiceFunction : IUtf8JsonSerializable, IJsonModel<ChatCompletionsNamedToolChoiceFunction>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsFunctionToolSelection>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsNamedToolChoiceFunction>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<ChatCompletionsFunctionToolSelection>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<ChatCompletionsNamedToolChoiceFunction>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolChoiceFunction>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolSelection)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(ChatCompletionsNamedToolChoiceFunction)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
@@ -46,19 +46,19 @@ void IJsonModel<ChatCompletionsFunctionToolSelection>.Write(Utf8JsonWriter write
             writer.WriteEndObject();
         }
 
-        ChatCompletionsFunctionToolSelection IJsonModel<ChatCompletionsFunctionToolSelection>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        ChatCompletionsNamedToolChoiceFunction IJsonModel<ChatCompletionsNamedToolChoiceFunction>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolChoiceFunction>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolSelection)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(ChatCompletionsNamedToolChoiceFunction)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeChatCompletionsFunctionToolSelection(document.RootElement, options);
+            return DeserializeChatCompletionsNamedToolChoiceFunction(document.RootElement, options);
         }
 
-        internal static ChatCompletionsFunctionToolSelection DeserializeChatCompletionsFunctionToolSelection(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static ChatCompletionsNamedToolChoiceFunction DeserializeChatCompletionsNamedToolChoiceFunction(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -82,46 +82,46 @@ internal static ChatCompletionsFunctionToolSelection DeserializeChatCompletionsF
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new ChatCompletionsFunctionToolSelection(name, serializedAdditionalRawData);
+            return new ChatCompletionsNamedToolChoiceFunction(name, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<ChatCompletionsFunctionToolSelection>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<ChatCompletionsNamedToolChoiceFunction>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolChoiceFunction>)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.");
+                    throw new FormatException($"The model {nameof(ChatCompletionsNamedToolChoiceFunction)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ChatCompletionsFunctionToolSelection IPersistableModel<ChatCompletionsFunctionToolSelection>.Create(BinaryData data, ModelReaderWriterOptions options)
+        ChatCompletionsNamedToolChoiceFunction IPersistableModel<ChatCompletionsNamedToolChoiceFunction>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolChoiceFunction>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeChatCompletionsFunctionToolSelection(document.RootElement, options);
+                        return DeserializeChatCompletionsNamedToolChoiceFunction(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolSelection)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ChatCompletionsNamedToolChoiceFunction)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ChatCompletionsFunctionToolSelection>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ChatCompletionsNamedToolChoiceFunction>.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)
+        internal static ChatCompletionsNamedToolChoiceFunction FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeChatCompletionsFunctionToolSelection(document.RootElement);
+            return DeserializeChatCompletionsNamedToolChoiceFunction(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolSelection.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoiceFunction.cs
similarity index 84%
rename from sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolSelection.cs
rename to sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoiceFunction.cs
index 9d40282d5d0d..961c1a6500cc 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolSelection.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoiceFunction.cs
@@ -11,7 +11,7 @@
 namespace Azure.AI.Inference
 {
     /// <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
+    public partial class ChatCompletionsNamedToolChoiceFunction
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,27 +45,27 @@ public partial class ChatCompletionsFunctionToolSelection
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolSelection"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsNamedToolChoiceFunction"/>. </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)
+        public ChatCompletionsNamedToolChoiceFunction(string name)
         {
             Argument.AssertNotNull(name, nameof(name));
 
             Name = name;
         }
 
-        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolSelection"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsNamedToolChoiceFunction"/>. </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 ChatCompletionsFunctionToolSelection(string name, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal ChatCompletionsNamedToolChoiceFunction(string name, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Name = name;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="ChatCompletionsFunctionToolSelection"/> for deserialization. </summary>
-        internal ChatCompletionsFunctionToolSelection()
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsNamedToolChoiceFunction"/> for deserialization. </summary>
+        internal ChatCompletionsNamedToolChoiceFunction()
         {
         }
 
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoiceType.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoiceType.cs
new file mode 100644
index 000000000000..930fad82bc73
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolChoiceType.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.Inference
+{
+    /// <summary> The ChatCompletionsNamedToolChoice_type. </summary>
+    public readonly partial struct ChatCompletionsNamedToolChoiceType : IEquatable<ChatCompletionsNamedToolChoiceType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsNamedToolChoiceType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ChatCompletionsNamedToolChoiceType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string FunctionValue = "function";
+
+        /// <summary> function. </summary>
+        public static ChatCompletionsNamedToolChoiceType Function { get; } = new ChatCompletionsNamedToolChoiceType(FunctionValue);
+        /// <summary> Determines if two <see cref="ChatCompletionsNamedToolChoiceType"/> values are the same. </summary>
+        public static bool operator ==(ChatCompletionsNamedToolChoiceType left, ChatCompletionsNamedToolChoiceType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ChatCompletionsNamedToolChoiceType"/> values are not the same. </summary>
+        public static bool operator !=(ChatCompletionsNamedToolChoiceType left, ChatCompletionsNamedToolChoiceType right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ChatCompletionsNamedToolChoiceType"/>. </summary>
+        public static implicit operator ChatCompletionsNamedToolChoiceType(string value) => new ChatCompletionsNamedToolChoiceType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ChatCompletionsNamedToolChoiceType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ChatCompletionsNamedToolChoiceType 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/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolSelection.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolSelection.Serialization.cs
deleted file mode 100644
index 5b299b414e7c..000000000000
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolSelection.Serialization.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// 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.Inference
-{
-    [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/ai/Azure.AI.Inference/src/Generated/ChatCompletionsOptions.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsOptions.cs
index 5a4882acb5f5..55b2bf833d24 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsOptions.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsOptions.cs
@@ -89,9 +89,8 @@ public ChatCompletionsOptions(IEnumerable<ChatRequestMessage> messages)
         /// </param>
         /// <param name="stopSequences"> A collection of textual sequences that will end completions generation. </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"/>.
+        /// A list of tools the model may request to call. Currently, only functions are supported as a tool. The model
+        /// may response with a function call request and provide the input arguments in JSON format for that function.
         /// </param>
         /// <param name="internalSuppressedToolChoice"> If specified, the model will configure which of the provided tools it can use for the chat completions response. </param>
         /// <param name="seed">
@@ -117,16 +116,6 @@ internal ChatCompletionsOptions(IList<ChatRequestMessage> messages, float? frequ
             Model = model;
             AdditionalProperties = additionalProperties;
         }
-
-        /// <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="ChatRequestSystemMessage"/>, <see cref="ChatRequestToolMessage"/> and <see cref="ChatRequestUserMessage"/>.
-        /// </summary>
-        public IList<ChatRequestMessage> Messages { get; }
         /// <summary>
         /// A value that influences the probability of generated tokens appearing based on their cumulative
         /// frequency in generated text.
@@ -175,9 +164,8 @@ internal ChatCompletionsOptions(IList<ChatRequestMessage> messages, float? frequ
         /// <summary> A collection of textual sequences that will end completions generation. </summary>
         public IList<string> StopSequences { get; }
         /// <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"/>.
+        /// A list of tools the model may request to call. Currently, only functions are supported as a tool. The model
+        /// may response with a function call request and provide the input arguments in JSON format for that function.
         /// </summary>
         public IList<ChatCompletionsToolDefinition> Tools { get; }
         /// <summary>
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolCall.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolCall.Serialization.cs
index 6847d4c576e2..6caa22ef1c24 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolCall.Serialization.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolCall.Serialization.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.ClientModel.Primitives;
+using System.Collections.Generic;
 using System.Text.Json;
 using Azure.Core;
 
 namespace Azure.AI.Inference
 {
-    [PersistableModelProxy(typeof(UnknownChatCompletionsToolCall))]
     public partial class ChatCompletionsToolCall : IUtf8JsonSerializable, IJsonModel<ChatCompletionsToolCall>
     {
         void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsToolCall>)this).Write(writer, ModelSerializationExtensions.WireOptions);
@@ -26,10 +26,12 @@ void IJsonModel<ChatCompletionsToolCall>.Write(Utf8JsonWriter writer, ModelReade
             }
 
             writer.WriteStartObject();
-            writer.WritePropertyName("type"u8);
-            writer.WriteStringValue(Type);
             writer.WritePropertyName("id"u8);
             writer.WriteStringValue(Id);
+            writer.WritePropertyName("type"u8);
+            writer.WriteStringValue(Type.ToString());
+            writer.WritePropertyName("function"u8);
+            writer.WriteObjectValue(Function, options);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -68,14 +70,35 @@ internal static ChatCompletionsToolCall DeserializeChatCompletionsToolCall(JsonE
             {
                 return null;
             }
-            if (element.TryGetProperty("type", out JsonElement discriminator))
+            string id = default;
+            ChatCompletionsToolCallType type = default;
+            FunctionCall function = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
             {
-                switch (discriminator.GetString())
+                if (property.NameEquals("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                if (property.NameEquals("type"u8))
+                {
+                    type = new ChatCompletionsToolCallType(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("function"u8))
+                {
+                    function = FunctionCall.DeserializeFunctionCall(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
                 {
-                    case "function": return ChatCompletionsFunctionToolCall.DeserializeChatCompletionsFunctionToolCall(element, options);
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
-            return UnknownChatCompletionsToolCall.DeserializeUnknownChatCompletionsToolCall(element, options);
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatCompletionsToolCall(id, type, function, serializedAdditionalRawData);
         }
 
         BinaryData IPersistableModel<ChatCompletionsToolCall>.Write(ModelReaderWriterOptions options)
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolCall.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolCall.cs
index 5f1cc216e79d..bc9240a7e246 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolCall.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolCall.cs
@@ -10,13 +10,8 @@
 
 namespace Azure.AI.Inference
 {
-    /// <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> A function tool call requested by the AI model. </summary>
+    public partial class ChatCompletionsToolCall
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -48,26 +43,31 @@ public abstract partial class ChatCompletionsToolCall
         /// </list>
         /// </para>
         /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        private 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)
+        /// <param name="function"> The details of the function call requested by the AI model. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> or <paramref name="function"/> is null. </exception>
+        public ChatCompletionsToolCall(string id, FunctionCall function)
         {
             Argument.AssertNotNull(id, nameof(id));
+            Argument.AssertNotNull(function, nameof(function));
 
             Id = id;
+            Function = function;
         }
 
         /// <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="type"> The type of tool call. Currently, only `function` is supported. </param>
+        /// <param name="function"> The details of the function call requested by the AI model. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ChatCompletionsToolCall(string type, string id, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal ChatCompletionsToolCall(string id, ChatCompletionsToolCallType type, FunctionCall function, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
-            Type = type;
             Id = id;
+            Type = type;
+            Function = function;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
@@ -76,9 +76,12 @@ 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; }
+        /// <summary> The type of tool call. Currently, only `function` is supported. </summary>
+        public ChatCompletionsToolCallType Type { get; } = ChatCompletionsToolCallType.Function;
+
+        /// <summary> The details of the function call requested by the AI model. </summary>
+        public FunctionCall Function { get; set; }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolCallType.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolCallType.cs
new file mode 100644
index 000000000000..660eae8b8078
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolCallType.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.Inference
+{
+    /// <summary> The ChatCompletionsToolCall_type. </summary>
+    public readonly partial struct ChatCompletionsToolCallType : IEquatable<ChatCompletionsToolCallType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsToolCallType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ChatCompletionsToolCallType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string FunctionValue = "function";
+
+        /// <summary> function. </summary>
+        public static ChatCompletionsToolCallType Function { get; } = new ChatCompletionsToolCallType(FunctionValue);
+        /// <summary> Determines if two <see cref="ChatCompletionsToolCallType"/> values are the same. </summary>
+        public static bool operator ==(ChatCompletionsToolCallType left, ChatCompletionsToolCallType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ChatCompletionsToolCallType"/> values are not the same. </summary>
+        public static bool operator !=(ChatCompletionsToolCallType left, ChatCompletionsToolCallType right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ChatCompletionsToolCallType"/>. </summary>
+        public static implicit operator ChatCompletionsToolCallType(string value) => new ChatCompletionsToolCallType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ChatCompletionsToolCallType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ChatCompletionsToolCallType 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/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolSelectionPreset.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolChoicePreset.cs
similarity index 59%
rename from sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolSelectionPreset.cs
rename to sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolChoicePreset.cs
index af2ed715c576..1c0a1a3118fd 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolSelectionPreset.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolChoicePreset.cs
@@ -11,13 +11,13 @@
 namespace Azure.AI.Inference
 {
     /// <summary> Represents a generic policy for how a chat completions tool may be selected. </summary>
-    public readonly partial struct ChatCompletionsToolSelectionPreset : IEquatable<ChatCompletionsToolSelectionPreset>
+    public readonly partial struct ChatCompletionsToolChoicePreset : IEquatable<ChatCompletionsToolChoicePreset>
     {
         private readonly string _value;
 
-        /// <summary> Initializes a new instance of <see cref="ChatCompletionsToolSelectionPreset"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsToolChoicePreset"/>. </summary>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public ChatCompletionsToolSelectionPreset(string value)
+        public ChatCompletionsToolChoicePreset(string value)
         {
             _value = value ?? throw new ArgumentNullException(nameof(value));
         }
@@ -30,26 +30,26 @@ public ChatCompletionsToolSelectionPreset(string value)
         /// 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);
+        public static ChatCompletionsToolChoicePreset Auto { get; } = new ChatCompletionsToolChoicePreset(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);
+        public static ChatCompletionsToolChoicePreset None { get; } = new ChatCompletionsToolChoicePreset(NoneValue);
         /// <summary> Specifies that the model should respond with a call to 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);
+        public static ChatCompletionsToolChoicePreset Required { get; } = new ChatCompletionsToolChoicePreset(RequiredValue);
+        /// <summary> Determines if two <see cref="ChatCompletionsToolChoicePreset"/> values are the same. </summary>
+        public static bool operator ==(ChatCompletionsToolChoicePreset left, ChatCompletionsToolChoicePreset right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ChatCompletionsToolChoicePreset"/> values are not the same. </summary>
+        public static bool operator !=(ChatCompletionsToolChoicePreset left, ChatCompletionsToolChoicePreset right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ChatCompletionsToolChoicePreset"/>. </summary>
+        public static implicit operator ChatCompletionsToolChoicePreset(string value) => new ChatCompletionsToolChoicePreset(value);
 
         /// <inheritdoc />
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is ChatCompletionsToolSelectionPreset other && Equals(other);
+        public override bool Equals(object obj) => obj is ChatCompletionsToolChoicePreset other && Equals(other);
         /// <inheritdoc />
-        public bool Equals(ChatCompletionsToolSelectionPreset other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
+        public bool Equals(ChatCompletionsToolChoicePreset other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
         /// <inheritdoc />
         [EditorBrowsable(EditorBrowsableState.Never)]
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolDefinition.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolDefinition.Serialization.cs
index 134596576b09..e7563c808ef3 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolDefinition.Serialization.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolDefinition.Serialization.cs
@@ -7,12 +7,12 @@
 
 using System;
 using System.ClientModel.Primitives;
+using System.Collections.Generic;
 using System.Text.Json;
 using Azure.Core;
 
 namespace Azure.AI.Inference
 {
-    [PersistableModelProxy(typeof(UnknownChatCompletionsToolDefinition))]
     public partial class ChatCompletionsToolDefinition : IUtf8JsonSerializable, IJsonModel<ChatCompletionsToolDefinition>
     {
         void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsToolDefinition>)this).Write(writer, ModelSerializationExtensions.WireOptions);
@@ -27,7 +27,9 @@ void IJsonModel<ChatCompletionsToolDefinition>.Write(Utf8JsonWriter writer, Mode
 
             writer.WriteStartObject();
             writer.WritePropertyName("type"u8);
-            writer.WriteStringValue(Type);
+            writer.WriteStringValue(Type.ToString());
+            writer.WritePropertyName("function"u8);
+            writer.WriteObjectValue(Function, options);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -66,14 +68,29 @@ internal static ChatCompletionsToolDefinition DeserializeChatCompletionsToolDefi
             {
                 return null;
             }
-            if (element.TryGetProperty("type", out JsonElement discriminator))
+            ChatCompletionsToolDefinitionType type = default;
+            FunctionDefinition function = default;
+            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
+            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
             {
-                switch (discriminator.GetString())
+                if (property.NameEquals("type"u8))
                 {
-                    case "function": return ChatCompletionsFunctionToolDefinition.DeserializeChatCompletionsFunctionToolDefinition(element, options);
+                    type = new ChatCompletionsToolDefinitionType(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("function"u8))
+                {
+                    function = FunctionDefinition.DeserializeFunctionDefinition(property.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
                 }
             }
-            return UnknownChatCompletionsToolDefinition.DeserializeUnknownChatCompletionsToolDefinition(element, options);
+            serializedAdditionalRawData = rawDataDictionary;
+            return new ChatCompletionsToolDefinition(type, function, serializedAdditionalRawData);
         }
 
         BinaryData IPersistableModel<ChatCompletionsToolDefinition>.Write(ModelReaderWriterOptions options)
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolDefinition.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolDefinition.cs
index ac527ab55257..3ccfacb95646 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolDefinition.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolDefinition.cs
@@ -10,12 +10,8 @@
 
 namespace Azure.AI.Inference
 {
-    /// <summary>
-    /// 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 ChatCompletionsToolDefinition
+    /// <summary> The definition of a chat completions tool that can call a function. </summary>
+    public partial class ChatCompletionsToolDefinition
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -47,23 +43,38 @@ public abstract partial class ChatCompletionsToolDefinition
         /// </list>
         /// </para>
         /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
         /// <summary> Initializes a new instance of <see cref="ChatCompletionsToolDefinition"/>. </summary>
-        protected ChatCompletionsToolDefinition()
+        /// <param name="function"> The function definition details for the function tool. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="function"/> is null. </exception>
+        public ChatCompletionsToolDefinition(FunctionDefinition function)
         {
+            Argument.AssertNotNull(function, nameof(function));
+
+            Function = function;
         }
 
         /// <summary> Initializes a new instance of <see cref="ChatCompletionsToolDefinition"/>. </summary>
-        /// <param name="type"> The object type. </param>
+        /// <param name="type"> The type of the tool. Currently, only `function` is supported. </param>
+        /// <param name="function"> The function definition details for the function tool. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ChatCompletionsToolDefinition(string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal ChatCompletionsToolDefinition(ChatCompletionsToolDefinitionType type, FunctionDefinition function, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Type = type;
+            Function = function;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> The object type. </summary>
-        internal string Type { get; set; }
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsToolDefinition"/> for deserialization. </summary>
+        internal ChatCompletionsToolDefinition()
+        {
+        }
+
+        /// <summary> The type of the tool. Currently, only `function` is supported. </summary>
+        public ChatCompletionsToolDefinitionType Type { get; } = ChatCompletionsToolDefinitionType.Function;
+
+        /// <summary> The function definition details for the function tool. </summary>
+        public FunctionDefinition Function { get; }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolDefinitionType.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolDefinitionType.cs
new file mode 100644
index 000000000000..0204f4682b9d
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsToolDefinitionType.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.Inference
+{
+    /// <summary> The ChatCompletionsToolDefinition_type. </summary>
+    public readonly partial struct ChatCompletionsToolDefinitionType : IEquatable<ChatCompletionsToolDefinitionType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="ChatCompletionsToolDefinitionType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public ChatCompletionsToolDefinitionType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string FunctionValue = "function";
+
+        /// <summary> function. </summary>
+        public static ChatCompletionsToolDefinitionType Function { get; } = new ChatCompletionsToolDefinitionType(FunctionValue);
+        /// <summary> Determines if two <see cref="ChatCompletionsToolDefinitionType"/> values are the same. </summary>
+        public static bool operator ==(ChatCompletionsToolDefinitionType left, ChatCompletionsToolDefinitionType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="ChatCompletionsToolDefinitionType"/> values are not the same. </summary>
+        public static bool operator !=(ChatCompletionsToolDefinitionType left, ChatCompletionsToolDefinitionType right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="ChatCompletionsToolDefinitionType"/>. </summary>
+        public static implicit operator ChatCompletionsToolDefinitionType(string value) => new ChatCompletionsToolDefinitionType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is ChatCompletionsToolDefinitionType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(ChatCompletionsToolDefinitionType 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/ai/Azure.AI.Inference/src/Generated/ChatRequestAssistantMessage.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatRequestAssistantMessage.Serialization.cs
index d6d26c635367..796e3f72a357 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatRequestAssistantMessage.Serialization.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatRequestAssistantMessage.Serialization.cs
@@ -44,7 +44,7 @@ void IJsonModel<ChatRequestAssistantMessage>.Write(Utf8JsonWriter writer, ModelR
                 writer.WriteStartArray();
                 foreach (var item in ToolCalls)
                 {
-                    writer.WriteObjectValue(item, options);
+                    writer.WriteObjectValue<ChatCompletionsToolCall>(item, options);
                 }
                 writer.WriteEndArray();
             }
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatRequestAssistantMessage.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatRequestAssistantMessage.cs
index 55d8b7dac8ff..1ae63901bfa6 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatRequestAssistantMessage.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatRequestAssistantMessage.cs
@@ -13,13 +13,6 @@ namespace Azure.AI.Inference
     /// <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>
-        public ChatRequestAssistantMessage()
-        {
-            Role = ChatRole.Assistant;
-            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>
@@ -27,8 +20,6 @@ public ChatRequestAssistantMessage()
         /// <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>
         internal ChatRequestAssistantMessage(ChatRole role, IDictionary<string, BinaryData> serializedAdditionalRawData, string content, IList<ChatCompletionsToolCall> toolCalls) : base(role, serializedAdditionalRawData)
         {
@@ -38,12 +29,5 @@ internal ChatRequestAssistantMessage(ChatRole role, IDictionary<string, BinaryDa
 
         /// <summary> The content of the message. </summary>
         public string Content { 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; }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatResponseMessage.cs b/sdk/ai/Azure.AI.Inference/src/Generated/ChatResponseMessage.cs
index 1b4995b7ea07..6ba151e01adb 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatResponseMessage.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/ChatResponseMessage.cs
@@ -61,8 +61,6 @@ internal ChatResponseMessage(ChatRole role, string content)
         /// <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="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
         internal ChatResponseMessage(ChatRole role, string content, IReadOnlyList<ChatCompletionsToolCall> toolCalls, IDictionary<string, BinaryData> serializedAdditionalRawData)
@@ -85,8 +83,6 @@ internal ChatResponseMessage()
         /// <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; }
     }
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/Docs/EmbeddingsClient.xml b/sdk/ai/Azure.AI.Inference/src/Generated/Docs/EmbeddingsClient.xml
new file mode 100644
index 000000000000..2f52491f2297
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/Docs/EmbeddingsClient.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doc>
+  <members>
+    <member name="EmbedAsync(EmbeddingsOptions,ExtraParameters?,CancellationToken)">
+      <example>
+This sample shows how to call EmbedAsync.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+EmbeddingsOptions embeddingsOptions = null;
+Response<EmbeddingsResult> response = await client.EmbedAsync(embeddingsOptions);
+]]></code>
+This sample shows how to call EmbedAsync.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+EmbeddingsOptions embeddingsOptions = null;
+Response<EmbeddingsResult> response = await client.EmbedAsync(embeddingsOptions);
+]]></code></example>
+    </member>
+    <member name="Embed(EmbeddingsOptions,ExtraParameters?,CancellationToken)">
+      <example>
+This sample shows how to call Embed.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+EmbeddingsOptions embeddingsOptions = null;
+Response<EmbeddingsResult> response = client.Embed(embeddingsOptions);
+]]></code>
+This sample shows how to call Embed.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+EmbeddingsOptions embeddingsOptions = null;
+Response<EmbeddingsResult> response = client.Embed(embeddingsOptions);
+]]></code></example>
+    </member>
+    <member name="EmbedAsync(RequestContent,string,RequestContext)">
+      <example>
+This sample shows how to call EmbedAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+using RequestContent content = RequestContent.Create(new object());
+Response response = await client.EmbedAsync(content);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("data")[0].GetProperty("embedding").ToString());
+Console.WriteLine(result.GetProperty("data")[0].GetProperty("index").ToString());
+Console.WriteLine(result.GetProperty("usage").GetProperty("prompt_tokens").ToString());
+Console.WriteLine(result.GetProperty("usage").GetProperty("total_tokens").ToString());
+Console.WriteLine(result.GetProperty("model").ToString());
+]]></code>
+This sample shows how to call EmbedAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+using RequestContent content = RequestContent.Create(new object());
+Response response = await client.EmbedAsync(content);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("data")[0].GetProperty("embedding").ToString());
+Console.WriteLine(result.GetProperty("data")[0].GetProperty("index").ToString());
+Console.WriteLine(result.GetProperty("usage").GetProperty("prompt_tokens").ToString());
+Console.WriteLine(result.GetProperty("usage").GetProperty("total_tokens").ToString());
+Console.WriteLine(result.GetProperty("model").ToString());
+]]></code></example>
+    </member>
+    <member name="Embed(RequestContent,string,RequestContext)">
+      <example>
+This sample shows how to call Embed and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+using RequestContent content = RequestContent.Create(new object());
+Response response = client.Embed(content);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("data")[0].GetProperty("embedding").ToString());
+Console.WriteLine(result.GetProperty("data")[0].GetProperty("index").ToString());
+Console.WriteLine(result.GetProperty("usage").GetProperty("prompt_tokens").ToString());
+Console.WriteLine(result.GetProperty("usage").GetProperty("total_tokens").ToString());
+Console.WriteLine(result.GetProperty("model").ToString());
+]]></code>
+This sample shows how to call Embed and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+using RequestContent content = RequestContent.Create(new object());
+Response response = client.Embed(content);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("id").ToString());
+Console.WriteLine(result.GetProperty("data")[0].GetProperty("embedding").ToString());
+Console.WriteLine(result.GetProperty("data")[0].GetProperty("index").ToString());
+Console.WriteLine(result.GetProperty("usage").GetProperty("prompt_tokens").ToString());
+Console.WriteLine(result.GetProperty("usage").GetProperty("total_tokens").ToString());
+Console.WriteLine(result.GetProperty("model").ToString());
+]]></code></example>
+    </member>
+    <member name="GetModelInfoAsync(CancellationToken)">
+      <example>
+This sample shows how to call GetModelInfoAsync.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+Response<ModelInfo> response = await client.GetModelInfoAsync();
+]]></code>
+This sample shows how to call GetModelInfoAsync.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+Response<ModelInfo> response = await client.GetModelInfoAsync();
+]]></code></example>
+    </member>
+    <member name="GetModelInfo(CancellationToken)">
+      <example>
+This sample shows how to call GetModelInfo.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+Response<ModelInfo> response = client.GetModelInfo();
+]]></code>
+This sample shows how to call GetModelInfo.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+Response<ModelInfo> response = client.GetModelInfo();
+]]></code></example>
+    </member>
+    <member name="GetModelInfoAsync(RequestContext)">
+      <example>
+This sample shows how to call GetModelInfoAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+Response response = await client.GetModelInfoAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("model_name").ToString());
+Console.WriteLine(result.GetProperty("model_type").ToString());
+Console.WriteLine(result.GetProperty("model_provider_name").ToString());
+]]></code>
+This sample shows how to call GetModelInfoAsync and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+Response response = await client.GetModelInfoAsync(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("model_name").ToString());
+Console.WriteLine(result.GetProperty("model_type").ToString());
+Console.WriteLine(result.GetProperty("model_provider_name").ToString());
+]]></code></example>
+    </member>
+    <member name="GetModelInfo(RequestContext)">
+      <example>
+This sample shows how to call GetModelInfo and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+Response response = client.GetModelInfo(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("model_name").ToString());
+Console.WriteLine(result.GetProperty("model_type").ToString());
+Console.WriteLine(result.GetProperty("model_provider_name").ToString());
+]]></code>
+This sample shows how to call GetModelInfo and parse the result.
+<code><![CDATA[
+Uri endpoint = new Uri("<endpoint>");
+AzureKeyCredential credential = new AzureKeyCredential("<key>");
+EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+Response response = client.GetModelInfo(null);
+
+JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+Console.WriteLine(result.GetProperty("model_name").ToString());
+Console.WriteLine(result.GetProperty("model_type").ToString());
+Console.WriteLine(result.GetProperty("model_provider_name").ToString());
+]]></code></example>
+    </member>
+  </members>
+</doc>
\ No newline at end of file
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsNamedToolSelection.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/EmbedRequest.Serialization.cs
similarity index 53%
rename from sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsNamedToolSelection.Serialization.cs
rename to sdk/ai/Azure.AI.Inference/src/Generated/EmbedRequest.Serialization.cs
index c3c50bb2e9e9..8a543620fc51 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsNamedToolSelection.Serialization.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/EmbedRequest.Serialization.cs
@@ -13,21 +13,21 @@
 
 namespace Azure.AI.Inference
 {
-    internal partial class UnknownChatCompletionsNamedToolSelection : IUtf8JsonSerializable, IJsonModel<ChatCompletionsNamedToolSelection>
+    internal partial class EmbedRequest : IUtf8JsonSerializable, IJsonModel<EmbedRequest>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsNamedToolSelection>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<EmbedRequest>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<ChatCompletionsNamedToolSelection>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<EmbedRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<EmbedRequest>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatCompletionsNamedToolSelection)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(EmbedRequest)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            writer.WritePropertyName("type"u8);
-            writer.WriteStringValue(Type);
+            writer.WritePropertyName("embeddingsOptions"u8);
+            writer.WriteObjectValue(EmbeddingsOptions, options);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -46,19 +46,19 @@ void IJsonModel<ChatCompletionsNamedToolSelection>.Write(Utf8JsonWriter writer,
             writer.WriteEndObject();
         }
 
-        ChatCompletionsNamedToolSelection IJsonModel<ChatCompletionsNamedToolSelection>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        EmbedRequest IJsonModel<EmbedRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<EmbedRequest>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatCompletionsNamedToolSelection)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(EmbedRequest)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeChatCompletionsNamedToolSelection(document.RootElement, options);
+            return DeserializeEmbedRequest(document.RootElement, options);
         }
 
-        internal static UnknownChatCompletionsNamedToolSelection DeserializeUnknownChatCompletionsNamedToolSelection(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static EmbedRequest DeserializeEmbedRequest(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -66,14 +66,14 @@ internal static UnknownChatCompletionsNamedToolSelection DeserializeUnknownChatC
             {
                 return null;
             }
-            string type = "Unknown";
+            EmbeddingsOptions embeddingsOptions = 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.NameEquals("embeddingsOptions"u8))
                 {
-                    type = property.Value.GetString();
+                    embeddingsOptions = EmbeddingsOptions.DeserializeEmbeddingsOptions(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
@@ -82,53 +82,53 @@ internal static UnknownChatCompletionsNamedToolSelection DeserializeUnknownChatC
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new UnknownChatCompletionsNamedToolSelection(type, serializedAdditionalRawData);
+            return new EmbedRequest(embeddingsOptions, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<ChatCompletionsNamedToolSelection>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<EmbedRequest>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<EmbedRequest>)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.");
+                    throw new FormatException($"The model {nameof(EmbedRequest)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ChatCompletionsNamedToolSelection IPersistableModel<ChatCompletionsNamedToolSelection>.Create(BinaryData data, ModelReaderWriterOptions options)
+        EmbedRequest IPersistableModel<EmbedRequest>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsNamedToolSelection>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<EmbedRequest>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeChatCompletionsNamedToolSelection(document.RootElement, options);
+                        return DeserializeEmbedRequest(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(ChatCompletionsNamedToolSelection)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(EmbedRequest)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ChatCompletionsNamedToolSelection>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<EmbedRequest>.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)
+        internal static EmbedRequest FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeUnknownChatCompletionsNamedToolSelection(document.RootElement);
+            return DeserializeEmbedRequest(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
+        internal virtual RequestContent ToRequestContent()
         {
             var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue<ChatCompletionsNamedToolSelection>(this, ModelSerializationExtensions.WireOptions);
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
             return content;
         }
     }
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolSelection.cs b/sdk/ai/Azure.AI.Inference/src/Generated/EmbedRequest.cs
similarity index 58%
rename from sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolSelection.cs
rename to sdk/ai/Azure.AI.Inference/src/Generated/EmbedRequest.cs
index e4848e2f0528..4cb73d47f7cd 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsNamedToolSelection.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/EmbedRequest.cs
@@ -10,12 +10,8 @@
 
 namespace Azure.AI.Inference
 {
-    /// <summary>
-    /// 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 ChatCompletionsNamedToolSelection
+    /// <summary> The EmbedRequest. </summary>
+    internal partial class EmbedRequest
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -47,23 +43,33 @@ public abstract partial class ChatCompletionsNamedToolSelection
         /// </list>
         /// </para>
         /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="ChatCompletionsNamedToolSelection"/>. </summary>
-        protected ChatCompletionsNamedToolSelection()
+        /// <summary> Initializes a new instance of <see cref="EmbedRequest"/>. </summary>
+        /// <param name="embeddingsOptions"></param>
+        /// <exception cref="ArgumentNullException"> <paramref name="embeddingsOptions"/> is null. </exception>
+        internal EmbedRequest(EmbeddingsOptions embeddingsOptions)
         {
+            Argument.AssertNotNull(embeddingsOptions, nameof(embeddingsOptions));
+
+            EmbeddingsOptions = embeddingsOptions;
         }
 
-        /// <summary> Initializes a new instance of <see cref="ChatCompletionsNamedToolSelection"/>. </summary>
-        /// <param name="type"> The object type. </param>
+        /// <summary> Initializes a new instance of <see cref="EmbedRequest"/>. </summary>
+        /// <param name="embeddingsOptions"></param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ChatCompletionsNamedToolSelection(string type, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal EmbedRequest(EmbeddingsOptions embeddingsOptions, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
-            Type = type;
+            EmbeddingsOptions = embeddingsOptions;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> The object type. </summary>
-        internal string Type { get; set; }
+        /// <summary> Initializes a new instance of <see cref="EmbedRequest"/> for deserialization. </summary>
+        internal EmbedRequest()
+        {
+        }
+
+        /// <summary> Gets the embeddings options. </summary>
+        public EmbeddingsOptions EmbeddingsOptions { get; }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingEncodingFormat.cs b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingEncodingFormat.cs
new file mode 100644
index 000000000000..968dfae30f12
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingEncodingFormat.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.Inference
+{
+    /// <summary>
+    /// The format of the embeddings result.
+    /// Returns a 422 error if the model doesn't support the value or parameter.
+    /// </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 Base64Value = "base64";
+        private const string BinaryValue = "binary";
+        private const string SingleValue = "float";
+        private const string SByteValue = "int8";
+        private const string UbinaryValue = "ubinary";
+        private const string ByteValue = "uint8";
+
+        /// <summary> Base64. </summary>
+        public static EmbeddingEncodingFormat Base64 { get; } = new EmbeddingEncodingFormat(Base64Value);
+        /// <summary> Binary. </summary>
+        public static EmbeddingEncodingFormat Binary { get; } = new EmbeddingEncodingFormat(BinaryValue);
+        /// <summary> ubinary. </summary>
+        public static EmbeddingEncodingFormat Ubinary { get; } = new EmbeddingEncodingFormat(UbinaryValue);
+        /// <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/ai/Azure.AI.Inference/src/Generated/EmbeddingInputType.cs b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingInputType.cs
new file mode 100644
index 000000000000..9e75eba6dc3c
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingInputType.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.Inference
+{
+    /// <summary> Represents the input types used for embedding search. </summary>
+    public readonly partial struct EmbeddingInputType : IEquatable<EmbeddingInputType>
+    {
+        private readonly string _value;
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingInputType"/>. </summary>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public EmbeddingInputType(string value)
+        {
+            _value = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        private const string TextValue = "text";
+        private const string QueryValue = "query";
+        private const string DocumentValue = "document";
+
+        /// <summary> Indicates the input is a general text input. </summary>
+        public static EmbeddingInputType Text { get; } = new EmbeddingInputType(TextValue);
+        /// <summary> Indicates the input represents a search query to find the most relevant documents in your vector database. </summary>
+        public static EmbeddingInputType Query { get; } = new EmbeddingInputType(QueryValue);
+        /// <summary> Indicates the input represents a document that is stored in a vector database. </summary>
+        public static EmbeddingInputType Document { get; } = new EmbeddingInputType(DocumentValue);
+        /// <summary> Determines if two <see cref="EmbeddingInputType"/> values are the same. </summary>
+        public static bool operator ==(EmbeddingInputType left, EmbeddingInputType right) => left.Equals(right);
+        /// <summary> Determines if two <see cref="EmbeddingInputType"/> values are not the same. </summary>
+        public static bool operator !=(EmbeddingInputType left, EmbeddingInputType right) => !left.Equals(right);
+        /// <summary> Converts a <see cref="string"/> to a <see cref="EmbeddingInputType"/>. </summary>
+        public static implicit operator EmbeddingInputType(string value) => new EmbeddingInputType(value);
+
+        /// <inheritdoc />
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public override bool Equals(object obj) => obj is EmbeddingInputType other && Equals(other);
+        /// <inheritdoc />
+        public bool Equals(EmbeddingInputType 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/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsToolCall.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingItem.Serialization.cs
similarity index 54%
rename from sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsToolCall.Serialization.cs
rename to sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingItem.Serialization.cs
index 84f7e3fe34a6..56ace06d12cf 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsToolCall.Serialization.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingItem.Serialization.cs
@@ -13,23 +13,30 @@
 
 namespace Azure.AI.Inference
 {
-    internal partial class UnknownChatCompletionsToolCall : IUtf8JsonSerializable, IJsonModel<ChatCompletionsToolCall>
+    public partial class EmbeddingItem : IUtf8JsonSerializable, IJsonModel<EmbeddingItem>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsToolCall>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<EmbeddingItem>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<ChatCompletionsToolCall>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<EmbeddingItem>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolCall>)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(ChatCompletionsToolCall)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(EmbeddingItem)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            writer.WritePropertyName("type"u8);
-            writer.WriteStringValue(Type);
-            writer.WritePropertyName("id"u8);
-            writer.WriteStringValue(Id);
+            writer.WritePropertyName("embedding"u8);
+#if NET6_0_OR_GREATER
+				writer.WriteRawValue(Embedding);
+#else
+            using (JsonDocument document = JsonDocument.Parse(Embedding))
+            {
+                JsonSerializer.Serialize(writer, document.RootElement);
+            }
+#endif
+            writer.WritePropertyName("index"u8);
+            writer.WriteNumberValue(Index);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -48,19 +55,19 @@ void IJsonModel<ChatCompletionsToolCall>.Write(Utf8JsonWriter writer, ModelReade
             writer.WriteEndObject();
         }
 
-        ChatCompletionsToolCall IJsonModel<ChatCompletionsToolCall>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        EmbeddingItem IJsonModel<EmbeddingItem>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolCall>)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(ChatCompletionsToolCall)} 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 DeserializeChatCompletionsToolCall(document.RootElement, options);
+            return DeserializeEmbeddingItem(document.RootElement, options);
         }
 
-        internal static UnknownChatCompletionsToolCall DeserializeUnknownChatCompletionsToolCall(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static EmbeddingItem DeserializeEmbeddingItem(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -68,20 +75,20 @@ internal static UnknownChatCompletionsToolCall DeserializeUnknownChatCompletions
             {
                 return null;
             }
-            string type = "Unknown";
-            string id = default;
+            BinaryData embedding = default;
+            int index = 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.NameEquals("embedding"u8))
                 {
-                    type = property.Value.GetString();
+                    embedding = BinaryData.FromString(property.Value.GetRawText());
                     continue;
                 }
-                if (property.NameEquals("id"u8))
+                if (property.NameEquals("index"u8))
                 {
-                    id = property.Value.GetString();
+                    index = property.Value.GetInt32();
                     continue;
                 }
                 if (options.Format != "W")
@@ -90,53 +97,53 @@ internal static UnknownChatCompletionsToolCall DeserializeUnknownChatCompletions
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new UnknownChatCompletionsToolCall(type, id, serializedAdditionalRawData);
+            return new EmbeddingItem(embedding, index, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<ChatCompletionsToolCall>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<EmbeddingItem>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolCall>)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(ChatCompletionsToolCall)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(EmbeddingItem)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ChatCompletionsToolCall IPersistableModel<ChatCompletionsToolCall>.Create(BinaryData data, ModelReaderWriterOptions options)
+        EmbeddingItem IPersistableModel<EmbeddingItem>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolCall>)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 DeserializeChatCompletionsToolCall(document.RootElement, options);
+                        return DeserializeEmbeddingItem(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(ChatCompletionsToolCall)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(EmbeddingItem)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ChatCompletionsToolCall>.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 new UnknownChatCompletionsToolCall FromResponse(Response response)
+        internal static EmbeddingItem FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeUnknownChatCompletionsToolCall(document.RootElement);
+            return DeserializeEmbeddingItem(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
+        internal virtual RequestContent ToRequestContent()
         {
             var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue<ChatCompletionsToolCall>(this, ModelSerializationExtensions.WireOptions);
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
             return content;
         }
     }
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingItem.cs b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingItem.cs
new file mode 100644
index 000000000000..676f0aba0bc7
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingItem.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.Collections.Generic;
+
+namespace Azure.AI.Inference
+{
+    /// <summary> Representation of a single embeddings relatedness comparison. </summary>
+    public 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 embedding values for the input prompt. These represent a measurement of the
+        /// vector-based relatedness of the provided input. Or a base64 encoded string of the embedding vector.
+        /// </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(BinaryData embedding, int index)
+        {
+            Argument.AssertNotNull(embedding, nameof(embedding));
+
+            Embedding = embedding;
+            Index = index;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingItem"/>. </summary>
+        /// <param name="embedding">
+        /// List of embedding values for the input prompt. These represent a measurement of the
+        /// vector-based relatedness of the provided input. Or a base64 encoded string of the embedding vector.
+        /// </param>
+        /// <param name="index"> Index of the prompt to which the EmbeddingItem corresponds. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal EmbeddingItem(BinaryData embedding, int index, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Embedding = embedding;
+            Index = index;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingItem"/> for deserialization. </summary>
+        internal EmbeddingItem()
+        {
+        }
+
+        /// <summary>
+        /// List of embedding values for the input prompt. These represent a measurement of the
+        /// vector-based relatedness of the provided input. Or a base64 encoded string of the embedding vector.
+        /// <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="float"/></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 Embedding { get; }
+        /// <summary> Index of the prompt to which the EmbeddingItem corresponds. </summary>
+        public int Index { get; }
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsClient.cs b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsClient.cs
new file mode 100644
index 000000000000..1d747f7cedad
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsClient.cs
@@ -0,0 +1,229 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure.Core;
+using Azure.Core.Pipeline;
+
+namespace Azure.AI.Inference
+{
+    // Data plane generated client.
+    /// <summary> The Embeddings service client. </summary>
+    public partial class EmbeddingsClient
+    {
+        private const string AuthorizationHeader = "Authorization";
+        private readonly AzureKeyCredential _keyCredential;
+        private const string AuthorizationApiKeyPrefix = "Bearer";
+        private static readonly string[] AuthorizationScopes = new string[] { "https://ml.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 EmbeddingsClient for mocking. </summary>
+        protected EmbeddingsClient()
+        {
+        }
+
+        /// <summary> Initializes a new instance of EmbeddingsClient. </summary>
+        /// <param name="endpoint"> Service host. </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 EmbeddingsClient(Uri endpoint, AzureKeyCredential credential) : this(endpoint, credential, new AzureAIInferenceClientOptions())
+        {
+        }
+
+        /// <summary> Initializes a new instance of EmbeddingsClient. </summary>
+        /// <param name="endpoint"> Service host. </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 EmbeddingsClient(Uri endpoint, TokenCredential credential) : this(endpoint, credential, new AzureAIInferenceClientOptions())
+        {
+        }
+
+        /// <summary> Initializes a new instance of EmbeddingsClient. </summary>
+        /// <param name="endpoint"> Service host. </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 EmbeddingsClient(Uri endpoint, TokenCredential credential, AzureAIInferenceClientOptions options)
+        {
+            Argument.AssertNotNull(endpoint, nameof(endpoint));
+            Argument.AssertNotNull(credential, nameof(credential));
+            options ??= new AzureAIInferenceClientOptions();
+
+            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>
+        /// Returns information about the AI model.
+        /// The method makes a REST API call to the `/info` route on the given endpoint.
+        /// This method will only work when using Serverless API or Managed Compute endpoint.
+        /// It will not work for GitHub Models endpoint or Azure OpenAI endpoint.
+        /// </summary>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <include file="Docs/EmbeddingsClient.xml" path="doc/members/member[@name='GetModelInfoAsync(CancellationToken)']/*" />
+        public virtual async Task<Response<ModelInfo>> GetModelInfoAsync(CancellationToken cancellationToken = default)
+        {
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = await GetModelInfoAsync(context).ConfigureAwait(false);
+            return Response.FromValue(ModelInfo.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// Returns information about the AI model.
+        /// The method makes a REST API call to the `/info` route on the given endpoint.
+        /// This method will only work when using Serverless API or Managed Compute endpoint.
+        /// It will not work for GitHub Models endpoint or Azure OpenAI endpoint.
+        /// </summary>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <include file="Docs/EmbeddingsClient.xml" path="doc/members/member[@name='GetModelInfo(CancellationToken)']/*" />
+        public virtual Response<ModelInfo> GetModelInfo(CancellationToken cancellationToken = default)
+        {
+            RequestContext context = FromCancellationToken(cancellationToken);
+            Response response = GetModelInfo(context);
+            return Response.FromValue(ModelInfo.FromResponse(response), response);
+        }
+
+        /// <summary>
+        /// [Protocol Method] Returns information about the AI model.
+        /// The method makes a REST API call to the `/info` route on the given endpoint.
+        /// This method will only work when using Serverless API or Managed Compute endpoint.
+        /// It will not work for GitHub Models endpoint or Azure OpenAI 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="GetModelInfoAsync(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <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>
+        /// <include file="Docs/EmbeddingsClient.xml" path="doc/members/member[@name='GetModelInfoAsync(RequestContext)']/*" />
+        public virtual async Task<Response> GetModelInfoAsync(RequestContext context)
+        {
+            using var scope = ClientDiagnostics.CreateScope("EmbeddingsClient.GetModelInfo");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetModelInfoRequest(context);
+                return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// [Protocol Method] Returns information about the AI model.
+        /// The method makes a REST API call to the `/info` route on the given endpoint.
+        /// This method will only work when using Serverless API or Managed Compute endpoint.
+        /// It will not work for GitHub Models endpoint or Azure OpenAI 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="GetModelInfo(CancellationToken)"/> convenience overload with strongly typed models first.
+        /// </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <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>
+        /// <include file="Docs/EmbeddingsClient.xml" path="doc/members/member[@name='GetModelInfo(RequestContext)']/*" />
+        public virtual Response GetModelInfo(RequestContext context)
+        {
+            using var scope = ClientDiagnostics.CreateScope("EmbeddingsClient.GetModelInfo");
+            scope.Start();
+            try
+            {
+                using HttpMessage message = CreateGetModelInfoRequest(context);
+                return _pipeline.ProcessMessage(message, context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        internal HttpMessage CreateEmbedRequest(RequestContent content, string extraParams, 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("/embeddings", false);
+            uri.AppendQuery("api-version", _apiVersion, true);
+            request.Uri = uri;
+            request.Headers.Add("Accept", "application/json");
+            if (extraParams != null)
+            {
+                request.Headers.Add("extra-parameters", extraParams);
+            }
+            request.Headers.Add("Content-Type", "application/json");
+            request.Content = content;
+            return message;
+        }
+
+        internal HttpMessage CreateGetModelInfoRequest(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("/info", false);
+            uri.AppendQuery("api-version", _apiVersion, 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)
+        {
+            if (!cancellationToken.CanBeCanceled)
+            {
+                return DefaultRequestContext;
+            }
+
+            return new RequestContext() { CancellationToken = cancellationToken };
+        }
+
+        private static ResponseClassifier _responseClassifier200;
+        private static ResponseClassifier ResponseClassifier200 => _responseClassifier200 ??= new StatusCodeClassifier(stackalloc ushort[] { 200 });
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsOptions.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsOptions.Serialization.cs
new file mode 100644
index 000000000000..975c71f9d3da
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsOptions.Serialization.cs
@@ -0,0 +1,201 @@
+// 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.Inference
+{
+    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();
+            writer.WritePropertyName("input"u8);
+            writer.WriteStartArray();
+            foreach (var item in Input)
+            {
+                writer.WriteStringValue(item);
+            }
+            writer.WriteEndArray();
+            if (Optional.IsDefined(Dimensions))
+            {
+                writer.WritePropertyName("dimensions"u8);
+                writer.WriteNumberValue(Dimensions.Value);
+            }
+            if (Optional.IsDefined(EncodingFormat))
+            {
+                writer.WritePropertyName("encoding_format"u8);
+                writer.WriteStringValue(EncodingFormat.Value.ToString());
+            }
+            if (Optional.IsDefined(InputType))
+            {
+                writer.WritePropertyName("input_type"u8);
+                writer.WriteStringValue(InputType.Value.ToString());
+            }
+            if (Optional.IsDefined(Model))
+            {
+                writer.WritePropertyName("model"u8);
+                writer.WriteStringValue(Model);
+            }
+            foreach (var item in AdditionalProperties)
+            {
+                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;
+            }
+            IList<string> input = default;
+            int? dimensions = default;
+            EmbeddingEncodingFormat? encodingFormat = default;
+            EmbeddingInputType? inputType = default;
+            string model = default;
+            IDictionary<string, BinaryData> additionalProperties = default;
+            Dictionary<string, BinaryData> additionalPropertiesDictionary = new Dictionary<string, BinaryData>();
+            foreach (var property in element.EnumerateObject())
+            {
+                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("dimensions"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    dimensions = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("encoding_format"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    encodingFormat = new EmbeddingEncodingFormat(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("input_type"u8))
+                {
+                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    inputType = new EmbeddingInputType(property.Value.GetString());
+                    continue;
+                }
+                if (property.NameEquals("model"u8))
+                {
+                    model = property.Value.GetString();
+                    continue;
+                }
+                additionalPropertiesDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+            }
+            additionalProperties = additionalPropertiesDictionary;
+            return new EmbeddingsOptions(
+                input,
+                dimensions,
+                encodingFormat,
+                inputType,
+                model,
+                additionalProperties);
+        }
+
+        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/ai/Azure.AI.Inference/src/Generated/EmbeddingsOptions.cs b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsOptions.cs
new file mode 100644
index 000000000000..879babca6604
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsOptions.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;
+using System.Linq;
+
+namespace Azure.AI.Inference
+{
+    /// <summary> The configuration information for an embeddings request. </summary>
+    public partial class EmbeddingsOptions
+    {
+        /// <summary> Initializes a new instance of <see cref="EmbeddingsOptions"/>. </summary>
+        /// <param name="input">
+        /// Input text to embed, encoded as a string or array of tokens.
+        /// To embed multiple inputs in a single request, pass an array
+        /// of strings or array of token arrays.
+        /// </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="input"/> is null. </exception>
+        public EmbeddingsOptions(IEnumerable<string> input)
+        {
+            Argument.AssertNotNull(input, nameof(input));
+
+            Input = input.ToList();
+            AdditionalProperties = new ChangeTrackingDictionary<string, BinaryData>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingsOptions"/>. </summary>
+        /// <param name="input">
+        /// Input text to embed, encoded as a string or array of tokens.
+        /// To embed multiple inputs in a single request, pass an array
+        /// of strings or array of token arrays.
+        /// </param>
+        /// <param name="dimensions">
+        /// Optional. The number of dimensions the resulting output embeddings should have.
+        /// Passing null causes the model to use its default value.
+        /// Returns a 422 error if the model doesn't support the value or parameter.
+        /// </param>
+        /// <param name="encodingFormat"> Optional. The desired format for the returned embeddings. </param>
+        /// <param name="inputType">
+        /// Optional. The type of the input.
+        /// Returns a 422 error if the model doesn't support the value or parameter.
+        /// </param>
+        /// <param name="model"> ID of the specific AI model to use, if more than one model is available on the endpoint. </param>
+        /// <param name="additionalProperties"> Additional Properties. </param>
+        internal EmbeddingsOptions(IList<string> input, int? dimensions, EmbeddingEncodingFormat? encodingFormat, EmbeddingInputType? inputType, string model, IDictionary<string, BinaryData> additionalProperties)
+        {
+            Input = input;
+            Dimensions = dimensions;
+            EncodingFormat = encodingFormat;
+            InputType = inputType;
+            Model = model;
+            AdditionalProperties = additionalProperties;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingsOptions"/> for deserialization. </summary>
+        internal EmbeddingsOptions()
+        {
+        }
+
+        /// <summary>
+        /// Input text to embed, encoded as a string or array of tokens.
+        /// To embed multiple inputs in a single request, pass an array
+        /// of strings or array of token arrays.
+        /// </summary>
+        public IList<string> Input { get; }
+        /// <summary>
+        /// Optional. The number of dimensions the resulting output embeddings should have.
+        /// Passing null causes the model to use its default value.
+        /// Returns a 422 error if the model doesn't support the value or parameter.
+        /// </summary>
+        public int? Dimensions { get; set; }
+        /// <summary> Optional. The desired format for the returned embeddings. </summary>
+        public EmbeddingEncodingFormat? EncodingFormat { get; set; }
+        /// <summary>
+        /// Optional. The type of the input.
+        /// Returns a 422 error if the model doesn't support the value or parameter.
+        /// </summary>
+        public EmbeddingInputType? InputType { get; set; }
+        /// <summary> ID of the specific AI model to use, if more than one model is available on the endpoint. </summary>
+        public string Model { get; set; }
+        /// <summary>
+        /// Additional Properties
+        /// <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>
+        public IDictionary<string, BinaryData> AdditionalProperties { get; }
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsResult.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsResult.Serialization.cs
new file mode 100644
index 000000000000..ce69ed786690
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsResult.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.Inference
+{
+    public partial class EmbeddingsResult : IUtf8JsonSerializable, IJsonModel<EmbeddingsResult>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<EmbeddingsResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<EmbeddingsResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsResult>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(EmbeddingsResult)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            writer.WritePropertyName("id"u8);
+            writer.WriteStringValue(Id);
+            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);
+            writer.WritePropertyName("model"u8);
+            writer.WriteStringValue(Model);
+            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();
+        }
+
+        EmbeddingsResult IJsonModel<EmbeddingsResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsResult>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(EmbeddingsResult)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeEmbeddingsResult(document.RootElement, options);
+        }
+
+        internal static EmbeddingsResult DeserializeEmbeddingsResult(JsonElement element, ModelReaderWriterOptions options = null)
+        {
+            options ??= ModelSerializationExtensions.WireOptions;
+
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string id = default;
+            IReadOnlyList<EmbeddingItem> data = default;
+            EmbeddingsUsage usage = 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("id"u8))
+                {
+                    id = property.Value.GetString();
+                    continue;
+                }
+                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 (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 EmbeddingsResult(id, data, usage, model, serializedAdditionalRawData);
+        }
+
+        BinaryData IPersistableModel<EmbeddingsResult>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsResult>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(EmbeddingsResult)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        EmbeddingsResult IPersistableModel<EmbeddingsResult>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsResult>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeEmbeddingsResult(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(EmbeddingsResult)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<EmbeddingsResult>.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 EmbeddingsResult FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeEmbeddingsResult(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/ai/Azure.AI.Inference/src/Generated/EmbeddingsResult.cs b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsResult.cs
new file mode 100644
index 000000000000..c44b8e64397b
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsResult.cs
@@ -0,0 +1,101 @@
+// 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.Inference
+{
+    /// <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>
+    public partial class EmbeddingsResult
+    {
+        /// <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="EmbeddingsResult"/>. </summary>
+        /// <param name="id"> Unique identifier for the embeddings result. </param>
+        /// <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="model"> The model ID used to generate this result. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/>, <paramref name="data"/>, <paramref name="usage"/> or <paramref name="model"/> is null. </exception>
+        internal EmbeddingsResult(string id, IEnumerable<EmbeddingItem> data, EmbeddingsUsage usage, string model)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+            Argument.AssertNotNull(data, nameof(data));
+            Argument.AssertNotNull(usage, nameof(usage));
+            Argument.AssertNotNull(model, nameof(model));
+
+            Id = id;
+            Data = data.ToList();
+            Usage = usage;
+            Model = model;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingsResult"/>. </summary>
+        /// <param name="id"> Unique identifier for the embeddings result. </param>
+        /// <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="model"> The model ID used to generate this result. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal EmbeddingsResult(string id, IReadOnlyList<EmbeddingItem> data, EmbeddingsUsage usage, string model, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            Data = data;
+            Usage = usage;
+            Model = model;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="EmbeddingsResult"/> for deserialization. </summary>
+        internal EmbeddingsResult()
+        {
+        }
+
+        /// <summary> Unique identifier for the embeddings result. </summary>
+        public string Id { get; }
+        /// <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; }
+        /// <summary> The model ID used to generate this result. </summary>
+        public string Model { get; }
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsToolDefinition.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsUsage.Serialization.cs
similarity index 54%
rename from sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsToolDefinition.Serialization.cs
rename to sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsUsage.Serialization.cs
index 0fd79deb8261..5d5efa61a1cb 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsToolDefinition.Serialization.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsUsage.Serialization.cs
@@ -13,21 +13,23 @@
 
 namespace Azure.AI.Inference
 {
-    internal partial class UnknownChatCompletionsToolDefinition : IUtf8JsonSerializable, IJsonModel<ChatCompletionsToolDefinition>
+    public partial class EmbeddingsUsage : IUtf8JsonSerializable, IJsonModel<EmbeddingsUsage>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsToolDefinition>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<EmbeddingsUsage>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<ChatCompletionsToolDefinition>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<EmbeddingsUsage>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsUsage>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatCompletionsToolDefinition)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(EmbeddingsUsage)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            writer.WritePropertyName("type"u8);
-            writer.WriteStringValue(Type);
+            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)
@@ -46,19 +48,19 @@ void IJsonModel<ChatCompletionsToolDefinition>.Write(Utf8JsonWriter writer, Mode
             writer.WriteEndObject();
         }
 
-        ChatCompletionsToolDefinition IJsonModel<ChatCompletionsToolDefinition>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        EmbeddingsUsage IJsonModel<EmbeddingsUsage>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsUsage>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatCompletionsToolDefinition)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(EmbeddingsUsage)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeChatCompletionsToolDefinition(document.RootElement, options);
+            return DeserializeEmbeddingsUsage(document.RootElement, options);
         }
 
-        internal static UnknownChatCompletionsToolDefinition DeserializeUnknownChatCompletionsToolDefinition(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static EmbeddingsUsage DeserializeEmbeddingsUsage(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -66,14 +68,20 @@ internal static UnknownChatCompletionsToolDefinition DeserializeUnknownChatCompl
             {
                 return null;
             }
-            string type = "Unknown";
+            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("type"u8))
+                if (property.NameEquals("prompt_tokens"u8))
                 {
-                    type = property.Value.GetString();
+                    promptTokens = property.Value.GetInt32();
+                    continue;
+                }
+                if (property.NameEquals("total_tokens"u8))
+                {
+                    totalTokens = property.Value.GetInt32();
                     continue;
                 }
                 if (options.Format != "W")
@@ -82,53 +90,53 @@ internal static UnknownChatCompletionsToolDefinition DeserializeUnknownChatCompl
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new UnknownChatCompletionsToolDefinition(type, serializedAdditionalRawData);
+            return new EmbeddingsUsage(promptTokens, totalTokens, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<ChatCompletionsToolDefinition>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<EmbeddingsUsage>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            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(ChatCompletionsToolDefinition)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(EmbeddingsUsage)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ChatCompletionsToolDefinition IPersistableModel<ChatCompletionsToolDefinition>.Create(BinaryData data, ModelReaderWriterOptions options)
+        EmbeddingsUsage IPersistableModel<EmbeddingsUsage>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsToolDefinition>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<EmbeddingsUsage>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeChatCompletionsToolDefinition(document.RootElement, options);
+                        return DeserializeEmbeddingsUsage(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(ChatCompletionsToolDefinition)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(EmbeddingsUsage)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ChatCompletionsToolDefinition>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        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 new UnknownChatCompletionsToolDefinition FromResponse(Response response)
+        internal static EmbeddingsUsage FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeUnknownChatCompletionsToolDefinition(document.RootElement);
+            return DeserializeEmbeddingsUsage(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
+        internal virtual RequestContent ToRequestContent()
         {
             var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue<ChatCompletionsToolDefinition>(this, ModelSerializationExtensions.WireOptions);
+            content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
             return content;
         }
     }
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsUsage.cs b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsUsage.cs
new file mode 100644
index 000000000000..f0808a074012
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/EmbeddingsUsage.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.Inference
+{
+    /// <summary> Measurement of the amount of tokens used in this request and response. </summary>
+    public 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 in the request. </param>
+        /// <param name="totalTokens">
+        /// Total number of tokens transacted in this request/response. Should equal the
+        /// number of tokens in the request.
+        /// </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 in the request. </param>
+        /// <param name="totalTokens">
+        /// Total number of tokens transacted in this request/response. Should equal the
+        /// number of tokens in the request.
+        /// </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 in the request. </summary>
+        public int PromptTokens { get; }
+        /// <summary>
+        /// Total number of tokens transacted in this request/response. Should equal the
+        /// number of tokens in the request.
+        /// </summary>
+        public int TotalTokens { get; }
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatChoiceUpdate.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatChoiceUpdate.Serialization.cs
index 906c73937e89..9ce5c33f0228 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatChoiceUpdate.Serialization.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatChoiceUpdate.Serialization.cs
@@ -38,7 +38,7 @@ void IJsonModel<StreamingChatChoiceUpdate>.Write(Utf8JsonWriter writer, ModelRea
                 writer.WriteNull("finish_reason");
             }
             writer.WritePropertyName("delta"u8);
-            writer.WriteObjectValue(Delta, options);
+            writer.WriteObjectValue<StreamingChatResponseMessageUpdate>(Delta, options);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -79,7 +79,7 @@ internal static StreamingChatChoiceUpdate DeserializeStreamingChatChoiceUpdate(J
             }
             int index = default;
             CompletionsFinishReason? finishReason = default;
-            ChatResponseMessage delta = default;
+            StreamingChatResponseMessageUpdate delta = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -101,7 +101,7 @@ internal static StreamingChatChoiceUpdate DeserializeStreamingChatChoiceUpdate(J
                 }
                 if (property.NameEquals("delta"u8))
                 {
-                    delta = ChatResponseMessage.DeserializeChatResponseMessage(property.Value, options);
+                    delta = StreamingChatResponseMessageUpdate.DeserializeStreamingChatResponseMessageUpdate(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatChoiceUpdate.cs b/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatChoiceUpdate.cs
index f29bb1b500e4..51f0e6a01037 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatChoiceUpdate.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatChoiceUpdate.cs
@@ -55,7 +55,7 @@ public partial class StreamingChatChoiceUpdate
         /// <param name="finishReason"> The reason that this chat completions choice completed its generated. </param>
         /// <param name="delta"> An update to the chat message for a given chat completions prompt. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="delta"/> is null. </exception>
-        internal StreamingChatChoiceUpdate(int index, CompletionsFinishReason? finishReason, ChatResponseMessage delta)
+        internal StreamingChatChoiceUpdate(int index, CompletionsFinishReason? finishReason, StreamingChatResponseMessageUpdate delta)
         {
             Argument.AssertNotNull(delta, nameof(delta));
 
@@ -69,7 +69,7 @@ internal StreamingChatChoiceUpdate(int index, CompletionsFinishReason? finishRea
         /// <param name="finishReason"> The reason that this chat completions choice completed its generated. </param>
         /// <param name="delta"> An update to the chat message for a given chat completions prompt. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal StreamingChatChoiceUpdate(int index, CompletionsFinishReason? finishReason, ChatResponseMessage delta, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal StreamingChatChoiceUpdate(int index, CompletionsFinishReason? finishReason, StreamingChatResponseMessageUpdate delta, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Index = index;
             FinishReason = finishReason;
@@ -86,7 +86,5 @@ internal StreamingChatChoiceUpdate()
         public int Index { get; }
         /// <summary> The reason that this chat completions choice completed its generated. </summary>
         public CompletionsFinishReason? FinishReason { get; }
-        /// <summary> An update to the chat message for a given chat completions prompt. </summary>
-        public ChatResponseMessage Delta { get; }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatResponseMessageUpdate.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatResponseMessageUpdate.Serialization.cs
new file mode 100644
index 000000000000..70fddc324c6f
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatResponseMessageUpdate.Serialization.cs
@@ -0,0 +1,125 @@
+// 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.Inference
+{
+    public partial class StreamingChatResponseMessageUpdate : IUtf8JsonSerializable, IJsonModel<StreamingChatResponseMessageUpdate>
+    {
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StreamingChatResponseMessageUpdate>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+
+        void IJsonModel<StreamingChatResponseMessageUpdate>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<StreamingChatResponseMessageUpdate>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(StreamingChatResponseMessageUpdate)} does not support writing '{format}' format.");
+            }
+
+            writer.WriteStartObject();
+            if (Optional.IsDefined(Role))
+            {
+                writer.WritePropertyName("role"u8);
+                writer.WriteStringValue(Role.Value.ToString());
+            }
+            if (Optional.IsDefined(Content))
+            {
+                writer.WritePropertyName("content"u8);
+                writer.WriteStringValue(Content);
+            }
+            if (Optional.IsCollectionDefined(ToolCalls))
+            {
+                writer.WritePropertyName("tool_calls"u8);
+                writer.WriteStartArray();
+                foreach (var item in ToolCalls)
+                {
+                    writer.WriteObjectValue<StreamingChatResponseToolCallUpdate>(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();
+        }
+
+        StreamingChatResponseMessageUpdate IJsonModel<StreamingChatResponseMessageUpdate>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<StreamingChatResponseMessageUpdate>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(StreamingChatResponseMessageUpdate)} does not support reading '{format}' format.");
+            }
+
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeStreamingChatResponseMessageUpdate(document.RootElement, options);
+        }
+
+        BinaryData IPersistableModel<StreamingChatResponseMessageUpdate>.Write(ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<StreamingChatResponseMessageUpdate>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options);
+                default:
+                    throw new FormatException($"The model {nameof(StreamingChatResponseMessageUpdate)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        StreamingChatResponseMessageUpdate IPersistableModel<StreamingChatResponseMessageUpdate>.Create(BinaryData data, ModelReaderWriterOptions options)
+        {
+            var format = options.Format == "W" ? ((IPersistableModel<StreamingChatResponseMessageUpdate>)this).GetFormatFromOptions(options) : options.Format;
+
+            switch (format)
+            {
+                case "J":
+                    {
+                        using JsonDocument document = JsonDocument.Parse(data);
+                        return DeserializeStreamingChatResponseMessageUpdate(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(StreamingChatResponseMessageUpdate)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        string IPersistableModel<StreamingChatResponseMessageUpdate>.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 StreamingChatResponseMessageUpdate FromResponse(Response response)
+        {
+            using var document = JsonDocument.Parse(response.Content);
+            return DeserializeStreamingChatResponseMessageUpdate(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/ai/Azure.AI.Inference/src/Generated/StreamingChatResponseMessageUpdate.cs b/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatResponseMessageUpdate.cs
new file mode 100644
index 000000000000..7d6808846e19
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatResponseMessageUpdate.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.Inference
+{
+    /// <summary> A representation of a chat message update as received in a streaming response. </summary>
+    public partial class StreamingChatResponseMessageUpdate
+    {
+        /// <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="StreamingChatResponseMessageUpdate"/>. </summary>
+        internal StreamingChatResponseMessageUpdate()
+        {
+            ToolCalls = new ChangeTrackingList<StreamingChatResponseToolCallUpdate>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="StreamingChatResponseMessageUpdate"/>. </summary>
+        /// <param name="role"> The chat role associated with the message. If present, should always be 'assistant'. </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.
+        /// </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal StreamingChatResponseMessageUpdate(ChatRole? role, string content, IReadOnlyList<StreamingChatResponseToolCallUpdate> toolCalls, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Role = role;
+            Content = content;
+            ToolCalls = toolCalls;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> The chat role associated with the message. If present, should always be 'assistant'. </summary>
+        public ChatRole? Role { get; }
+        /// <summary> The content of the message. </summary>
+        public string Content { get; }
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolCall.Serialization.cs b/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatResponseToolCallUpdate.Serialization.cs
similarity index 58%
rename from sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolCall.Serialization.cs
rename to sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatResponseToolCallUpdate.Serialization.cs
index 2ff06c84703f..fd8490dbf5c9 100644
--- a/sdk/ai/Azure.AI.Inference/src/Generated/ChatCompletionsFunctionToolCall.Serialization.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatResponseToolCallUpdate.Serialization.cs
@@ -13,25 +13,23 @@
 
 namespace Azure.AI.Inference
 {
-    public partial class ChatCompletionsFunctionToolCall : IUtf8JsonSerializable, IJsonModel<ChatCompletionsFunctionToolCall>
+    public partial class StreamingChatResponseToolCallUpdate : IUtf8JsonSerializable, IJsonModel<StreamingChatResponseToolCallUpdate>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChatCompletionsFunctionToolCall>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StreamingChatResponseToolCallUpdate>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<ChatCompletionsFunctionToolCall>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<StreamingChatResponseToolCallUpdate>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<StreamingChatResponseToolCallUpdate>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolCall)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(StreamingChatResponseToolCallUpdate)} does not support writing '{format}' format.");
             }
 
             writer.WriteStartObject();
-            writer.WritePropertyName("function"u8);
-            writer.WriteObjectValue<FunctionCall>(Function, options);
-            writer.WritePropertyName("type"u8);
-            writer.WriteStringValue(Type);
             writer.WritePropertyName("id"u8);
             writer.WriteStringValue(Id);
+            writer.WritePropertyName("function"u8);
+            writer.WriteObjectValue(Function, options);
             if (options.Format != "W" && _serializedAdditionalRawData != null)
             {
                 foreach (var item in _serializedAdditionalRawData)
@@ -50,19 +48,19 @@ void IJsonModel<ChatCompletionsFunctionToolCall>.Write(Utf8JsonWriter writer, Mo
             writer.WriteEndObject();
         }
 
-        ChatCompletionsFunctionToolCall IJsonModel<ChatCompletionsFunctionToolCall>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        StreamingChatResponseToolCallUpdate IJsonModel<StreamingChatResponseToolCallUpdate>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<StreamingChatResponseToolCallUpdate>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolCall)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(StreamingChatResponseToolCallUpdate)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeChatCompletionsFunctionToolCall(document.RootElement, options);
+            return DeserializeStreamingChatResponseToolCallUpdate(document.RootElement, options);
         }
 
-        internal static ChatCompletionsFunctionToolCall DeserializeChatCompletionsFunctionToolCall(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static StreamingChatResponseToolCallUpdate DeserializeStreamingChatResponseToolCallUpdate(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -70,26 +68,20 @@ internal static ChatCompletionsFunctionToolCall DeserializeChatCompletionsFuncti
             {
                 return null;
             }
-            FunctionCall function = default;
-            string type = default;
             string id = default;
+            FunctionCall function = 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))
+                if (property.NameEquals("id"u8))
                 {
-                    type = property.Value.GetString();
+                    id = property.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("id"u8))
+                if (property.NameEquals("function"u8))
                 {
-                    id = property.Value.GetString();
+                    function = FunctionCall.DeserializeFunctionCall(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
@@ -98,50 +90,50 @@ internal static ChatCompletionsFunctionToolCall DeserializeChatCompletionsFuncti
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new ChatCompletionsFunctionToolCall(type, id, serializedAdditionalRawData, function);
+            return new StreamingChatResponseToolCallUpdate(id, function, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<ChatCompletionsFunctionToolCall>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<StreamingChatResponseToolCallUpdate>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<StreamingChatResponseToolCallUpdate>)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.");
+                    throw new FormatException($"The model {nameof(StreamingChatResponseToolCallUpdate)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ChatCompletionsFunctionToolCall IPersistableModel<ChatCompletionsFunctionToolCall>.Create(BinaryData data, ModelReaderWriterOptions options)
+        StreamingChatResponseToolCallUpdate IPersistableModel<StreamingChatResponseToolCallUpdate>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChatCompletionsFunctionToolCall>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<StreamingChatResponseToolCallUpdate>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data);
-                        return DeserializeChatCompletionsFunctionToolCall(document.RootElement, options);
+                        return DeserializeStreamingChatResponseToolCallUpdate(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(ChatCompletionsFunctionToolCall)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(StreamingChatResponseToolCallUpdate)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ChatCompletionsFunctionToolCall>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<StreamingChatResponseToolCallUpdate>.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)
+        internal static StreamingChatResponseToolCallUpdate FromResponse(Response response)
         {
             using var document = JsonDocument.Parse(response.Content);
-            return DeserializeChatCompletionsFunctionToolCall(document.RootElement);
+            return DeserializeStreamingChatResponseToolCallUpdate(document.RootElement);
         }
 
         /// <summary> Convert into a <see cref="RequestContent"/>. </summary>
-        internal override RequestContent ToRequestContent()
+        internal virtual RequestContent ToRequestContent()
         {
             var content = new Utf8JsonRequestContent();
             content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions);
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatResponseToolCallUpdate.cs b/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatResponseToolCallUpdate.cs
new file mode 100644
index 000000000000..213468dcfc3c
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/src/Generated/StreamingChatResponseToolCallUpdate.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.Inference
+{
+    /// <summary> An update to the function tool call information requested by the AI model. </summary>
+    public partial class StreamingChatResponseToolCallUpdate
+    {
+        /// <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="StreamingChatResponseToolCallUpdate"/>. </summary>
+        /// <param name="id"> The ID of the tool call. </param>
+        /// <param name="function"> Updates to the function call requested by the AI model. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="id"/> or <paramref name="function"/> is null. </exception>
+        internal StreamingChatResponseToolCallUpdate(string id, FunctionCall function)
+        {
+            Argument.AssertNotNull(id, nameof(id));
+            Argument.AssertNotNull(function, nameof(function));
+
+            Id = id;
+            Function = function;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="StreamingChatResponseToolCallUpdate"/>. </summary>
+        /// <param name="id"> The ID of the tool call. </param>
+        /// <param name="function"> Updates to the function call requested by the AI model. </param>
+        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        internal StreamingChatResponseToolCallUpdate(string id, FunctionCall function, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        {
+            Id = id;
+            Function = function;
+            _serializedAdditionalRawData = serializedAdditionalRawData;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="StreamingChatResponseToolCallUpdate"/> for deserialization. </summary>
+        internal StreamingChatResponseToolCallUpdate()
+        {
+        }
+
+        /// <summary> The ID of the tool call. </summary>
+        public string Id { get; }
+        /// <summary> Updates to the function call requested by the AI model. </summary>
+        public FunctionCall Function { get; }
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsNamedToolSelection.cs b/sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsNamedToolSelection.cs
deleted file mode 100644
index 27162a1f09c6..000000000000
--- a/sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsNamedToolSelection.cs
+++ /dev/null
@@ -1,28 +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.Inference
-{
-    /// <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/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsToolCall.cs b/sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsToolCall.cs
deleted file mode 100644
index 647a28b0af43..000000000000
--- a/sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsToolCall.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.Inference
-{
-    /// <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/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsToolDefinition.cs b/sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsToolDefinition.cs
deleted file mode 100644
index b33a226a4be9..000000000000
--- a/sdk/ai/Azure.AI.Inference/src/Generated/UnknownChatCompletionsToolDefinition.cs
+++ /dev/null
@@ -1,28 +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.Inference
-{
-    /// <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/ai/Azure.AI.Inference/src/Telemetry/RecordedResponse.cs b/sdk/ai/Azure.AI.Inference/src/Telemetry/RecordedResponse.cs
index c349ab8de273..8a584b173eec 100644
--- a/sdk/ai/Azure.AI.Inference/src/Telemetry/RecordedResponse.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Telemetry/RecordedResponse.cs
@@ -68,8 +68,8 @@ public RecordedResponse(ChatCompletions completions, bool recordContent)
                 calls[t] = new
                 {
                     id = toolCalls[t].Id,
-                    type = toolCalls[t].Type,
-                    function = toolCalls[t] is ChatCompletionsFunctionToolCall funcCall ?
+                    type = toolCalls[t].Type.ToString(),
+                    function = toolCalls[t] is ChatCompletionsToolCall funcCall ?
                         new { name = funcCall.Name, arguments = traceContent ? funcCall.Arguments : null }
                         : null
                 };
diff --git a/sdk/ai/Azure.AI.Inference/src/Telemetry/ResponseBuffer.cs b/sdk/ai/Azure.AI.Inference/src/Telemetry/ResponseBuffer.cs
index 2f977c84eee5..9a4141563b29 100644
--- a/sdk/ai/Azure.AI.Inference/src/Telemetry/ResponseBuffer.cs
+++ b/sdk/ai/Azure.AI.Inference/src/Telemetry/ResponseBuffer.cs
@@ -36,6 +36,11 @@ public Choice(int index, bool traceContent)
 
             public void CreateOrUpdateToolCall(StreamingToolCallUpdate call)
             {
+                if (call == null)
+                {
+                    return;
+                }
+
                 _toolCalls ??= new List<ToolCall>();
 
                 StreamingFunctionToolCallUpdate functionCall = call as StreamingFunctionToolCallUpdate;
@@ -59,20 +64,46 @@ public void CreateOrUpdateToolCall(StreamingToolCallUpdate call)
                 }
             }
 
-            public void CreateOrUpdateToolCall(ChatCompletionsToolCall call)
+            public void CreateOrUpdateToolCall(StreamingChatResponseToolCallUpdate call)
             {
+                if (call == null)
+                {
+                    return;
+                }
+
                 _toolCalls ??= new List<ToolCall>();
 
-                ChatCompletionsFunctionToolCall functionCall = call as ChatCompletionsFunctionToolCall;
+                // it's possible to get one or more tool calls in choice.delta
+                // but the StreamingChatResponseToolCallUpdate does not provide
+                // tool call index even though it's available on the wire.
+                // So for now let's try to correlate using tool call id and
+                // when index is available optimize to use index.
+                // and if Id is null, let's assume there is just one tool call
+                // which is obviously wrong, but at least we can support one tool call
+                // this way.
+
+                // TODO: THIS NEEDS TO BE FIXED WHEN INDEX IS SUPPORTED
+                string id = call.Id ?? _toolCalls.FirstOrDefault()?.Id;
 
-                if (!_toolCalls.Any())
+                ToolCall callToUpdate = null;
+                foreach (ToolCall c in _toolCalls)
                 {
-                    _toolCalls.Add(new ToolCall(functionCall?.Name, call.Id, _traceContent) { Type = call.Type });
+                    if (c.Id == id)
+                    {
+                        callToUpdate = c;
+                        break;
+                    }
+                }
+
+                if (callToUpdate == null)
+                {
+                    callToUpdate = new ToolCall(call.Function?.Name, id, _traceContent) { Type = "function" };
+                    _toolCalls.Add(callToUpdate);
                 }
 
-                if (_traceContent && functionCall?.Arguments != null)
+                if (_traceContent && call.Function?.Arguments != null)
                 {
-                    _toolCalls[0].Content.Append(functionCall.Arguments);
+                    callToUpdate.Content.Append(call.Function.Arguments);
                 }
             }
 
@@ -131,12 +162,6 @@ public void Update(StreamingChatCompletionsUpdate item)
                         choice.Content?.Append(choiceUpdate.Delta?.Content);
                     }
 
-                    // it's possible to get one or more tool calls in choice.delta
-                    // but the types that represents it - ChatCompletionsToolCall
-                    // and ChatCompletionsFunctionToolCall do not provide tool call index
-                    // even though it's available on the wire.
-                    // So for now we'll assume there is just one tool with index 0.
-
                     if (choiceUpdate.Delta?.ToolCalls != null)
                     {
                         foreach (var call in choiceUpdate.Delta?.ToolCalls)
diff --git a/sdk/ai/Azure.AI.Inference/tests/ChatCompletionsClientTest.cs b/sdk/ai/Azure.AI.Inference/tests/ChatCompletionsClientTest.cs
new file mode 100644
index 000000000000..30e1e0148f11
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/tests/ChatCompletionsClientTest.cs
@@ -0,0 +1,1055 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Azure.Core;
+using Azure.Core.Pipeline;
+using Azure.Core.TestFramework;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using File = System.IO.File;
+
+namespace Azure.AI.Inference.Tests
+{
+    public class ChatCompletionsClientTest: RecordedTestBase<InferenceClientTestEnvironment>
+    {
+        public enum TargetModel
+        {
+            MistralSmall,
+            GitHubGpt4o,
+            AoaiGpt4Turbo,
+        }
+
+        public enum ToolChoiceTestType
+        {
+            DoNotSpecifyToolChoice,
+            UseAutoPresetToolChoice,
+            UseNonePresetToolChoice,
+            UseRequiredPresetToolChoice,
+            UseFunctionByExplicitToolDefinitionForToolChoice,
+            UseFunctionByImplicitToolDefinitionForToolChoice,
+        }
+
+        public enum ImageTestSourceKind
+        {
+            UsingInternetLocation,
+            UsingStream,
+            UsingBinaryData,
+            UsingFilePath
+        }
+
+        public ChatCompletionsClientTest(bool isAsync) : base(isAsync)
+        {
+            TestDiagnostics = false;
+            JsonPathSanitizers.Add("$.messages[*].content[*].image_url.url");
+        }
+
+        /* please refer to https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/template/Azure.Template/tests/TemplateClientLiveTests.cs to write tests. */
+
+        [RecordedTest]
+        public async Task TestChatCompletions()
+        {
+            var mistralSmallEndpoint = new Uri(TestEnvironment.MistralSmallEndpoint);
+            var mistralSmallCredential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
+
+            var client = CreateClient(mistralSmallEndpoint, mistralSmallCredential, new AzureAIInferenceClientOptions());
+
+            var requestOptions = new ChatCompletionsOptions()
+            {
+                Messages =
+                {
+                    new ChatRequestSystemMessage("You are a helpful assistant."),
+                    new ChatRequestUserMessage("How many feet are in a mile?"),
+                },
+            };
+
+            Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
+            ChatCompletions result = response.Value;
+            Assert.That(result.Id, Is.Not.Null.Or.Empty);
+            Assert.That(result.Created, Is.Not.Null.Or.Empty);
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
+        }
+
+        [RecordedTest]
+        public async Task TestChatCompletionsWithEntraIdAuth()
+        {
+            var aoaiEndpoint = new Uri(TestEnvironment.AoaiEndpoint);
+            var entraIdCredential = TestEnvironment.Credential;
+
+            CaptureRequestPayloadPolicy captureRequestPayloadPolicy = new CaptureRequestPayloadPolicy();
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+            clientOptions.AddPolicy(captureRequestPayloadPolicy, HttpPipelinePosition.PerCall);
+
+            BearerTokenAuthenticationPolicy tokenPolicy = new BearerTokenAuthenticationPolicy(entraIdCredential, new string[] { "https://cognitiveservices.azure.com/.default" });
+            clientOptions.AddPolicy(tokenPolicy, HttpPipelinePosition.PerRetry);
+
+            var client = CreateClient(aoaiEndpoint, entraIdCredential, clientOptions);
+
+            var requestOptions = new ChatCompletionsOptions()
+            {
+                Messages =
+                {
+                    new ChatRequestSystemMessage("You are a helpful assistant."),
+                    new ChatRequestUserMessage("How many feet are in a mile?"),
+                },
+            };
+
+            Response<ChatCompletions> response = null;
+            try
+            {
+                response = await client.CompleteAsync(requestOptions);
+            }
+            catch (Exception ex)
+            {
+                var requestPayload = captureRequestPayloadPolicy._requestContent;
+                var requestHeaders = captureRequestPayloadPolicy._requestHeaders;
+                Assert.True(false, $"Request failed with the following exception:\n {ex}\n Request headers: {requestHeaders}\n Request payload: {requestPayload}");
+            }
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
+            ChatCompletions result = response.Value;
+            Assert.That(result.Id, Is.Not.Null.Or.Empty);
+            Assert.That(result.Created, Is.Not.Null.Or.Empty);
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
+        }
+
+        [RecordedTest]
+        public async Task TestStreamingChatCompletions()
+        {
+            var mistralSmallEndpoint = new Uri(TestEnvironment.MistralSmallEndpoint);
+            var mistralSmallCredential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
+
+            CaptureRequestPayloadPolicy captureRequestPayloadPolicy = new CaptureRequestPayloadPolicy();
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+            clientOptions.AddPolicy(captureRequestPayloadPolicy, HttpPipelinePosition.PerCall);
+
+            var client = CreateClient(mistralSmallEndpoint, mistralSmallCredential, clientOptions);
+
+            var requestOptions = new ChatCompletionsOptions()
+            {
+                Messages =
+                {
+                    new ChatRequestSystemMessage("You are a helpful assistant."),
+                    new ChatRequestUserMessage("How many feet are in a mile?"),
+                },
+                MaxTokens = 512,
+            };
+
+            StreamingResponse<StreamingChatCompletionsUpdate> response = null;
+            try
+            {
+                response = await client.CompleteStreamingAsync(requestOptions);
+            }
+            catch (Exception ex)
+            {
+                var requestPayload = captureRequestPayloadPolicy._requestContent;
+                var requestHeaders = captureRequestPayloadPolicy._requestHeaders;
+                Assert.True(false, $"Request failed with the following exception:\n {ex}\n Request headers: {requestHeaders}\n Request payload: {requestPayload}");
+            }
+
+            Assert.That(response, Is.Not.Null);
+
+            StringBuilder contentBuilder = new();
+            string id = null;
+            string model = null;
+            bool gotRole = false;
+
+            // await ProcessStreamingResponse(response, messages);
+
+            await foreach (StreamingChatCompletionsUpdate chatUpdate in response)
+            {
+                Assert.That(chatUpdate, Is.Not.Null);
+
+                Assert.That(chatUpdate.Id, Is.Not.Null.Or.Empty);
+                Assert.That(chatUpdate.Created, Is.GreaterThan(new DateTimeOffset(new DateTime(2023, 1, 1))));
+                Assert.That(chatUpdate.Created, Is.LessThan(DateTimeOffset.UtcNow.AddDays(7)));
+
+                if (!string.IsNullOrEmpty(chatUpdate.Id))
+                {
+                    Assert.That((id is null) || (id == chatUpdate.Id));
+                    id = chatUpdate.Id;
+                }
+                if (!string.IsNullOrEmpty(chatUpdate.Model))
+                {
+                    Assert.That((model is null) || (model == chatUpdate.Model));
+                    model = chatUpdate.Model;
+                }
+                if (chatUpdate.Role.HasValue)
+                {
+                    Assert.IsFalse(gotRole);
+                    Assert.That(chatUpdate.Role.Value, Is.EqualTo(ChatRole.Assistant));
+                    gotRole = true;
+                }
+                if (!string.IsNullOrEmpty(chatUpdate.ContentUpdate))
+                {
+                    contentBuilder.Append(chatUpdate.ContentUpdate);
+                }
+            }
+
+            Assert.IsTrue(!string.IsNullOrEmpty(id));
+            Assert.IsTrue(!string.IsNullOrEmpty(model));
+            Assert.IsTrue(gotRole);
+            var result = contentBuilder.ToString();
+            Assert.That(contentBuilder.ToString(), Is.Not.Null.Or.Empty);
+        }
+
+        [RecordedTest]
+        public async Task TestSendModelExtras()
+        {
+            var mistralSmallEndpoint = new Uri(TestEnvironment.MistralSmallEndpoint);
+            var mistralSmallCredential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
+
+            CaptureRequestPayloadPolicy captureRequestPayloadPolicy = new CaptureRequestPayloadPolicy();
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+            clientOptions.AddPolicy(captureRequestPayloadPolicy, HttpPipelinePosition.PerCall);
+
+            var client = CreateClient(mistralSmallEndpoint, mistralSmallCredential, clientOptions);
+
+            var requestOptions = new ChatCompletionsOptions()
+            {
+                Messages =
+                {
+                    new ChatRequestSystemMessage("You are a helpful assistant."),
+                    new ChatRequestUserMessage("How many feet are in a mile?"),
+                },
+                AdditionalProperties = { { "foo", BinaryData.FromString("\"bar\"") } },
+            };
+
+            var exceptionThrown = false;
+
+            try
+            {
+                await client.CompleteAsync(requestOptions);
+            }
+            catch (Exception e)
+            {
+                exceptionThrown = true;
+                Assert.IsTrue(e.Message.Contains("Extra inputs are not permitted"));
+                Assert.IsTrue(captureRequestPayloadPolicy._requestContent.Contains("foo"));
+                Assert.IsTrue(captureRequestPayloadPolicy._requestHeaders.ContainsKey("extra-parameters"));
+                Assert.IsTrue(captureRequestPayloadPolicy._requestHeaders["extra-parameters"] == ExtraParameters.PassThrough);
+            }
+            Assert.IsTrue(exceptionThrown);
+        }
+
+        [RecordedTest]
+        [TestCase(ToolChoiceTestType.DoNotSpecifyToolChoice, TargetModel.MistralSmall)]
+        [TestCase(ToolChoiceTestType.UseAutoPresetToolChoice, TargetModel.MistralSmall)]
+        [TestCase(ToolChoiceTestType.UseNonePresetToolChoice, TargetModel.MistralSmall)]
+        [TestCase(ToolChoiceTestType.UseRequiredPresetToolChoice, TargetModel.MistralSmall, IgnoreReason = "Endpoint needs to be updated to support")]
+        [TestCase(ToolChoiceTestType.UseFunctionByExplicitToolDefinitionForToolChoice, TargetModel.GitHubGpt4o)]
+        [TestCase(ToolChoiceTestType.UseFunctionByImplicitToolDefinitionForToolChoice, TargetModel.GitHubGpt4o)]
+        public async Task TestChatCompletionsFunctionToolHandling(ToolChoiceTestType toolChoiceType, TargetModel targetModel)
+        {
+            FunctionDefinition futureTemperatureFunction = new FunctionDefinition("get_future_temperature")
+            {
+                Description = "requests the anticipated future temperature at a provided location to help inform "
+                + "advice about topics like choice of attire",
+                Parameters = BinaryData.FromObjectAsJson(new
+                {
+                    Type = "object",
+                    Properties = new
+                    {
+                        LocationName = new
+                        {
+                            Type = "string",
+                            Description = "the name or brief description of a location for weather information"
+                        },
+                        DaysInAdvance = new
+                        {
+                            Type = "integer",
+                            Description = "the number of days in the future for which to retrieve weather information"
+                        }
+                    }
+                },
+                new JsonSerializerOptions() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase })
+            };
+
+            ChatCompletionsToolDefinition functionToolDef = new ChatCompletionsToolDefinition(futureTemperatureFunction);
+
+            var endpoint = targetModel switch
+            {
+                TargetModel.MistralSmall => new Uri(TestEnvironment.MistralSmallEndpoint),
+                TargetModel.GitHubGpt4o => new Uri(TestEnvironment.GithubEndpoint),
+                _ => throw new ArgumentException(nameof(targetModel)),
+            };
+
+            var credential = targetModel switch
+            {
+                TargetModel.MistralSmall => new AzureKeyCredential(TestEnvironment.MistralSmallApiKey),
+                TargetModel.GitHubGpt4o => new AzureKeyCredential(TestEnvironment.GithubToken),
+                _ => throw new ArgumentException(nameof(targetModel)),
+            };
+
+            var githubModelName = "gpt-4o";
+
+            CaptureRequestPayloadPolicy captureRequestPayloadPolicy = new CaptureRequestPayloadPolicy();
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+            clientOptions.AddPolicy(captureRequestPayloadPolicy, HttpPipelinePosition.PerCall);
+
+            // Uncomment the following lines to enable enhanced log output
+            // AzureEventSourceListener listener = AzureEventSourceListener.CreateConsoleLogger(EventLevel.Verbose);
+            // clientOptions.Diagnostics.IsLoggingContentEnabled = true;
+
+            var client = CreateClient(endpoint, credential, clientOptions);
+
+            var requestOptions = new ChatCompletionsOptions()
+            {
+                Messages =
+                {
+                    new ChatRequestSystemMessage("You are a helpful assistant."),
+                    new ChatRequestUserMessage("What should I wear in Honolulu in 3 days?"),
+                },
+                MaxTokens = 512,
+                Tools = { functionToolDef },
+            };
+
+            if (targetModel == TargetModel.GitHubGpt4o)
+            {
+                requestOptions.Model = githubModelName;
+            }
+
+            requestOptions.ToolChoice = toolChoiceType switch
+            {
+                ToolChoiceTestType.UseAutoPresetToolChoice => ChatCompletionsToolChoice.Auto,
+                ToolChoiceTestType.UseNonePresetToolChoice => ChatCompletionsToolChoice.None,
+                ToolChoiceTestType.UseRequiredPresetToolChoice => ChatCompletionsToolChoice.Required,
+                ToolChoiceTestType.UseFunctionByExplicitToolDefinitionForToolChoice => new ChatCompletionsToolChoice(functionToolDef),
+                ToolChoiceTestType.UseFunctionByImplicitToolDefinitionForToolChoice => functionToolDef,
+                _ => null,
+            };
+
+            Response<ChatCompletions> response = null;
+            try
+            {
+                response = await client.CompleteAsync(requestOptions);
+            }
+            catch (Exception ex)
+            {
+                var requestPayload = captureRequestPayloadPolicy._requestContent;
+                var requestHeaders = captureRequestPayloadPolicy._requestHeaders;
+                Assert.True(false, $"Request failed with the following exception:\n {ex}\n Request headers: {requestHeaders}\n Request payload: {requestPayload}");
+            }
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
+            ChatCompletions result = response.Value;
+            Assert.That(result.Id, Is.Not.Null.Or.Empty);
+            Assert.That(result.Created, Is.Not.Null.Or.Empty);
+
+            if (toolChoiceType == ToolChoiceTestType.UseNonePresetToolChoice)
+            {
+                Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+                Assert.That(result.ToolCalls, Is.Null.Or.Empty);
+                // We finish the test here as there's no further exercise for 'none' beyond ensuring we didn't do what we
+                // weren't meant to
+                return;
+            }
+            else if (toolChoiceType == ToolChoiceTestType.UseAutoPresetToolChoice || toolChoiceType == ToolChoiceTestType.DoNotSpecifyToolChoice)
+            {
+                Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.ToolCalls));
+                // and continue the test
+            }
+            else
+            {
+                Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+                // and continue the test, as we will have tool_calls
+            }
+
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Null.Or.Empty);
+            Assert.That(result.ToolCalls, Is.Not.Null.Or.Empty);
+            Assert.That(result.ToolCalls.Count, Is.EqualTo(1));
+            ChatCompletionsToolCall functionToolCall = result.ToolCalls[0] as ChatCompletionsToolCall;
+            Assert.That(functionToolCall, Is.Not.Null);
+            Assert.That(functionToolCall.Name, Is.EqualTo(futureTemperatureFunction.Name));
+            Assert.That(functionToolCall.Arguments, Is.Not.Null.Or.Empty);
+
+            Dictionary<string, string> arguments
+                = JsonConvert.DeserializeObject<Dictionary<string, string>>(functionToolCall.Arguments);
+            Assert.That(arguments.ContainsKey("locationName"));
+            Assert.That(arguments.ContainsKey("daysInAdvance"));
+
+            ChatCompletionsOptions followupOptions = new()
+            {
+                Tools = { functionToolDef },
+                MaxTokens = 512,
+            };
+
+            if (targetModel == TargetModel.GitHubGpt4o)
+            {
+                followupOptions.Model = githubModelName;
+            }
+
+            // Include all original messages
+            foreach (ChatRequestMessage originalMessage in requestOptions.Messages)
+            {
+                followupOptions.Messages.Add(originalMessage);
+            }
+
+            // Add the tool call message just received back from the assistant
+            followupOptions.Messages.Add(new ChatRequestAssistantMessage(result));
+
+            // And also the tool message that resolves the tool call
+            followupOptions.Messages.Add(new ChatRequestToolMessage(
+                toolCallId: functionToolCall.Id,
+                content: "31 celsius"));
+
+            Response<ChatCompletions> followupResponse = null;
+            try
+            {
+                followupResponse = await client.CompleteAsync(followupOptions);
+            }
+            catch (Exception ex)
+            {
+                var requestPayload = captureRequestPayloadPolicy._requestContent;
+                var requestHeaders = captureRequestPayloadPolicy._requestHeaders;
+                Assert.True(false, $"Request failed with the following exception:\n {ex}\n Request headers: {requestHeaders}\n Request payload: {requestPayload}");
+            }
+            var requestPayload1 = captureRequestPayloadPolicy._requestContent;
+
+            Assert.That(followupResponse, Is.Not.Null);
+            Assert.That(followupResponse.Value, Is.Not.Null);
+            Assert.That(followupResponse.Value.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(followupResponse.Value.Content, Is.Not.Null.Or.Empty);
+        }
+
+        [RecordedTest]
+        [TestCase(ImageTestSourceKind.UsingInternetLocation)]
+        [TestCase(ImageTestSourceKind.UsingStream)]
+        [TestCase(ImageTestSourceKind.UsingBinaryData)]
+        [TestCase(ImageTestSourceKind.UsingFilePath)]
+        public async Task TestChatCompletionsWithImages(ImageTestSourceKind imageSourceKind)
+        {
+            if (imageSourceKind == ImageTestSourceKind.UsingFilePath && Mode == RecordedTestMode.Playback)
+            {
+                Assert.Inconclusive("Unable to run test with file path in playback mode.");
+            }
+
+            var aoaiEndpoint = new Uri(TestEnvironment.AoaiEndpoint);
+            var aoaiKey = new AzureKeyCredential(TestEnvironment.AoaiKey);
+
+            CaptureRequestPayloadPolicy captureRequestPayloadPolicy = new CaptureRequestPayloadPolicy();
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+            clientOptions.AddPolicy(captureRequestPayloadPolicy, HttpPipelinePosition.PerCall);
+
+            // Uncomment the following lines to enable enhanced log output
+            // AzureEventSourceListener listener = AzureEventSourceListener.CreateConsoleLogger(EventLevel.Verbose);
+            // clientOptions.Diagnostics.IsLoggingContentEnabled = true;
+
+            var client = CreateClient(aoaiEndpoint, aoaiKey, clientOptions);
+
+            ChatMessageImageContentItem imageContentItem = imageSourceKind switch
+            {
+                ImageTestSourceKind.UsingInternetLocation => new(GetTestImageInternetUri(), ChatMessageImageDetailLevel.Low),
+                ImageTestSourceKind.UsingStream => new(GetTestImageStream("image/jpg"), "image/jpg", ChatMessageImageDetailLevel.Low),
+                ImageTestSourceKind.UsingBinaryData => new(GetTestImageData("image/jpg"), "image/jpg", ChatMessageImageDetailLevel.Low),
+                ImageTestSourceKind.UsingFilePath => new(TestEnvironment.TestImageJpgInputPath, "image/jpg", ChatMessageImageDetailLevel.Low),
+                _ => throw new ArgumentException(nameof(imageSourceKind)),
+            };
+
+            var requestOptions = new ChatCompletionsOptions()
+            {
+                Messages =
+                {
+                    new ChatRequestSystemMessage("You are a helpful assistant that helps describe images."),
+                    new ChatRequestUserMessage(
+                        new ChatMessageTextContentItem("describe this image"),
+                        imageContentItem),
+                },
+                MaxTokens = 2048,
+            };
+
+            Response<ChatCompletions> response = null;
+            try
+            {
+                response = await client.CompleteAsync(requestOptions);
+            }
+            catch (Exception ex)
+            {
+                var requestPayload = captureRequestPayloadPolicy._requestContent;
+                var requestHeaders = captureRequestPayloadPolicy._requestHeaders;
+                Assert.True(false, $"Request failed with the following exception:\n {ex}\n Request headers: {requestHeaders}\n Request payload: {requestPayload}");
+            }
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
+            ChatCompletions result = response.Value;
+            Assert.That(result.Id, Is.Not.Null.Or.Empty);
+            Assert.That(result.Created, Is.Not.Null.Or.Empty);
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
+        }
+
+        [RecordedTest]
+        public async Task TestChatCompletionsUserAgent()
+        {
+            var mistralSmallEndpoint = new Uri(TestEnvironment.MistralSmallEndpoint);
+            var mistralSmallCredential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
+
+            var clientOptions = new AzureAIInferenceClientOptions();
+            CaptureRequestPayloadPolicy captureRequestPayloadPolicy = new CaptureRequestPayloadPolicy();
+            clientOptions.AddPolicy(captureRequestPayloadPolicy, HttpPipelinePosition.PerCall);
+            AddAppIdPolicy addAppIdPolicy = new AddAppIdPolicy("MyAppId");
+            clientOptions.AddPolicy(addAppIdPolicy, HttpPipelinePosition.PerCall);
+
+            var client = CreateClient(mistralSmallEndpoint, mistralSmallCredential, clientOptions);
+
+            var requestOptions = new ChatCompletionsOptions()
+            {
+                Messages =
+                {
+                    new ChatRequestSystemMessage("You are a helpful assistant."),
+                    new ChatRequestUserMessage("How many feet are in a mile?"),
+                },
+            };
+
+            Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
+            ChatCompletions result = response.Value;
+            Assert.That(result.Id, Is.Not.Null.Or.Empty);
+            Assert.That(result.Created, Is.Not.Null.Or.Empty);
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
+
+            string userAgent = null;
+            captureRequestPayloadPolicy._requestHeaders.TryGetValue("User-Agent", out userAgent);
+            Assert.That(userAgent, Is.Not.Null.Or.Empty);
+            Assert.That(userAgent.StartsWith("MyAppId"));
+        }
+
+        [RecordedTest]
+        [TestCase(ToolChoiceTestType.DoNotSpecifyToolChoice, TargetModel.MistralSmall)]
+        [TestCase(ToolChoiceTestType.UseAutoPresetToolChoice, TargetModel.MistralSmall)]
+        [TestCase(ToolChoiceTestType.UseNonePresetToolChoice, TargetModel.MistralSmall)]
+        [TestCase(ToolChoiceTestType.UseRequiredPresetToolChoice, TargetModel.MistralSmall, IgnoreReason = "Endpoint needs to be updated to support")]
+        [TestCase(ToolChoiceTestType.UseFunctionByExplicitToolDefinitionForToolChoice, TargetModel.GitHubGpt4o)]
+        [TestCase(ToolChoiceTestType.UseFunctionByExplicitToolDefinitionForToolChoice, TargetModel.AoaiGpt4Turbo)]
+        [TestCase(ToolChoiceTestType.UseFunctionByImplicitToolDefinitionForToolChoice, TargetModel.GitHubGpt4o)]
+        public async Task TestChatCompletionsFunctionToolHandlingWithStreaming(ToolChoiceTestType toolChoiceType, TargetModel targetModel)
+        {
+            FunctionDefinition futureTemperatureFunction = new FunctionDefinition("get_future_temperature")
+            {
+                Description = "requests the anticipated future temperature at a provided location to help inform "
+                + "advice about topics like choice of attire",
+                Parameters = BinaryData.FromObjectAsJson(new
+                {
+                    Type = "object",
+                    Properties = new
+                    {
+                        LocationName = new
+                        {
+                            Type = "string",
+                            Description = "the name or brief description of a location for weather information"
+                        },
+                        DaysInAdvance = new
+                        {
+                            Type = "integer",
+                            Description = "the number of days in the future for which to retrieve weather information"
+                        }
+                    }
+                },
+                new JsonSerializerOptions() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase })
+            };
+
+            ChatCompletionsToolDefinition functionToolDef = new ChatCompletionsToolDefinition(futureTemperatureFunction);
+
+            var endpoint = targetModel switch
+            {
+                TargetModel.MistralSmall => new Uri(TestEnvironment.MistralSmallEndpoint),
+                TargetModel.GitHubGpt4o => new Uri(TestEnvironment.GithubEndpoint),
+                TargetModel.AoaiGpt4Turbo => new Uri(TestEnvironment.AoaiEndpoint),
+                _ => throw new ArgumentException(nameof(targetModel)),
+            };
+
+            var credential = targetModel switch
+            {
+                TargetModel.MistralSmall => new AzureKeyCredential(TestEnvironment.MistralSmallApiKey),
+                TargetModel.GitHubGpt4o => new AzureKeyCredential(TestEnvironment.GithubToken),
+                TargetModel.AoaiGpt4Turbo => new AzureKeyCredential(TestEnvironment.AoaiKey),
+                _ => throw new ArgumentException(nameof(targetModel)),
+            };
+
+            var githubModelName = "gpt-4o";
+
+            CaptureRequestPayloadPolicy captureRequestPayloadPolicy = new CaptureRequestPayloadPolicy();
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+            clientOptions.AddPolicy(captureRequestPayloadPolicy, HttpPipelinePosition.PerCall);
+
+            // Uncomment the following lines to enable enhanced log output
+            // AzureEventSourceListener listener = AzureEventSourceListener.CreateConsoleLogger(EventLevel.Verbose);
+            // clientOptions.Diagnostics.IsLoggingContentEnabled = true;
+
+            var client = CreateClient(endpoint, credential, clientOptions);
+
+            #region
+            var messages = new List<ChatRequestMessage>()
+            {
+                new ChatRequestSystemMessage("You are a helpful assistant."),
+                new ChatRequestUserMessage("What should I wear in Honolulu in 3 days?"),
+            };
+
+            var requestOptions = new ChatCompletionsOptions(messages)
+            {
+                MaxTokens = 512,
+                Tools = { functionToolDef },
+            };
+
+            if (targetModel == TargetModel.GitHubGpt4o)
+            {
+                requestOptions.Model = githubModelName;
+            }
+
+            requestOptions.ToolChoice = toolChoiceType switch
+            {
+                ToolChoiceTestType.UseAutoPresetToolChoice => ChatCompletionsToolChoice.Auto,
+                ToolChoiceTestType.UseNonePresetToolChoice => ChatCompletionsToolChoice.None,
+                ToolChoiceTestType.UseRequiredPresetToolChoice => ChatCompletionsToolChoice.Required,
+                ToolChoiceTestType.UseFunctionByExplicitToolDefinitionForToolChoice => new ChatCompletionsToolChoice(functionToolDef),
+                ToolChoiceTestType.UseFunctionByImplicitToolDefinitionForToolChoice => functionToolDef,
+                _ => null,
+            };
+            #endregion
+
+            #region
+
+            StreamingResponse<StreamingChatCompletionsUpdate> response = null;
+            string requestPayload = null;
+            Dictionary<string, string> requestHeaders = null;
+            try
+            {
+                response = await client.CompleteStreamingAsync(requestOptions);
+            }
+            catch (Exception ex)
+            {
+                Assert.True(false, $"Request failed with the following exception:\n {ex}\n Request headers: {requestHeaders}\n Request payload: {requestPayload}");
+            }
+            finally
+            {
+                requestPayload = captureRequestPayloadPolicy._requestContent;
+                requestHeaders = captureRequestPayloadPolicy._requestHeaders;
+            }
+
+            await ProcessStreamingResponse(response, messages);
+
+            if (toolChoiceType == ToolChoiceTestType.UseNonePresetToolChoice)
+            {
+                Assert.That(messages.Count == 3);
+                // We finish the test here as there's no further exercise for 'none' beyond ensuring we didn't do what we
+                // weren't meant to
+                return;
+            }
+
+            ChatCompletionsOptions followupOptions = new ChatCompletionsOptions(messages)
+            {
+                Tools = { functionToolDef },
+                MaxTokens = 512,
+            };
+
+            if (targetModel == TargetModel.GitHubGpt4o)
+            {
+                followupOptions.Model = githubModelName;
+            }
+
+            try
+            {
+                response = await client.CompleteStreamingAsync(followupOptions);
+            }
+            catch (Exception ex)
+            {
+                Assert.True(false, $"Request failed with the following exception:\n {ex}\n Request headers: {requestHeaders}\n Request payload: {requestPayload}");
+            }
+            finally
+            {
+                requestPayload = captureRequestPayloadPolicy._requestContent;
+                requestHeaders = captureRequestPayloadPolicy._requestHeaders;
+            }
+
+            await ProcessStreamingResponse(response, messages);
+            #endregion
+
+            Assert.That(messages.Count() > 4);
+
+            #region
+            foreach (ChatRequestMessage requestMessage in messages)
+            {
+                switch (requestMessage)
+                {
+                    case ChatRequestSystemMessage systemMessage:
+                        Console.WriteLine($"[SYSTEM]:");
+                        Console.WriteLine($"{systemMessage.Content}");
+                        Console.WriteLine();
+                        break;
+
+                    case ChatRequestUserMessage userMessage:
+                        Console.WriteLine($"[USER]:");
+                        Console.WriteLine($"{userMessage.Content}");
+                        Console.WriteLine();
+                        break;
+
+                    case ChatRequestAssistantMessage assistantMessage:
+                        Console.WriteLine($"[ASSISTANT]:");
+                        Console.WriteLine($"{assistantMessage.Content}");
+                        Console.WriteLine();
+                        break;
+
+                    case ChatRequestToolMessage:
+                        // Do not print any tool messages; let the assistant summarize the tool results instead.
+                        break;
+
+                    default:
+                        break;
+                }
+            }
+            #endregion
+        }
+
+        #region Helpers
+        private class CaptureRequestPayloadPolicy : HttpPipelinePolicy
+        {
+            public string _requestContent;
+            public Dictionary<string, string> _requestHeaders;
+
+            public override void Process(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
+            {
+                ProcessNext(message, pipeline);
+
+                var memStream = new MemoryStream();
+                message.Request.Content.WriteTo(memStream, new System.Threading.CancellationToken());
+                _requestContent = Encoding.UTF8.GetString(memStream.ToArray());
+
+                _requestHeaders = message.Request.Headers.ToDictionary(a => a.Name, a => a.Value);
+            }
+
+            public override ValueTask ProcessAsync(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
+            {
+                var task = ProcessNextAsync(message, pipeline);
+
+                var memStream = new MemoryStream();
+                message.Request.Content.WriteTo(memStream, new System.Threading.CancellationToken());
+                _requestContent = Encoding.UTF8.GetString(memStream.ToArray());
+
+                _requestHeaders = message.Request.Headers.ToDictionary(a => a.Name, a => a.Value);
+
+                return task;
+            }
+        }
+
+        private class AddAppIdPolicy : HttpPipelinePolicy
+        {
+            private string AppId { get; }
+
+            public AddAppIdPolicy(string appId)
+            {
+                AppId = appId;
+            }
+
+            public override void Process(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
+            {
+                ProcessNext(message, pipeline);
+
+                UpdateHeader(message);
+            }
+
+            public override ValueTask ProcessAsync(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
+            {
+                var task = ProcessNextAsync(message, pipeline);
+
+                UpdateHeader(message);
+
+                return task;
+            }
+
+            private void UpdateHeader(HttpMessage message)
+            {
+                if (message.Request.Headers.TryGetValue("User-Agent", out string currentHeader) == false)
+                {
+                    // Add your desired header name and value
+                    message.Request.Headers.Add("User-Agent", AppId);
+                }
+                else
+                {
+                    message.Request.Headers.SetValue("User-Agent", $"{AppId} {currentHeader}");
+                }
+            }
+        }
+
+        private ChatCompletionsClient CreateClient(Uri endpoint, AzureKeyCredential credential, AzureAIInferenceClientOptions clientOptions)
+        {
+            return InstrumentClient(new ChatCompletionsClient(endpoint, credential, InstrumentClientOptions(clientOptions)));
+        }
+
+        private ChatCompletionsClient CreateClient(Uri endpoint, TokenCredential credential, AzureAIInferenceClientOptions clientOptions)
+        {
+            return InstrumentClient(new ChatCompletionsClient(endpoint, credential, InstrumentClientOptions(clientOptions)));
+        }
+
+        private static BinaryData GetContentFromResponse(Response r)
+        {
+            // Workaround azure/azure-sdk-for-net#21048, which prevents .Content from working when dealing with responses
+            // from the playback system.
+
+            MemoryStream ms = new MemoryStream();
+            r.ContentStream.CopyTo(ms);
+            return new BinaryData(ms.ToArray());
+        }
+
+        private Uri GetTestImageInternetUri()
+        {
+            if (Mode == RecordedTestMode.Playback)
+            {
+                return new Uri("https://sanitized");
+            }
+            return new Uri("https://aka.ms/azsdk/azure-ai-inference/csharp/tests/juggling_balls.png");
+        }
+
+        private Stream GetTestImageStream(string mimeType)
+        {
+            if (Mode == RecordedTestMode.Playback)
+            {
+                return new MemoryStream();
+            }
+            return File.OpenRead(mimeType switch
+            {
+                "image/jpg" => TestEnvironment.TestImageJpgInputPath,
+                _ => throw new ArgumentException(nameof(mimeType)),
+            });
+        }
+
+        private BinaryData GetTestImageData(string mimeType)
+            => BinaryData.FromStream(GetTestImageStream(mimeType));
+
+        private async Task ProcessStreamingResponse(StreamingResponse<StreamingChatCompletionsUpdate> response, List<ChatRequestMessage> messages)
+        {
+            string toolCallId = null;
+            string functionName = null;
+            StringBuilder functionArguments = null;
+            StringBuilder contentBuilder = new();
+
+            await foreach (StreamingChatCompletionsUpdate chatUpdate in response)
+            {
+                // Accumulate the text content as new updates arrive.
+                contentBuilder.Append(chatUpdate.ContentUpdate);
+
+                // Build the tool calls as new updates arrive.
+                StreamingChatResponseToolCallUpdate toolCallUpdate = chatUpdate.ToolCallUpdate;
+
+                if (toolCallUpdate != null)
+                {
+                    if (toolCallUpdate.Id != null)
+                    {
+                        toolCallId = toolCallUpdate.Id;
+                    }
+
+                    // Keep track of which function name belongs to this update id.
+                    if (toolCallUpdate.Function.Name is not null)
+                    {
+                        functionName = toolCallUpdate.Function.Name;
+                    }
+
+                    // Keep track of which function arguments belong to this update index,
+                    // and accumulate the arguments string as new updates arrive.
+                    if (toolCallUpdate.Function.Arguments is not null)
+                    {
+                        functionArguments ??= new StringBuilder();
+                        functionArguments.Append(toolCallUpdate.Function.Arguments);
+                    }
+                }
+
+                if (chatUpdate.FinishReason == CompletionsFinishReason.Stopped || chatUpdate.FinishReason == CompletionsFinishReason.ToolCalls)
+                {
+                    ProcessToolArguments(messages, contentBuilder, functionArguments, toolCallId, functionName);
+                }
+                else if (chatUpdate.FinishReason == CompletionsFinishReason.TokenLimitReached)
+                {
+                    throw new NotImplementedException("Incomplete model output due to MaxTokens parameter or token limit exceeded.");
+                }
+                else if (chatUpdate.FinishReason == CompletionsFinishReason.ContentFiltered)
+                {
+                    throw new NotImplementedException("Omitted content due to a content filter flag.");
+                }
+            }
+        }
+
+        private async Task ProcessMultiToolStreamingResponse(StreamingResponse<StreamingChatCompletionsUpdate> response, List<ChatRequestMessage> messages)
+        {
+            Dictionary<string, string> idToFunctionName = new Dictionary<string, string>();
+            Dictionary<string, StringBuilder> idToFunctionArguments = new Dictionary<string, StringBuilder>();
+            StringBuilder contentBuilder = new();
+
+            await foreach (StreamingChatCompletionsUpdate chatUpdate in response)
+            {
+                // Accumulate the text content as new updates arrive.
+                contentBuilder.Append(chatUpdate.ContentUpdate);
+
+                // Build the tool calls as new updates arrive.
+                StreamingChatResponseToolCallUpdate toolCallUpdate = chatUpdate.ToolCallUpdate;
+
+                if (toolCallUpdate != null)
+                {
+                    // Keep track of which function name belongs to this update id.
+                    if (toolCallUpdate.Function.Name is not null)
+                    {
+                        idToFunctionName[toolCallUpdate.Id] = toolCallUpdate.Function.Name;
+                    }
+
+                    // Keep track of which function arguments belong to this update index,
+                    // and accumulate the arguments string as new updates arrive.
+                    if (toolCallUpdate.Function.Arguments is not null)
+                    {
+                        StringBuilder argumentsBuilder
+                            = idToFunctionArguments.TryGetValue(toolCallUpdate.Id, out StringBuilder existingBuilder)
+                                ? existingBuilder
+                                : new StringBuilder();
+                        argumentsBuilder.Append(toolCallUpdate.Function.Arguments);
+                        idToFunctionArguments[toolCallUpdate.Id] = argumentsBuilder;
+                    }
+                }
+
+                if (chatUpdate.FinishReason == CompletionsFinishReason.Stopped)
+                {
+                    // Add the assistant message to the conversation history.
+                    messages.Add(new ChatRequestAssistantMessage(contentBuilder.ToString()));
+                }
+                else if (chatUpdate.FinishReason == CompletionsFinishReason.ToolCalls)
+                {
+                    // First, collect the accumulated function arguments into complete tool calls to be processed
+                    List<ChatCompletionsToolCall> toolCalls = new();
+                    foreach (var id in idToFunctionName.Keys)
+                    {
+                        ChatCompletionsToolCall toolCall = ChatCompletionsToolCall.CreateFunctionToolCall(
+                            id,
+                            idToFunctionName[id],
+                            idToFunctionArguments[id].ToString());
+
+                        toolCalls.Add(toolCall);
+                    }
+
+                    // Next, add the assistant message with tool calls to the conversation history.
+                    string content = contentBuilder.Length > 0 ? contentBuilder.ToString() : null;
+                    messages.Add(new ChatRequestAssistantMessage(toolCalls, content));
+
+                    // Then, add a new tool message for each tool call to be resolved.
+                    foreach (ChatCompletionsToolCall toolCall in toolCalls)
+                    {
+                        switch (toolCall.Name)
+                        {
+                            case "get_future_temperature":
+                                {
+                                    // The arguments that the model wants to use to call the function are specified as a
+                                    // stringified JSON object based on the schema defined in the tool definition. Note that
+                                    // the model may hallucinate arguments too. Consequently, it is important to do the
+                                    // appropriate parsing and validation before calling the function.
+                                    using JsonDocument argumentsJson = JsonDocument.Parse(toolCall.Arguments);
+                                    bool hasLocation = argumentsJson.RootElement.TryGetProperty("locationName", out JsonElement location);
+                                    bool hasDaysInAdvance = argumentsJson.RootElement.TryGetProperty("daysInAdvance", out JsonElement daysInAdvance);
+
+                                    if (!hasLocation)
+                                    {
+                                        throw new ArgumentNullException(nameof(location), "The location argument is required.");
+                                    }
+                                    else if (!hasDaysInAdvance)
+                                    {
+                                        throw new ArgumentNullException(nameof(daysInAdvance), "The daysInAdvance argument is required.");
+                                    }
+
+                                    messages.Add(new ChatRequestToolMessage(
+                                        toolCallId: toolCall.Id,
+                                        content: "31 celsius"));
+                                    break;
+                                }
+                            default:
+                                {
+                                    // Handle other unexpected calls.
+                                    throw new NotImplementedException();
+                                }
+                        }
+                    }
+                }
+                else if (chatUpdate.FinishReason == CompletionsFinishReason.TokenLimitReached)
+                {
+                    throw new NotImplementedException("Incomplete model output due to MaxTokens parameter or token limit exceeded.");
+                }
+                else if (chatUpdate.FinishReason == CompletionsFinishReason.ContentFiltered)
+                {
+                    throw new NotImplementedException("Omitted content due to a content filter flag.");
+                }
+            }
+        }
+
+        private void ProcessToolArguments(List<ChatRequestMessage> messages, StringBuilder contentBuilder, StringBuilder functionArguments, string toolId, string toolName)
+        {
+            if (toolId is null && toolName is null)
+            {
+                string content = contentBuilder.Length > 0 ? contentBuilder.ToString() : null;
+                messages.Add(new ChatRequestAssistantMessage(content));
+            }
+            else
+            {
+                // First, collect the accumulated function arguments into complete tool calls to be processed
+                ChatCompletionsToolCall toolCall = ChatCompletionsToolCall.CreateFunctionToolCall(
+                    toolId,
+                    toolName,
+                    functionArguments.ToString());
+
+                // Next, add the assistant message with tool calls to the conversation history.
+                string content = contentBuilder.Length > 0 ? contentBuilder.ToString() : null;
+                messages.Add(new ChatRequestAssistantMessage(new List<ChatCompletionsToolCall>() { toolCall }, content));
+
+                // Then, add a new tool message for each tool call to be resolved.
+                switch (toolCall.Name)
+                {
+                    case "get_future_temperature":
+                        {
+                            // The arguments that the model wants to use to call the function are specified as a
+                            // stringified JSON object based on the schema defined in the tool definition. Note that
+                            // the model may hallucinate arguments too. Consequently, it is important to do the
+                            // appropriate parsing and validation before calling the function.
+                            using JsonDocument argumentsJson = JsonDocument.Parse(toolCall.Arguments);
+                            bool hasLocation = argumentsJson.RootElement.TryGetProperty("locationName", out JsonElement location);
+                            bool hasDaysInAdvance = argumentsJson.RootElement.TryGetProperty("daysInAdvance", out JsonElement daysInAdvance);
+
+                            if (!hasLocation)
+                            {
+                                throw new ArgumentNullException(nameof(location), "The location argument is required.");
+                            }
+                            else if (!hasDaysInAdvance)
+                            {
+                                throw new ArgumentNullException(nameof(daysInAdvance), "The daysInAdvance argument is required.");
+                            }
+
+                            messages.Add(new ChatRequestToolMessage(
+                                toolCallId: toolCall.Id,
+                                content: "31 celsius"));
+                            break;
+                        }
+                    default:
+                        {
+                            // Handle other unexpected calls.
+                            throw new NotImplementedException();
+                        }
+                }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/tests/EmbeddingClientTests.cs b/sdk/ai/Azure.AI.Inference/tests/EmbeddingClientTests.cs
new file mode 100644
index 000000000000..8b16a9a3e392
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/tests/EmbeddingClientTests.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Azure.Core;
+using Azure.Core.TestFramework;
+using NUnit.Framework;
+
+namespace Azure.AI.Inference.Tests
+{
+    public class EmbeddingClientTests : RecordedTestBase<InferenceClientTestEnvironment>
+    {
+        public EmbeddingClientTests(bool isAsync) : base(isAsync)
+        {
+        }
+
+        [RecordedTest]
+        public async Task TestEmbed()
+        {
+            var cohereEmbeddingEndpoint = new Uri(TestEnvironment.CohereEmbeddingEndpoint);
+            var cohereEmbeddingCredential = new AzureKeyCredential(TestEnvironment.CohereEmbeddingApiKey);
+
+            var client = CreateClient(cohereEmbeddingEndpoint, cohereEmbeddingCredential, new AzureAIInferenceClientOptions());
+
+            var input = new List<string> { "King", "Queen", "Jack", "Page" };
+            var requestOptions = new EmbeddingsOptions(input);
+
+            Response<EmbeddingsResult> response = await client.EmbedAsync(requestOptions);
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<EmbeddingsResult>());
+            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
+            Assert.AreEqual(response.Value.Data.Count, input.Count);
+            for (int i = 0; i < input.Count; i++)
+            {
+                Assert.AreEqual(response.Value.Data[i].Index, i);
+                Assert.That(response.Value.Data[i].Embedding, Is.Not.Null.Or.Empty);
+                var embedding = response.Value.Data[i].Embedding.ToObjectFromJson<List<float>>();
+                Assert.That(embedding.Count, Is.GreaterThan(0));
+            }
+        }
+
+        [RecordedTest]
+        public async Task TestEmbedWithBase64()
+        {
+            var cohereEmbeddingEndpoint = new Uri(TestEnvironment.CohereEmbeddingEndpoint);
+            var cohereEmbeddingCredential = new AzureKeyCredential(TestEnvironment.CohereEmbeddingApiKey);
+
+            var client = CreateClient(cohereEmbeddingEndpoint, cohereEmbeddingCredential, new AzureAIInferenceClientOptions());
+
+            var input = new List<string> { "King", "Queen", "Jack", "Page" };
+            var requestOptions = new EmbeddingsOptions(input)
+            {
+                EncodingFormat = EmbeddingEncodingFormat.Base64,
+            };
+
+            var response = await client.EmbedAsync(requestOptions);
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<EmbeddingsResult>());
+            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
+            Assert.AreEqual(response.Value.Data.Count, input.Count);
+            for (int i = 0; i < input.Count; i++)
+            {
+                Assert.AreEqual(response.Value.Data[i].Index, i);
+                Assert.That(response.Value.Data[i].Embedding, Is.Not.Null.Or.Empty);
+                var stringEmbedding = response.Value.Data[i].Embedding.ToObjectFromJson<string>();
+                Assert.That(stringEmbedding, Is.Not.Null.Or.Empty);
+            }
+            Assert.That(response.Value.Usage.PromptTokens, Is.GreaterThan(0));
+            Assert.That(response.Value.Usage.TotalTokens, Is.GreaterThan(0));
+        }
+
+        #region Helpers
+        private EmbeddingsClient CreateClient(Uri endpoint, AzureKeyCredential credential, AzureAIInferenceClientOptions clientOptions)
+        {
+            return InstrumentClient(new EmbeddingsClient(endpoint, credential, InstrumentClientOptions(clientOptions)));
+        }
+
+        private EmbeddingsClient CreateClient(Uri endpoint, TokenCredential credential, AzureAIInferenceClientOptions clientOptions)
+        {
+            return InstrumentClient(new EmbeddingsClient(endpoint, credential, InstrumentClientOptions(clientOptions)));
+        }
+        #endregion
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/tests/Generated/Samples/Samples_EmbeddingsClient.cs b/sdk/ai/Azure.AI.Inference/tests/Generated/Samples/Samples_EmbeddingsClient.cs
new file mode 100644
index 000000000000..1244fa042540
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/tests/Generated/Samples/Samples_EmbeddingsClient.cs
@@ -0,0 +1,255 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Azure.Core;
+using Azure.Identity;
+using NUnit.Framework;
+
+namespace Azure.AI.Inference.Samples
+{
+    public partial class Samples_EmbeddingsClient
+    {
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_Client2_Embed_MaximumSetEmbeddings()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            using RequestContent content = RequestContent.Create(new object());
+            Response response = client.Embed(content);
+
+            JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+            Console.WriteLine(result.GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("data")[0].GetProperty("embedding").ToString());
+            Console.WriteLine(result.GetProperty("data")[0].GetProperty("index").ToString());
+            Console.WriteLine(result.GetProperty("usage").GetProperty("prompt_tokens").ToString());
+            Console.WriteLine(result.GetProperty("usage").GetProperty("total_tokens").ToString());
+            Console.WriteLine(result.GetProperty("model").ToString());
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_Client2_Embed_MaximumSetEmbeddings_Async()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            using RequestContent content = RequestContent.Create(new object());
+            Response response = await client.EmbedAsync(content);
+
+            JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+            Console.WriteLine(result.GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("data")[0].GetProperty("embedding").ToString());
+            Console.WriteLine(result.GetProperty("data")[0].GetProperty("index").ToString());
+            Console.WriteLine(result.GetProperty("usage").GetProperty("prompt_tokens").ToString());
+            Console.WriteLine(result.GetProperty("usage").GetProperty("total_tokens").ToString());
+            Console.WriteLine(result.GetProperty("model").ToString());
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_Client2_Embed_MaximumSetEmbeddings_Convenience()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            EmbeddingsOptions embeddingsOptions = null;
+            Response<EmbeddingsResult> response = client.Embed(embeddingsOptions);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_Client2_Embed_MaximumSetEmbeddings_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            EmbeddingsOptions embeddingsOptions = null;
+            Response<EmbeddingsResult> response = await client.EmbedAsync(embeddingsOptions);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_Client2_Embed_MinimumSetEmbeddings()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            using RequestContent content = RequestContent.Create(new object());
+            Response response = client.Embed(content);
+
+            JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+            Console.WriteLine(result.GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("data")[0].GetProperty("embedding").ToString());
+            Console.WriteLine(result.GetProperty("data")[0].GetProperty("index").ToString());
+            Console.WriteLine(result.GetProperty("usage").GetProperty("prompt_tokens").ToString());
+            Console.WriteLine(result.GetProperty("usage").GetProperty("total_tokens").ToString());
+            Console.WriteLine(result.GetProperty("model").ToString());
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_Client2_Embed_MinimumSetEmbeddings_Async()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            using RequestContent content = RequestContent.Create(new object());
+            Response response = await client.EmbedAsync(content);
+
+            JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+            Console.WriteLine(result.GetProperty("id").ToString());
+            Console.WriteLine(result.GetProperty("data")[0].GetProperty("embedding").ToString());
+            Console.WriteLine(result.GetProperty("data")[0].GetProperty("index").ToString());
+            Console.WriteLine(result.GetProperty("usage").GetProperty("prompt_tokens").ToString());
+            Console.WriteLine(result.GetProperty("usage").GetProperty("total_tokens").ToString());
+            Console.WriteLine(result.GetProperty("model").ToString());
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_Client2_Embed_MinimumSetEmbeddings_Convenience()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            EmbeddingsOptions embeddingsOptions = null;
+            Response<EmbeddingsResult> response = client.Embed(embeddingsOptions);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_Client2_Embed_MinimumSetEmbeddings_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            EmbeddingsOptions embeddingsOptions = null;
+            Response<EmbeddingsResult> response = await client.EmbedAsync(embeddingsOptions);
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_Client2_GetModelInfo_MaximumSetModelInformation()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            Response response = client.GetModelInfo(null);
+
+            JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+            Console.WriteLine(result.GetProperty("model_name").ToString());
+            Console.WriteLine(result.GetProperty("model_type").ToString());
+            Console.WriteLine(result.GetProperty("model_provider_name").ToString());
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_Client2_GetModelInfo_MaximumSetModelInformation_Async()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            Response response = await client.GetModelInfoAsync(null);
+
+            JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+            Console.WriteLine(result.GetProperty("model_name").ToString());
+            Console.WriteLine(result.GetProperty("model_type").ToString());
+            Console.WriteLine(result.GetProperty("model_provider_name").ToString());
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_Client2_GetModelInfo_MaximumSetModelInformation_Convenience()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            Response<ModelInfo> response = client.GetModelInfo();
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_Client2_GetModelInfo_MaximumSetModelInformation_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            Response<ModelInfo> response = await client.GetModelInfoAsync();
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_Client2_GetModelInfo_MinimumSetModelInformation()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            Response response = client.GetModelInfo(null);
+
+            JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+            Console.WriteLine(result.GetProperty("model_name").ToString());
+            Console.WriteLine(result.GetProperty("model_type").ToString());
+            Console.WriteLine(result.GetProperty("model_provider_name").ToString());
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_Client2_GetModelInfo_MinimumSetModelInformation_Async()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            Response response = await client.GetModelInfoAsync(null);
+
+            JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement;
+            Console.WriteLine(result.GetProperty("model_name").ToString());
+            Console.WriteLine(result.GetProperty("model_type").ToString());
+            Console.WriteLine(result.GetProperty("model_provider_name").ToString());
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public void Example_Client2_GetModelInfo_MinimumSetModelInformation_Convenience()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            Response<ModelInfo> response = client.GetModelInfo();
+        }
+
+        [Test]
+        [Ignore("Only validating compilation of examples")]
+        public async Task Example_Client2_GetModelInfo_MinimumSetModelInformation_Convenience_Async()
+        {
+            Uri endpoint = new Uri("<endpoint>");
+            AzureKeyCredential credential = new AzureKeyCredential("<key>");
+            EmbeddingsClient client = new EmbeddingsClient(endpoint, credential);
+
+            Response<ModelInfo> response = await client.GetModelInfoAsync();
+        }
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/tests/InferenceClientTelemetryTest.cs b/sdk/ai/Azure.AI.Inference/tests/InferenceClientTelemetryTest.cs
index ee710b7bb75b..b65ccc8275b9 100644
--- a/sdk/ai/Azure.AI.Inference/tests/InferenceClientTelemetryTest.cs
+++ b/sdk/ai/Azure.AI.Inference/tests/InferenceClientTelemetryTest.cs
@@ -261,8 +261,8 @@ public async Task TestToolCalls(TestType testType)
                 },
                 Model = "gpt-4o",
                 Temperature = 1,
-                Tools = { new ChatCompletionsFunctionToolDefinition(GetFutureTemperatureFunction()) },
-                ToolChoice = ChatCompletionsToolChoice.Required,
+                Tools = { new ChatCompletionsToolDefinition(GetFutureTemperatureFunction()) },
+                ToolChoice = ChatCompletionsToolChoice.Auto,
                 AdditionalProperties = { ["n"] = BinaryData.FromString("2") }
             };
 
@@ -304,9 +304,8 @@ public async Task TestToolCalls(TestType testType)
 
                         StringBuilder[] fullContent = new[] { new StringBuilder() };
                         StringBuilder[] toolArgs = new[] { new StringBuilder(), new StringBuilder() };
-                        string[] toolNames = new string[2];
-                        string[] toolTypes = new string[2];
-                        string[] toolCallIds = new string[2];
+                        Dictionary<string, string> toolCallNames = new Dictionary<string, string>();
+                        Dictionary<string, StringBuilder> toolCallArgs = new Dictionary<string, StringBuilder>();
                         expectedResponse.FinishReasons = new string[1];
                         await foreach (var update in response)
                         {
@@ -317,19 +316,25 @@ public async Task TestToolCalls(TestType testType)
 
                             if (update.ToolCallUpdate != null)
                             {
-                                var index = update.ToolCallUpdate.ToolCallIndex;
-                                toolCallIds[index] ??= update.ToolCallUpdate.Id;
-                                toolTypes[index] ??= update.ToolCallUpdate.Type;
-                                toolNames[index] ??= (update.ToolCallUpdate as StreamingFunctionToolCallUpdate)?.Name;
-                                toolArgs[index].Append((update.ToolCallUpdate as StreamingFunctionToolCallUpdate)?.ArgumentsUpdate);
+                                // OpenAI correlates using index, not the id, so id might not be available
+                                // but it's not supported, so we'll assume there is just one tool call...
+
+                                string id = update.ToolCallUpdate.Id ?? toolCallNames.FirstOrDefault().Key;
+
+                                if (!toolCallArgs.ContainsKey(id))
+                                {
+                                    toolCallNames.Add(id, update.ToolCallUpdate?.Function?.Name);
+                                    toolCallArgs[id] = new StringBuilder();
+                                }
+                                toolCallArgs[id].Append(update.ToolCallUpdate?.Function?.Arguments);
                             }
                         }
 
-                        int toolCallsCount = (toolCallIds[0] != null ? 1 : 0) + (toolCallIds[1] != null ? 1 : 0);
-                        Assert.AreEqual(2, toolCallsCount);
+                        Assert.AreEqual(2, toolCallNames.Count);
                         expectedResponse.Choices = new[] {
                             new { finish_reason = expectedResponse.FinishReasons[0], index = 0,
-                                message = new { content = fullContent[0].ToString(), tool_calls = GetToolCalls(toolNames, toolTypes, toolCallIds, toolArgs) }
+                                message = new { content = fullContent[0].ToString(), tool_calls =
+                                GetToolCalls(toolCallNames, toolCallArgs) }
                         } };
 
                         actListener.ValidateStartActivity(requestOptions, endpoint, true);
@@ -350,7 +355,7 @@ private ChatCompletionsClient CreateClient(Uri endpoint)
                 new ChatCompletionsClient(
                     endpoint,
                     new AzureKeyCredential(TestEnvironment.GithubToken),
-                    InstrumentClientOptions(new ChatCompletionsClientOptions())));
+                    InstrumentClientOptions(new AzureAIInferenceClientOptions())));
         }
 
         private object GetToolCalls(IEnumerable<ChatCompletionsToolCall> calls)
@@ -361,11 +366,11 @@ private object GetToolCalls(IEnumerable<ChatCompletionsToolCall> calls)
                 toolsCalls.Add(new
                 {
                     id = call.Id,
-                    type = call.Type,
+                    type = call.Type.ToString(),
                     function = new
                     {
-                        name = (call as ChatCompletionsFunctionToolCall)?.Name,
-                        arguments = (call as ChatCompletionsFunctionToolCall)?.Arguments
+                        name = call.Name,
+                        arguments = call.Arguments
                     },
                 });
             }
@@ -373,19 +378,19 @@ private object GetToolCalls(IEnumerable<ChatCompletionsToolCall> calls)
             return toolsCalls;
         }
 
-        private object GetToolCalls(string[] toolNames, string[] toolTypes, string[] toolIds, StringBuilder[] toolArgs)
+        private object GetToolCalls(Dictionary<string, string> toolCallNames, Dictionary<string, StringBuilder> toolCallArgs)
         {
             List<object> toolsCalls = new List<object>();
-            for (int i = 0; i < toolNames.Length; i++)
+            foreach (string id in toolCallNames.Keys)
             {
                 toolsCalls.Add(new
                 {
-                    id = toolIds[i],
-                    type = toolTypes[i],
+                    id,
+                    type = "function",
                     function = new
                     {
-                        name = toolNames[i],
-                        arguments = toolArgs[i].ToString()
+                        name = toolCallNames[id],
+                        arguments = toolCallArgs[id].ToString()
                     },
                 });
             }
diff --git a/sdk/ai/Azure.AI.Inference/tests/InferenceClientTest.cs b/sdk/ai/Azure.AI.Inference/tests/InferenceClientTest.cs
deleted file mode 100644
index 9ee53ebe785a..000000000000
--- a/sdk/ai/Azure.AI.Inference/tests/InferenceClientTest.cs
+++ /dev/null
@@ -1,629 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Tracing;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-using Azure.AI.Inference.Telemetry;
-using Azure.Core;
-using Azure.Core.Diagnostics;
-using Azure.Core.Pipeline;
-using Azure.Core.TestFramework;
-using Azure.Identity;
-using Newtonsoft.Json;
-using NUnit.Framework;
-using File = System.IO.File;
-
-namespace Azure.AI.Inference.Tests
-{
-    public class InferenceClientTest: RecordedTestBase<InferenceClientTestEnvironment>
-    {
-        public enum TargetModel
-        {
-            MistralSmall,
-            GitHubGpt4o,
-            AoaiGpt4Turbo,
-        }
-
-        public enum ToolChoiceTestType
-        {
-            DoNotSpecifyToolChoice,
-            UseAutoPresetToolChoice,
-            UseNonePresetToolChoice,
-            UseRequiredPresetToolChoice,
-            UseFunctionByExplicitToolDefinitionForToolChoice,
-            UseFunctionByImplicitToolDefinitionForToolChoice,
-        }
-
-        public enum ImageTestSourceKind
-        {
-            UsingInternetLocation,
-            UsingStream,
-            UsingBinaryData,
-        }
-
-        public InferenceClientTest(bool isAsync) : base(isAsync)
-        {
-            TestDiagnostics = false;
-            JsonPathSanitizers.Add("$.messages[*].content[*].image_url.url");
-        }
-
-        /* please refer to https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/template/Azure.Template/tests/TemplateClientLiveTests.cs to write tests. */
-
-        [RecordedTest]
-        public async Task TestChatCompletions()
-        {
-            var mistralSmallEndpoint = new Uri(TestEnvironment.MistralSmallEndpoint);
-            var mistralSmallCredential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
-
-            var client = CreateClient(mistralSmallEndpoint, mistralSmallCredential, new ChatCompletionsClientOptions());
-
-            var requestOptions = new ChatCompletionsOptions()
-            {
-                Messages =
-                {
-                    new ChatRequestSystemMessage("You are a helpful assistant."),
-                    new ChatRequestUserMessage("How many feet are in a mile?"),
-                },
-            };
-
-            Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
-
-            Assert.That(response, Is.Not.Null);
-            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
-            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(choice.Index, Is.EqualTo(0));
-            Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-            Assert.That(choice.Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(choice.Message.Content, Is.Not.Null.Or.Empty);
-        }
-
-        [RecordedTest]
-        public async Task TestChatCompletionsWithEntraIdAuth()
-        {
-            var aoaiEndpoint = new Uri(TestEnvironment.AoaiEndpoint);
-            var entraIdCredential = TestEnvironment.Credential;
-
-            CaptureRequestPayloadPolicy captureRequestPayloadPolicy = new CaptureRequestPayloadPolicy();
-            ChatCompletionsClientOptions clientOptions = new ChatCompletionsClientOptions();
-            clientOptions.AddPolicy(captureRequestPayloadPolicy, HttpPipelinePosition.PerCall);
-
-            BearerTokenAuthenticationPolicy tokenPolicy = new BearerTokenAuthenticationPolicy(entraIdCredential, new string[] { "https://cognitiveservices.azure.com/.default" });
-            clientOptions.AddPolicy(tokenPolicy, HttpPipelinePosition.PerRetry);
-
-            var client = CreateClient(aoaiEndpoint, entraIdCredential, clientOptions);
-
-            var requestOptions = new ChatCompletionsOptions()
-            {
-                Messages =
-                {
-                    new ChatRequestSystemMessage("You are a helpful assistant."),
-                    new ChatRequestUserMessage("How many feet are in a mile?"),
-                },
-            };
-
-            Response<ChatCompletions> response = null;
-            try
-            {
-                response = await client.CompleteAsync(requestOptions);
-            }
-            catch (Exception ex)
-            {
-                var requestPayload = captureRequestPayloadPolicy._requestContent;
-                var requestHeaders = captureRequestPayloadPolicy._requestHeaders;
-                Assert.True(false, $"Request failed with the following exception:\n {ex}\n Request headers: {requestHeaders}\n Request payload: {requestPayload}");
-            }
-
-            Assert.That(response, Is.Not.Null);
-            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
-            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(choice.Index, Is.EqualTo(0));
-            Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-            Assert.That(choice.Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(choice.Message.Content, Is.Not.Null.Or.Empty);
-        }
-
-        [RecordedTest]
-        public async Task TestStreamingChatCompletions()
-        {
-            var mistralSmallEndpoint = new Uri(TestEnvironment.MistralSmallEndpoint);
-            var mistralSmallCredential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
-
-            var clientOptions = new ChatCompletionsClientOptions();
-            var client = CreateClient(mistralSmallEndpoint, mistralSmallCredential, clientOptions);
-
-            var requestOptions = new ChatCompletionsOptions()
-            {
-                Messages =
-                {
-                    new ChatRequestSystemMessage("You are a helpful assistant."),
-                    new ChatRequestUserMessage("How many feet are in a mile?"),
-                },
-                MaxTokens = 512,
-            };
-
-            StreamingResponse<StreamingChatCompletionsUpdate> response = await client.CompleteStreamingAsync(requestOptions);
-            Assert.That(response, Is.Not.Null);
-
-            StringBuilder contentBuilder = new();
-            string id = null;
-            string model = null;
-            bool gotRole = false;
-
-            await foreach (StreamingChatCompletionsUpdate chatUpdate in response)
-            {
-                Assert.That(chatUpdate, Is.Not.Null);
-
-                Assert.That(chatUpdate.Id, Is.Not.Null.Or.Empty);
-                Assert.That(chatUpdate.Created, Is.GreaterThan(new DateTimeOffset(new DateTime(2023, 1, 1))));
-                Assert.That(chatUpdate.Created, Is.LessThan(DateTimeOffset.UtcNow.AddDays(7)));
-
-                if (!string.IsNullOrEmpty(chatUpdate.Id))
-                {
-                    Assert.That((id is null) || (id == chatUpdate.Id));
-                    id = chatUpdate.Id;
-                }
-                if (!string.IsNullOrEmpty(chatUpdate.Model))
-                {
-                    Assert.That((model is null) || (model == chatUpdate.Model));
-                    model = chatUpdate.Model;
-                }
-                if (chatUpdate.Role.HasValue)
-                {
-                    Assert.IsFalse(gotRole);
-                    Assert.That(chatUpdate.Role.Value, Is.EqualTo(ChatRole.Assistant));
-                    gotRole = true;
-                }
-                if (!string.IsNullOrEmpty(chatUpdate.ContentUpdate))
-                {
-                    contentBuilder.Append(chatUpdate.ContentUpdate);
-                }
-            }
-
-            Assert.IsTrue(!string.IsNullOrEmpty(id));
-            Assert.IsTrue(!string.IsNullOrEmpty(model));
-            Assert.IsTrue(gotRole);
-            var result = contentBuilder.ToString();
-            Assert.That(contentBuilder.ToString(), Is.Not.Null.Or.Empty);
-        }
-
-        [RecordedTest]
-        public async Task TestSendModelExtras()
-        {
-            var mistralSmallEndpoint = new Uri(TestEnvironment.MistralSmallEndpoint);
-            var mistralSmallCredential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
-
-            CaptureRequestPayloadPolicy captureRequestPayloadPolicy = new CaptureRequestPayloadPolicy();
-            ChatCompletionsClientOptions clientOptions = new ChatCompletionsClientOptions();
-            clientOptions.AddPolicy(captureRequestPayloadPolicy, HttpPipelinePosition.PerCall);
-
-            var client = CreateClient(mistralSmallEndpoint, mistralSmallCredential, clientOptions);
-
-            var requestOptions = new ChatCompletionsOptions()
-            {
-                Messages =
-                {
-                    new ChatRequestSystemMessage("You are a helpful assistant."),
-                    new ChatRequestUserMessage("How many feet are in a mile?"),
-                },
-                AdditionalProperties = { { "foo", BinaryData.FromString("\"bar\"") } },
-            };
-
-            var exceptionThrown = false;
-
-            try
-            {
-                await client.CompleteAsync(requestOptions);
-            }
-            catch (Exception e)
-            {
-                exceptionThrown = true;
-                Assert.IsTrue(e.Message.Contains("Extra inputs are not permitted"));
-                Assert.IsTrue(captureRequestPayloadPolicy._requestContent.Contains("foo"));
-                Assert.IsTrue(captureRequestPayloadPolicy._requestHeaders.ContainsKey("extra-parameters"));
-                Assert.IsTrue(captureRequestPayloadPolicy._requestHeaders["extra-parameters"] == ExtraParameters.PassThrough);
-            }
-            Assert.IsTrue(exceptionThrown);
-
-            exceptionThrown = false;
-            try
-            {
-                 await client.CompleteAsync(requestOptions, ExtraParameters.PassThrough);
-            }
-            catch (Exception e)
-            {
-                exceptionThrown = true;
-                Assert.IsTrue(e.Message.Contains("Extra inputs are not permitted"));
-                Assert.IsTrue(captureRequestPayloadPolicy._requestContent.Contains("foo"));
-            }
-            Assert.IsTrue(exceptionThrown);
-
-            /*
-            // To be enabled once ExtraParameters is implemented in the service
-            var response = await client.CompleteAsync(requestOptions, ExtraParameters.Drop);
-
-            Assert.IsTrue(captureRequestPayloadPolicy._requestContent.Contains("foo"));
-
-            Assert.That(response, Is.Not.Null);
-            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
-            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(choice.Index, Is.EqualTo(0));
-            Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-            Assert.That(choice.Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(choice.Message.Content, Is.Not.Null.Or.Empty);
-            */
-        }
-
-        [RecordedTest]
-        [TestCase(ToolChoiceTestType.DoNotSpecifyToolChoice, TargetModel.MistralSmall)]
-        [TestCase(ToolChoiceTestType.UseAutoPresetToolChoice, TargetModel.MistralSmall)]
-        [TestCase(ToolChoiceTestType.UseNonePresetToolChoice, TargetModel.MistralSmall)]
-        [TestCase(ToolChoiceTestType.UseRequiredPresetToolChoice, TargetModel.MistralSmall, IgnoreReason = "Endpoint needs to be updated to support")]
-        [TestCase(ToolChoiceTestType.UseFunctionByExplicitToolDefinitionForToolChoice, TargetModel.GitHubGpt4o)]
-        [TestCase(ToolChoiceTestType.UseFunctionByImplicitToolDefinitionForToolChoice, TargetModel.GitHubGpt4o)]
-        public async Task TestChatCompletionsFunctionToolHandling(ToolChoiceTestType toolChoiceType, TargetModel targetModel)
-        {
-            FunctionDefinition futureTemperatureFunction = new FunctionDefinition("get_future_temperature")
-            {
-                Description = "requests the anticipated future temperature at a provided location to help inform "
-                + "advice about topics like choice of attire",
-                Parameters = BinaryData.FromObjectAsJson(new
-                {
-                    Type = "object",
-                    Properties = new
-                    {
-                        LocationName = new
-                        {
-                            Type = "string",
-                            Description = "the name or brief description of a location for weather information"
-                        },
-                        DaysInAdvance = new
-                        {
-                            Type = "integer",
-                            Description = "the number of days in the future for which to retrieve weather information"
-                        }
-                    }
-                },
-                new JsonSerializerOptions() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase })
-            };
-
-            ChatCompletionsFunctionToolDefinition functionToolDef = new ChatCompletionsFunctionToolDefinition(futureTemperatureFunction);
-
-            var endpoint = targetModel switch
-            {
-                TargetModel.MistralSmall => new Uri(TestEnvironment.MistralSmallEndpoint),
-                TargetModel.GitHubGpt4o => new Uri(TestEnvironment.GithubEndpoint),
-                _ => throw new ArgumentException(nameof(targetModel)),
-            };
-
-            var credential = targetModel switch
-            {
-                TargetModel.MistralSmall => new AzureKeyCredential(TestEnvironment.MistralSmallApiKey),
-                TargetModel.GitHubGpt4o => new AzureKeyCredential(TestEnvironment.GithubToken),
-                _ => throw new ArgumentException(nameof(targetModel)),
-            };
-
-            var githubModelName = "gpt-4o";
-
-            CaptureRequestPayloadPolicy captureRequestPayloadPolicy = new CaptureRequestPayloadPolicy();
-            ChatCompletionsClientOptions clientOptions = new ChatCompletionsClientOptions();
-            clientOptions.AddPolicy(captureRequestPayloadPolicy, HttpPipelinePosition.PerCall);
-
-            // Uncomment the following lines to enable enhanced log output
-            // AzureEventSourceListener listener = AzureEventSourceListener.CreateConsoleLogger(EventLevel.Verbose);
-            // clientOptions.Diagnostics.IsLoggingContentEnabled = true;
-
-            var client = CreateClient(endpoint, credential, clientOptions);
-
-            var requestOptions = new ChatCompletionsOptions()
-            {
-                Messages =
-                {
-                    new ChatRequestSystemMessage("You are a helpful assistant."),
-                    new ChatRequestUserMessage("What should I wear in Honolulu in 3 days?"),
-                },
-                MaxTokens = 512,
-                Tools = { functionToolDef },
-            };
-
-            if (targetModel == TargetModel.GitHubGpt4o)
-            {
-                requestOptions.Model = githubModelName;
-            }
-
-            requestOptions.ToolChoice = toolChoiceType switch
-            {
-                ToolChoiceTestType.UseAutoPresetToolChoice => ChatCompletionsToolChoice.Auto,
-                ToolChoiceTestType.UseNonePresetToolChoice => ChatCompletionsToolChoice.None,
-                ToolChoiceTestType.UseRequiredPresetToolChoice => ChatCompletionsToolChoice.Required,
-                ToolChoiceTestType.UseFunctionByExplicitToolDefinitionForToolChoice => new ChatCompletionsToolChoice(functionToolDef),
-                ToolChoiceTestType.UseFunctionByImplicitToolDefinitionForToolChoice => functionToolDef,
-                _ => null,
-            };
-
-            Response<ChatCompletions> response = null;
-            try
-            {
-                response = await client.CompleteAsync(requestOptions);
-            }
-            catch (Exception ex)
-            {
-                var requestPayload = captureRequestPayloadPolicy._requestContent;
-                var requestHeaders = captureRequestPayloadPolicy._requestHeaders;
-                Assert.True(false, $"Request failed with the following exception:\n {ex}\n Request headers: {requestHeaders}\n Request payload: {requestPayload}");
-            }
-
-            Assert.That(response, Is.Not.Null);
-
-            Assert.That(response.Value, Is.Not.Null);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-
-            ChatChoice choice = response.Value.Choices[0];
-
-            if (toolChoiceType == ToolChoiceTestType.UseNonePresetToolChoice)
-            {
-                Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-                Assert.That(choice.Message.ToolCalls, Is.Null.Or.Empty);
-                // We finish the test here as there's no further exercise for 'none' beyond ensuring we didn't do what we
-                // weren't meant to
-                return;
-            }
-            else if (toolChoiceType == ToolChoiceTestType.UseAutoPresetToolChoice || toolChoiceType == ToolChoiceTestType.DoNotSpecifyToolChoice)
-            {
-                Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.ToolCalls));
-                // and continue the test
-            }
-            else
-            {
-                Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-                // and continue the test, as we will have tool_calls
-            }
-
-            ChatResponseMessage message = choice.Message;
-            Assert.That(message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(message.Content, Is.Null.Or.Empty);
-            Assert.That(message.ToolCalls, Is.Not.Null.Or.Empty);
-            Assert.That(message.ToolCalls.Count, Is.EqualTo(1));
-            ChatCompletionsFunctionToolCall functionToolCall = message.ToolCalls[0] as ChatCompletionsFunctionToolCall;
-            Assert.That(functionToolCall, Is.Not.Null);
-            Assert.That(functionToolCall.Name, Is.EqualTo(futureTemperatureFunction.Name));
-            Assert.That(functionToolCall.Arguments, Is.Not.Null.Or.Empty);
-
-            Dictionary<string, string> arguments
-                = JsonConvert.DeserializeObject<Dictionary<string, string>>(functionToolCall.Arguments);
-            Assert.That(arguments.ContainsKey("locationName"));
-            Assert.That(arguments.ContainsKey("daysInAdvance"));
-
-            ChatCompletionsOptions followupOptions = new()
-            {
-                Tools = { functionToolDef },
-                MaxTokens = 512,
-            };
-
-            if (targetModel == TargetModel.GitHubGpt4o)
-            {
-                followupOptions.Model = githubModelName;
-            }
-
-            // Include all original messages
-            foreach (ChatRequestMessage originalMessage in requestOptions.Messages)
-            {
-                followupOptions.Messages.Add(originalMessage);
-            }
-
-            // Add the tool call message just received back from the assistant
-            followupOptions.Messages.Add(new ChatRequestAssistantMessage(choice.Message));
-
-            // And also the tool message that resolves the tool call
-            followupOptions.Messages.Add(new ChatRequestToolMessage(
-                toolCallId: functionToolCall.Id,
-                content: "31 celsius"));
-
-            Response<ChatCompletions> followupResponse = null;
-            try
-            {
-                followupResponse = await client.CompleteAsync(followupOptions);
-            }
-            catch (Exception ex)
-            {
-                var requestPayload = captureRequestPayloadPolicy._requestContent;
-                var requestHeaders = captureRequestPayloadPolicy._requestHeaders;
-                Assert.True(false, $"Request failed with the following exception:\n {ex}\n Request headers: {requestHeaders}\n Request payload: {requestPayload}");
-            }
-
-            Assert.That(followupResponse, Is.Not.Null);
-            Assert.That(followupResponse.Value, Is.Not.Null);
-            Assert.That(followupResponse.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(followupResponse.Value.Choices[0], Is.Not.Null);
-            Assert.That(followupResponse.Value.Choices[0].Message, Is.Not.Null);
-            Assert.That(followupResponse.Value.Choices[0].Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(followupResponse.Value.Choices[0].Message.Content, Is.Not.Null.Or.Empty);
-        }
-
-        [RecordedTest]
-        [TestCase(ImageTestSourceKind.UsingInternetLocation)]
-        [TestCase(ImageTestSourceKind.UsingStream)]
-        [TestCase(ImageTestSourceKind.UsingBinaryData)]
-        public async Task TestChatCompletionsWithImages(ImageTestSourceKind imageSourceKind)
-        {
-            var aoaiEndpoint = new Uri(TestEnvironment.AoaiEndpoint);
-            // This isn't used currently, but is necessary because of the header handling for the generated client
-            var aoaiKey = new AzureKeyCredential("foo");
-
-            CaptureRequestPayloadPolicy captureRequestPayloadPolicy = new CaptureRequestPayloadPolicy();
-            ChatCompletionsClientOptions clientOptions = new ChatCompletionsClientOptions();
-            clientOptions.AddPolicy(captureRequestPayloadPolicy, HttpPipelinePosition.PerCall);
-            clientOptions.AddPolicy(new AddAoaiAuthHeaderPolicy(TestEnvironment), HttpPipelinePosition.PerCall);
-
-            // Uncomment the following lines to enable enhanced log output
-            // AzureEventSourceListener listener = AzureEventSourceListener.CreateConsoleLogger(EventLevel.Verbose);
-            // clientOptions.Diagnostics.IsLoggingContentEnabled = true;
-
-            var client = CreateClient(aoaiEndpoint, aoaiKey, clientOptions);
-
-            ChatMessageImageContentItem imageContentItem = imageSourceKind switch
-            {
-                ImageTestSourceKind.UsingInternetLocation => new(GetTestImageInternetUri(), ChatMessageImageDetailLevel.Low),
-                ImageTestSourceKind.UsingStream => new(GetTestImageStream("image/jpg"), "image/jpg", ChatMessageImageDetailLevel.Low),
-                ImageTestSourceKind.UsingBinaryData => new(GetTestImageData("image/jpg"), "image/jpg", ChatMessageImageDetailLevel.Low),
-                _ => throw new ArgumentException(nameof(imageSourceKind)),
-            };
-
-            var requestOptions = new ChatCompletionsOptions()
-            {
-                Messages =
-                {
-                    new ChatRequestSystemMessage("You are a helpful assistant that helps describe images."),
-                    new ChatRequestUserMessage(
-                        new ChatMessageTextContentItem("describe this image"),
-                        imageContentItem),
-                },
-                MaxTokens = 2048,
-            };
-
-            Response<ChatCompletions> response = null;
-            try
-            {
-                response = await client.CompleteAsync(requestOptions);
-            }
-            catch (Exception ex)
-            {
-                var requestPayload = captureRequestPayloadPolicy._requestContent;
-                var requestHeaders = captureRequestPayloadPolicy._requestHeaders;
-                Assert.True(false, $"Request failed with the following exception:\n {ex}\n Request headers: {requestHeaders}\n Request payload: {requestPayload}");
-            }
-
-            Assert.That(response, Is.Not.Null);
-            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
-            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(choice.Index, Is.EqualTo(0));
-
-            Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-            Assert.That(choice.Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(choice.Message.Content, Is.Not.Null.Or.Empty);
-        }
-
-        #region Helpers
-        private class CaptureRequestPayloadPolicy : HttpPipelinePolicy
-        {
-            public string _requestContent;
-            public Dictionary<string, string> _requestHeaders;
-
-            public override void Process(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
-            {
-                var memStream = new MemoryStream();
-                message.Request.Content.WriteTo(memStream, new System.Threading.CancellationToken());
-                _requestContent = Encoding.UTF8.GetString(memStream.ToArray());
-
-                _requestHeaders = message.Request.Headers.ToDictionary(a => a.Name, a => a.Value);
-
-                ProcessNext(message, pipeline);
-            }
-
-            public override ValueTask ProcessAsync(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
-            {
-                var memStream = new MemoryStream();
-                message.Request.Content.WriteTo(memStream, new System.Threading.CancellationToken());
-                _requestContent = Encoding.UTF8.GetString(memStream.ToArray());
-
-                _requestHeaders = message.Request.Headers.ToDictionary(a=>a.Name, a=>a.Value);
-
-                return ProcessNextAsync(message, pipeline);
-            }
-        }
-
-        private class AddAoaiAuthHeaderPolicy : HttpPipelinePolicy
-        {
-            public InferenceClientTestEnvironment TestEnvironment { get; }
-            public string Token { get; }
-
-            public AddAoaiAuthHeaderPolicy(InferenceClientTestEnvironment testEnvironment)
-            {
-                TestEnvironment = testEnvironment;
-            }
-
-            public override void Process(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
-            {
-                // Add your desired header name and value
-                message.Request.Headers.Add("api-key", TestEnvironment.AoaiKey);
-
-                ProcessNext(message, pipeline);
-            }
-
-            public override ValueTask ProcessAsync(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
-            {
-                // Add your desired header name and value
-                message.Request.Headers.Add("api-key", TestEnvironment.AoaiKey);
-
-                return ProcessNextAsync(message, pipeline);
-            }
-        }
-
-        private ChatCompletionsClient CreateClient(Uri endpoint, AzureKeyCredential credential, ChatCompletionsClientOptions clientOptions)
-        {
-            return InstrumentClient(new ChatCompletionsClient(endpoint, credential, InstrumentClientOptions(clientOptions)));
-        }
-
-        private ChatCompletionsClient CreateClient(Uri endpoint, TokenCredential credential, ChatCompletionsClientOptions clientOptions)
-        {
-            return InstrumentClient(new ChatCompletionsClient(endpoint, credential, InstrumentClientOptions(clientOptions)));
-        }
-
-        private static BinaryData GetContentFromResponse(Response r)
-        {
-            // Workaround azure/azure-sdk-for-net#21048, which prevents .Content from working when dealing with responses
-            // from the playback system.
-
-            MemoryStream ms = new MemoryStream();
-            r.ContentStream.CopyTo(ms);
-            return new BinaryData(ms.ToArray());
-        }
-
-        private Uri GetTestImageInternetUri()
-        {
-            if (Mode == RecordedTestMode.Playback)
-            {
-                return new Uri("https://sanitized");
-            }
-            return new Uri("https://aka.ms/azsdk/azure-ai-inference/csharp/tests/juggling_balls.png");
-        }
-
-        private Stream GetTestImageStream(string mimeType)
-        {
-            if (Mode == RecordedTestMode.Playback)
-            {
-                return new MemoryStream();
-            }
-            return File.OpenRead(mimeType switch
-            {
-                "image/jpg" => TestEnvironment.TestImageJpgInputPath,
-                _ => throw new ArgumentException(nameof(mimeType)),
-            });
-        }
-
-        private BinaryData GetTestImageData(string mimeType)
-            => BinaryData.FromStream(GetTestImageStream(mimeType));
-        #endregion
-    }
-}
diff --git a/sdk/ai/Azure.AI.Inference/tests/InferenceClientTestEnvironment.cs b/sdk/ai/Azure.AI.Inference/tests/InferenceClientTestEnvironment.cs
index d43f6fd7e35f..916ba01e1730 100644
--- a/sdk/ai/Azure.AI.Inference/tests/InferenceClientTestEnvironment.cs
+++ b/sdk/ai/Azure.AI.Inference/tests/InferenceClientTestEnvironment.cs
@@ -9,10 +9,14 @@ public class InferenceClientTestEnvironment : TestEnvironment
     {
         public string MistralSmallEndpoint => GetRecordedVariable("AZUREAI_MISTRAL_SMALL_URL");
         public string MistralSmallApiKey => GetRecordedVariable("AZUREAI_MISTRAL_SMALL_KEY", options => options.IsSecret());
+        public string CohereEmbeddingEndpoint => GetRecordedVariable("AZUREAI_COHERE_EMBEDDING_URL");
+        public string CohereEmbeddingApiKey => GetRecordedVariable("AZUREAI_COHERE_EMBEDDING_KEY", options => options.IsSecret());
         public string GithubEndpoint => GetRecordedVariable("AZUREAI_GITHUB_URL");
         public string GithubToken => GetRecordedVariable("AZUREAI_GITHUB_TOKEN", options => options.IsSecret());
         public string AoaiEndpoint => GetRecordedVariable("AOAI_CHAT_COMPLETIONS_ENDPOINT");
-        public string AoaiKey => GetRecordedVariable("AOAI_CHAT_COMPLETIONS_KEY");
+        public string AoaiKey => GetRecordedVariable("AOAI_CHAT_COMPLETIONS_KEY", options => options.IsSecret());
+        public string AoaiEmbeddingsEndpoint => GetRecordedVariable("AOAI_EMBEDDINGS_ENDPOINT");
+        public string AoaiEmbeddingsKey => GetRecordedVariable("AOAI_EMBEDDINGS_KEY", options => options.IsSecret());
         public string TestImageJpgInputPath => GetRecordedVariable("AZUREAI_TEST_IMAGE_JPG_INPUT_PATH");
         // Add other client paramters here as above.
     }
diff --git a/sdk/ai/Azure.AI.Inference/tests/OpenTelemetryScopeTest.cs b/sdk/ai/Azure.AI.Inference/tests/OpenTelemetryScopeTest.cs
index c06bccfb8583..b98e2fc4921a 100644
--- a/sdk/ai/Azure.AI.Inference/tests/OpenTelemetryScopeTest.cs
+++ b/sdk/ai/Azure.AI.Inference/tests/OpenTelemetryScopeTest.cs
@@ -458,9 +458,7 @@ private static StreamingChatCompletionsUpdate GetStreamingToolUpdate(string cont
                 role: ChatRole.Assistant,
                 contentUpdate: content,
                 finishReason: finishReason,
-                functionName: null,
-                functionArgumentsUpdate: null,
-                toolCallUpdate: StreamingToolCallUpdate.DeserializeStreamingToolCallUpdate(
+                toolCallUpdate: StreamingChatResponseToolCallUpdate.DeserializeStreamingChatResponseToolCallUpdate(
                     JsonSerializer.SerializeToElement(toolUpdate)
                 )
             );
diff --git a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample0_ReadmeSnippets.cs b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample0_ReadmeSnippets.cs
index 292e68116c62..6a010f698533 100644
--- a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample0_ReadmeSnippets.cs
+++ b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample0_ReadmeSnippets.cs
@@ -25,7 +25,7 @@ public void InitializeChatCompletionsClient()
             var credential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
 #endif
 
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
             #endregion
         }
 
@@ -42,7 +42,7 @@ public void GetModelInfo()
             var credential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
 #endif
 
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
             Response<ModelInfo> modelInfo = client.GetModelInfo();
 
             Console.WriteLine($"Model name: {modelInfo.Value.ModelName}");
@@ -64,7 +64,7 @@ public void ChatCompletionsWithJsonInput()
             var credential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
 #endif
 
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
             var requestOptions = new ChatCompletionsOptions()
             {
@@ -80,7 +80,7 @@ public void ChatCompletionsWithJsonInput()
             requestOptions = ModelReaderWriter.Read<ChatCompletionsOptions>(messages);
 
             Response<ChatCompletions> response = client.Complete(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(response.Value.Content);
             #endregion
         }
 
@@ -97,7 +97,7 @@ public async Task ReadmeStreamingChatCompletions()
             var credential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
 #endif
 
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
             var requestOptions = new ChatCompletionsOptions()
             {
@@ -135,7 +135,7 @@ public void ChatCompletionsExceptionHandling()
             var credential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
 #endif
 
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
             var requestOptions = new ChatCompletionsOptions()
             {
                 Messages =
diff --git a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample10_EmbeddingsWithAoai.cs b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample10_EmbeddingsWithAoai.cs
new file mode 100644
index 000000000000..5c5f2860bedf
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample10_EmbeddingsWithAoai.cs
@@ -0,0 +1,176 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Threading.Tasks;
+using Azure.Core.Pipeline;
+using Azure.Core;
+using Azure.Core.TestFramework;
+using NUnit.Framework;
+using System.Collections.Generic;
+
+namespace Azure.AI.Inference.Tests.Samples
+{
+    public class Sample10_EmbeddingsWithAoai : SamplesBase<InferenceClientTestEnvironment>
+    {
+        [Test]
+        [SyncOnly]
+        public void BasicEmbeddingAoai()
+        {
+            #region Snippet:Azure_AI_Inference_BasicEmbeddingAoaiScenarioClientCreate
+#if SNIPPET
+            var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_OPENAI_EMBEDDINGS_ENDPOINT"));
+            var key = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_EMBEDDINGS_KEY");
+#else
+            var endpoint = new Uri(TestEnvironment.AoaiEmbeddingsEndpoint);
+            var key = TestEnvironment.AoaiEmbeddingsKey;
+#endif
+
+            // For AOAI, currently the key is passed via a different header not directly handled by the client, however
+            // the credential object is still required. So create with a dummy value.
+            var credential = new AzureKeyCredential("foo");
+
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+            clientOptions.AddPolicy(new AddAoaiAuthHeaderPolicy(key), HttpPipelinePosition.PerCall);
+
+            var client = new EmbeddingsClient(endpoint, credential, clientOptions);
+            #endregion
+
+            #region Snippet:Azure_AI_Inference_BasicEmbeddingAoai
+            var input = new List<string> { "King", "Queen", "Jack", "Page" };
+            var requestOptions = new EmbeddingsOptions(input);
+
+            Response<EmbeddingsResult> response = client.Embed(requestOptions);
+            foreach (EmbeddingItem item in response.Value.Data)
+            {
+                List<float> embedding = item.Embedding.ToObjectFromJson<List<float>>();
+                Console.WriteLine($"Index: {item.Index}, Embedding: <{string.Join(", ", embedding)}>");
+            }
+            #endregion
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<EmbeddingsResult>());
+            Assert.AreEqual(response.Value.Data.Count, input.Count);
+            for (int i = 0; i < input.Count; i++)
+            {
+                Assert.AreEqual(response.Value.Data[i].Index, i);
+                Assert.That(response.Value.Data[i].Embedding, Is.Not.Null.Or.Empty);
+                var embedding = response.Value.Data[i].Embedding.ToObjectFromJson<List<float>>();
+                Assert.That(embedding.Count, Is.GreaterThan(0));
+            }
+        }
+
+        [Test]
+        [AsyncOnly]
+        public async Task BasicEmbeddingAoaiAsync()
+        {
+#if SNIPPET
+            var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_OPENAI_EMBEDDINGS_ENDPOINT"));
+            var key = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_EMBEDDINGS_KEY");
+#else
+            var endpoint = new Uri(TestEnvironment.AoaiEmbeddingsEndpoint);
+            var key = TestEnvironment.AoaiEmbeddingsKey;
+#endif
+
+            // For AOAI, currently the key is passed via a different header not directly handled by the client, however
+            // the credential object is still required. So create with a dummy value.
+            var credential = new AzureKeyCredential("foo");
+
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+            clientOptions.AddPolicy(new AddAoaiAuthHeaderPolicy(key), HttpPipelinePosition.PerCall);
+
+            var client = new EmbeddingsClient(endpoint, credential, clientOptions);
+
+            #region Snippet:Azure_AI_Inference_BasicEmbeddingAoaiAsync
+            var input = new List<string> { "King", "Queen", "Jack", "Page" };
+            var requestOptions = new EmbeddingsOptions(input);
+
+            Response<EmbeddingsResult> response = await client.EmbedAsync(requestOptions);
+            foreach (EmbeddingItem item in response.Value.Data)
+            {
+                List<float> embedding = item.Embedding.ToObjectFromJson<List<float>>();
+                Console.WriteLine($"Index: {item.Index}, Embedding: <{string.Join(", ", embedding)}>");
+            }
+            #endregion
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<EmbeddingsResult>());
+            Assert.AreEqual(response.Value.Data.Count, input.Count);
+            for (int i = 0; i < input.Count; i++)
+            {
+                Assert.AreEqual(response.Value.Data[i].Index, i);
+                Assert.That(response.Value.Data[i].Embedding, Is.Not.Null.Or.Empty);
+                var embedding = response.Value.Data[i].Embedding.ToObjectFromJson<List<float>>();
+                Assert.That(embedding.Count, Is.GreaterThan(0));
+            }
+        }
+
+        [Test]
+        [SyncOnly]
+        public void BasicEmbeddingAoaiWithEntraId()
+        {
+            #region Snippet:Azure_AI_Inference_EmbeddingWithEntraIdClientCreate
+#if SNIPPET
+            var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_OPENAI_EMBEDDINGS_ENDPOINT"));
+            var credential = new DefaultAzureCredential(includeInteractiveCredentials: true);
+#else
+            var endpoint = new Uri(TestEnvironment.AoaiEmbeddingsEndpoint);
+            var credential = TestEnvironment.Credential;
+#endif
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+
+            BearerTokenAuthenticationPolicy tokenPolicy = new BearerTokenAuthenticationPolicy(credential, new string[] { "https://cognitiveservices.azure.com/.default" });
+            clientOptions.AddPolicy(tokenPolicy, HttpPipelinePosition.PerRetry);
+
+            var client = new EmbeddingsClient(endpoint, credential, clientOptions);
+            #endregion
+
+            var input = new List<string> { "King", "Queen", "Jack", "Page" };
+            var requestOptions = new EmbeddingsOptions(input);
+
+            Response<EmbeddingsResult> response = client.Embed(requestOptions);
+            foreach (EmbeddingItem item in response.Value.Data)
+            {
+                List<float> embedding = item.Embedding.ToObjectFromJson<List<float>>();
+                Console.WriteLine($"Index: {item.Index}, Embedding: <{string.Join(", ", embedding)}>");
+            }
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<EmbeddingsResult>());
+            Assert.AreEqual(response.Value.Data.Count, input.Count);
+            for (int i = 0; i < input.Count; i++)
+            {
+                Assert.AreEqual(response.Value.Data[i].Index, i);
+                Assert.That(response.Value.Data[i].Embedding, Is.Not.Null.Or.Empty);
+                var embedding = response.Value.Data[i].Embedding.ToObjectFromJson<List<float>>();
+                Assert.That(embedding.Count, Is.GreaterThan(0));
+            }
+        }
+
+        private class AddAoaiAuthHeaderPolicy : HttpPipelinePolicy
+        {
+            public string AoaiKey { get; }
+
+            public AddAoaiAuthHeaderPolicy(string key)
+            {
+                AoaiKey = key;
+            }
+
+            public override void Process(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
+            {
+                // Add your desired header name and value
+                message.Request.Headers.Add("api-key", AoaiKey);
+
+                ProcessNext(message, pipeline);
+            }
+
+            public override ValueTask ProcessAsync(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
+            {
+                // Add your desired header name and value
+                message.Request.Headers.Add("api-key", AoaiKey);
+
+                return ProcessNextAsync(message, pipeline);
+            }
+        }
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample1_ChatCompletions.cs b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample1_ChatCompletions.cs
index 1af051775d0c..88f2720ba96a 100644
--- a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample1_ChatCompletions.cs
+++ b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample1_ChatCompletions.cs
@@ -25,7 +25,7 @@ public void HelloWorldScenario()
             var credential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
 #endif
 
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
             var requestOptions = new ChatCompletionsOptions()
             {
@@ -37,20 +37,17 @@ public void HelloWorldScenario()
             };
 
             Response<ChatCompletions> response = client.Complete(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(response.Value.Content);
             #endregion
 
             Assert.That(response, Is.Not.Null);
             Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
             Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
             Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(choice.Index, Is.EqualTo(0));
-            Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-            Assert.That(choice.Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(choice.Message.Content, Is.Not.Null.Or.Empty);
+            ChatCompletions result = response.Value;
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
         }
 
         [Test]
@@ -66,7 +63,7 @@ public async Task HelloWorldScenarioAsync()
             var credential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
 #endif
 
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
             var requestOptions = new ChatCompletionsOptions()
             {
@@ -78,20 +75,17 @@ public async Task HelloWorldScenarioAsync()
             };
 
             Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(response.Value.Content);
             #endregion
 
             Assert.That(response, Is.Not.Null);
             Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
             Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
             Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(choice.Index, Is.EqualTo(0));
-            Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-            Assert.That(choice.Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(choice.Message.Content, Is.Not.Null.Or.Empty);
+            ChatCompletions result = response.Value;
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
         }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample2_ChatCompletionsWithAoai.cs b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample2_ChatCompletionsWithAoai.cs
index ba3a5d8c5b2a..fb6ae02e001f 100644
--- a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample2_ChatCompletionsWithAoai.cs
+++ b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample2_ChatCompletionsWithAoai.cs
@@ -29,7 +29,7 @@ public void HelloWorldAoaiScenario()
             // the credential object is still required. So create with a dummy value.
             var credential = new AzureKeyCredential("foo");
 
-            ChatCompletionsClientOptions clientOptions = new ChatCompletionsClientOptions();
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
             clientOptions.AddPolicy(new AddAoaiAuthHeaderPolicy(key), HttpPipelinePosition.PerCall);
 
             var client = new ChatCompletionsClient(endpoint, credential, clientOptions);
@@ -46,20 +46,17 @@ public void HelloWorldAoaiScenario()
             };
 
             Response<ChatCompletions> response = client.Complete(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(response.Value.Content);
             #endregion
 
             Assert.That(response, Is.Not.Null);
             Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
             Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
             Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(choice.Index, Is.EqualTo(0));
-            Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-            Assert.That(choice.Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(choice.Message.Content, Is.Not.Null.Or.Empty);
+            ChatCompletions result = response.Value;
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
         }
 
         [Test]
@@ -78,7 +75,7 @@ public async Task HelloWorldAoaiScenarioAsync()
             // the credential object is still required. So create with a dummy value.
             var credential = new AzureKeyCredential("foo");
 
-            ChatCompletionsClientOptions clientOptions = new ChatCompletionsClientOptions();
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
             clientOptions.AddPolicy(new AddAoaiAuthHeaderPolicy(key), HttpPipelinePosition.PerCall);
 
             var client = new ChatCompletionsClient(endpoint, credential, clientOptions);
@@ -94,20 +91,17 @@ public async Task HelloWorldAoaiScenarioAsync()
             };
 
             Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(response.Value.Content);
             #endregion
 
             Assert.That(response, Is.Not.Null);
             Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
             Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
             Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(choice.Index, Is.EqualTo(0));
-            Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-            Assert.That(choice.Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(choice.Message.Content, Is.Not.Null.Or.Empty);
+            ChatCompletions result = response.Value;
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
         }
 
         [Test]
@@ -124,7 +118,7 @@ public void HelloWorldScenarioWithEntraId()
 
 #endif
 
-            ChatCompletionsClientOptions clientOptions = new ChatCompletionsClientOptions();
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
 
             BearerTokenAuthenticationPolicy tokenPolicy = new BearerTokenAuthenticationPolicy(credential, new string[] { "https://cognitiveservices.azure.com/.default" });
             clientOptions.AddPolicy(tokenPolicy, HttpPipelinePosition.PerRetry);
@@ -142,19 +136,16 @@ public void HelloWorldScenarioWithEntraId()
             };
 
             Response<ChatCompletions> response = client.Complete(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(response.Value.Content);
 
             Assert.That(response, Is.Not.Null);
             Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
             Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
             Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(choice.Index, Is.EqualTo(0));
-            Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-            Assert.That(choice.Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(choice.Message.Content, Is.Not.Null.Or.Empty);
+            ChatCompletions result = response.Value;
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
         }
 
         [Test]
@@ -170,7 +161,7 @@ public async Task HelloWorldScenarioAsyncWithEntraId()
 
 #endif
 
-            ChatCompletionsClientOptions clientOptions = new ChatCompletionsClientOptions();
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
 
             BearerTokenAuthenticationPolicy tokenPolicy = new BearerTokenAuthenticationPolicy(credential, new string[] { "https://cognitiveservices.azure.com/.default" });
             clientOptions.AddPolicy(tokenPolicy, HttpPipelinePosition.PerRetry);
@@ -187,19 +178,16 @@ public async Task HelloWorldScenarioAsyncWithEntraId()
             };
 
             Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(response.Value.Content);
 
             Assert.That(response, Is.Not.Null);
             Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
             Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
             Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(choice.Index, Is.EqualTo(0));
-            Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-            Assert.That(choice.Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(choice.Message.Content, Is.Not.Null.Or.Empty);
+            ChatCompletions result = response.Value;
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
         }
 
         #region Snippet:Azure_AI_Inference_AoaiAuthHeaderPolicy
diff --git a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample3_ChatCompletionsStreaming.cs b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample3_ChatCompletionsStreaming.cs
index 4d32ecf07b2a..e37449a312c3 100644
--- a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample3_ChatCompletionsStreaming.cs
+++ b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample3_ChatCompletionsStreaming.cs
@@ -24,7 +24,7 @@ public async Task HelloWorldStreamingScenarioAsync()
             var credential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
 #endif
 
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
             var requestOptions = new ChatCompletionsOptions()
             {
diff --git a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample4_ChatCompletionsWithHistory.cs b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample4_ChatCompletionsWithHistory.cs
index c357279a8fa8..8bf8440466dc 100644
--- a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample4_ChatCompletionsWithHistory.cs
+++ b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample4_ChatCompletionsWithHistory.cs
@@ -25,7 +25,7 @@ public void ChatCompletionsWithHistoryScenario()
             var credential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
 #endif
 
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
             var messages = new List<ChatRequestMessage>()
             {
                 new ChatRequestSystemMessage("You are an AI assistant that helps people find information. Your replies are short, no more than two sentences."),
@@ -35,27 +35,24 @@ public void ChatCompletionsWithHistoryScenario()
             var requestOptions = new ChatCompletionsOptions(messages);
 
             Response<ChatCompletions> response = client.Complete(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(response.Value.Content);
 
-            messages.Add(new ChatRequestAssistantMessage(response.Value.Choices[0].Message));
+            messages.Add(new ChatRequestAssistantMessage(response.Value));
             messages.Add(new ChatRequestUserMessage("And what was the estimated cost to build it?"));
 
             requestOptions = new ChatCompletionsOptions(messages);
             response = client.Complete(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(response.Value.Content);
             #endregion
 
             Assert.That(response, Is.Not.Null);
             Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
             Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
             Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(choice.Index, Is.EqualTo(0));
-            Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-            Assert.That(choice.Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(choice.Message.Content, Is.Not.Null.Or.Empty);
+            ChatCompletions result = response.Value;
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
         }
 
         [Test]
@@ -71,7 +68,7 @@ public async Task ChatCompletionsWithHistoryScenarioAsync()
             var credential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
 #endif
 
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
             var messages = new List<ChatRequestMessage>()
             {
                 new ChatRequestSystemMessage("You are an AI assistant that helps people find information. Your replies are short, no more than two sentences."),
@@ -81,27 +78,24 @@ public async Task ChatCompletionsWithHistoryScenarioAsync()
             var requestOptions = new ChatCompletionsOptions(messages);
 
             Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(response.Value.Content);
 
-            messages.Add(new ChatRequestAssistantMessage(response.Value.Choices[0].Message));
+            messages.Add(new ChatRequestAssistantMessage(response.Value));
             messages.Add(new ChatRequestUserMessage("And what was the estimated cost to build it?"));
 
             requestOptions = new ChatCompletionsOptions(messages);
             response = await client.CompleteAsync(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(response.Value.Content);
             #endregion
 
             Assert.That(response, Is.Not.Null);
             Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
             Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
             Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(choice.Index, Is.EqualTo(0));
-            Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-            Assert.That(choice.Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(choice.Message.Content, Is.Not.Null.Or.Empty);
+            ChatCompletions result = response.Value;
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
         }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample5_ChatCompletionsWithImageUrl.cs b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample5_ChatCompletionsWithImageUrl.cs
deleted file mode 100644
index 9f2dfdd1a2d5..000000000000
--- a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample5_ChatCompletionsWithImageUrl.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-using System;
-using Azure.Core.Pipeline;
-using Azure.Core;
-using System.Threading.Tasks;
-using Azure.Core.TestFramework;
-using NUnit.Framework;
-
-namespace Azure.AI.Inference.Tests.Samples
-{
-    public class Sample5_ChatCompletionsWithImageUrl : SamplesBase<InferenceClientTestEnvironment>
-    {
-        [Test]
-        [SyncOnly]
-        public void ChatCompletionsWithImageUrlScenario()
-        {
-            #region Snippet:Azure_AI_Inference_ChatCompletionsWithImageUrlScenario
-#if SNIPPET
-            var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
-            var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
-
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
-
-            ChatMessageImageContentItem imageContentItem =
-                new ChatMessageImageContentItem(
-                    new Uri("https://example.com/image.jpg"),
-                    ChatMessageImageDetailLevel.Low
-                );
-#else
-            var endpoint = new Uri(TestEnvironment.AoaiEndpoint);
-            var credential = new AzureKeyCredential("foo");
-            var key = TestEnvironment.AoaiKey;
-
-            ChatCompletionsClientOptions clientOptions = new ChatCompletionsClientOptions();
-            clientOptions.AddPolicy(new AddAoaiAuthHeaderPolicy(key), HttpPipelinePosition.PerCall);
-
-            var client = new ChatCompletionsClient(endpoint, credential, clientOptions);
-
-            ChatMessageImageContentItem imageContentItem =
-                new ChatMessageImageContentItem(
-                    new Uri("https://aka.ms/azsdk/azure-ai-inference/csharp/tests/juggling_balls.png"),
-                    ChatMessageImageDetailLevel.Low
-                );
-#endif
-
-            var requestOptions = new ChatCompletionsOptions()
-            {
-                Messages =
-                {
-                    new ChatRequestSystemMessage("You are a helpful assistant that helps describe images."),
-                    new ChatRequestUserMessage(
-                        new ChatMessageTextContentItem("describe this image"),
-                        imageContentItem),
-                },
-            };
-
-            Response<ChatCompletions> response = client.Complete(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
-            #endregion
-
-            Assert.That(response, Is.Not.Null);
-            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
-            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(choice.Index, Is.EqualTo(0));
-            Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-            Assert.That(choice.Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(choice.Message.Content, Is.Not.Null.Or.Empty);
-        }
-
-        [Test]
-        [AsyncOnly]
-        public async Task ChatCompletionsWithImageUrlScenarioAsync()
-        {
-            #region Snippet:Azure_AI_Inference_ChatCompletionsWithImageUrlScenarioAsync
-#if SNIPPET
-            var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
-            var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
-
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
-
-            ChatMessageImageContentItem imageContentItem =
-                new ChatMessageImageContentItem(
-                    new Uri("https://example.com/image.jpg"),
-                    ChatMessageImageDetailLevel.Low
-                );
-#else
-            var endpoint = new Uri(TestEnvironment.AoaiEndpoint);
-            var credential = new AzureKeyCredential("foo");
-            var key = TestEnvironment.AoaiKey;
-
-            ChatCompletionsClientOptions clientOptions = new ChatCompletionsClientOptions();
-            clientOptions.AddPolicy(new AddAoaiAuthHeaderPolicy(key), HttpPipelinePosition.PerCall);
-
-            var client = new ChatCompletionsClient(endpoint, credential, clientOptions);
-
-            ChatMessageImageContentItem imageContentItem =
-                new ChatMessageImageContentItem(
-                    new Uri("https://aka.ms/azsdk/azure-ai-inference/csharp/tests/juggling_balls.png"),
-                    ChatMessageImageDetailLevel.Low
-                );
-#endif
-
-            var requestOptions = new ChatCompletionsOptions()
-            {
-                Messages =
-                {
-                    new ChatRequestSystemMessage("You are a helpful assistant that helps describe images."),
-                    new ChatRequestUserMessage(
-                        new ChatMessageTextContentItem("describe this image"),
-                        imageContentItem),
-                },
-            };
-
-            Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
-            #endregion
-
-            Assert.That(response, Is.Not.Null);
-            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
-            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(choice.Index, Is.EqualTo(0));
-            Assert.That(choice.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
-            Assert.That(choice.Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(choice.Message.Content, Is.Not.Null.Or.Empty);
-        }
-
-        private class AddAoaiAuthHeaderPolicy : HttpPipelinePolicy
-        {
-            public string AoaiKey { get; }
-
-            public AddAoaiAuthHeaderPolicy(string key)
-            {
-                AoaiKey = key;
-            }
-
-            public override void Process(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
-            {
-                // Add your desired header name and value
-                message.Request.Headers.Add("api-key", AoaiKey);
-
-                ProcessNext(message, pipeline);
-            }
-
-            public override ValueTask ProcessAsync(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
-            {
-                // Add your desired header name and value
-                message.Request.Headers.Add("api-key", AoaiKey);
-
-                return ProcessNextAsync(message, pipeline);
-            }
-        }
-    }
-}
diff --git a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample5_ChatCompletionsWithImages.cs b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample5_ChatCompletionsWithImages.cs
new file mode 100644
index 000000000000..027b052e99c3
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample5_ChatCompletionsWithImages.cs
@@ -0,0 +1,271 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using Azure.Core.Pipeline;
+using Azure.Core;
+using System.Threading.Tasks;
+using Azure.Core.TestFramework;
+using NUnit.Framework;
+using System.IO;
+
+namespace Azure.AI.Inference.Tests.Samples
+{
+    public class Sample5_ChatCompletionsWithImages : SamplesBase<InferenceClientTestEnvironment>
+    {
+        [Test]
+        [SyncOnly]
+        public void ChatCompletionsWithImageUrlScenario()
+        {
+            #region Snippet:Azure_AI_Inference_ChatCompletionsWithImageUrlScenario
+#if SNIPPET
+            var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
+            var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
+
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
+
+            ChatMessageImageContentItem imageContentItem =
+                new ChatMessageImageContentItem(
+                    new Uri("https://example.com/image.jpg"),
+                    ChatMessageImageDetailLevel.Low
+                );
+#else
+            var endpoint = new Uri(TestEnvironment.AoaiEndpoint);
+            var credential = new AzureKeyCredential("foo");
+            var key = TestEnvironment.AoaiKey;
+
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+            clientOptions.AddPolicy(new AddAoaiAuthHeaderPolicy(key), HttpPipelinePosition.PerCall);
+
+            var client = new ChatCompletionsClient(endpoint, credential, clientOptions);
+
+            ChatMessageImageContentItem imageContentItem =
+                new ChatMessageImageContentItem(
+                    new Uri("https://aka.ms/azsdk/azure-ai-inference/csharp/tests/juggling_balls.png"),
+                    ChatMessageImageDetailLevel.Low
+                );
+#endif
+
+            var requestOptions = new ChatCompletionsOptions()
+            {
+                Messages =
+                {
+                    new ChatRequestSystemMessage("You are a helpful assistant that helps describe images."),
+                    new ChatRequestUserMessage(
+                        new ChatMessageTextContentItem("describe this image"),
+                        imageContentItem),
+                },
+            };
+
+            Response<ChatCompletions> response = client.Complete(requestOptions);
+            System.Console.WriteLine(response.Value.Content);
+            #endregion
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
+            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
+            Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
+            ChatCompletions result = response.Value;
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
+        }
+
+        [Test]
+        [AsyncOnly]
+        public async Task ChatCompletionsWithImageUrlScenarioAsync()
+        {
+            #region Snippet:Azure_AI_Inference_ChatCompletionsWithImageUrlScenarioAsync
+#if SNIPPET
+            var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_ENDPOINT"));
+            var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_CHAT_KEY"));
+
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
+
+            ChatMessageImageContentItem imageContentItem =
+                new ChatMessageImageContentItem(
+                    new Uri("https://example.com/image.jpg"),
+                    ChatMessageImageDetailLevel.Low
+                );
+#else
+            var endpoint = new Uri(TestEnvironment.AoaiEndpoint);
+            var credential = new AzureKeyCredential("foo");
+            var key = TestEnvironment.AoaiKey;
+
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+            clientOptions.AddPolicy(new AddAoaiAuthHeaderPolicy(key), HttpPipelinePosition.PerCall);
+
+            var client = new ChatCompletionsClient(endpoint, credential, clientOptions);
+
+            ChatMessageImageContentItem imageContentItem =
+                new ChatMessageImageContentItem(
+                    new Uri("https://aka.ms/azsdk/azure-ai-inference/csharp/tests/juggling_balls.png"),
+                    ChatMessageImageDetailLevel.Low
+                );
+#endif
+
+            var requestOptions = new ChatCompletionsOptions()
+            {
+                Messages =
+                {
+                    new ChatRequestSystemMessage("You are a helpful assistant that helps describe images."),
+                    new ChatRequestUserMessage(
+                        new ChatMessageTextContentItem("describe this image"),
+                        imageContentItem),
+                },
+            };
+
+            Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
+            System.Console.WriteLine(response.Value.Content);
+            #endregion
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
+            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
+            Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
+            ChatCompletions result = response.Value;
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
+        }
+
+        [Test]
+        [SyncOnly]
+        public void ChatCompletionsWithImageStreamScenario()
+        {
+            var endpoint = new Uri(TestEnvironment.AoaiEndpoint);
+            var credential = new AzureKeyCredential("foo");
+            var key = TestEnvironment.AoaiKey;
+
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+            clientOptions.AddPolicy(new AddAoaiAuthHeaderPolicy(key), HttpPipelinePosition.PerCall);
+
+            var client = new ChatCompletionsClient(endpoint, credential, clientOptions);
+
+            #region Snippet:Azure_AI_Inference_ChatCompletionsWithImageStreamScenario
+#if SNIPPET
+            Stream imageStream = File.OpenRead("sample_image_path");
+
+            ChatMessageImageContentItem imageContentItem =
+                new ChatMessageImageContentItem(
+                    imageStream,
+                    "image/jpg",
+                    ChatMessageImageDetailLevel.Low
+                );
+#else
+            Stream imageStream = File.OpenRead(TestEnvironment.TestImageJpgInputPath);
+
+            ChatMessageImageContentItem imageContentItem =
+                new ChatMessageImageContentItem(
+                    imageStream,
+                    "image/jpg",
+                    ChatMessageImageDetailLevel.Low
+                );
+#endif
+
+            var requestOptions = new ChatCompletionsOptions()
+            {
+                Messages =
+                {
+                    new ChatRequestSystemMessage("You are a helpful assistant that helps describe images."),
+                    new ChatRequestUserMessage(
+                        new ChatMessageTextContentItem("describe this image"),
+                        imageContentItem),
+                },
+            };
+
+            Response<ChatCompletions> response = client.Complete(requestOptions);
+            System.Console.WriteLine(response.Value.Content);
+            #endregion
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
+            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
+            Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
+            ChatCompletions result = response.Value;
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
+        }
+
+        [Test]
+        [SyncOnly]
+        public void ChatCompletionsWithImagePathScenario()
+        {
+            var endpoint = new Uri(TestEnvironment.AoaiEndpoint);
+            var credential = new AzureKeyCredential("foo");
+            var key = TestEnvironment.AoaiKey;
+
+            AzureAIInferenceClientOptions clientOptions = new AzureAIInferenceClientOptions();
+            clientOptions.AddPolicy(new AddAoaiAuthHeaderPolicy(key), HttpPipelinePosition.PerCall);
+
+            var client = new ChatCompletionsClient(endpoint, credential, clientOptions);
+
+            #region Snippet:Azure_AI_Inference_ChatCompletionsWithImagePathScenario
+#if SNIPPET
+            ChatMessageImageContentItem imageContentItem =
+                new ChatMessageImageContentItem(
+                    "sample_image_path",
+                    "image/jpg",
+                    ChatMessageImageDetailLevel.Low
+                );
+#else
+            ChatMessageImageContentItem imageContentItem =
+                new ChatMessageImageContentItem(
+                    TestEnvironment.TestImageJpgInputPath,
+                    "image/jpg",
+                    ChatMessageImageDetailLevel.Low
+                );
+#endif
+            #endregion
+
+            var requestOptions = new ChatCompletionsOptions()
+            {
+                Messages =
+                {
+                    new ChatRequestSystemMessage("You are a helpful assistant that helps describe images."),
+                    new ChatRequestUserMessage(
+                        new ChatMessageTextContentItem("describe this image"),
+                        imageContentItem),
+                },
+            };
+
+            var response = client.Complete(requestOptions);
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
+            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
+            Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
+            var result = response.Value;
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
+        }
+
+        private class AddAoaiAuthHeaderPolicy : HttpPipelinePolicy
+        {
+            public string AoaiKey { get; }
+
+            public AddAoaiAuthHeaderPolicy(string key)
+            {
+                AoaiKey = key;
+            }
+
+            public override void Process(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
+            {
+                // Add your desired header name and value
+                message.Request.Headers.Add("api-key", AoaiKey);
+
+                ProcessNext(message, pipeline);
+            }
+
+            public override ValueTask ProcessAsync(HttpMessage message, ReadOnlyMemory<HttpPipelinePolicy> pipeline)
+            {
+                // Add your desired header name and value
+                message.Request.Headers.Add("api-key", AoaiKey);
+
+                return ProcessNextAsync(message, pipeline);
+            }
+        }
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample6_ChatCompletionsWithAdditionalProperties.cs b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample6_ChatCompletionsWithAdditionalProperties.cs
index 9cf92e2016f4..fc4ecdbd145b 100644
--- a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample6_ChatCompletionsWithAdditionalProperties.cs
+++ b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample6_ChatCompletionsWithAdditionalProperties.cs
@@ -23,7 +23,7 @@ public void ChatCompletionsWithAdditionalPropertiesScenario()
             var credential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
 #endif
 
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
             var requestOptions = new ChatCompletionsOptions()
             {
@@ -50,12 +50,6 @@ public void ChatCompletionsWithAdditionalPropertiesScenario()
                 Assert.IsTrue(e.Message.Contains("Extra inputs are not permitted"));
             }
             Assert.IsTrue(exceptionThrown);
-#endif
-            #endregion
-
-            #region Snippet:Azure_AI_Inference_ChatCompletionsWithAdditionalPropertiesScenarioExtraParams
-#if SNIPPET
-            response = client.Complete(requestOptions, extraParams: ExtraParameters.PassThrough);
 #endif
             #endregion
         }
@@ -73,7 +67,7 @@ public async Task ChatCompletionsWithAdditionalPropertiesScenarioAsync()
             var credential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
 #endif
 
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
             var requestOptions = new ChatCompletionsOptions()
             {
@@ -100,12 +94,6 @@ public async Task ChatCompletionsWithAdditionalPropertiesScenarioAsync()
                 Assert.IsTrue(e.Message.Contains("Extra inputs are not permitted"));
             }
             Assert.IsTrue(exceptionThrown);
-#endif
-            #endregion
-
-            #region Snippet:Azure_AI_Inference_ChatCompletionsWithAdditionalPropertiesScenarioExtraParamsAsync
-#if SNIPPET
-            response = await client.CompleteAsync(requestOptions, extraParams: ExtraParameters.PassThrough);
 #endif
             #endregion
         }
diff --git a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample7_ChatCompletionsWithTools.cs b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample7_ChatCompletionsWithTools.cs
index cb343dcf458a..d1652697d6c2 100644
--- a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample7_ChatCompletionsWithTools.cs
+++ b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample7_ChatCompletionsWithTools.cs
@@ -26,7 +26,7 @@ public void ChatCompletionsWithToolsScenario()
             var credential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
 #endif
 
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
             FunctionDefinition futureTemperatureFunction = new FunctionDefinition("get_future_temperature")
             {
@@ -51,7 +51,7 @@ public void ChatCompletionsWithToolsScenario()
                 },
                 new JsonSerializerOptions() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase })
             };
-            ChatCompletionsFunctionToolDefinition functionToolDef = new ChatCompletionsFunctionToolDefinition(futureTemperatureFunction);
+            ChatCompletionsToolDefinition functionToolDef = new ChatCompletionsToolDefinition(futureTemperatureFunction);
 
             var requestOptions = new ChatCompletionsOptions()
             {
@@ -64,22 +64,20 @@ public void ChatCompletionsWithToolsScenario()
             };
 
             Response<ChatCompletions> response = client.Complete(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(response.Value.Content);
 
-            ChatResponseMessage responseMessage = response.Value.Choices[0].Message;
-            ChatCompletionsFunctionToolCall functionToolCall = responseMessage.ToolCalls[0] as ChatCompletionsFunctionToolCall;
+            ChatCompletionsToolCall functionToolCall = response.Value.ToolCalls[0];
 #if !SNIPPET
             Assert.That(response, Is.Not.Null);
             Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
             Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
             Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(responseMessage.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(responseMessage.Content, Is.Null.Or.Empty);
-            Assert.That(responseMessage.ToolCalls, Is.Not.Null.Or.Empty);
-            Assert.That(responseMessage.ToolCalls.Count, Is.EqualTo(1));
+            ChatCompletions result = response.Value;
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.ToolCalls));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
+            Assert.That(result.ToolCalls, Is.Not.Null.Or.Empty);
+            Assert.That(result.ToolCalls.Count, Is.EqualTo(1));
             Assert.That(functionToolCall, Is.Not.Null);
             Assert.That(functionToolCall.Name, Is.EqualTo(futureTemperatureFunction.Name));
             Assert.That(functionToolCall.Arguments, Is.Not.Null.Or.Empty);
@@ -102,7 +100,7 @@ Dictionary<string, string> arguments
             }
 
             // Add the tool call message just received back from the assistant
-            followupOptions.Messages.Add(new ChatRequestAssistantMessage(responseMessage));
+            followupOptions.Messages.Add(new ChatRequestAssistantMessage(response.Value));
 
             // And also the tool message that resolves the tool call
             followupOptions.Messages.Add(new ChatRequestToolMessage(
@@ -110,16 +108,14 @@ Dictionary<string, string> arguments
                 content: "31 celsius"));
 
             Response<ChatCompletions> followupResponse = client.Complete(followupOptions);
-            System.Console.WriteLine(followupResponse.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(followupResponse.Value.Content);
             #endregion
 
             Assert.That(followupResponse, Is.Not.Null);
             Assert.That(followupResponse.Value, Is.Not.Null);
-            Assert.That(followupResponse.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(followupResponse.Value.Choices[0], Is.Not.Null);
-            Assert.That(followupResponse.Value.Choices[0].Message, Is.Not.Null);
-            Assert.That(followupResponse.Value.Choices[0].Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(followupResponse.Value.Choices[0].Message.Content, Is.Not.Null.Or.Empty);
+            Assert.That(followupResponse.Value.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(followupResponse.Value.Content, Is.Not.Null.Or.Empty);
+            Assert.That(followupResponse.Value.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
         }
 
         [Test]
@@ -135,7 +131,7 @@ public async Task ChatCompletionsWithToolsScenarioAsync()
             var credential = new AzureKeyCredential(TestEnvironment.MistralSmallApiKey);
 #endif
 
-            var client = new ChatCompletionsClient(endpoint, credential, new ChatCompletionsClientOptions());
+            var client = new ChatCompletionsClient(endpoint, credential, new AzureAIInferenceClientOptions());
 
             FunctionDefinition futureTemperatureFunction = new FunctionDefinition("get_future_temperature")
             {
@@ -160,7 +156,7 @@ public async Task ChatCompletionsWithToolsScenarioAsync()
                 },
                 new JsonSerializerOptions() { PropertyNamingPolicy = JsonNamingPolicy.CamelCase })
             };
-            ChatCompletionsFunctionToolDefinition functionToolDef = new ChatCompletionsFunctionToolDefinition(futureTemperatureFunction);
+            ChatCompletionsToolDefinition functionToolDef = new ChatCompletionsToolDefinition(futureTemperatureFunction);
 
             var requestOptions = new ChatCompletionsOptions()
             {
@@ -173,22 +169,20 @@ public async Task ChatCompletionsWithToolsScenarioAsync()
             };
 
             Response<ChatCompletions> response = await client.CompleteAsync(requestOptions);
-            System.Console.WriteLine(response.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(response.Value.Content);
 
-            ChatResponseMessage responseMessage = response.Value.Choices[0].Message;
-            ChatCompletionsFunctionToolCall functionToolCall = responseMessage.ToolCalls[0] as ChatCompletionsFunctionToolCall;
+            ChatCompletionsToolCall functionToolCall = response.Value.ToolCalls[0];
 #if !SNIPPET
             Assert.That(response, Is.Not.Null);
             Assert.That(response.Value, Is.InstanceOf<ChatCompletions>());
             Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
             Assert.That(response.Value.Created, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(response.Value.Choices.Count, Is.EqualTo(1));
-            ChatChoice choice = response.Value.Choices[0];
-            Assert.That(responseMessage.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(responseMessage.Content, Is.Null.Or.Empty);
-            Assert.That(responseMessage.ToolCalls, Is.Not.Null.Or.Empty);
-            Assert.That(responseMessage.ToolCalls.Count, Is.EqualTo(1));
+            ChatCompletions result = response.Value;
+            Assert.That(result.FinishReason, Is.EqualTo(CompletionsFinishReason.ToolCalls));
+            Assert.That(result.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(result.Content, Is.Not.Null.Or.Empty);
+            Assert.That(result.ToolCalls, Is.Not.Null.Or.Empty);
+            Assert.That(result.ToolCalls.Count, Is.EqualTo(1));
             Assert.That(functionToolCall, Is.Not.Null);
             Assert.That(functionToolCall.Name, Is.EqualTo(futureTemperatureFunction.Name));
             Assert.That(functionToolCall.Arguments, Is.Not.Null.Or.Empty);
@@ -211,7 +205,7 @@ Dictionary<string, string> arguments
             }
 
             // Add the tool call message just received back from the assistant
-            followupOptions.Messages.Add(new ChatRequestAssistantMessage(responseMessage));
+            followupOptions.Messages.Add(new ChatRequestAssistantMessage(response.Value));
 
             // And also the tool message that resolves the tool call
             followupOptions.Messages.Add(new ChatRequestToolMessage(
@@ -219,16 +213,14 @@ Dictionary<string, string> arguments
                 content: "31 celsius"));
 
             Response<ChatCompletions> followupResponse = await client.CompleteAsync(followupOptions);
-            System.Console.WriteLine(followupResponse.Value.Choices[0].Message.Content);
+            System.Console.WriteLine(followupResponse.Value.Content);
             #endregion
 
             Assert.That(followupResponse, Is.Not.Null);
             Assert.That(followupResponse.Value, Is.Not.Null);
-            Assert.That(followupResponse.Value.Choices, Is.Not.Null.Or.Empty);
-            Assert.That(followupResponse.Value.Choices[0], Is.Not.Null);
-            Assert.That(followupResponse.Value.Choices[0].Message, Is.Not.Null);
-            Assert.That(followupResponse.Value.Choices[0].Message.Role, Is.EqualTo(ChatRole.Assistant));
-            Assert.That(followupResponse.Value.Choices[0].Message.Content, Is.Not.Null.Or.Empty);
+            Assert.That(followupResponse.Value.Role, Is.EqualTo(ChatRole.Assistant));
+            Assert.That(followupResponse.Value.Content, Is.Not.Null.Or.Empty);
+            Assert.That(followupResponse.Value.FinishReason, Is.EqualTo(CompletionsFinishReason.Stopped));
         }
     }
 }
diff --git a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample8_ChatCompletionsWithOpenTelemetry.cs b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample8_ChatCompletionsWithOpenTelemetry.cs
index 4339a05f8a87..30a04aa1d098 100644
--- a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample8_ChatCompletionsWithOpenTelemetry.cs
+++ b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample8_ChatCompletionsWithOpenTelemetry.cs
@@ -79,7 +79,7 @@ public void EnableOpenTelemetry()
             var client = new ChatCompletionsClient(
                 endpoint,
                 credential,
-                new ChatCompletionsClientOptions());
+                new AzureAIInferenceClientOptions());
 
             var requestOptions = new ChatCompletionsOptions()
             {
diff --git a/sdk/ai/Azure.AI.Inference/tests/Samples/Sample9_Embeddings.cs b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample9_Embeddings.cs
new file mode 100644
index 000000000000..4164778e3399
--- /dev/null
+++ b/sdk/ai/Azure.AI.Inference/tests/Samples/Sample9_Embeddings.cs
@@ -0,0 +1,136 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Threading.Tasks;
+using Azure.Core.Pipeline;
+using Azure.Core;
+using Azure.Core.TestFramework;
+using NUnit.Framework;
+using System.Collections.Generic;
+
+namespace Azure.AI.Inference.Tests.Samples
+{
+    public class Sample9_Embeddings : SamplesBase<InferenceClientTestEnvironment>
+    {
+        [Test]
+        [SyncOnly]
+        public void BasicEmbedding()
+        {
+            #region Snippet:Azure_AI_Inference_BasicEmbedding
+#if SNIPPET
+            var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_EMBEDDINGS_ENDPOINT"));
+            var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_EMBEDDINGS_KEY"));
+#else
+            var endpoint = new Uri(TestEnvironment.CohereEmbeddingEndpoint);
+            var credential = new AzureKeyCredential(TestEnvironment.CohereEmbeddingApiKey);
+#endif
+
+            var client = new EmbeddingsClient(endpoint, credential, new AzureAIInferenceClientOptions());
+
+            var input = new List<string> { "King", "Queen", "Jack", "Page" };
+            var requestOptions = new EmbeddingsOptions(input);
+
+            Response<EmbeddingsResult> response = client.Embed(requestOptions);
+            foreach (EmbeddingItem item in response.Value.Data)
+            {
+                List<float> embedding = item.Embedding.ToObjectFromJson<List<float>>();
+                Console.WriteLine($"Index: {item.Index}, Embedding: <{string.Join(", ", embedding)}>");
+            }
+            #endregion
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<EmbeddingsResult>());
+            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
+            Assert.AreEqual(response.Value.Data.Count, input.Count);
+            for (int i = 0; i < input.Count; i++)
+            {
+                Assert.AreEqual(response.Value.Data[i].Index, i);
+                Assert.That(response.Value.Data[i].Embedding, Is.Not.Null.Or.Empty);
+                var embedding = response.Value.Data[i].Embedding.ToObjectFromJson<List<float>>();
+                Assert.That(embedding.Count, Is.GreaterThan(0));
+            }
+        }
+
+        [Test]
+        [AsyncOnly]
+        public async Task BasicEmbeddingAsync()
+        {
+            #region Snippet:Azure_AI_Inference_BasicEmbeddingAsync
+#if SNIPPET
+            var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_EMBEDDINGS_ENDPOINT"));
+            var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_EMBEDDINGS_KEY"));
+#else
+            var endpoint = new Uri(TestEnvironment.CohereEmbeddingEndpoint);
+            var credential = new AzureKeyCredential(TestEnvironment.CohereEmbeddingApiKey);
+#endif
+
+            var client = new EmbeddingsClient(endpoint, credential, new AzureAIInferenceClientOptions());
+
+            var input = new List<string> { "King", "Queen", "Jack", "Page" };
+            var requestOptions = new EmbeddingsOptions(input);
+
+            Response<EmbeddingsResult> response = await client.EmbedAsync(requestOptions);
+            foreach (EmbeddingItem item in response.Value.Data)
+            {
+                List<float> embedding = item.Embedding.ToObjectFromJson<List<float>>();
+                Console.WriteLine($"Index: {item.Index}, Embedding: <{string.Join(", ", embedding)}>");
+            }
+            #endregion
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<EmbeddingsResult>());
+            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
+            Assert.AreEqual(response.Value.Data.Count, input.Count);
+            for (int i = 0; i < input.Count; i++)
+            {
+                Assert.AreEqual(response.Value.Data[i].Index, i);
+                Assert.That(response.Value.Data[i].Embedding, Is.Not.Null.Or.Empty);
+                var embedding = response.Value.Data[i].Embedding.ToObjectFromJson<List<float>>();
+                Assert.That(embedding.Count, Is.GreaterThan(0));
+            }
+        }
+
+        [Test]
+        [SyncOnly]
+        public void BasicEmbeddingBase64()
+        {
+#if SNIPPET
+            var endpoint = new Uri(System.Environment.GetEnvironmentVariable("AZURE_AI_EMBEDDINGS_ENDPOINT"));
+            var credential = new AzureKeyCredential(System.Environment.GetEnvironmentVariable("AZURE_AI_EMBEDDINGS_KEY"));
+#else
+            var endpoint = new Uri(TestEnvironment.CohereEmbeddingEndpoint);
+            var credential = new AzureKeyCredential(TestEnvironment.CohereEmbeddingApiKey);
+#endif
+
+            var client = new EmbeddingsClient(endpoint, credential, new AzureAIInferenceClientOptions());
+
+            #region Snippet:Azure_AI_Inference_Base64Embedding
+            var input = new List<string> { "King", "Queen", "Jack", "Page" };
+            var requestOptions = new EmbeddingsOptions(input)
+            {
+                EncodingFormat = EmbeddingEncodingFormat.Base64,
+            };
+
+            Response<EmbeddingsResult> response = client.Embed(requestOptions);
+            foreach (EmbeddingItem item in response.Value.Data)
+            {
+                string embedding = item.Embedding.ToObjectFromJson<string>();
+                Console.WriteLine($"Index: {item.Index}, Embedding: {embedding}");
+            }
+            #endregion
+
+            Assert.That(response, Is.Not.Null);
+            Assert.That(response.Value, Is.InstanceOf<EmbeddingsResult>());
+            Assert.That(response.Value.Id, Is.Not.Null.Or.Empty);
+            Assert.AreEqual(response.Value.Data.Count, input.Count);
+            for (int i = 0; i < input.Count; i++)
+            {
+                Assert.AreEqual(response.Value.Data[i].Index, i);
+                Assert.That(response.Value.Data[i].Embedding, Is.Not.Null.Or.Empty);
+                var embedding = response.Value.Data[i].Embedding.ToObjectFromJson<string>();
+                Assert.That(embedding, Is.Not.Null.Or.Empty);
+            }
+        }
+    }
+}
diff --git a/sdk/ai/Azure.AI.Inference/tests/SingleRecordedResponseTest.cs b/sdk/ai/Azure.AI.Inference/tests/SingleRecordedResponseTest.cs
index 57d4ee327023..616e62096863 100644
--- a/sdk/ai/Azure.AI.Inference/tests/SingleRecordedResponseTest.cs
+++ b/sdk/ai/Azure.AI.Inference/tests/SingleRecordedResponseTest.cs
@@ -121,14 +121,14 @@ public void TestWithTools(
                 null,
                 new List<ChatCompletionsToolCall>()
                 {
-                    new ChatCompletionsFunctionToolCall(
+                    new ChatCompletionsToolCall(
                         id: "4",
                         function: new FunctionCall(
                             name: "func1",
                             arguments: "{\"arg1\": \"gg\"}"
                         )
                     ),
-                    new ChatCompletionsFunctionToolCall(
+                    new ChatCompletionsToolCall(
                         id: "5",
                         function: new FunctionCall(
                             name: "func1",
diff --git a/sdk/ai/Azure.AI.Inference/tests/StreamingRecordingResponseTest.cs b/sdk/ai/Azure.AI.Inference/tests/StreamingRecordingResponseTest.cs
index 9795fea748f9..2439032dd357 100644
--- a/sdk/ai/Azure.AI.Inference/tests/StreamingRecordingResponseTest.cs
+++ b/sdk/ai/Azure.AI.Inference/tests/StreamingRecordingResponseTest.cs
@@ -168,9 +168,7 @@ private static StreamingChatCompletionsUpdate GetToolUpdate(string content, stri
                 role: ChatRole.Assistant,
                 contentUpdate: content,
                 finishReason: isLast ? CompletionsFinishReason.ToolCalls : (CompletionsFinishReason?) null,
-                functionName: null,
-                functionArgumentsUpdate: null,
-                toolCallUpdate: StreamingToolCallUpdate.DeserializeStreamingToolCallUpdate(JsonSerializer.SerializeToElement(toolUpdate))
+                toolCallUpdate: StreamingChatResponseToolCallUpdate.DeserializeStreamingChatResponseToolCallUpdate(JsonSerializer.SerializeToElement(toolUpdate))
             );
         }
         #endregion
diff --git a/sdk/ai/Azure.AI.Inference/tsp-location.yaml b/sdk/ai/Azure.AI.Inference/tsp-location.yaml
index cb0567d7c627..a65691285852 100644
--- a/sdk/ai/Azure.AI.Inference/tsp-location.yaml
+++ b/sdk/ai/Azure.AI.Inference/tsp-location.yaml
@@ -1,3 +1,3 @@
 directory: specification/ai/ModelClient
 repo: trangevi/azure-rest-api-specs
-commit: 4039eb161a839f14dd1daa1ef01bc7a475fea5ff
+commit: aa97e50e44d2c620c92e5a4c791bb387a741d64c