Skip to content

Commit 1074122

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into compare
2 parents f461677 + 4f8fddf commit 1074122

File tree

738 files changed

+5324
-4018
lines changed

Some content is hidden

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

738 files changed

+5324
-4018
lines changed

.openpublishing.redirection.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4087,10 +4087,12 @@
40874087
"source_path_from_root": "/articles/event-grid/move-domains-across-regions.md",
40884088
"redirect_url": "/azure",
40894089
"redirect_document_id": false
4090+
},
4091+
{
4092+
"source_path_from_root": "/articles/data-factory/continuous-integration-delivery-automate-github-actions.md",
4093+
"redirect_url": "/azure",
4094+
"redirect_document_id": false
40904095
}
4091-
4092-
4093-
4094-
4096+
40954097
]
40964098
}

articles/active-directory-b2c/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -824,8 +824,6 @@
824824
href: user-flow-versions-legacy.md
825825
- name: Resources
826826
items:
827-
- name: Azure Roadmap
828-
href: https://azure.microsoft.com/updates/?status=nowavailable,inpreview,indevelopment&category=identity,security&query=b2c
829827
- name: Frequently asked questions
830828
href: ./faq.yml
831829
displayName: FAQ

articles/ai-services/cognitive-services-virtual-networks.md

Lines changed: 15 additions & 5 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-azurepowershell, devx-track-azurecli
1010
ms.topic: how-to
11-
ms.date: 04/05/2024
11+
ms.date: 06/13/2024
1212
ms.author: aahi
1313
---
1414

@@ -573,7 +573,10 @@ You can grant a subset of trusted Azure services access to Azure OpenAI, while m
573573
|Azure AI Search | `Microsoft.Search` |
574574
575575
576-
You can grant networking access to trusted Azure services by creating a network rule exception using the REST API:
576+
You can grant networking access to trusted Azure services by creating a network rule exception using the REST API or Azure portal:
577+
578+
### Using the Azure CLI
579+
577580
```bash
578581
579582
accessToken=$(az account get-access-token --resource https://management.azure.com --query "accessToken" --output tsv)
@@ -595,9 +598,6 @@ curl -i -X PATCH https://management.azure.com$rid?api-version=2023-10-01-preview
595598
'
596599
```
597600

598-
> [!NOTE]
599-
> The trusted service feature is only available using the command line described above, and cannot be done using the Azure portal.
600-
601601
To revoke the exception, set `networkAcls.bypass` to `None`.
602602

603603
To verify if the trusted service has been enabled from the Azure portal,
@@ -610,6 +610,16 @@ To verify if the trusted service has been enabled from the Azure portal,
610610

611611
:::image type="content" source="media/vnet/virtual-network-trusted-service.png" alt-text="A screenshot showing the trusted service is enabled." lightbox="media/vnet/virtual-network-trusted-service.png":::
612612

613+
### Using the Azure portal
614+
615+
1. Navigate to your Azure OpenAI resource, and select **Networking** from the navigation menu.
616+
1. Under **Exceptions**, select **Allow Azure services on the trusted services list to access this cognitive services account.**
617+
> [!TIP]
618+
> You can view the **Exceptions** option by selecting either **Selected networks and private endpoints** or **Disabled** under **Allow access from**.
619+
620+
:::image type="content" source="media/vnet/toggle-trusted-service.png" alt-text="A screenshot showing the networking settings for a resource in the Azure portal." lightbox="media/vnet/toggle-trusted-service.png":::
621+
***
622+
613623
### Pricing
614624

