Skip to content

Commit 6bacd39

Browse files
committed
Merge branch 'main' into release-azure-search
2 parents 5bad034 + 389aa48 commit 6bacd39

28 files changed

+317
-253
lines changed

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

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,28 @@ For more information on Provisioned deployments, see our [Provisioned guidance](
259259

260260
**Supported regions:**
261261

262-
- eastus
263-
- eastus2
264-
- northcentralus
265-
- swedencentral
266-
- switzerlandnorth
267-
- westus
268-
- westus3
262+
- australiaeast
263+
- brazilsouth
264+
- canadaeast
265+
- eastus
266+
- eastus2
267+
- francecentral
268+
- germanywestcentral
269+
- japaneast
270+
- koreacentral
271+
- northcentralus
272+
- norwayeast
273+
- polandcentral
274+
- spaincentral
275+
- southafricanorth
276+
- southcentralus
277+
- southindia
278+
- swedencentral
279+
- switzerlandnorth
280+
- uksouth
281+
- westeurope
282+
- westus
283+
- westus3
269284

270285
`gpt-4` **Version:** `turbo-2024-04-09`
271286

articles/ai-services/openai/gpt-v-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.custom: devx-track-python, devx-track-js, devx-track-ts
99
ms.topic: quickstart
1010
author: PatrickFarley
1111
ms.author: pafarley
12-
ms.date: 08/21/2024
12+
ms.date: 10/03/2024
1313
zone_pivot_groups: openai-quickstart-gpt-v
1414
---
1515

articles/ai-services/openai/how-to/use-blocklists.md

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: Learn how to use blocklists with Azure OpenAI Service
66
manager: nitinme
77
ms.service: azure-ai-openai
88
ms.topic: how-to
9-
ms.date: 11/07/2023
9+
ms.date: 10/03/2024
1010
author: PatrickFarley
1111
ms.author: pafarley
1212
---
@@ -253,22 +253,20 @@ If the completion itself is blocked, the response returns `200`, as the completi
253253

254254
You can also create custom blocklists in the Azure OpenAI Studio as part of your content filtering configurations (public preview). Instructions on how to create custom content filters can be found [here](/azure/ai-services/openai/how-to/content-filters). The following steps show how to create custom blocklists as part of your content filters via Azure OpenAI Studio.
255255

256-
1. Select the Blocklists tab next to Content filters tab.
257-
:::image type="content" source="../media/content-filters/blocklist-select.jpg" alt-text="screenshot of blocklist selection." lightbox="../media/content-filters/blocklist-select.jpg":::
258-
1. Select Create blocklist
259-
:::image type="content" source="../media/content-filters/blocklist-select-create.jpg" alt-text="Screenshot of blocklist create selection." lightbox="../media/content-filters/blocklist-select-create.jpg":::
260-
1. Create a name for your blocklist, add a description and select on Create.
261-
:::image type="content" source="../media/content-filters/create-blocklist.jpg" alt-text="Screenshot of blocklist naming." lightbox="../media/content-filters/create-blocklist.jpg":::
262-
1. Select your custom blocklist once it's created, and select Add term.
263-
:::image type="content" source="../media/content-filters/custom-blocklist-add.jpg" alt-text="Screenshot of custom blocklist add term." lightbox="../media/content-filters/custom-blocklist-add.jpg":::
264-
1. Add a term that should be filtered, and select Create. You can also create a regex.
265-
:::image type="content" source="../media/content-filters/custom-blocklist-add-item.jpg" alt-text="Screenshot of custom blocklist add item." lightbox="../media/content-filters/custom-blocklist-add-item.jpg":::
266-
1. You can Edit and Delete every term in your blocklist.
267-
:::image type="content" source="../media/content-filters/custom-blocklist-edit.jpg" alt-text="Screenshot of custom blocklist edit." lightbox="../media/content-filters/custom-blocklist-edit.jpg":::
256+
1. Select Content Filters from the left menu. Select the Blocklists tab next to Content filters tab. Then select Create Blocklist.
257+
:::image type="content" source="../media/content-filters/blocklist-select-create.png" alt-text="Screenshot of blocklist create selection." lightbox="../media/content-filters/blocklist-select-create.png":::
258+
1. Create a name for your blocklist, add a description and select on Create Blocklist.
259+
:::image type="content" source="../media/content-filters/create-blocklist.png" alt-text="Screenshot of blocklist name and description." lightbox="../media/content-filters/create-blocklist.png":::
260+
1. Select your custom blocklist once it's created, and select Add new term.
261+
:::image type="content" source="../media/content-filters/custom-blocklist-add.png" alt-text="Screenshot of custom blocklist add term." lightbox="../media/content-filters/custom-blocklist-add.png":::
262+
1. Add a term that should be filtered, and select Add term. You can also create a regex.
263+
:::image type="content" source="../media/content-filters/custom-blocklist-add-item.png" alt-text="Screenshot of custom blocklist add item." lightbox="../media/content-filters/custom-blocklist-add-item.png":::
264+
1. You can delete each term in your blocklist.
265+
:::image type="content" source="../media/content-filters/custom-blocklist-edit.png" alt-text="Screenshot of custom blocklist edit screen." lightbox="../media/content-filters/custom-blocklist-edit.png":::
268266
1. Once the blocklist is ready, navigate to the Content filters (Preview) section and create a new customized content filter configuration. This opens a wizard with several AI content safety components. You can find more information on how to configure the main filters and optional models [here](/azure/ai-services/openai/how-to/content-filters). Go to Add blocklist (Optional).
269267
1. You'll now see all available blocklists. There are two types of blocklists – the blocklists you created, and prebuilt blocklists that Microsoft provides, in this case a Profanity blocklist (English)
270-
1. You can now decide which of the available blocklists you would like to include in your content filtering configuration, and you can select if it should apply to and filter prompts, completions or both. In the below example, we apply CustomBlocklist1 that we just created to prompts and completions, and the Profanity blocklist to completions only. The last step is to review and finish the content filtering configuration by clicking on Next.
271-
:::image type="content" source="../media/content-filters/filtering-configuration-manage.jpg" alt-text="Screenshot of filtering configuration management." lightbox="../media/content-filters/filtering-configuration-manage.jpg":::
268+
1. You can now decide which of the available blocklists you would like to include in your content filtering configuration. In the below example, we apply CustomBlocklist1 that we just created. The last step is to review and finish the content filtering configuration by clicking on Next.
269+
:::image type="content" source="../media/content-filters/filtering-configuration-manage.png" alt-text="Screenshot of filtering configuration management." lightbox="../media/content-filters/filtering-configuration-manage.png":::
272270
1. You can always go back and edit your configuration. Once it’s ready, select on Create content filter. The new configuration that includes your blocklists can now be applied to a deployment. Detailed instructions can be found [here](/azure/ai-services/openai/how-to/content-filters).
273271

274272

articles/ai-services/openai/includes/gpt-v-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: nitinme
77
ms.service: azure-ai-openai
88
ms.topic: include
99
ms.custom: references_regions
10-
ms.date: 11/02/2023
10+
ms.date: 10/03/2024
1111
---
1212

1313
Start exploring GPT-4 Turbo with Vision capabilities with a no-code approach through Azure OpenAI Studio.

0 commit comments

Comments
 (0)