Merge pull request #2229 from aahill/oyd-qs

updating C# code

Author: AnnaMHuff

articles/ai-services/openai/includes/use-your-data-dotnet.md

@@ -5,7 +5,7 @@ author: travisw
 ms.author: travisw
 ms.service: azure-ai-openai
 ms.topic: include
-ms.date: 03/07/2024
+ms.date: 01/09/2025
 ---
 
 [!INCLUDE [Set up required variables](./use-your-data-common-variables.md)]
@@ -14,14 +14,12 @@ ms.date: 03/07/2024
 
 From the project directory, open the *Program.cs* file and replace its contents with the following code:
 
-### Without response streaming
-
 ```csharp
-using Azure;
+using System;
 using Azure.AI.OpenAI;
+using System.ClientModel;
 using Azure.AI.OpenAI.Chat;
 using OpenAI.Chat;
-using System.Text.Json;
 using static System.Environment;
 
 string azureOpenAIEndpoint = GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT");
@@ -31,36 +29,38 @@ string searchEndpoint = GetEnvironmentVariable("AZURE_AI_SEARCH_ENDPOINT");
 string searchKey = GetEnvironmentVariable("AZURE_AI_SEARCH_API_KEY");
 string searchIndex = GetEnvironmentVariable("AZURE_AI_SEARCH_INDEX");
 
-#pragma warning disable AOAI001
 AzureOpenAIClient azureClient = new(
-    new Uri(azureOpenAIEndpoint),
-    new AzureKeyCredential(azureOpenAIKey));
+			new Uri(azureOpenAIEndpoint),
+			new ApiKeyCredential(azureOpenAIKey));
 ChatClient chatClient = azureClient.GetChatClient(deploymentName);
 
+// Extension methods to use data sources with options are subject to SDK surface changes. Suppress the
+// warning to acknowledge and this and use the subject-to-change AddDataSource method.
+#pragma warning disable AOAI001
+
 ChatCompletionOptions options = new();
 options.AddDataSource(new AzureSearchChatDataSource()
 {
-    Endpoint = new Uri(searchEndpoint),
-    IndexName = searchIndex,
-    Authentication = DataSourceAuthentication.FromApiKey(searchKey),
+	Endpoint = new Uri(searchEndpoint),
+	IndexName = searchIndex,
+	Authentication = DataSourceAuthentication.FromApiKey(searchKey),
 });
 
 ChatCompletion completion = chatClient.CompleteChat(
-    [
-        new UserChatMessage("What are my available health plans?"),
-    ], options);
-
-Console.WriteLine(completion.Content[0].Text);
+	[
+		new UserChatMessage("What health plans are available?"),
+			],
+	options);
 
-AzureChatMessageContext onYourDataContext = completion.GetAzureMessageContext();
+ChatMessageContext onYourDataContext = completion.GetMessageContext();
 
 if (onYourDataContext?.Intent is not null)
 {
-    Console.WriteLine($"Intent: {onYourDataContext.Intent}");
+	Console.WriteLine($"Intent: {onYourDataContext.Intent}");
 }
-foreach (AzureChatCitation citation in onYourDataContext?.Citations ?? [])
+foreach (ChatCitation citation in onYourDataContext?.Citations ?? [])
 {
-    Console.WriteLine($"Citation: {citation.Content}");
+	Console.WriteLine($"Citation: {citation.Content}");
 }
 ```
 
@@ -86,72 +86,4 @@ Thank you for your interest in the Contoso electronics plan and benefit packages
 learn more about the various options available to you...// Omitted for brevity
 ```
 
-This will wait until the model has generated its entire response before printing the results. Alternatively, if you want to asynchronously stream the response and print the results, you can replace the contents of *Program.cs* with the code in the next example.
-
-### Async with streaming
-
-```csharp
-using Azure;
-using Azure.AI.OpenAI;
-using Azure.AI.OpenAI.Chat;
-using OpenAI.Chat;
-using static System.Environment;
-
-string azureOpenAIEndpoint = GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT");
-string azureOpenAIKey = GetEnvironmentVariable("AZURE_OPENAI_API_KEY");
-string deploymentName = GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_ID");
-string searchEndpoint = GetEnvironmentVariable("AZURE_AI_SEARCH_ENDPOINT");
-string searchKey = GetEnvironmentVariable("AZURE_AI_SEARCH_API_KEY");
-string searchIndex = GetEnvironmentVariable("AZURE_AI_SEARCH_INDEX");
-
-#pragma warning disable AOAI001
-
-AzureOpenAIClient azureClient = new(
-    new Uri(azureOpenAIEndpoint),
-    new AzureKeyCredential(azureOpenAIKey));
-ChatClient chatClient = azureClient.GetChatClient(deploymentName);
-
-ChatCompletionOptions options = new();
-options.AddDataSource(new AzureSearchChatDataSource()
-{
-    Endpoint = new Uri(searchEndpoint),
-    IndexName = searchIndex,
-    Authentication = DataSourceAuthentication.FromApiKey(searchKey),
-});
-
-var chatUpdates = chatClient.CompleteChatStreamingAsync(
-    [
-        new UserChatMessage("What are my available health plans?"),
-    ], options);
-
-AzureChatMessageContext onYourDataContext = null;
-await foreach (var chatUpdate in chatUpdates)
-{
-    if (chatUpdate.Role.HasValue)
-    {
-        Console.WriteLine($"{chatUpdate.Role}: ");
-    }
-
-    foreach (var contentPart in chatUpdate.ContentUpdate)
-    {
-        Console.Write(contentPart.Text);
-    }
-
-    if (onYourDataContext == null)
-    {
-        onYourDataContext = chatUpdate.GetAzureMessageContext();
-    }
-}
-
-Console.WriteLine();
-if (onYourDataContext?.Intent is not null)
-{
-    Console.WriteLine($"Intent: {onYourDataContext.Intent}");
-}
-foreach (AzureChatCitation citation in onYourDataContext?.Citations ?? [])
-{
-    Console.Write($"Citation: {citation.Content}");
-}
-```
-
-
+This will wait until the model has generated its entire response before printing the results.

articles/ai-services/openai/use-your-data-quickstart.md

@@ -8,7 +8,7 @@ ms.custom: devx-track-dotnet, devx-track-extended-java, devx-track-js, devx-trac
 ms.topic: quickstart
 author: aahill
 ms.author: aahi
-ms.date: 10/22/2024
+ms.date: 01/09/2025
 recommendations: false
 zone_pivot_groups: openai-use-your-data
 ---