615625
For pricing details, see [Azure Private Link pricing](https://azure.microsoft.com/pricing/details/private-link).

articles/ai-services/computer-vision/includes/identity-curl-quickstart.md

Lines changed: 81 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ Get started with facial recognition using the Face REST API. The Face service pr
2424
* You'll need the key and endpoint from the resource you create to connect your application to the Face API. You'll paste your key and endpoint into the code below later in the quickstart.
2525
* You can use the free pricing tier (`F0`) to try the service, and upgrade later to a paid tier for production.
2626
* [PowerShell version 6.0+](/powershell/scripting/install/installing-powershell-core-on-windows), or a similar command-line application.
27-
* [cURL](https://curl.haxx.se/) installed.
28-
27+
* [cURL](https://curl.se/) installed.
2928

3029

3130

@@ -34,58 +33,134 @@ Get started with facial recognition using the Face REST API. The Face service pr
3433
> [!NOTE]
3534
> If you haven't received access to the Face service using the [intake form](https://aka.ms/facerecognition), some of these functions won't work.
3635
37-
1. First, call the Detect API on the source face. This is the face that we'll try to identify from the larger group. Copy the following command to a text editor, insert your own key, and then copy it into a shell window and run it.
36+
1. First, call the Detect API on the source face. This is the face that we'll try to identify from the larger group. Copy the following command to a text editor, insert your own key and endpoint, and then copy it into a shell window and run it.
37+
38+
#### [Windows](#tab/windows)
39+
40+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_detect":::
41+
42+
#### [Linux](#tab/linux)
3843

3944
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_detect":::
4045

46+
---
47+
4148
Save the returned face ID string to a temporary location. You'll use it again at the end.
4249

43-
1. Next you'll need to create a **LargePersonGroup**. This object will store the aggregated face data of several persons. Run the following command, inserting your own key. Optionally, change the group's name and metadata in the request body.
50+
1. Next you'll need to create a **LargePersonGroup** and give it an arbitrary ID that matches regex pattern `^[a-z0-9-_]+$`. This object will store the aggregated face data of several persons. Run the following command, inserting your own key. Optionally, change the group's name and metadata in the request body.
51+
52+
#### [Windows](#tab/windows)
53+
54+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_create_persongroup":::
55+
56+
#### [Linux](#tab/linux)
4457

4558
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_create_persongroup":::
4659

47-
Save the returned ID of the created group to a temporary location.
60+
---
61+
62+
Save the specified ID of the created group to a temporary location.
4863

4964
1. Next, you'll create **Person** objects that belong to the group. Run the following command, inserting your own key and the ID of the **LargePersonGroup** from the previous step. This command creates a **Person** named "Family1-Dad".
5065

66+
#### [Windows](#tab/windows)
67+
68+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_create_person":::
69+
70+
#### [Linux](#tab/linux)
71+
5172
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_create_person":::
5273

74+
---
75+
5376
After you run this command, run it again with different input data to create more **Person** objects: "Family1-Mom", "Family1-Son", "Family1-Daughter", "Family2-Lady", and "Family2-Man".
5477

5578
Save the IDs of each **Person** created; it's important to keep track of which person name has which ID.
5679

5780
1. Next you'll need to detect new faces and associate them with the **Person** objects that exist. The following command detects a face from the image *Family1-Dad1.jpg* and adds it to the corresponding person. You need to specify the `personId` as the ID that was returned when you created the "Family1-Dad" **Person** object. The image name corresponds to the name of the created **Person**. Also enter the **LargePersonGroup** ID and your key in the appropriate fields.
5881

82+
#### [Windows](#tab/windows)
83+
84+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_add_face":::
85+
86+
#### [Linux](#tab/linux)
87+
5988
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_add_face":::
6089

90+
---
91+
6192
Then, run the above command again with a different source image and target **Person**. The images available are: *Family1-Dad1.jpg*, *Family1-Dad2.jpg* *Family1-Mom1.jpg*, *Family1-Mom2.jpg*, *Family1-Son1.jpg*, *Family1-Son2.jpg*, *Family1-Daughter1.jpg*, *Family1-Daughter2.jpg*, *Family2-Lady1.jpg*, *Family2-Lady2.jpg*, *Family2-Man1.jpg*, and *Family2-Man2.jpg*. Be sure that the **Person** whose ID you specify in the API call matches the name of the image file in the request body.
6293

6394
At the end of this step, you should have multiple **Person** objects that each have one or more corresponding faces, detected directly from the provided images.
6495

6596
1. Next, train the **LargePersonGroup** with the current face data. The training operation teaches the model how to associate facial features, sometimes aggregated from multiple source images, to each single person. Insert the **LargePersonGroup** ID and your key before running the command.
6697

98+
#### [Windows](#tab/windows)
99+
100+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_train":::
101+
102+
#### [Linux](#tab/linux)
103+
67104
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_train":::
105+
106+
---
68107

108+
1. Check whether the training status is succeeded. If not, wait for a while and query again.
109+
110+
#### [Windows](#tab/windows)
111+
112+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_check_status":::
113+
114+
#### [Linux](#tab/linux)
115+
116+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_check_status":::
117+
118+
---
119+
69120
1. Now you're ready to call the Identify API, using the source face ID from the first step and the **LargePersonGroup** ID. Insert these values into the appropriate fields in the request body, and insert your key.
70121

122+
#### [Windows](#tab/windows)
123+
124+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_identify":::
125+
126+
#### [Linux](#tab/linux)
127+
71128
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_identify":::
72129

130+
---
131+
73132
The response should give you a **Person** ID indicating the person identified with the source face. It should be the ID that corresponds to the "Family1-Dad" person, because the source face is of that person.
74133

75134
1. To do face verification, you'll use the **Person** ID returned in the previous step, the **LargePersonGroup** ID, and also the source face ID. Insert these values into the fields in the request body, and insert your key.
76135

136+
#### [Windows](#tab/windows)
137+
138+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="verify":::
139+
140+
#### [Linux](#tab/linux)
141+
77142
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="verify":::
78143

144+
---
145+
79146
The response should give you a boolean verification result along with a confidence value.
80147

81148

82149

83150
## Clean up resources
84151

85-
To delete the **LargePersonGroup** you created in this exercise, run the LargePersonGroup - Delete call.
152+
To delete the **LargePersonGroup** you created in this exercise, run the [LargePersonGroup - Delete](/rest/api/face/person-group-operations/delete-large-person-group) call.
153+
154+
#### [Windows](#tab/windows)
155+
156+
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.ps1" ID="identify_delete":::
157+
158+
#### [Linux](#tab/linux)
86159

87160
:::code source="~/cognitive-services-quickstart-code/curl/face/detect.sh" ID="identify_delete":::
88161

162+
---
163+
89164
If you want to clean up and remove an Azure AI services subscription, you can delete the resource or resource group. Deleting the resource group also deletes any other resources associated with it.
90165

91166
* [Portal](../../multi-service-resource.md?pivots=azportal#clean-up-resources)

articles/ai-services/containers/includes/cognitive-services-container-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The host should allowlist **port 443** and the following domains:
3939

4040
#### Disable deep packet inspection
4141

42-
[Deep packet inspection](https://en.wikipedia.org/wiki/Deep_packet_inspection) (DPI) is a type of data processing that inspects in detail the data sent over a computer network, and usually takes action by blocking, rerouting, or logging it accordingly.
42+
[Deep packet inspection (DPI)](https://en.wikipedia.org/wiki/Deep_packet_inspection) is a type of data processing that inspects in detail the data sent over a computer network, and usually takes action by blocking, rerouting, or logging it accordingly.
4343

4444
Disable DPI on the secure channels that the Azure AI containers create to Microsoft servers. Failure to do so will prevent the container from functioning correctly.
4545

articles/ai-services/document-intelligence/containers/install-run.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ms.author: lajanuar
1919
<!-- markdownlint-disable MD051 -->
2020

2121
:::moniker range="doc-intel-2.1.0 || doc-intel-4.0.0"
22-
Support for containers is currently available with Document Intelligence version `2022-08-31 (GA)` for all models and `2023-07-31 (GA)` for Read and Layout only:
22+
Support for containers is currently available with Document Intelligence version `2022-08-31 (GA)` for all models and `2023-07-31 (GA)` for Read, Layout, ID Document, Receipt and Invoice models:
2323

2424
* [REST API `2022-08-31 (GA)`](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-v3.0%20(2022-08-31)&preserve-view=true&tabs=HTTP)
2525
* [REST API `2023-07-31 (GA)`](/rest/api/aiservices/document-models/analyze-document?view=rest-aiservices-v3.1%20(2023-07-31)&tabs=HTTP&preserve-view=true)
@@ -38,9 +38,9 @@ Azure AI Document Intelligence is an Azure AI service that lets you build automa
3838

3939
In this article you learn how to download, install, and run Document Intelligence containers. Containers enable you to run the Document Intelligence service in your own environment. Containers are great for specific security and data governance requirements.
4040

41-
* **Read**, and **Layout** models are supported by Document Intelligence v3.1 containers.
41+
* **Read**, **Layout**, **ID Document**, **Receipt**, and **Invoice** models are supported by Document Intelligence v3.1 containers.
4242

43-
* **Read**, **Layout**, **General Document**, **ID Document**, **Receipt**, **Invoice**, **Business Card**, and **Custom** models are supported by Document Intelligence v3.0 containers.
43+
* **Read**, **Layout**, **General Document**, **Business Card**, and **Custom** models are supported by Document Intelligence v3.0 containers.
4444

4545
* **Business Card** model is currently only supported in the [v2.1 containers](install-run.md?view=doc-intel-2.1.0&preserve-view=true).
4646

articles/ai-services/document-intelligence/create-sas-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Create shared access signature (SAS) tokens for your storage containers and blobs
3-
description: How to create Shared Access Signature tokens (SAS) for containers and blobs with Microsoft Storage Explorer and the Azure portal.
3+
description: How to create Shared Access Signature (SAS) tokens for containers and blobs with Microsoft Storage Explorer and the Azure portal.
44
ms.topic: how-to
55
author: laujan
66
manager: nitinme

articles/ai-services/document-intelligence/how-to-guides/includes/v3-0/java-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ monikerRange: 'doc-intel-3.1.0 || doc-intel-3.0.0'
3434

3535
If you aren't using Visual Studio Code, make sure you have the following installed in your development environment:
3636

37-
- A [**Java Development Kit** (JDK)](/java/openjdk/download#openjdk-17) version 8 or later. For more information, see [Microsoft Build of OpenJDK](https://www.microsoft.com/openjdk).
37+
- A [**Java Development Kit (JDK)**](/java/openjdk/download#openjdk-17) version 8 or later. For more information, see [Microsoft Build of OpenJDK](https://www.microsoft.com/openjdk).
3838
- [**Gradle**](https://docs.gradle.org/current/userguide/installation.html), version 6.8 or later.
3939

4040
- An Azure AI services or Document Intelligence resource. Create a <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer" title="Create a Document Intelligence resource." target="_blank">single-service</a> or <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne" title="Create a multiple Document Intelligence resource." target="_blank">multi-service</a>. You can use the free pricing tier (`F0`) to try the service, and upgrade later to a paid tier for production.

articles/ai-services/document-intelligence/how-to-guides/includes/v4-0/java-sdk.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ms.custom: devx-track-csharp, ignite-2023, linux-related-content
2727

2828
If you aren't using Visual Studio Code, make sure you have the following installed in your development environment:
2929

30-
- A [**Java Development Kit** (JDK)](/java/openjdk/download#openjdk-17) version 8 or later. For more information, see [Microsoft Build of OpenJDK](https://www.microsoft.com/openjdk).
30+
- A [**Java Development Kit (JDK)**](/java/openjdk/download#openjdk-17) version 8 or later. For more information, see [Microsoft Build of OpenJDK](https://www.microsoft.com/openjdk).
3131
- [**Gradle**](https://docs.gradle.org/current/userguide/installation.html), version 6.8 or later.
3232

3333
- An Azure AI services or Document Intelligence resource. Create a <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer" title="Create a Document Intelligence resource." target="_blank">single-service</a> or <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesAllInOne" title="Create a multiple Document Intelligence resource." target="_blank">multi-service</a>. You can use the free pricing tier (`F0`) to try the service, and upgrade later to a paid tier for production.
@@ -85,10 +85,10 @@ This article uses the Gradle dependency manager. You can find the client library
8585

8686
1. Open the project's *build.gradle.kts* file in your IDE. Copy and paste the following code to include the client library as an `implementation` statement, along with the required plugins and settings.
8787

88-
```kotlin
89-
plugins {
90-
java
91-
application
88+
```kotlin
89+
plugins {
90+
java
91+
application
9292
}
9393
application {
9494
mainClass.set("DocIntelligence")
@@ -98,9 +98,8 @@ This article uses the Gradle dependency manager. You can find the client library
9898
}
9999
dependencies {
100100
implementation group: 'com.azure', name: 'azure-ai-documentintelligence', version: '1.0.0-beta.2'
101-
102101
}
103-
```
102+
```
104103

105104
## Create a Java application
106105

articles/ai-services/document-intelligence/quickstarts/includes/java-sdk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ In this quickstart, use the following features to analyze and extract data and v
4343
4444
* If you aren't using Visual Studio Code, make sure you have the following installed in your development environment:
4545

46-
* A [**Java Development Kit** (JDK)](/java/openjdk/download#openjdk-17) version 8 or later. For more information, *see* [Microsoft Build of OpenJDK](https://www.microsoft.com/openjdk).
46+
* A [**Java Development Kit (JDK)**](/java/openjdk/download#openjdk-17) version 8 or later. For more information, *see* [Microsoft Build of OpenJDK](https://www.microsoft.com/openjdk).
4747

4848
* [**Gradle**](https://docs.gradle.org/current/userguide/installation.html), version 6.8 or later.
4949

0 commit comments

Comments
 (0)