Merge branch 'main' into release-2024-march-openai-ga

Author: superyyrrzz

.openpublishing.redirection.active-directory.json

@@ -33690,6 +33690,6 @@
             "source_path_from_root": "/articles/active-directory-domain-services/contact-us.md",
             "redirect_url": "/azure/active-directory/fundamentals/support-help-options",
             "redirect_document_id": false
-        },
+        }
     ]
-}
+}

.openpublishing.redirection.sql-database.json

@@ -2580,6 +2580,6 @@
             "source_path_from_root": "/articles/sql-data-warehouse/sql-data-warehouse-security-threat-detection.md",
             "redirect_url": "/azure/sql-database/sql-database-threat-detection-overview",
             "redirect_document_id": false
-        },
+        }
     ]
 }

articles/ai-services/openai/assistants-quickstart.md

@@ -9,7 +9,7 @@ ms.topic: quickstart
 author: mrbullwinkle
 ms.author: mbullwin
 ms.date: 02/01/2024
-zone_pivot_groups: openai-quickstart
+zone_pivot_groups: openai-quickstart-assistants
 recommendations: false
 ---
 
@@ -30,6 +30,12 @@ Azure OpenAI Assistants (Preview) allows you to create AI assistants tailored to
 
 ::: zone-end
 
+::: zone pivot="programming-language-csharp"
+
+[!INCLUDE [C# quickstart](includes/assistants-csharp.md)]
+
+::: zone-end
+
 ::: zone pivot="rest-api"
 
 [!INCLUDE [REST API quickstart](includes/assistants-rest.md)]

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

@@ -0,0 +1,158 @@
+---
+title: 'Quickstart: Use the OpenAI Service via the .NET SDK'
+titleSuffix: Azure OpenAI Service
+description: Walkthrough on how to get started with Azure OpenAI and make your first completions call with the .NET SDK. 
+manager: masoucou
+author: aapowell
+ms.author: aapowell
+ms.service: azure-ai-openai
+ms.topic: include
+ms.date: 03/05/2024
+---
+
+[Source code](https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/openai/Azure.AI.OpenAI/src) | [Package (NuGet)](https://www.nuget.org/packages/Azure.AI.OpenAI/)
+
+## Prerequisites
+
+- An Azure subscription - <a href="https://azure.microsoft.com/free/cognitive-services" target="_blank">Create one for free</a>
+- Access granted to Azure OpenAI in the desired Azure subscription
+
+    Currently, access to this service is granted only by application. You can apply for access to Azure OpenAI by completing the form at <a href="https://aka.ms/oai/access" target="_blank">https://aka.ms/oai/access</a>. Open an issue on this repo to contact us if you have an issue.
+- The [.NET 8 SDK](https://dotnet.microsoft.com/download/dotnet/8.0)
+- Azure OpenAI Assistants are currently available in Sweden Central, East US 2, and Australia East. For more information about model availability in those regions, see the [models guide](../concepts/models.md).
+- We recommend reviewing the [Responsible AI transparency note](/legal/cognitive-services/openai/transparency-note?context=%2Fazure%2Fai-services%2Fopenai%2Fcontext%2Fcontext&tabs=text) and other [Responsible AI resources](/legal/cognitive-services/openai/overview?context=%2Fazure%2Fai-services%2Fopenai%2Fcontext%2Fcontext) to familiarize yourself with the capabilities and limitations of the Azure OpenAI Service.
+- An Azure OpenAI resource with the `gpt-4 (1106-preview)` model deployed was used testing this example.
+
+## Set up
+
+### Create a new .NET Core application
+
+In a console window (such as cmd, PowerShell, or Bash), use the `dotnet new` command to create a new console app with the name `azure-openai-quickstart`. This command creates a simple "Hello World" project with a single C# source file: *Program.cs*.
+
+```dotnetcli
+dotnet new console -n azure-openai-assistants-quickstart
+```
+
+Change your directory to the newly created app folder. You can build the application with:
+
+```dotnetcli
+dotnet build
+```
+
+The build output should contain no warnings or errors.
+
+```output
+...
+Build succeeded.
+ 0 Warning(s)
+ 0 Error(s)
+...
+```
+
+Install the OpenAI .NET client library with:
+
+```console
+dotnet add package Azure.AI.OpenAI.Assistants --prerelease
+```
+
+[!INCLUDE [get-key-endpoint](get-key-endpoint.md)]
+
+[!INCLUDE [environment-variables](environment-variables.md)]
+
+## Create an assistant
+
+In our code we are going to specify the following values:
+
+| **Name** | **Description** |
+|:---|:---|
+| **Assistant name** | Your deployment name that is associated with a specific model. |
+| **Instructions** | Instructions are similar to system messages this is where you give the model guidance about how it should behave and any context it should reference when generating a response. You can describe the assistant's personality, tell it what it should and shouldn't answer, and tell it how to format responses. You can also provide examples of the steps it should take when answering responses. |
+| **Model** | This is where you set which model deployment name to use with your assistant. The retrieval tool requires `gpt-35-turbo (1106)` or `gpt-4 (1106-preview)` model. **Set this value to your deployment name, not the model name unless it is the same.** |
+| **Code interpreter** | Code interpreter provides access to a sandboxed Python environment that can be used to allow the model to test and execute code. |
+
+### Tools
+
+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).
+
+Create and run an assistant with the following:
+
+```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));
+
+// 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() }
+    });
+
+// 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)
+    {
+        if (contentItem is MessageTextContent textItem)
+        {
+            Console.Write(textItem.Text);
+        }
+        Console.WriteLine();
+    }
+}
+```
+
+This will print an output as follows:
+
+```
+2024-03-05 03:38:17 -       user: I need to solve the equation `3x + 11 = 14`. Can you help me?
+2024-03-05 03:38:25 -  assistant: The solution to the equation \(3x + 11 = 14\) is \(x = 1\).
+```
+
+New messages can be created on the thread before re-running, which will see the assistant use the past messages as context within the thread.
+
+## Clean up resources
+
+If you want to clean up and remove an OpenAI resource, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it.
+
+- [Portal](../../multi-service-resource.md?pivots=azportal#clean-up-resources)
+- [Azure CLI](../../multi-service-resource.md?pivots=azcli#clean-up-resources)
+
+## See also
+
+* Learn more about how to use Assistants with our [How-to guide on Assistants](../how-to/assistant.md).
+* [Azure OpenAI Assistants API samples](https://github.com/Azure-Samples/azureai-samples/tree/main/scenarios/Assistants)

articles/ai-services/openai/references/azure-search.md

@@ -5,7 +5,7 @@ description: Learn how to use Azure OpenAI on your Azure Search data Python & RE
 manager: nitinme
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 02/14/2024
+ms.date: 03/12/2024
 author: mrbullwinkle
 ms.author: mbullwin
 recommendations: false
@@ -14,7 +14,7 @@ ms.custom: devx-track-python
 
 # Data source - Azure AI Search
 
-The configurable options of Azure AI Search when using Azure OpenAI On Your Data. This data source is supported in API version `2024-02-15-preview`.
+The configurable options of Azure AI Search when using Azure OpenAI On Your Data. This data source is supported in API version `2024-02-01`.
 
 |Name | Type | Required | Description |
 |--- | --- | --- | --- |
@@ -141,7 +141,7 @@ token_provider = get_bearer_token_provider(DefaultAzureCredential(), "https://co
 client = AzureOpenAI(
     azure_endpoint=endpoint,
     azure_ad_token_provider=token_provider,
-    api_version="2024-02-15-preview",
+    api_version="2024-02-01",
 )
 
 completion = client.chat.completions.create(
@@ -176,7 +176,7 @@ print(completion.model_dump_json(indent=2))
 
 ```bash
 az rest --method POST \
- --uri $AzureOpenAIEndpoint/openai/deployments/$ChatCompletionsDeploymentName/chat/completions?api-version=2024-02-15-preview \
+ --uri $AzureOpenAIEndpoint/openai/deployments/$ChatCompletionsDeploymentName/chat/completions?api-version=2024-02-01 \
  --resource https://cognitiveservices.azure.com/ \
  --body \
 '

articles/ai-services/openai/references/cosmos-db.md

@@ -5,7 +5,7 @@ description: Learn how to use Azure OpenAI on your Azure Cosmos DB data Python &
 manager: nitinme
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 02/14/2024
+ms.date: 03/12/2024
 author: mrbullwinkle
 ms.author: mbullwin
 recommendations: false
@@ -14,7 +14,7 @@ ms.custom: devx-track-python
 
 # Data source - Azure Cosmos DB for MongoDB vCore
 
-The configurable options of Azure Cosmos DB for MongoDB vCore when using Azure OpenAI On Your Data. This data source is supported in API version `2024-02-15-preview`.
+The configurable options of Azure Cosmos DB for MongoDB vCore when using Azure OpenAI On Your Data. This data source is supported in API version `2024-02-01`.
 
 |Name | Type | Required | Description |
 |--- | --- | --- | --- |
@@ -127,7 +127,7 @@ token_provider = get_bearer_token_provider(
 client = AzureOpenAI(
     azure_endpoint=endpoint,
     azure_ad_token_provider=token_provider,
-    api_version="2024-02-15-preview",
+    api_version="2024-02-01",
 )
 
 completion = client.chat.completions.create(
@@ -178,7 +178,7 @@ print(completion.model_dump_json(indent=2))
 ```bash
 
 az rest --method POST \
- --uri $AzureOpenAIEndpoint/openai/deployments/$ChatCompletionsDeploymentName/chat/completions?api-version=2024-02-15-preview \
+ --uri $AzureOpenAIEndpoint/openai/deployments/$ChatCompletionsDeploymentName/chat/completions?api-version=2024-02-01 \
  --resource https://cognitiveservices.azure.com/ \
  --body \
 '

articles/ai-services/openai/references/on-your-data.md

@@ -5,7 +5,7 @@ description: Learn how to use Azure OpenAI On Your Data Python & REST API.
 manager: nitinme
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 02/14/2024
+ms.date: 03/12/2024
 author: mrbullwinkle
 ms.author: mbullwin
 recommendations: false
@@ -14,10 +14,10 @@ ms.custom: devx-track-python
 
 # Azure OpenAI On Your Data API Reference
 
-This article provides reference documentation for Python and REST for the new Azure OpenAI On Your Data API. The latest preview api-version is `2024-02-15-preview` [Swagger spec](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2024-02-15-preview/inference.json).
+This article provides reference documentation for Python and REST for the new Azure OpenAI On Your Data API. The latest API version is `2024-02-01` [Swagger spec](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/stable/2024-02-01).
 
 > [!NOTE]
-> Since `2024-02-15-preview` we introduced the following breaking changes comparing to earlier API versions:
+> Since API version `2024-02-15-preview` we introduced the following breaking changes comparing to earlier API versions:
 > * The API path is changed from `/extensions/chat/completions` to `/chat/completions`.
 > * The naming convention of property keys and enum values is changed from camel casing to snake casing. Example: `deploymentName` is changed to `deployment_name`.
 > * The data source type `AzureCognitiveSearch` is changed to `azure_search`.
@@ -27,6 +27,13 @@ This article provides reference documentation for Python and REST for the new Az
 POST {endpoint}/openai/deployments/{deployment-id}/chat/completions?api-version={api-version}
 ```
 
+**Supported versions**
+* `2024-02-15-preview` [Swagger spec](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2024-02-15-preview/inference.json)
+* `2024-02-01` [Swagger spec](https://github.com/Azure/azure-rest-api-specs/tree/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/stable/2024-02-01).
+
+> [!NOTE]
+> [Azure Machine learning indexes](./azure-machine-learning.md), [Pinecone](./pinecone.md), and [Elasticsearch](./elasticsearch.md) are only supported in the `2024-02-15-preview` API version.
+
 ## URI parameters
 
 |Name               | In   | Type     | Required | Description                                                                           |
@@ -118,7 +125,7 @@ token_provider = get_bearer_token_provider(DefaultAzureCredential(), "https://co
 client = AzureOpenAI(
     azure_endpoint=endpoint,
     azure_ad_token_provider=token_provider,
-    api_version="2024-02-15-preview",
+    api_version="2024-02-01",
 )
 
 completion = client.chat.completions.create(
@@ -164,7 +171,7 @@ print(completion.model_dump_json(indent=2))
 
 ```bash
 az rest --method POST \
- --uri $AzureOpenAIEndpoint/openai/deployments/$ChatCompletionsDeploymentName/chat/completions?api-version=2024-02-15-preview \
+ --uri $AzureOpenAIEndpoint/openai/deployments/$ChatCompletionsDeploymentName/chat/completions?api-version=2024-02-01 \
  --resource https://cognitiveservices.azure.com/ \
  --body \
 '

articles/ai-services/speech-service/batch-transcription-create.md

@@ -255,7 +255,7 @@ Azure AI Speech supports OpenAI's Whisper model by using the batch transcription
 To use a Whisper model for batch transcription, you need to set the `model` property. Whisper is a display-only model, so the lexical field isn't populated in the response.
 
 > [!IMPORTANT]
-> Whisper models are currently in preview. You should always use [version 3.2](./migrate-v3-1-to-v3-2.md) of the speech to text API, which is available in a separate preview, for Whisper models.
+> For Whisper models, you should always use [version 3.2](./migrate-v3-1-to-v3-2.md) of the speech to text API.
 
 Whisper models by batch transcription are supported in the East US, Southeast Asia, and West Europe regions.
 
@@ -285,36 +285,38 @@ spx csr list --base --api-version v3.2-preview.1
 
 ::: zone-end
 
-The `displayName` property of a Whisper model contains "Whisper Preview" as shown in this example. Whisper is a display-only model, so the lexical field isn't populated in the transcription.
+The `displayName` property of a Whisper model contains "Whisper" as shown in this example. Whisper is a display-only model, so the lexical field isn't populated in the transcription.
 
 ```json
 {
-  "self": "https://eastus.api.cognitive.microsoft.com/speechtotext/v3.2-preview.1/models/base/d9cbeee6-582b-47ad-b5c1-6226583c92b6",
+  "self": "https://eastus.api.cognitive.microsoft.com/speechtotext/v3.2-preview.1/models/base/e418c4a9-9937-4db7-b2c9-8afbff72d950",
   "links": {
-    "manifest": "https://eastus.api.cognitive.microsoft.com/speechtotext/v3.2-preview.1/models/base/d9cbeee6-582b-47ad-b5c1-6226583c92b6/manifest"
+    "manifest": "https://eastus.api.cognitive.microsoft.com/speechtotext/v3.2-preview.1/models/base/e418c4a9-9937-4db7-b2c9-8afbff72d950/manifest"
   },
   "properties": {
     "deprecationDates": {
-      "adaptationDateTime": "2024-10-15T00:00:00Z",
-      "transcriptionDateTime": "2025-10-15T00:00:00Z"
+      "adaptationDateTime": "2025-04-15T00:00:00Z",
+      "transcriptionDateTime": "2026-04-15T00:00:00Z"
     },
     "features": {
       "supportsTranscriptions": true,
       "supportsEndpoints": false,
       "supportsTranscriptionsOnSpeechContainers": false,
-      "supportsAdaptationsWith": [],
+      "supportsAdaptationsWith": [
+        "Acoustic"
+      ],
       "supportedOutputFormats": [
         "Display"
       ]
     },
-    "chargeForAdaptation": false
+    "chargeForAdaptation": true
   },
-  "lastActionDateTime": "2023-07-19T12:46:27Z",
+  "lastActionDateTime": "2024-02-29T15:53:28Z",
   "status": "Succeeded",
-  "createdDateTime": "2023-07-19T12:39:52Z",
+  "createdDateTime": "2024-02-29T15:46:07Z",
   "locale": "en-US",
-  "displayName": "20230707 Whisper Preview",
-  "description": "en-US base model"
+  "displayName": "20240228 Whisper Large V2",
+  "description": "OpenAI Whisper Model in Azure AI Speech (Whisper v2-large)"
 },
 ```
 

articles/aks/azure-cni-overlay.md

@@ -138,7 +138,7 @@ az aks nodepool add  -g $resourceGroup --cluster-name $clusterName \
 >
 > - The cluster is on Kubernetes version 1.22+.
 > - Doesn't use the dynamic pod IP allocation feature.
-> - Doesn't have network policies enabled.
+> - Doesn't have network policies enabled. Network Policy engine can be uninstalled before the upgrade, see [Uninstall Azure Network Policy Manager or Calico](use-network-policies.md#uninstall-azure-network-policy-manager-or-calico-preview)
 > - Doesn't use any Windows node pools with docker as the container runtime.
 
 > [!NOTE]