Skip to content

Commit 00d70d8

Browse files
authored
Merge pull request #858 from MicrosoftDocs/main
10/16/2024 PM Publish
2 parents 77eecfc + 0daf952 commit 00d70d8

20 files changed

+620
-298
lines changed

articles/ai-services/content-safety/includes/quickstarts/rest-quickstart-image.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Paste the command below into a text editor, and make the following changes.
4444
1. Populate the `"image"` field in the body with either a `"content"` field or a `"blobUrl"` field. For example: `{"image": {"content": "<base_64_string>"}` or `{"image": {"blobUrl": "<your_storage_url>"}`.
4545

4646
```shell
47-
curl --location --request POST '<endpoint>/contentsafety/image:analyze?api-version=2023-10-01' \
47+
curl --location --request POST '<endpoint>/contentsafety/image:analyze?api-version=2024-09-01' \
4848
--header 'Ocp-Apim-Subscription-Key: <your_subscription_key>' \
4949
--header 'Content-Type: application/json' \
5050
--data-raw '{
@@ -71,7 +71,7 @@ The below fields must be included in the URL:
7171
7272
| Name |Required? | Description | Type |
7373
| :------- |-------- |:--------------- | ------ |
74-
| **API Version** |Required |This is the API version to be checked. Current version is: `api-version=2023-10-01`. Example: `<endpoint>/contentsafety/image:analyze?api-version=2023-10-01` | String |
74+
| **API Version** |Required |This is the API version to be checked. Current version is: `api-version=2024-09-01`. Example: `<endpoint>/contentsafety/image:analyze?api-version=2024-09-01` | String |
7575
7676
The parameters in the request body are defined in this table:
7777

articles/ai-services/content-safety/includes/quickstarts/rest-quickstart-text.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The following section walks through a sample request with cURL. Paste the comman
3131
> See [Input requirements](../../overview.md#input-requirements) for maximum text length limitations.
3232
3333
```shell
34-
curl --location --request POST '<endpoint>/contentsafety/text:analyze?api-version=2023-10-01' \
34+
curl --location --request POST '<endpoint>/contentsafety/text:analyze?api-version=2024-09-01' \
3535
--header 'Ocp-Apim-Subscription-Key: <your_subscription_key>' \
3636
--header 'Content-Type: application/json' \
3737
--data-raw '{
@@ -47,7 +47,7 @@ The below fields must be included in the url:
4747

4848
| Name |Required | Description | Type |
4949
| :------- |-------- |:--------------- | ------ |
50-
| **API Version** |Required |This is the API version to be checked. The current version is: api-version=2023-10-01. Example: `<endpoint>/contentsafety/text:analyze?api-version=2023-10-01` | String |
50+
| **API Version** |Required |This is the API version to be checked. The current version is: api-version=2024-09-01. Example: `<endpoint>/contentsafety/text:analyze?api-version=2024-09-01` | String |
5151

5252
The parameters in the request body are defined in this table:
5353

