Merge branch 'main' into release-migrate-postgresql-single-to-flexible

Author: v-alje

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

@@ -383,40 +383,8 @@ You can send a streaming request using the `stream` parameter, allowing data to
 
 #### Conversation history for better results
 
-When you chat with a model, providing a history of the chat will help the model return higher quality results. 
+When you chat with a model, providing a history of the chat will help the model return higher quality results. You don't need to include the `context` property of the assistant messages in your API requests for better response quality. See [the API reference documentation](../references/on-your-data.md#examples) for examples.
 
-```json
-{
-    "dataSources": [
-        {
-            "type": "AzureCognitiveSearch",
-            "parameters": {
-                "endpoint": "'$AZURE_AI_SEARCH_ENDPOINT'",
-                "key": "'$AZURE_AI_SEARCH_API_KEY'",
-                "indexName": "'$AZURE_AI_SEARCH_INDEX'"
-            }
-        }
-    ],
-    "messages": [
-        {
-            "role": "user",
-            "content": "What are the differences between Azure Machine Learning and Azure AI services?"
-        },
-        {
-            "role": "tool",
-            "content": "{\"citations\": [{\"content\": \"title: Azure AI services and Machine Learning\\ntitleSuffix: Azure AI services\\ndescription: Learn where Azure AI services fits in with other Azure offerings for machine learning.\\nAzure AI services and machine learning\\nAzure AI services provides machine learning capabilities to solve general problems such as...\\n \"articles\\\\cognitive-services\\\\cognitive-services-and-machine-learning.md\", \"url\": null, \"metadata\": {\"chunking\": \"orignal document size=1018. Scores=0.32200050354003906 and 1.2880020141601562.Org Highlight count=115.\"}, \"chunk_id\": \"0\"}], \"intent\": \"[\\\"What are the differences between Azure Machine Learning and Azure AI services?\\\"]\"}"
-        },
-        {
-            "role": "assistant",
-            "content": " \nAzure Machine Learning is a product and service tailored for data scientists to build, train, and deploy machine learning models [doc1]..."
-        },
-        {
-            "role": "user",
-            "content": "How do I use Azure machine learning?"
-        }
-    ]
-}
-```
 
 ## Token usage estimation for Azure OpenAI On Your Data
 

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

@@ -28,7 +28,7 @@ POST {endpoint}/openai/deployments/{deployment-id}/chat/completions?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-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]
@@ -48,7 +48,6 @@ The request body inherits the same schema of chat completions API request. This
 
 |Name | Type | Required | Description |
 |--- | --- | --- | --- |
-| `messages` | [ChatMessage](#chat-message)[] | True | The array of messages to generate chat completions for, in the chat format. The [request chat message](#chat-message) has a `context` property, which is added for Azure OpenAI On Your Data.|
 | `data_sources` | [DataSource](#data-source)[] | True | The configuration entries for Azure OpenAI On Your Data. There must be exactly one element in the array. If `data_sources` is not provided, the service uses chat completions model directly, and does not use Azure OpenAI On Your Data.|
 
 ## Response body
@@ -57,17 +56,17 @@ The response body inherits the same schema of chat completions API response. The
 
 ## Chat message
 
-In both request and response, when the chat message `role` is `assistant`, the chat message schema inherits from the chat completions assistant chat message, and is extended with the property `context`.
+The response assistant message schema inherits from the chat completions assistant [chat message](../reference.md#chatmessage), and is extended with the property `context`.
 
 |Name | Type | Required | Description |
 |--- | --- | --- | --- |
-| `context` | [Context](#context) | False | Represents the incremental steps performed by the Azure OpenAI On Your Data while processing the request, including the detected search intent and the retrieved documents. |
+| `context` | [Context](#context) | False | Represents the incremental steps performed by the Azure OpenAI On Your Data while processing the request, including the retrieved documents. |
 
 ## Context
 |Name | Type | Required | Description |
 |--- | --- | --- | --- |
-| `citations` | [Citation](#citation)[] | False | The data source retrieval result, used to generate the assistant message in the response.|
-| `intent` | string | False | The detected intent from the chat history, used to pass to the next turn to carry over the context.|
+| `citations` | [Citation](#citation)[] | False | The data source retrieval result, used to generate the assistant message in the response. Clients can render references from the citations. |
+| `intent` | string | False | The detected intent from the chat history. Passing back the previous intent is no longer needed. Ignore this property. |
 
 ## Citation
 
@@ -91,7 +90,7 @@ This list shows the supported data sources.
 
 ## Examples
 
-This example shows how to pass context with conversation history for better results.
+This example shows how to pass conversation history for better results.
 
 Prerequisites:
 * Configure the role assignments from Azure OpenAI system assigned managed identity to Azure search service. Required roles: `Search Index Data Reader`, `Search Service Contributor`.
@@ -137,10 +136,7 @@ completion = client.chat.completions.create(
         },
         {
             "role": "assistant",
-            "content": "DRI stands for Directly Responsible Individual of a service. Which service are you asking about?",
-            "context": {
-                "intent": "[\"Who is DRI?\", \"What is the meaning of DRI?\", \"Define DRI\"]"
-            }
+            "content": "DRI stands for Directly Responsible Individual of a service. Which service are you asking about?"
         },
         {
             "role": "user",
@@ -191,14 +187,11 @@ az rest --method POST \
     "messages": [
         {
             "role": "user",
-            "content": "Who is DRI?",
+            "content": "Who is DRI?"
         },
         {
             "role": "assistant",
-            "content": "DRI stands for Directly Responsible Individual of a service. Which service are you asking about?",
-            "context": {
-              "intent": "[\"Who is DRI?\", \"What is the meaning of DRI?\", \"Define DRI\"]"
-            }
+            "content": "DRI stands for Directly Responsible Individual of a service. Which service are you asking about?"
         },
         {
             "role": "user",

articles/aks/azure-blob-csi.md

@@ -3,6 +3,7 @@ title: Use Container Storage Interface (CSI) driver for Azure Blob storage on Az
 description: Learn how to use the Container Storage Interface (CSI) driver for Azure Blob storage in an Azure Kubernetes Service (AKS) cluster.
 ms.topic: article
 ms.custom: linux-related-content
+ms.subservice: aks-storage
 ms.date: 11/24/2023
 ---
 

articles/aks/azure-csi-blob-storage-provision.md

@@ -4,6 +4,7 @@ titleSuffix: Azure Kubernetes Service
 description: Learn how to create a static or dynamic persistent volume with Azure Blob storage for use with multiple concurrent pods in Azure Kubernetes Service (AKS)
 ms.topic: article
 ms.custom: linux-related-content
+ms.subservice: aks-storage
 ms.date: 01/18/2024
 ---
 

articles/aks/azure-csi-disk-storage-provision.md

@@ -4,6 +4,7 @@ titleSuffix: Azure Kubernetes Service
 description: Learn how to create a static or dynamic persistent volume with Azure Disks for use with multiple concurrent pods in Azure Kubernetes Service (AKS)
 ms.topic: article
 ms.custom: devx-track-azurecli, linux-related-content
+ms.subservice: aks-storage
 ms.date: 03/05/2024
 ---
 

articles/aks/azure-csi-files-storage-provision.md

@@ -4,6 +4,7 @@ titleSuffix: Azure Kubernetes Service
 description: Learn how to create a static or dynamic persistent volume with Azure Files for use with multiple concurrent pods in Azure Kubernetes Service (AKS)
 ms.topic: article
 ms.custom: devx-track-azurecli, linux-related-content
+ms.subservice: aks-storage
 ms.date: 03/05/2024
 ---
 

articles/aks/azure-disk-csi.md

@@ -3,6 +3,7 @@ title: Use Container Storage Interface (CSI) driver for Azure Disk on Azure Kube
 description: Learn how to use the Container Storage Interface (CSI) driver for Azure Disk in an Azure Kubernetes Service (AKS) cluster.
 ms.topic: article
 ms.custom: linux-related-content
+ms.subservice: aks-storage
 ms.date: 04/19/2023
 ---
 

articles/aks/azure-disk-customer-managed-keys.md

@@ -3,6 +3,7 @@ title: Use a customer-managed key to encrypt Azure managed disks in Azure Kubern
 description: Bring your own keys (BYOK) to encrypt managed OS and data disks in AKS.
 ms.topic: article
 ms.custom: devx-track-azurecli, linux-related-content
+ms.subservice: aks-storage
 ms.date: 02/01/2024
 ---
 

articles/aks/azure-files-csi.md

@@ -3,6 +3,7 @@ title: Use Container Storage Interface (CSI) driver for Azure Files on Azure Kub
 description: Learn how to use the Container Storage Interface (CSI) driver for Azure Files in an Azure Kubernetes Service (AKS) cluster.
 ms.topic: article
 ms.custom: linux-related-content
+ms.subservice: aks-storage
 ms.date: 01/11/2024
 ---
 

articles/aks/azure-netapp-files-dual-protocol.md

@@ -3,6 +3,7 @@ title: Provision Azure NetApp Files dual-protocol volumes for Azure Kubernetes S
 description: Describes how to statically provision Azure NetApp Files dual-protocol volumes for Azure Kubernetes Service.
 ms.topic: article
 ms.custom:
+ms.subservice: aks-storage
 ms.date: 02/26/2024
 ---