Skip to content

Commit 6e04dd6

Browse files
authored
Merge pull request #1373 from MicrosoftDocs/main
11/7/2024 PM Publish
2 parents ecc20bf + 0e2ea00 commit 6e04dd6

File tree

7 files changed

+30
-22
lines changed

7 files changed

+30
-22
lines changed

articles/ai-services/content-safety/how-to/use-blocklist.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Copy the cURL command below to a text editor and make the following changes:
5353

5454

5555
```shell
56-
curl --location --request PATCH '<endpoint>/contentsafety/text/blocklists/<your_list_name>?api-version=2023-10-01' \
56+
curl --location --request PATCH '<endpoint>/contentsafety/text/blocklists/<your_list_name>?api-version=2024-09-01' \
5757
--header 'Ocp-Apim-Subscription-Key: <enter_your_key_here>' \
5858
--header 'Content-Type: application/json' \
5959
--data-raw '{
@@ -245,7 +245,7 @@ Copy the cURL command below to a text editor and make the following changes:
245245
1. Replace the value of the `"text"` field with the item you'd like to add to your blocklist. The maximum length of a blocklistItem is 128 characters.
246246

247247
```shell
248-
curl --location --request POST '<endpoint>/contentsafety/text/blocklists/<your_list_name>:addOrUpdateBlocklistItems?api-version=2023-10-01' \
248+
curl --location --request POST '<endpoint>/contentsafety/text/blocklists/<your_list_name>:addOrUpdateBlocklistItems?api-version=2024-09-01' \
249249
--header 'Ocp-Apim-Subscription-Key: <enter_your_key_here>' \
250250
--header 'Content-Type: application/json' \
251251
--data-raw '"blocklistItems": [{
@@ -487,7 +487,7 @@ Copy the cURL command below to a text editor and make the following changes:
487487
1. Optionally change the value of the `"text"` field to whatever text you want to analyze.
488488

489489
```shell
490-
curl --location --request POST '<endpoint>/contentsafety/text:analyze?api-version=2023-10-01&' \
490+
curl --location --request POST '<endpoint>/contentsafety/text:analyze?api-version=2024-09-01&' \
491491
--header 'Ocp-Apim-Subscription-Key: <enter_your_key_here>' \
492492
--header 'Content-Type: application/json' \
493493
--data-raw '{
@@ -727,7 +727,7 @@ Copy the cURL command below to a text editor and make the following changes:
727727
1. Replace `<your_list_name>` (in the request URL) with the name you used in the list creation step.
728728

729729
```shell
730-
curl --location --request GET '<endpoint>/contentsafety/text/blocklists/<your_list_name>/blocklistItems?api-version=2023-10-01' \
730+
curl --location --request GET '<endpoint>/contentsafety/text/blocklists/<your_list_name>/blocklistItems?api-version=2024-09-01' \
731731
--header 'Ocp-Apim-Subscription-Key: <enter_your_key_here>' \
732732
--header 'Content-Type: application/json'
733733
```
@@ -900,7 +900,7 @@ Copy the cURL command below to a text editor and make the following changes:
900900

901901

902902
```shell
903-
curl --location --request GET '<endpoint>/contentsafety/text/blocklists?api-version=2023-10-01' \
903+
curl --location --request GET '<endpoint>/contentsafety/text/blocklists?api-version=2024-09-01' \
904904
--header 'Ocp-Apim-Subscription-Key: <enter_your_key_here>' \
905905
--header 'Content-Type: application/json'
906906
```
@@ -1048,7 +1048,7 @@ Copy the cURL command below to a text editor and make the following changes:
10481048
1. Replace `<your_list_name>` (in the request URL) with the name you used in the list creation step.
10491049

10501050
```shell
1051-
cURL --location '<endpoint>contentsafety/text/blocklists/<your_list_name>?api-version=2023-10-01' \
1051+
cURL --location '<endpoint>contentsafety/text/blocklists/<your_list_name>?api-version=2024-09-01' \
10521052
--header 'Ocp-Apim-Subscription-Key: <enter_your_key_here>' \
10531053
--data ''
10541054
```
@@ -1199,7 +1199,7 @@ Copy the cURL command below to a text editor and make the following changes:
11991199

12001200

12011201
```shell
1202-
cURL --location '<endpoint>contentsafety/text/blocklists/<your_list_name>/blocklistItems/<your_item_id>?api-version=2023-10-01' \
1202+
cURL --location '<endpoint>contentsafety/text/blocklists/<your_list_name>/blocklistItems/<your_item_id>?api-version=2024-09-01' \
12031203
--header 'Ocp-Apim-Subscription-Key: <enter_your_key_here>' \
12041204
--data ''
12051205
```
@@ -1387,7 +1387,7 @@ Copy the cURL command below to a text editor and make the following changes:
13871387

13881388

13891389
```shell
1390-
curl --location --request DELETE '<endpoint>/contentsafety/text/blocklists/<your_list_name>:removeBlocklistItems?api-version=2023-10-01' \
1390+
curl --location --request POST '<endpoint>/contentsafety/text/blocklists/<your_list_name>:removeBlocklistItems?api-version=2024-09-01' \
13911391
--header 'Ocp-Apim-Subscription-Key: <enter_your_key_here>' \
13921392
--header 'Content-Type: application/json'
13931393
--data-raw '"blocklistItemIds":[
@@ -1573,7 +1573,7 @@ Copy the cURL command below to a text editor and make the following changes:
15731573
1. Replace `<your_list_name>` (in the request URL) with the name you used in the list creation step.
15741574

15751575
```shell
1576-
curl --location --request DELETE '<endpoint>/contentsafety/text/blocklists/<your_list_name>?api-version=2023-10-01' \
1576+
curl --location --request DELETE '<endpoint>/contentsafety/text/blocklists/<your_list_name>?api-version=2024-09-01' \
15771577
--header 'Ocp-Apim-Subscription-Key: <enter_your_key_here>' \
15781578
--header 'Content-Type: application/json' \
15791579
```

articles/ai-services/content-safety/quickstart-custom-categories.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,12 @@ To train a custom category, you need example text data that represents the categ
4545
> For tips on creating your own data set, see the [How-to guide](./how-to/custom-categories.md#prepare-your-training-data).
4646
4747
1. Download the [sample text data file](https://github.com/Azure-Samples/cognitive-services-sample-data-files/blob/master/ContentSafety/survival-advice.jsonl) from the GitHub repository.
48-
1. Upload the _.jsonl_ file to your Azure Storage account blob container. Then copy the blob URL to a temporary location for later use.
48+
2. Upload the _.jsonl_ file to your Azure Storage account blob container. Then copy the blob URL to a temporary location for later use.
4949

50+
> [!IMPORTANT]
51+
> **The user's storage account is set up as a hierarchical namespace account, which cannot be supported by Custom Categories. Please try using a regular storage account instead.**
52+
For example, your blob URL cannot be split into two layers, such as example/example1/, and should only have one layer. For more details, refer to the documentation: [Azure Data Lake Storage hierarchical namespace - Azure Storage](https://learn.microsoft.com/azure/storage/blobs/data-lake-storage-namespace).
53+
>
5054
### Grant storage access
5155

5256
[!INCLUDE [storage-account-access](./includes/storage-account-access.md)]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ An Azure OpenAI Deployment is a unit of management for a specific OpenAI Model.
4141
## How much throughput per PTU you get for each model
4242
The amount of throughput (tokens per minute or TPM) a deployment gets per PTU is a function of the input and output tokens in the minute. Generating output tokens requires more processing than input tokens and so the more output tokens generated the lower your overall TPM. The service dynamically balances the input & output costs, so users do not have to set specific input and output limits. This approach means your deployment is resilient to fluctuations in the workload shape.
4343

44-
To help with simplifying the sizing effort, the following table outlines the TPM per PTU for the `gpt-4o` and `gpt-4o-mini` models. The table also shows Service Level Agreement (SLA) Latency Target Values per model. For more information about the SLA for Azure OpenAI Service, see the [Service Level Agreements (SLA) for Online Services page].(https://www.microsoft.com/licensing/docs/view/Service-Level-Agreements-SLA-for-Online-Services?lang=1)
44+
To help with simplifying the sizing effort, the following table outlines the TPM per PTU for the `gpt-4o` and `gpt-4o-mini` models which represent the max all the traffic is either input or output. The table also shows Service Level Agreement (SLA) Latency Target Values per model. For more information about the SLA for Azure OpenAI Service, see the [Service Level Agreements (SLA) for Online Services page].(https://www.microsoft.com/licensing/docs/view/Service-Level-Agreements-SLA-for-Online-Services?lang=1)
4545

4646
| | **gpt-4o**, **2024-05-13** & **gpt-4o**, **2024-08-06** | **gpt-4o-mini**, **2024-07-18** |
4747
| --- | --- | --- |
4848
| Deployable Increments | 50 | 25|
49-
| Input TPM per PTU | 2,500 | 37,000 |
50-
| Output TPM per PTU| 833|12,333|
49+
|Max Input TPM per PTU | 2,500 | 37,000 |
50+
|Max Output TPM per PTU| 833|12,333|
5151
| Latency Target Value |25 Tokens Per Second* |33 Tokens Per Second*|
5252

5353
For a full list see the [AOAI Studio calculator](https://oai.azure.com/portal/calculator).

articles/ai-services/openai/how-to/migration-javascript.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ const azureADTokenProvider = getBearerTokenProvider(credential, scope);
4343

4444
### (Highly Discouraged) API Key
4545

46-
API keys are not recommended for production use because they are less secure than other authentication methods. However, if you are using an API key to authenticate `OpenAIClient` or `AssistantsClient`, an `AzureKeyCredential` object must be created as follows:
46+
API keys are not recommended for production use because they are less secure than other authentication methods. Previously, `AzureKeyCredential` objects were created as follows to authenticate `OpenAIClient` or `AssistantsClient`:
4747

4848
```typescript
4949
import { AzureKeyCredential } from "@azure/openai";
5050
const apiKey = new AzureKeyCredential("your API key");
5151
```
5252

53-
Authenticating `AzureOpenAI` with an API key involves setting the `AZURE_OPENAI_API_KEY` environment variable or setting the `apiKey` string property in the options object when creating the `AzureOpenAI` client.
53+
On the other hand, `AzureOpenAI` can be authenticated with an API key by setting the `AZURE_OPENAI_API_KEY` environment variable or by setting the `apiKey` string property in the options object when creating the `AzureOpenAI` client.
5454

5555
[!INCLUDE [Azure key vault](~/reusable-content/ce-skilling/azure/includes/ai-services/security/azure-key-vault.md)]
5656

articles/ai-services/openai/how-to/quota.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Quota provides the flexibility to actively manage the allocation of rate limits
1818
## Prerequisites
1919

2020
> [!IMPORTANT]
21-
> Viewing quota and deploying models requires the **Cognitive Services Usages Reader** role. This role provides the minimal access necessary to view quota usage across an Azure subscription. To learn more about this role and the other roles you will need to access Azure OpenAI, consult our [Azure role-based access (Azure RBAC) guide](./role-based-access-control.md).
21+
> For any task that requires viewing available quota we recommend using the **Cognitive Services Usages Reader** role. This role provides the minimal access necessary to view quota usage across an Azure subscription. To learn more about this role and the other roles you will need to access Azure OpenAI, consult our [Azure role-based access (Azure RBAC) guide](./role-based-access-control.md).
2222
>
2323
> This role can be found in the Azure portal under **Subscriptions** > **Access control (IAM)** > **Add role assignment** > search for **Cognitive Services Usages Reader**.This role **must be applied at the subscription level**, it does not exist at the resource level.
2424
>

articles/ai-services/translator/containers/install-run.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: laujan
77
manager: nitinme
88
ms.service: azure-ai-translator
99
ms.topic: how-to
10-
ms.date: 06/27/2024
10+
ms.date: 11/01/2024
1111
ms.author: lajanuar
1212
recommendations: false
1313
keywords: on-premises, Docker, container, identify
@@ -463,7 +463,7 @@ If you installed Docker Desktop CLI, it includes Docker compose and its prerequi
463463
services:
464464
azure-ai-translator:
465465
container_name: azure-ai-translator
466-
image: mcr.microsoft.com/product/azure-cognitive-services/translator/text-translation:latest
466+
image: mcr.microsoft.com/azure-cognitive-services/translator/text-translation::latest
467467
environment:
468468
- EULA=accept
469469
- billing={TRANSLATOR_ENDPOINT_URI}
@@ -472,13 +472,17 @@ If you installed Docker Desktop CLI, it includes Docker compose and its prerequi
472472
- VISIONURL=http://azure-ai-read:5000
473473
ports:
474474
- "5000:5000"
475+
volumes:
476+
- {your local folder}:/usr/local/models
475477
azure-ai-language:
476478
container_name: azure-ai-language
477479
image: mcr.microsoft.com/azure-cognitive-services/textanalytics/language:latest
478480
environment:
479481
- EULA=accept
480482
- billing={LANGUAGE_RESOURCE_ENDPOINT_URI}
481483
- apiKey={LANGUAGE_RESOURCE_KEY}
484+
- Languages=en,es
485+
- LADINCLUSTER=true
482486
azure-ai-read:
483487
container_name: azure-ai-read
484488
image: mcr.microsoft.com/azure-cognitive-services/vision/read:latest

articles/ai-studio/ai-services/how-to/create-model-deployments.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Add and configure models to Azure AI services
2+
title: Add and configure models to Azure AI model inference service
33
titleSuffix: Azure AI services
44
description: Learn how to add and configure new models to the Azure AI model's inference endpoint in Azure AI services.
55
ms.service: azure-ai-studio
@@ -12,9 +12,9 @@ ms.reviewer: fasantia
1212
recommendations: false
1313
---
1414

15-
# Add and configure models to Azure AI services
15+
# Add and configure models to Azure AI model inference service
1616

17-
You can decide and configure which models are available for inference in the Azure AI services resource model's inference endpoint. When a given model is configured, you can then generate predictions from it by indicating its model name or deployment name on your requests. No further changes are required in your code to use it.
17+
You can decide and configure which models are available for inference in the resource's model inference endpoint. When a given model is configured, you can then generate predictions from it by indicating its model name or deployment name on your requests. No further changes are required in your code to use it.
1818

1919
In this article, you learn how to add a new model to the Azure AI model inference service in Azure AI services.
2020

@@ -62,4 +62,4 @@ When creating model deployments, you can configure other settings including cont
6262
6363
## Next steps
6464

65-
* [Develop applications using Azure AI model inference service in Azure AI services](../concepts/endpoints.md)
65+
* [Develop applications using Azure AI model inference service in Azure AI services](../concepts/endpoints.md)

0 commit comments

Comments
 (0)