articles/ai-services/content-safety/overview.md

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -142,40 +142,41 @@ For more information, see [Language support](/azure/ai-services/content-safety/l
142142

143143
To use the Content Safety APIs, you must create your Azure AI Content Safety resource in a supported region. Currently, the Content Safety features are available in the following Azure regions:
144144

145-
| Region | Moderation APIs (text and image) | Moderation APIs (multimodal) | Prompt Shields | Protected material detection for Text | Protected material detection for Code | Groundedness detection (preview) | Custom categories (rapid) (preview) | Custom categories (standard) (preview) | Blocklists |
146-
|--|-|---|-|--|---|-|-|---|---|
147-
| East US ||||||||||
148-
| East US 2 || |||||| ||
149-
| Central US || | ||| || ||
150-
| North Central US || |||| || ||
151-
| South Central US || |||| || ||
152-
| West US | | |||| || | |
153-
| West US 2 || |||| || ||
154-
| West US 3 || |||| || ||
155-
| Canada East || |||| || ||
156-
| Canada Central || |||| | | | |
157-
| Brazil South || |||| | | | |
158-
| Switzerland North || |||| ||||
159-
| Germany West Central|| |||| | | | |
160-
| Poland Central || |||| || ||
161-
| Sweden Central || |||||| ||
162-
| Norway East || |||| | | | |
163-
| UK South || |||| || ||
164-
| France Central || | ||| || ||
165-
| West Europe |||||| || ||
166-
| Italy North | | |||| | | | |
167-
| India North | | |||| | | | |
168-
| South India || | ||| || ||
169-
| Central India | | |||| | | | |
170-
| South East Asia | | |||| || ||
171-
| Japan East || |||| || ||
172-
| Japan West | | |||| || | |
173-
| Korea Central || | | | | | | | |
174-
| Australia East || |||| ||||
175-
| UAE North || | | | | | | | |
176-
| South Africa North|| |||| | | | |
177-
| USGov Arizona || | | | | | | ||
178-
| USGov Virginia || | | | | | | ||
145+
| Region | Moderation APIs (text and image) | Moderation APIs (multimodal) | Prompt Shields | Protected material detection for Text | Protected material detection for Code | Groundedness detection (preview) | Custom categories (rapid) (preview) | Custom categories (standard) (preview) |
146+
|--|-|---|-|--|---|-|-|---|
147+
| Australia East || |||| |||
148+
| Brazil South || ||| | | | |
149+
| Canada Central || ||| | | | |
150+
| Central India | | ||| | | | |
151+
| Canada East || |||| || |
152+
| Central US || | ||| || |
153+
| East US |||||||||
154+
| East US 2 || |||||| |
155+
| France Central || |||| || |
156+
| Germany West Central|| ||| | | | |
157+
| India North | | ||| | | | |
158+
| Italy North || ||| | | | |
159+
| Japan East || |||| || |
160+
| Japan West | | | | || || |
161+
| Korea Central || | | | | | | |
162+
| North Central US || |||| || |
163+
| Norway East || | | | | | | |
164+
| Poland Central || |||| || |
165+
| South Africa North|| |||| | | |
166+
| South Central US || | | || || |
167+
| South East Asia | | ||| | || |
168+
| South India || | ||| || |
169+
| Sweden Central || |||||| |
170+
| Switzerland North || ||| | |||
171+
| Switzerland West || ||| | |||
172+
| UAE North || | | | | | | |
173+
| UK South || ||| | || |
174+
| West Europe |||||| || |
175+
| West US | | |||| || |
176+
| West US 2 || |||| || |
177+
| West US 3 || |||| || |
178+
| USGov Arizona || ||| | | | |
179+
| USGov Virginia || ||| | | | |
179180

180181

181182

@@ -189,10 +190,10 @@ Feel free to [contact us](mailto:[email protected]) if your bus
189190

190191
Content Safety features have query rate limits in requests-per-second (RPS) or requests-per-10-seconds (RP10S) . See the following table for the rate limits for each feature.
191192

192-
|Pricing tier | Moderation APIs<br>(text and image) | Prompt Shields | Protected material<br>detection | Groundedness<br>detection (preview) | Custom categories<br>(rapid) (preview) | Custom categories<br>(standard) (preview)|
193-
|---|-|---|-|-|-|--|
194-
| F0 | 5 RPS | 5 RPS | 5 RPS | 5 RPS | 5 RPS | 10 RP10S|
195-
| S0 | 1000 RP10S | 1000 RP10S | 1000 RP10S | 50 RPS | 1000 RP10S | 5 RPS|
193+
|Pricing tier | Moderation APIs<br>(text and image) | Prompt Shields | Protected material<br>detection | Groundedness<br>detection (preview) | Custom categories<br>(rapid) (preview) | Custom categories<br>(standard) (preview)|Multimodal |
194+
|---|-|---|-|-|-|--|--|
195+
| F0 | 5 RPS | 5 RPS | 5 RPS | N/A | 5 RPS | 5 RPS|5 RPS|
196+
| S0 | 1000 RP10S | 1000 RP10S | 1000 RP10S | 50 RPS | 1000 RP10S | 5 RPS|10 RPS|
196197

197198
If you need a faster rate, please [contact us](mailto:[email protected]) to request it.
198199

articles/ai-services/encryption/cognitive-services-encryption-keys-portal.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,61 +7,61 @@ ms.service: azure-ai-services
77
ms.custom:
88
- ignite-2023
99
ms.topic: conceptual
10-
ms.date: 11/15/2023
10+
ms.date: 10/16/2024
1111
ms.author: pafarley
1212
---
1313

1414
# Customer-managed keys for encryption
1515

16-
Azure AI is built on top of multiple Azure services. While the data is stored securely using encryption keys that Microsoft provides, you can enhance security by providing your own (customer-managed) keys. The keys you provide are stored securely using Azure Key Vault.
16+
Azure AI is built on top of multiple Azure services. While customer data is stored securely using encryption keys that Microsoft provides by default, you can enhance your security by providing your own (customer-managed) keys. The keys you provide are stored securely in Azure Key Vault.
1717

1818
## Prerequisites
1919

2020
* An Azure subscription.
21-
* An Azure Key Vault instance. The key vault contains the key(s) used to encrypt your services.
22-
21+
* An Azure Key Vault instance. The key vault contains the keys used to encrypt your services.
2322
* The key vault instance must enable soft delete and purge protection.
2423
* The managed identity for the services secured by a customer-managed key must have the following permissions in key vault:
25-
2624
* wrap key
2725
* unwrap key
2826
* get
2927

30-
## Customer-managed keys
31-
32-
When you don't use a customer-managed key, Microsoft creates and manages these resources in a Microsoft owned Azure subscription and uses a Microsoft-managed key to encrypt the data.
28+
## What are customer-managed keys?
3329

34-
When you use a customer-managed key, these resources are _in your Azure subscription_ and encrypted with your key. While they exist in your subscription, these resources are managed by Microsoft. They're automatically created and configured when you create your Azure AI resource.
30+
By default, Microsoft creates and manages your resources in a Microsoft-owned Azure subscription and uses a Microsoft-managed key to encrypt the data.
3531

36-
> [!IMPORTANT]
37-
> When using a customer-managed key, the costs for your subscription will be higher because these resources are in your subscription. To estimate the cost, use the [Azure pricing calculator](https://azure.microsoft.com/pricing/calculator/).
32+
When you use a customer-managed key, these resources live in _your_ Azure subscription and are encrypted with your own key. While they exist in your subscription, these resources are still managed by Microsoft. They're automatically created and configured when you create your Azure AI resource.
3833

39-
These Microsoft-managed resources are located in a new Azure resource group is created in your subscription. This group is in addition to the resource group for your project. This resource group contains the Microsoft-managed resources that your key is used with. The resource group is named using the formula of `<Azure AI resource group name><GUID>`. It isn't possible to change the naming of the resources in this managed resource group.
34+
These Microsoft-managed resources are located in a new Azure resource group is created in your subscription. This resource group exists in addition to the resource group for your project. It contains the Microsoft-managed resources that your key is used with. The resource group is named using the formula of `<Azure AI resource group name><GUID>`. It isn't possible to change the naming of the resources in this managed resource group.
4035

4136
> [!TIP]
42-
> * If your AI resource uses a private endpoint, this resource group will also contain a Microsoft-managed Azure Virtual Network. This VNet is used to secure communications between the managed services and the project. You cannot provide your own VNet for use with the Microsoft-managed resources. You also cannot modify the virtual network. For example, you cannot change the IP address range that it uses.
37+
> If your AI resource uses a private endpoint, this resource group will also contain a Microsoft-managed Azure Virtual Network. This VNet is used to secure communications between the managed services and the project. You cannot provide your own VNet for use with the Microsoft-managed resources. You also cannot modify the virtual network. For example, you cannot change the IP address range that it uses.
4338
4439
> [!IMPORTANT]
4540
> If your subscription does not have enough quota for these services, a failure will occur.
4641
42+
> [!IMPORTANT]
43+
> When using a customer-managed key, the costs for your subscription will be higher because these resources are in your subscription. To estimate the cost, use the [Azure pricing calculator](https://azure.microsoft.com/pricing/calculator/).
44+
4745
> [!WARNING]
48-
> Don't delete the managed resource group any of the resources automatically created in this group. If you need to delete the resource group or Microsoft-managed services in it, you must delete the Azure AI resources that uses it. The resource group resources are deleted when the associated AI resource is deleted.
46+
> Don't delete the managed resource group any of the resources automatically created in this group. If you need to delete the resource group or Microsoft-managed services in it, you must delete the Azure AI resources that use it. The resource group resources are deleted when the associated AI resource is deleted.
47+
48+
## Enable customer-managed keys
4949

50-
The process to enable Customer-Managed Keys with Azure Key Vault for Azure AI services varies by product. Use these links for service-specific instructions:
50+
The process to enable customer-managed keys with Azure Key Vault for Azure AI services varies by product. Use these links for service-specific instructions:
5151

52-
* [Azure OpenAI encryption of data at rest](../openai/encrypt-data-at-rest.md)
53-
* [Custom Vision encryption of data at rest](../custom-vision-service/encrypt-data-at-rest.md)
54-
* [Face Services encryption of data at rest](../computer-vision/identity-encrypt-data-at-rest.md)
55-
* [Document Intelligence encryption of data at rest](../../ai-services/document-intelligence/authentication/encrypt-data-at-rest.md)
56-
* [Translator encryption of data at rest](../translator/encrypt-data-at-rest.md)
57-
* [Language service encryption of data at rest](../language-service/concepts/encryption-data-at-rest.md)
58-
* [Speech encryption of data at rest](../speech-service/speech-encryption-of-data-at-rest.md)
59-
* [Content Moderator encryption of data at rest](../Content-Moderator/encrypt-data-at-rest.md)
60-
* [Personalizer encryption of data at rest](../personalizer/encrypt-data-at-rest.md)
52+
* [Azure OpenAI](../openai/encrypt-data-at-rest.md)
53+
* [Azure Custom Vision ](../custom-vision-service/encrypt-data-at-rest.md)
54+
* [Azure AI Face Service ](../computer-vision/identity-encrypt-data-at-rest.md)
55+
* [Azure AI Document Intelligence ](../../ai-services/document-intelligence/authentication/encrypt-data-at-rest.md)
56+
* [Azure AI Translator ](../translator/encrypt-data-at-rest.md)
57+
* [Azure AI Language service ](../language-service/concepts/encryption-data-at-rest.md)
58+
* [Azure AI Speech ](../speech-service/speech-encryption-of-data-at-rest.md)
59+
* [Azure Content Moderator ](../Content-Moderator/encrypt-data-at-rest.md)
60+
* [Azure Personalizer ](../personalizer/encrypt-data-at-rest.md)
6161

6262
## How compute data is stored
6363

64-
Azure AI uses compute resources for compute instance and serverless compute when you fine-tune models or build flows. The following table describes the compute options and how data is encrypted by each one:
64+
Azure AI uses resources for compute instance and serverless compute when you fine-tune models or build flows. The following table describes the compute options and how data is encrypted by each one:
6565

6666
| Compute | Encryption |
6767
| ----- | ----- |
@@ -84,7 +84,7 @@ Each virtual machine also has a local temporary disk for OS operations. If you w
8484
* Resources that are created in the Microsoft-managed Azure resource group in your subscription can't be modified by you or be provided by you at the time of creation as existing resources.
8585
* You can't delete Microsoft-managed resources used for customer-managed keys without also deleting your project.
8686

87-
## Next steps
87+
## Related content
8888

8989
* [Azure AI services Customer-Managed Key Request Form](https://aka.ms/cogsvc-cmk) is still required for Speech and Content Moderator.
9090
* [What is Azure Key Vault](/azure/key-vault/general/overview)?

articles/ai-services/openai/api-version-deprecation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: cognitive-services
55
manager: nitinme
66
ms.service: azure-ai-openai
77
ms.topic: conceptual
8-
ms.date: 10/01/2024
8+
ms.date: 10/16/2024
99
author: mrbullwinkle
1010
ms.author: mbullwin
1111
recommendations: false
@@ -23,8 +23,8 @@ This article is to help you understand the support lifecycle for the Azure OpenA
2323

2424
Azure OpenAI API latest release:
2525

26-
- Inference: [2024-09-01-preview](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2024-09-01-preview/inference.json)
27-
- Authoring: [2024-08-01-preview](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/cognitiveservices/data-plane/AzureOpenAI/authoring/preview/2024-08-01-preview/azureopenai.json)
26+
- Inference: [2024-10-01-preview](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2024-10-01-preview/inference.json)
27+
- Authoring: [2024-10-01-preview](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/cognitiveservices/data-plane/AzureOpenAI/authoring/preview/2024-10-01-preview/azureopenai.json)
2828

2929
This version contains support for the latest Azure OpenAI features including:
3030

0 commit comments

Comments
 (0)