Skip to content

Commit be53a4d

Browse files
dlepowdlepow
committed
merge conflict, review
2 parents 1a71f6b + 807a89d commit be53a4d

File tree

842 files changed

+13381
-4041
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

842 files changed

+13381
-4041
lines changed

‎.openpublishing.redirection.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/ai-studio/how-to/commitment-tier.md",
5+
"redirect_url": "/azure/ai-services/commitment-tier.md",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/storage/files/files-samples-dotnet-v11.md",
510
"redirect_url": "/previous-versions/azure/storage/files/files-samples-dotnet-v11",
@@ -4569,6 +4574,16 @@
45694574
"source_path_from_root": "/articles/virtual-network/how-to-create-encryption-cli.md",
45704575
"redirect_url": "/azure/virtual-network/how-to-create-encryption",
45714576
"redirect_document_id": false
4577+
},
4578+
{
4579+
"source_path_from_root": "/articles/virtual-network/tutorial-filter-network-traffic-powershell.md",
4580+
"redirect_url": "/azure/virtual-network/tutorial-filter-network-traffic",
4581+
"redirect_document_id": false
4582+
},
4583+
{
4584+
"source_path_from_root": "/articles/virtual-network/tutorial-filter-network-traffic-cli.md",
4585+
"redirect_url": "/azure/virtual-network/tutorial-filter-network-traffic",
4586+
"redirect_document_id": false
45724587
}
45734588
]
45744589
}

‎CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
/articles/mysql @tynevi @thomps23
1717
/articles/managed-instance-apache-cassandra @tynevi @thomps23
1818
/articles/virtual-machines @jasonwhowell @thomps23
19-
/articles/virtual-machines-scale-set @jasonwhowell @thomps23
19+
/articles/virtual-machines-scale-sets @jasonwhowell @thomps23
2020
/articles/container-instances @jasonwhowell @thomps23
2121
/articles/service-fabric @jasonwhowell @thomps23

‎articles/ai-services/index.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ metadata:
1313
ms.author: eur
1414
manager: nitinme
1515
ms.custom: ignite-2023
16-
ms.date: 3/19/2024
16+
ms.date: 8/20/2024
1717
highlightedContent:
1818
# itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
1919
items:
@@ -23,9 +23,9 @@ highlightedContent:
2323
- title: What is Azure AI Studio?
2424
itemType: overview
2525
url: ../ai-studio/what-is-ai-studio.md
26-
- title: Azure AI Studio copilot tutorial
26+
- title: Build your own copilot with Azure AI SDKs
2727
itemType: tutorial
28-
url: ../ai-studio/tutorials/deploy-copilot-ai-studio.md
28+
url: ../ai-studio/tutorials/copilot-sdk-build-rag.md
2929
- title: Responsible use of AI
3030
itemType: concept
3131
url: responsible-use-of-ai-overview.md

‎articles/ai-services/language-service/personally-identifiable-information/concepts/conversations-entity-categories.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ ms.custom: language-service-pii, build-2024
1616

1717
Use this article to find the entity categories that can be returned by the [conversational PII detection feature](../how-to-call-for-conversations.md). This feature runs a predictive model to identify, categorize, and redact sensitive information from an input conversation.
1818

19-
The PII preview feature includes the ability to detect personal (`PII`) information from conversations.
20-
2119
## Entity categories
2220

2321
The following entity categories are returned when you're sending API requests PII feature.

‎articles/ai-services/language-service/personally-identifiable-information/how-to-call-for-conversations.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ By default, this feature will use the latest available AI model on your input. Y
2626

2727
### Language support
2828

29-
Currently the conversational PII preview API only supports English language.
29+
See the [PII Language Support page](language-support.md) for more details. Currently the conversational PII GA model only supports the English language. The preview model and API support the [same list languages](../concepts/language-support.md) as the other Language services.
3030

3131
### Region support
3232

33-
Currently the conversational PII preview API supports all Azure regions supported by the Language service.
33+
The conversational PII API supports all Azure regions supported by the Language service.
3434

3535
## Submitting data
3636

@@ -82,7 +82,7 @@ When you get results from PII detection, you can stream the results to an applic
8282
Use the following example if you have conversations transcribed using the Speech service's [speech to text](../../Speech-Service/speech-to-text.md) feature:
8383

8484
```bash
85-
curl -i -X POST https://your-language-endpoint-here/language/analyze-conversations/jobs?api-version=2022-05-15-preview \
85+
curl -i -X POST https://your-language-endpoint-here/language/analyze-conversations/jobs?api-version=2024-05-01 \
8686
-H "Content-Type: application/json" \
8787
-H "Ocp-Apim-Subscription-Key: your-key-here" \
8888
-d \
@@ -195,7 +195,7 @@ curl -i -X POST https://your-language-endpoint-here/language/analyze-conversatio
195195
"taskName": "analyze 1",
196196
"kind": "ConversationalPIITask",
197197
"parameters": {
198-
"modelVersion": "2022-05-15-preview",
198+
"modelVersion": "2023-04-15-preview",
199199
"redactionSource": "text",
200200
"includeAudioRedaction": true,
201201
"piiCategories": [
@@ -213,7 +213,7 @@ curl -i -X POST https://your-language-endpoint-here/language/analyze-conversatio
213213
Use the following example if you have conversations that originated in text. For example, conversations through a text-based chat client.
214214
215215
```bash
216-
curl -i -X POST https://your-language-endpoint-here/language/analyze-conversations/jobs?api-version=2022-05-15-preview \
216+
curl -i -X POST https://your-language-endpoint-here/language/analyze-conversations/jobs?api-version=2024-05-01 \
217217
-H "Content-Type: application/json" \
218218
-H "Ocp-Apim-Subscription-Key: your-key-here" \
219219
-d \
@@ -251,7 +251,7 @@ curl -i -X POST https://your-language-endpoint-here/language/analyze-conversatio
251251
"taskName": "analyze 1",
252252
"kind": "ConversationalPIITask",
253253
"parameters": {
254-
"modelVersion": "2022-05-15-preview"
254+
"modelVersion": "2023-04-15-preview"
255255
}
256256
}
257257
]

‎articles/ai-services/language-service/personally-identifiable-information/language-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Use this article to learn which natural languages are supported by the PII and c
102102
|Chinese-Simplified |`zh-hans` |`zh` also accepted|
103103
|Chinese-Traditional |`zh-hant` | |
104104

105-
# [PII for conversations (preview)](#tab/conversations)
105+
# [PII for conversations](#tab/conversations)
106106

107107
## PII language support
108108

‎articles/ai-services/language-service/summarization/region-support.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ Some summarization features are only available in limited regions. More regions
2626
|East US |✅ |✅ |✅ |
2727
|East US 2 |✅ |✅ |❌ |
2828
|West US |✅ |✅ |❌ |
29+
|USNat West |✅ |✅ |❌ |
30+
|USNat East |✅ |✅ |❌ |
31+
|USSec West |✅ |✅ |❌ |
32+
|USSec East |✅ |✅ |❌ |
2933
|South UK |✅ |✅ |❌ |
3034
|Southeast Asia |✅ |✅ |❌ |
3135
|Australia East |✅ |✅ |❌ |

‎articles/ai-services/language-support.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
title: Language support
33
titleSuffix: Azure AI services
44
description: Azure AI services enable you to build applications that see, hear, speak with, and understand your users.
5-
#services: cognitive-services
65
author: laujan
76
manager: nitinme
87
ms.service: azure-ai-services
98
ms.topic: conceptual
10-
ms.date: 07/08/2024
9+
ms.date: 8/20/2024
1110
ms.author: lajanuar
1211
---
1312

‎articles/ai-services/multi-service-resource.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: nitinme
88
ms.service: azure-ai-services
99
ms.custom: devx-track-azurecli, devx-track-azurepowershell, build-2024
1010
ms.topic: quickstart
11-
ms.date: 8/1/2024
11+
ms.date: 8/20/2024
1212
ms.author: eur
1313
zone_pivot_groups: programming-languages-portal-cli-ps
1414
---
@@ -17,7 +17,7 @@ zone_pivot_groups: programming-languages-portal-cli-ps
1717

1818
Learn how to create and manage an Azure AI services resource. An Azure AI services resource allows you to access multiple Azure AI services with a single set of credentials.
1919

20-
You can access Azure AI services through two different resources:
20+
You can access Azure AI services through two different resource kinds:
2121

2222
* Azure AI services multi-service resource:
2323
* Access multiple Azure AI services with a single set of credentials.

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.custom:
1010
- ignite-2023
1111
- references_regions
1212
ms.topic: conceptual
13-
ms.date: 08/14/2024
13+
ms.date: 08/16/2024
1414
ms.author: mbullwin
1515
---
1616

@@ -50,27 +50,28 @@ The following sections provide you with a quick guide to the default quotas and
5050
| GPT-4 `vision-preview` & GPT-4 `turbo-2024-04-09` default max tokens | 16 <br><br> Increase the `max_tokens` parameter value to avoid truncated responses. GPT-4o max tokens defaults to 4096. |
5151
| Max number of custom headers in API requests<sup>1</sup> | 10 |
5252

53-
<sup>1</sup> Our current APIs allow up to 10 custom headers, which are passed through the pipeline, and returned. We have noticed some customers now exceed this header count resulting in HTTP 431 errors. There is no solution for this error, other than to reduce header volume. **In future API versions we will no longer pass through custom headers**. We recommend customers not depend on custom headers in future system architectures.
54-
53+
<sup>1</sup> Our current APIs allow up to 10 custom headers, which are passed through the pipeline, and returned. We have noticed some customers now exceed this header count resulting in HTTP 431 errors. There is no solution for this error, other than to reduce header volume. **In future API versions we will no longer pass through custom headers**. We recommend customers not depend on custom headers in future system architectures.
5554

5655
## Regional quota limits
5756

5857
[!INCLUDE [Quota](./includes/model-matrix/quota.md)]
5958

6059
[!INCLUDE [Quota](./includes/global-batch-limits.md)]
6160

62-
## gpt-4o rate limits
61+
## gpt-4o & GPT-4 Turbo rate limits
6362

64-
`gpt-4o` and `gpt-4o-mini` have rate limit tiers with higher limits for certain customer types.
63+
`gpt-4o` and `gpt-4o-mini`, and `gpt-4` (`turbo-2024-04-09`) have rate limit tiers with higher limits for certain customer types.
6564

66-
### gpt-4o global standard
65+
### gpt-4o & GPT-4 Turbo global standard
6766

6867
| Model|Tier| Quota Limit in tokens per minute (TPM) | Requests per minute |
6968
|---|---|:---:|:---:|
7069
|`gpt-4o`|Enterprise agreement | 30 M | 180 K |
7170
|`gpt-4o-mini` | Enterprise agreement | 50 M | 300 K |
71+
|`gpt-4` (turbo-2024-04-09) | Enterprise agreement | 2 M | 12 K |
7272
|`gpt-4o` |Default | 450 K | 2.7 K |
7373
|`gpt-4o-mini` | Default | 2 M | 12 K |
74+
|`gpt-4` (turbo-2024-04-09) | Default | 450 K | 2.7 K |
7475

7576
M = million | K = thousand
7677

0 commit comments

Comments
 (0)