Merging codeblocks

Author: aaronpowell

articles/ai-services/openai/includes/assistants-csharp.md

@@ -74,79 +74,67 @@ In our code we are going to specify the following values:
 
 An individual assistant can access up to 128 tools including `code interpreter`, as well as any custom tools you create via [functions](../how-to/assistant-functions.md).
 
-1. Create the `AssistantClient`:
+Create and run an assistant with the following:
 
-    ```csharp
-    using Azure;
-    using Azure.AI.OpenAI.Assistants;
+```csharp
+using Azure;
+using Azure.AI.OpenAI.Assistants;
 
-    string endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new ArgumentNullException("AZURE_OPENAI_ENDPOINT");
-    string key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new ArgumentNullException("AZURE_OPENAI_API_KEY");
-    AssistantsClient client = new AssistantsClient(new Uri(endpoint), new AzureKeyCredential(key));
-    ```
+string endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT") ?? throw new ArgumentNullException("AZURE_OPENAI_ENDPOINT");
+string key = Environment.GetEnvironmentVariable("AZURE_OPENAI_API_KEY") ?? throw new ArgumentNullException("AZURE_OPENAI_API_KEY");
+AssistantsClient client = new AssistantsClient(new Uri(endpoint), new AzureKeyCredential(key));
 
-1. Create an assistant:
-
-    ```csharp
-    // Create an assistant
-    Assistant assistant = await client.CreateAssistantAsync(
-        new AssistantCreationOptions("gpt-4-1106-preview") // Replace this with the name of your model deployment
-        {
-            Name = "Math Tutor",
-            Instructions = "You are a personal math tutor. Write and run code to answer math questions.",
-            Tools = { new CodeInterpreterToolDefinition() }
-        });
-    ```
-
-1. Create a thread and add a message to it:
-
-    ```csharp
-    // Create a thread
-    AssistantThread thread = await client.CreateThreadAsync();
-
-    // Add a user question to the thread
-    ThreadMessage message = await client.CreateMessageAsync(
-        thread.Id,
-        MessageRole.User,
-        "I need to solve the equation `3x + 11 = 14`. Can you help me?");
-    ```
-
-1. Execute the thread and display the result:
-
-    ```csharp
-    // Run the thread
-    ThreadRun run = await client.CreateRunAsync(
-        thread.Id,
-        new CreateRunOptions(assistant.Id)
-    );
-
-    // Wait for the assistant to respond
-    do
+// Create an assistant
+Assistant assistant = await client.CreateAssistantAsync(
+    new AssistantCreationOptions("gpt-4-1106-preview") // Replace this with the name of your model deployment
     {
-        await Task.Delay(TimeSpan.FromMilliseconds(500));
-        run = await client.GetRunAsync(thread.Id, run.Id);
-    }
-    while (run.Status == RunStatus.Queued
-        || run.Status == RunStatus.InProgress);
-
-    // Get the messages
-    PageableList<ThreadMessage> messagesPage = await client.GetMessagesAsync(thread.Id);
-    IReadOnlyList<ThreadMessage> messages = messagesPage.Data;
-
-    // Note: messages iterate from newest to oldest, with the messages[0] being the most recent
-    foreach (ThreadMessage threadMessage in messages.Reverse())
+        Name = "Math Tutor",
+        Instructions = "You are a personal math tutor. Write and run code to answer math questions.",
+        Tools = { new CodeInterpreterToolDefinition() }
+    });
+
+// Create a thread
+AssistantThread thread = await client.CreateThreadAsync();
+
+// Add a user question to the thread
+ThreadMessage message = await client.CreateMessageAsync(
+    thread.Id,
+    MessageRole.User,
+    "I need to solve the equation `3x + 11 = 14`. Can you help me?");
+
+// Run the thread
+ThreadRun run = await client.CreateRunAsync(
+    thread.Id,
+    new CreateRunOptions(assistant.Id)
+);
+
+// Wait for the assistant to respond
+do
+{
+    await Task.Delay(TimeSpan.FromMilliseconds(500));
+    run = await client.GetRunAsync(thread.Id, run.Id);
+}
+while (run.Status == RunStatus.Queued
+    || run.Status == RunStatus.InProgress);
+
+// Get the messages
+PageableList<ThreadMessage> messagesPage = await client.GetMessagesAsync(thread.Id);
+IReadOnlyList<ThreadMessage> messages = messagesPage.Data;
+
+// Note: messages iterate from newest to oldest, with the messages[0] being the most recent
+foreach (ThreadMessage threadMessage in messages.Reverse())
+{
+    Console.Write($"{threadMessage.CreatedAt:yyyy-MM-dd HH:mm:ss} - {threadMessage.Role,10}: ");
+    foreach (MessageContent contentItem in threadMessage.ContentItems)
     {
-        Console.Write($"{threadMessage.CreatedAt:yyyy-MM-dd HH:mm:ss} - {threadMessage.Role,10}: ");
-        foreach (MessageContent contentItem in threadMessage.ContentItems)
+        if (contentItem is MessageTextContent textItem)
         {
-            if (contentItem is MessageTextContent textItem)
-            {
-                Console.Write(textItem.Text);
-            }
-            Console.WriteLine();
+            Console.Write(textItem.Text);
         }
+        Console.WriteLine();
     }
-    ```
+}
+```
 
 This will print an output as follows: