Merge pull request #263158 from v-thepet/dirty1-12

PostgreSQL: Another dirty PR for release branch merge conflict with upstream main

Author: rmca14

.openpublishing.publish.config.json

@@ -1228,6 +1228,7 @@
   "articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
   "articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
   "articles/ai-services/.openpublishing.redirection.cognitive-services.json",
+  "articles/ai-studio/.openpublishing.redirection.ai-studio.json",
   "articles/energy-data-services/.openpublishing.redirection.energy-data-services.json",
   "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
   "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
@@ -1249,6 +1250,7 @@
   "articles/event-grid/.openpublishing.redirection.event-grid.json",
   "articles/event-hubs/.openpublishing.redirection.event-hubs.json",
   "articles/governance/policy/.openpublishing.redirection.policy.json",
+  "articles/governance/policy/.openpublishing.redirection.resource-graph.json",
   "articles/hdinsight/.openpublishing.redirection.hdinsight.json",
   "articles/hdinsight-aks/.openpublishing.redirection.hdinsight-aks.json",
   "articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
     "redirections": [
+    {
+      "source_path": "articles/storage/common/storage-analytics-metrics.md",
+      "redirect_url": "/previous-versions/azure/storage/common/storage-analytics-metrics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/common/manage-storage-analytics-metrics.md",
+      "redirect_url": "/previous-versions/azure/storage/common/manage-storage-analytics-metrics",
+      "redirect_document_id": false
+    },
     {
         "source_path": "articles/azure-arc/vmware-vsphere/switch-to-new-preview-version.md",
         "redirect_url": "/azure/azure-arc/vmware-vsphere/switch-to-new-version-vmware",

articles/ai-services/content-safety/includes/severity-levels.md

@@ -796,6 +796,10 @@ data: {"id":"","object":"","created":0,"model":"","choices":[{"index":0,"finish_
 
 data: [DONE] 
 ```
+
+> [!IMPORTANT]
+> When content filtering is triggered for a prompt and a `"status": 400` is received as part of the response there may be a charge for this request as the prompt was evaluated by the service. [Charges will also occur](https://azure.microsoft.com/pricing/details/cognitive-services/openai-service/) when a `"status":200` is received with `"finish_reason": "content_filter"`. In this case the prompt did not have any issues, but the completion generated by the model was detected to violate the content filtering rules which results in the completion being filtered.
+
 ## Best practices
 
 As part of your application design, consider the following best practices to deliver a positive experience with your application while minimizing potential harms:

articles/ai-services/openai/concepts/content-filter.md

@@ -101,7 +101,7 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
 **<sup>2</sup>** GPT-4 Turbo with Vision Preview = `gpt-4` (vision-preview). To deploy this model, under **Deployments** select model **gpt-4**. For **Model version** select **vision-preview**.
 
 > [!CAUTION]
-> We don't recommend using these models in production. We will upgrade all deployments of these models to a future stable version. Models designated preview do not follow the standard Azure OpenAI model lifecycle.
+> We don't recommend using preview models in production. We will upgrade all deployments of preview models to a future stable version. Models designated preview do not follow the standard Azure OpenAI model lifecycle.
 
 > [!NOTE]
 > Regions where GPT-4 (0314) & (0613) are listed as available have access to both the 8K and 32K versions of the model
@@ -110,8 +110,8 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
 
 | Model Availability | gpt-4 (0314) | gpt-4 (0613) | gpt-4 (1106-preview) | gpt-4 (vision-preview) | 
 |---|:---|:---|:---|:---|
-| Available to all subscriptions with Azure OpenAI access | | Australia East <br> Canada East <br> France Central <br> Sweden Central <br> Switzerland North | Australia East <br> Canada East <br> East US 2 <br> France Central <br> Norway East <br> South India <br> Sweden Central <br> UK South <br> West US | Switzerland North <br> West US | 
-| Available to subscriptions with current access to the model version in the region | East US <br> France Central <br> South Central US <br> UK South | East US <br> East US 2 <br> Japan East <br> UK South | | Australia East <br>Sweden Central|
+| Available to all subscriptions with Azure OpenAI access | | Australia East <br> Canada East <br> France Central <br> Sweden Central <br> Switzerland North | Australia East <br> Canada East <br> East US 2 <br> France Central <br> Norway East <br> South India <br> Sweden Central <br> UK South <br> West US | Sweden Central <br> Switzerland North <br> West US | 
+| Available to subscriptions with current access to the model version in the region | East US <br> France Central <br> South Central US <br> UK South | East US <br> East US 2 <br> Japan East <br> UK South | | Australia East |
 
 ### GPT-3.5 models
 

articles/ai-services/openai/concepts/models.md

@@ -52,6 +52,6 @@ We introduced a new deployment type called **ProvisionedManaged** which provides
 
 Provisioned throughput quota represents a specific amount of total throughput you can deploy. Quota in the Azure OpenAI Service is managed at the subscription level meaning that it can be consumed by different resources within that subscription.
 
-Quota is specific to a (deployment type, mode, region) triplet and isn't interchangeable. Meaning you can't use quota for GPT-4 to deploy GPT-35-turbo. Customers can raise a support request to move the quota across deployment types, models, or regions but we can't guarantee that it will be possible.
+Quota is specific to a (deployment type, model, region) triplet and isn't interchangeable. Meaning you can't use quota for GPT-4 to deploy GPT-35-turbo. Customers can raise a support request to move the quota across deployment types, models, or regions but we can't guarantee that it will be possible.
 
 While we make every attempt to ensure that quota is always deployable, quota does not represent a guarantee that the underlying capacity is available for the customer to use. The service assigns capacity to the customer at deployment time and if capacity is unavailable the deployment will fail with an out of capacity error.

articles/ai-services/openai/concepts/provisioned-throughput.md

@@ -64,8 +64,6 @@ Open a command prompt and browse to your project folder. Create a new python fil
 
 ## Install the Python SDK
 
-> [!IMPORTANT]
-> The latest release of the [OpenAI Python library](https://pypi.org/project/openai/) does not currently support DALL-E when used with Azure OpenAI. To access DALL-E with Azure OpenAI use version `0.28.1`.
 
 Install the OpenAI Python SDK by using the following command:
 
@@ -77,6 +75,9 @@ pip install openai
 
 #### [DALL-E 2](#tab/dalle2)
 
+> [!IMPORTANT]
+> The latest release of the [OpenAI Python library](https://pypi.org/project/openai/) does not currently support DALL-E 2 when used with Azure OpenAI. To access DALL-E 2 with Azure OpenAI use version `0.28.1`. Or, follow the [migration guide](/azure/ai-services/openai/how-to/migration?tabs=python%2Cdalle-fix) to use DALL-E 2 with OpenAI 1.x.
+
 ```bash
 pip install openai==0.28.1
 ```

articles/ai-services/openai/includes/dall-e-python.md

@@ -29,13 +29,14 @@ string searchKey = GetEnvironmentVariable("SearchKey");
 string searchIndex = GetEnvironmentVariable("SearchIndex");
 string deploymentName = GetEnvironmentVariable("AOAIDeploymentId");
 
+
 var client = new OpenAIClient(new Uri(azureOpenAIEndpoint), new AzureKeyCredential(azureOpenAIKey));
 
 var chatCompletionsOptions = new ChatCompletionsOptions()
 {
     Messages =
     {
-        new ChatMessage(ChatRole.User, "What are the differences between Azure Machine Learning and Azure AI services?"),
+        new ChatRequestUserMessage("What are the differences between Azure Machine Learning and Azure AI services?"),
     },
     AzureExtensionsOptions = new AzureChatExtensionsOptions()
     {
@@ -48,12 +49,13 @@ var chatCompletionsOptions = new ChatCompletionsOptions()
                 IndexName = searchIndex,
             },
         }
-    }
+    },
+    DeploymentName = deploymentName
 };
 
-Response<ChatCompletions> response = client.GetChatCompletions(deploymentName, chatCompletionsOptions);
+Response<ChatCompletions> response = client.GetChatCompletions(chatCompletionsOptions);
 
-ChatMessage responseMessage = response.Value.Choices[0].Message;
+ChatResponseMessage responseMessage = response.Value.Choices[0].Message;
 
 Console.WriteLine($"Message from {responseMessage.Role}:");
 Console.WriteLine("===");
@@ -62,7 +64,7 @@ Console.WriteLine("===");
 
 Console.WriteLine($"Context information (e.g. citations) from chat extensions:");
 Console.WriteLine("===");
-foreach (ChatMessage contextMessage in responseMessage.AzureExtensionsContext.Messages)
+foreach (ChatResponseMessage contextMessage in responseMessage.AzureExtensionsContext.Messages)
 {
     string contextContent = contextMessage.Content;
     try
@@ -126,25 +128,22 @@ using Azure.AI.OpenAI;
 using System.Text.Json;
 using static System.Environment;
 
-string endpoint = GetEnvironmentVariable("AOAIEndpoint");
-string key = GetEnvironmentVariable("AOAIKey");
-
-var client = new OpenAIClient(new Uri(endpoint), new AzureKeyCredential(key));
-
 string azureOpenAIEndpoint = GetEnvironmentVariable("AOAIEndpoint");
 string azureOpenAIKey = GetEnvironmentVariable("AOAIKey");
 string searchEndpoint = GetEnvironmentVariable("SearchEndpoint");
 string searchKey = GetEnvironmentVariable("SearchKey");
 string searchIndex = GetEnvironmentVariable("SearchIndex");
 string deploymentName = GetEnvironmentVariable("AOAIDeploymentId");
 
+
 var client = new OpenAIClient(new Uri(azureOpenAIEndpoint), new AzureKeyCredential(azureOpenAIKey));
 
 var chatCompletionsOptions = new ChatCompletionsOptions()
 {
+    DeploymentName = deploymentName,
     Messages =
     {
-        new ChatMessage(ChatRole.User, "What are the differences between Azure Machine Learning and Azure AI services?"),
+        new ChatRequestUserMessage("What are the differences between Azure Machine Learning and Azure AI services?"),
     },
     AzureExtensionsOptions = new AzureChatExtensionsOptions()
     {
@@ -159,44 +158,15 @@ var chatCompletionsOptions = new ChatCompletionsOptions()
         }
     }
 };
-
-Response<StreamingChatCompletions> response = await client.GetChatCompletionsStreamingAsync(
-    deploymentName,
-    chatCompletionsOptions);
-
-using StreamingChatCompletions streamingChatCompletions = response.Value;
-
-await foreach (StreamingChatChoice streamingChatChoice in streamingChatCompletions.GetChoicesStreaming())
+await foreach (StreamingChatCompletionsUpdate chatUpdate in client.GetChatCompletionsStreaming(chatCompletionsOptions))
 {
-    await foreach (ChatMessage chatMessage in streamingChatChoice.GetMessageStreaming())
+    if (chatUpdate.Role.HasValue)
     {
-        if (chatMessage.Role != default)
-        {
-            Console.WriteLine($"Message from {chatMessage.Role}: ");
-        }
-        if (chatMessage.Content != default)
-        {
-            Console.Write(chatMessage.Content);
-        }
-        if (chatMessage.AzureExtensionsContext != default)
-        {
-            Console.WriteLine($"Context information (e.g. citations) from chat extensions:");
-            foreach (var contextMessage in chatMessage.AzureExtensionsContext.Messages)
-            {
-                string contextContent = contextMessage.Content;
-                try
-                {
-                    var contextMessageJson = JsonDocument.Parse(contextMessage.Content);
-                    contextContent = JsonSerializer.Serialize(contextMessageJson, new JsonSerializerOptions()
-                    {
-                        WriteIndented = true,
-                    });
-                }
-                catch (JsonException)
-                {}
-                Console.WriteLine($"{contextMessage.Role}: {contextContent}");
-            }
-        }
+        Console.Write($"{chatUpdate.Role.Value.ToString().ToUpperInvariant()}: ");
+    }
+    if (!string.IsNullOrEmpty(chatUpdate.ContentUpdate))
+    {
+        Console.Write(chatUpdate.ContentUpdate);
     }
 }
 ```

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

@@ -10,7 +10,7 @@ ms.custom:
   - ignite-2023
   - references_regions
 ms.topic: conceptual
-ms.date: 12/06/2023
+ms.date: 01/12/2024
 ms.author: mbullwin
 ---
 
@@ -107,7 +107,7 @@ The default quota for models varies by model and region. Default quota limits ar
 <tr>  
     <td>gpt-4 (vision-preview)<br>GPT-4 Turbo with Vision</td>  
     <td>Sweden Central, Switzerland North, Australia East, West US</td>  
-    <td>10 K</td>  
+    <td>30 K</td>  
   </tr>  
   <tr>  
     <td rowspan="2">text-embedding-ada-002</td>