Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-encryption-limited-ga

Author: asudbring

.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",

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

@@ -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>  

articles/ai-services/openai/quotas-limits.md

@@ -0,0 +1,9 @@
+{
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/ai-studio/how-to/vscode-web.md",
+      "redirect_url": "/azure/ai-studio/how-to/develop-in-vscode",
+      "redirect_document_id": true
+    }
+  ]
+}

articles/ai-studio/.openpublishing.redirection.ai-studio.json

@@ -91,7 +91,7 @@ You can install the Azure AI CLI locally as described previously, or run it usin
 
 ### Option 1: Using VS Code (web) in Azure AI Studio
 
-VS Code (web) in Azure AI Studio creates and runs the development container on a compute instance. To get started with this approach, follow the instructions in [How to work with Azure AI Studio projects in VS Code (Web)](vscode-web.md).
+VS Code (web) in Azure AI Studio creates and runs the development container on a compute instance. To get started with this approach, follow the instructions in [Work with Azure AI projects in VS Code](develop-in-vscode.md).
 
 Our prebuilt development environments are based on a docker container that has the Azure AI SDK generative packages, the Azure AI CLI, the Prompt flow SDK, and other tools. It's configured to run VS Code remotely inside of the container. The docker container is similar to [this Dockerfile](https://github.com/Azure/aistudio-copilot-sample/blob/main/.devcontainer/Dockerfile), and is based on [Microsoft's Python 3.10 Development Container Image](https://mcr.microsoft.com/en-us/product/devcontainers/python/about). 
 
@@ -221,7 +221,7 @@ As mentioned in step 2 above, your flow.dag.yaml should reference connection and
 
 If you're working in your own development environment (including Codespaces), you might need to manually update these fields so that your flow runs connected to Azure resources.
 
-If you launched VS Code from the AI Studio, you are in an Azure-connected custom container experience, and you can work directly with flows stored in the `shared` folder. These flow files are the same underlying files prompt flow references in the Studio, so they should already be configured with your project connections and deployments. To learn more about the folder structure in the VS Code container experience, see [Get started with Azure AI projects in VS Code (Web)](vscode-web.md)
+If you launched VS Code from the AI Studio, you are in an Azure-connected custom container experience, and you can work directly with flows stored in the `shared` folder. These flow files are the same underlying files prompt flow references in the Studio, so they should already be configured with your project connections and deployments. To learn more about the folder structure in the VS Code container experience, see [Work with Azure AI projects in VS Code](develop-in-vscode.md)
 
 ## ai chat
 
@@ -295,7 +295,7 @@ ai help
 
 ## Next steps
 
-- [Try the Azure AI CLI from Azure AI Studio in a browser](vscode-web.md)
+- [Try the Azure AI CLI from Azure AI Studio in a browser](develop-in-vscode.md)
 
 
 

articles/ai-studio/how-to/cli-install.md

@@ -57,7 +57,7 @@ To create a compute instance in Azure AI Studio:
     :::image type="content" source="../media/compute/compute-scheduling.png" alt-text="Screenshot of the option to enable idle shutdown and create a schedule." lightbox="../media/compute/compute-scheduling.png":::
 
     > [!IMPORTANT]
-    > The compute can't be idle if you have [prompt flow runtime](./create-manage-runtime.md) in **Running** status on the compute. You need to delete any active runtime before the compute instance can be eligible for idle shutdown. You also can't have any active [VS Code (Web)](./vscode-web.md) sessions hosted on the compute instance.
+    > The compute can't be idle if you have [prompt flow runtime](./create-manage-runtime.md) in **Running** status on the compute. You need to delete any active runtime before the compute instance can be eligible for idle shutdown. You also can't have any active [VS Code (Web)](./develop-in-vscode.md) sessions hosted on the compute instance.
 
 1. You can update the schedule days and times to meet your needs. You can also add additional schedules. For example, you can create a schedule to start at 9 AM and stop at 6 PM from Monday-Thursday, and a second schedule to start at 9 AM and stop at 4 PM for Friday. You can create a total of four schedules per compute instance.
 
@@ -84,7 +84,7 @@ Note that disabling SSH prevents SSH access from the public internet. But when a
 To avoid getting charged for a compute instance that is switched on but inactive, you can configure when to shut down your compute instance due to inactivity. 
 
 > [!IMPORTANT]
-> The compute can't be idle if you have [prompt flow runtime](./create-manage-runtime.md) in **Running** status on the compute. You need to delete any active runtime before the compute instance can be eligible for idle shutdown. You also can't have any active [VS Code (Web)](./vscode-web.md) sessions hosted on the compute instance.
+> The compute can't be idle if you have [prompt flow runtime](./create-manage-runtime.md) in **Running** status on the compute. You need to delete any active runtime before the compute instance can be eligible for idle shutdown. You also can't have any active [VS Code (Web)](./develop-in-vscode.md) sessions hosted on the compute instance.
 
 The setting can be configured during compute instance creation or for existing compute instances.