Skip to content

Commit 8113933

Browse files
authored
Merge pull request #276019 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents fc1ad27 + 416f2ad commit 8113933

File tree

10 files changed

+39
-40
lines changed

10 files changed

+39
-40
lines changed

articles/ai-services/computer-vision/includes/quickstarts-sdk/identity-python-sdk.md

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ ms.author: pafarley
1515

1616
Get started with facial recognition using the Face client library for Python. Follow these steps to install the package and try out the example code for basic tasks. The Face service provides you with access to advanced algorithms for detecting and recognizing human faces in images. Follow these steps to install the package and try out the example code for basic face identification using remote images.
1717

18-
[Reference documentation](/python/api/azure-ai-vision-face/azure.ai.vision.face) | [Library source code](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/face/azure-ai-vision-face/azure/ai/vision/face) | [Package (PiPy)](https://aka.ms/azsdk-python-face-pkg) | [Samples](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/face/azure-ai-vision-face/samples)
18+
[Reference documentation](/python/api/overview/azure/cognitiveservices/face-readme) | [Library source code](https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/cognitiveservices/azure-cognitiveservices-vision-face) | [Package (PiPy)](https://pypi.org/project/azure-cognitiveservices-vision-face/) | [Samples](/samples/browse/?products=azure&term=face)
1919

2020
## Prerequisites
2121

2222
* Azure subscription - [Create one for free](https://azure.microsoft.com/free/cognitive-services/)
23-
* [Python 3.8+](https://www.python.org/)
23+
* [Python 3.x](https://www.python.org/)
2424
* Your Python installation should include [pip](https://pip.pypa.io/en/stable/). You can check if you have pip installed by running `pip --version` on the command line. Get pip by installing the latest version of Python.
2525
* [!INCLUDE [contributor-requirement](../../../includes/quickstarts/contributor-requirement.md)]
2626
* Once you have your Azure subscription, <a href="https://portal.azure.com/#create/Microsoft.CognitiveServicesFace" title="Create a Face resource" target="_blank">create a Face resource</a> in the Azure portal to get your key and endpoint. After it deploys, select **Go to resource**.
@@ -38,7 +38,7 @@ Get started with facial recognition using the Face client library for Python. Fo
3838
After installing Python, you can install the client library with:
3939

4040
```console
41-
python -m pip install azure-ai-vision-face
41+
pip install --upgrade azure-cognitiveservices-vision-face
4242
```
4343

4444
1. Create a new Python application
@@ -65,28 +65,25 @@ Get started with facial recognition using the Face client library for Python. Fo
6565
## Output
6666

6767
```console
68-
Person group: dbd92bf0-8b74-43fc-a27a-b127c1bb1b66
69-
face 1d09b50e-0fb6-430c-a47c-9bb235761c17 added to person ea92a5d5-5250-44db-88fb-3b32e1a1ecaf
70-
face 74e1807a-6c86-4c74-b497-a3bcdda8c631 added to person ea92a5d5-5250-44db-88fb-3b32e1a1ecaf
71-
face 512cc8ff-e18a-4702-9413-3c83af9a0915 added to person f03219b3-c2dc-4ad6-b00b-bd71792686ac
72-
face 899bbe8e-2d03-4941-8221-d087911df21b added to person f03219b3-c2dc-4ad6-b00b-bd71792686ac
73-
face dfc0d142-36b0-4d90-982b-b51570ead5a8 added to person 8697d263-be7b-4d78-ba40-b55305dbbeb6
74-
face 29939a66-9da2-46f2-b572-abbe4e0d754a added to person 8697d263-be7b-4d78-ba40-b55305dbbeb6
75-
Train the person group dbd92bf0-8b74-43fc-a27a-b127c1bb1b66
76-
The person group dbd92bf0-8b74-43fc-a27a-b127c1bb1b66 is trained successfully.
68+
Person group: c8e679eb-0b71-43b4-aa91-ab8200cae7df
69+
face 861d769b-d014-40e8-8b4a-7fd3bc9b425b added to person f80c1cfa-b8cb-46f8-9f7f-e72fbe402bc3
70+
face e3c356a4-1ac3-4c97-9219-14648997f195 added to person f80c1cfa-b8cb-46f8-9f7f-e72fbe402bc3
71+
face f9119820-c374-4c4d-b795-96ae2fec5069 added to person be4084a7-0c7b-4cf9-9463-3756d2e28e17
72+
face 67d626df-3f75-4801-9364-601b63c8296a added to person be4084a7-0c7b-4cf9-9463-3756d2e28e17
73+
face 19e2e8cc-5029-4087-bca0-9f94588fb850 added to person 3ff07c65-6193-4d3e-bf18-d7c106393cd5
74+
face dcc61e80-16b1-4241-ae3f-9721597bae4c added to person 3ff07c65-6193-4d3e-bf18-d7c106393cd5
75+
pg resource is c8e679eb-0b71-43b4-aa91-ab8200cae7df
76+
<msrest.pipeline.ClientRawResponse object at 0x00000240DAD47310>
77+
Training status: running.
78+
79+
Training status: succeeded.
80+
7781
Pausing for 10 seconds to avoid triggering rate limit on free account...
7882
Identifying faces in image
79-
Person is identified for face ID 5779a986-238c-499d-b22a-d2a7cec92e88 in image, with a confidence of 0.96725.
80-
verification result: True. confidence: 0.96725
81-
Person is identified for face ID a28a4997-600e-4595-be39-d7a7d0f8afc8 in image, with a confidence of 0.96921.
82-
verification result: True. confidence: 0.96921
83-
No person identified for face ID 02a56d35-f3a4-43eb-a295-f23a1b772de9 in image.
84-
Person is identified for face ID 5de2019a-c4d3-4021-b8d0-9a3b86adceb7 in image, with a confidence of 0.92886.
85-
verification result: True. confidence: 0.92886
86-
87-
The person group dbd92bf0-8b74-43fc-a27a-b127c1bb1b66 is deleted.
88-
89-
End of quickstart.
83+
Person for face ID 40582995-d3a8-41c4-a9d1-d17ae6b46c5c is identified in image, with a confidence of 0.96725.
84+
Person for face ID 7a0368a2-332c-4e7a-81c4-2db3d74c78c5 is identified in image, with a confidence of 0.96921.
85+
No person identified for face ID c4a3dd28-ef2d-457e-81d1-a447344242c4 in image.
86+
Person for face ID 360edf1a-1e8f-402d-aa96-1734d0c21c1c is identified in image, with a confidence of 0.92886.
9087
```
9188

9289

@@ -98,6 +95,10 @@ If you want to clean up and remove an Azure AI services subscription, you can de
9895
* [Portal](../../../multi-service-resource.md?pivots=azportal#clean-up-resources)
9996
* [Azure CLI](../../../multi-service-resource.md?pivots=azcli#clean-up-resources)
10097

98+
To delete the **PersonGroup** you created in this quickstart, run the following code in your script:
99+
100+
[!code-python[](~/cognitive-services-quickstart-code/python/Face/FaceQuickstart.py?name=snippet_deletegroup)]
101+
101102
## Next steps
102103

103104
In this quickstart, you learned how to use the Face client library for Python to do basic face identification. Next, learn about the different face detection models and how to specify the right model for your use case.
@@ -106,4 +107,4 @@ In this quickstart, you learned how to use the Face client library for Python to
106107
> [Specify a face detection model version](../../how-to/specify-detection-model.md)
107108
108109
* [What is the Face service?](../../overview-identity.md)
109-
* More extensive sample code can be found on [GitHub](https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/face/azure-ai-vision-face/samples).
110+
* More extensive sample code can be found on [GitHub](https://github.com/Azure-Samples/cognitive-services-quickstart-code/blob/master/python/Face/FaceQuickstart.py).

articles/aks/azure-cni-powered-by-cilium.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Azure CNI powered by Cilium currently has the following limitations:
7373
Use the following commands to create a cluster with an overlay network and Cilium. Replace the values for `<clusterName>`, `<resourceGroupName>`, and `<location>`:
7474

7575
```azurecli-interactive
76-
az aks create --name <clusterName> --resource-group <resourceGroupName> --loctaion <location> \
76+
az aks create --name <clusterName> --resource-group <resourceGroupName> --location <location> \
7777
--network-plugin azure \
7878
--network-plugin-mode overlay \
7979
--pod-cidr 192.168.0.0/16 \

articles/azure-monitor/agents/troubleshooter-ama-linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ sudo python3 -V
3636
Multiple versions of Python can be installed and aliased – if multiple versions are installed, use:
3737

3838
```Bash
39-
ls -ls /usr/bing/python*
39+
ls -ls /usr/bin/python*
4040
```
4141

4242
:::image type="content" source="media/agent-linux/python-multiple-version-check.png" alt-text="Screenshot of command to check multiple versions of Python for Linux." lightbox="media/agent-linux/python-multiple-version-check.png":::

articles/container-apps/opentelemetry-agents.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ While you can set up as many OTLP-configured endpoints as you like, each endpoin
167167
"appInsightsConfiguration": {},
168168
"openTelemetryConfiguration": {
169169
"destinationsConfiguration":{
170-
"otlpConfiguration": [
170+
"otlpConfigurations": [
171171
{
172172
"name": "otlp1",
173173
"endpoint": "ENDPOINT_URL_1",

articles/event-hubs/log-compaction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Log compaction is a way of retaining data in Event Hubs using event key based re
1515

1616
As shown in the following image, an event log (of an event hub partition) may have multiple events with the same key. If you're using a compacted event hub, then Event Hubs service takes care of purging old events and only keeping the latest events of a given event key.
1717

18-
:::image type="content" source="./media/event-hubs-log-compaction/log-compaction.png" alt-text="Diagram showing how a topic gets compacted." lightbox="./media/event-hubs-resource-governance-overview/app-groups.png":::
18+
:::image type="content" source="./media/event-hubs-log-compaction/log-compaction.png" alt-text="Diagram showing how a topic gets compacted." lightbox="./media/event-hubs-log-compaction/log-compaction.png":::
1919

2020
### Compaction key
2121
The partition key that you set with each event is used as the compaction key.

articles/machine-learning/how-to-manage-hub-workspace-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ At hub creation, select between the networking isolation modes: **Public**, **Pr
102102

103103
At hub creation in the Azure portal, creation of associated Azure AI services, Storage account, Key vault, Application insights, and Container registry is given. These resources are found on the Resources tab during creation.
104104

105-
To connect to Azure AI services (Azure OpenAI, Azure AI Search, and Azure AI Content Safety) or storage accounts in Azure AI Studio, create a private endpoint in your virtual network. Ensure the public network access (PNA) flag is disabled when creating the private endpoint connection. For more about Azure AI services connections, see [Azure AI services and virtual networks]](../../ai-services/cognitive-services-virtual-networks.md). You can optionally bring your own (BYO) search, but this requires a private endpoint connection from your virtual network.
105+
To connect to Azure AI services (Azure OpenAI, Azure AI Search, and Azure AI Content Safety) or storage accounts in Azure AI Studio, create a private endpoint in your virtual network. Ensure the public network access (PNA) flag is disabled when creating the private endpoint connection. For more about Azure AI services connections, see [Azure AI services and virtual networks](../ai-services/cognitive-services-virtual-networks.md). You can optionally bring your own (BYO) search, but this requires a private endpoint connection from your virtual network.
106106

107107
### Encryption
108108

@@ -123,4 +123,4 @@ You can configure your hub for these resources during creation or update after c
123123

124124
## Next steps
125125

126-
Once you have a workspace hub, you can Create a project using [Azure Machine Learning studio](how-to-manage-workspace.md?tabs=mlstudio), [AI Studio](../ai-studio/how-to/create-projects.md), [Azure SDK](how-to-manage-workspace.md?tabs=python), or [Using automation templates](how-to-create-workspace-template.md).
126+
Once you have a workspace hub, you can Create a project using [Azure Machine Learning studio](how-to-manage-workspace.md?tabs=mlstudio), [AI Studio](../ai-studio/how-to/create-projects.md), [Azure SDK](how-to-manage-workspace.md?tabs=python), or [Using automation templates](how-to-create-workspace-template.md).

articles/site-recovery/site-recovery-monitor-and-troubleshoot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ You can manage your alerts settings under **Business Continuity Center** > **Mon
254254

255255
Select **View alert** to get alert details and take action.
256256

257-
:::image type="content" source="./media/site-recovery-monitor-and-troubleshoot/manage-alerts.png" alt-text="Screenshot displays Manage alerts option." lightbox="./media/site-recovery-monitor-and-troubleshoot/manage-alerts.png":::
257+
:::image type="content" source="./media/site-recovery-monitor-and-troubleshoot/manage-alerts.png" alt-text="Screenshot displays View alert option." lightbox="./media/site-recovery-monitor-and-troubleshoot/manage-alerts.png":::
258258

259259
Like Azure Monitor, Business Continuity Center, and Recovery Services Vault you can view alerts from Backup Center as well.
260260

articles/storage/common/multiple-identity-scenarios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ CosmosClient client = new CosmosClient(
318318
});
319319
320320
// Open a connection to Azure SQL using a managed identity
321-
string ConnectionString1 = @"Server=<azure-sql-hostname>.database.windows.net; User Id=ObjectIdOfManagedIdentity; Authentication=Active Directory Default; Database=<database-name>";
321+
string ConnectionString1 = @"Server=<azure-sql-hostname>.database.windows.net; User Id=ClientIDOfTheManagedIdentity; Authentication=Active Directory Default; Database=<database-name>";
322322
323323
using (SqlConnection conn = new SqlConnection(ConnectionString1))
324324
{

articles/synapse-analytics/spark/tutorial-spark-pool-filesystem-spec.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,9 @@ FSSPEC can read/write ADLS data by specifying the linked service name.
105105
import fsspec
106106
import pandas
107107
108-
adls_account_name = '' #Provide exact ADLS account name
109-
sas_key = TokenLibrary.getConnectionString(<LinkedServiceName>)
108+
linked_service_name = '' #Provide exact Linked Service Name
110109
111-
fsspec_handle = fsspec.open('abfs[s]://<container>/<path-to-file>', account_name = adls_account_name, sas_token=sas_key)
110+
fsspec_handle = fsspec.open('abfs[s]://<container>/<path-to-file>', storage_options={'linked_service': linked_service_name})
112111
113112
with fsspec_handle.open() as f:
114113
df = pandas.read_csv(f)
@@ -117,17 +116,16 @@ FSSPEC can read/write ADLS data by specifying the linked service name.
117116
import fsspec
118117
import pandas
119118
120-
adls_account_name = '' #Provide exact ADLS account name
119+
linked_service_name = '' #Provide exact Linked Service Name
121120
122121
data = pandas.DataFrame({'Name':['Tom', 'nick', 'krish', 'jack'], 'Age':[20, 21, 19, 18]})
123-
sas_key = TokenLibrary.getConnectionString(<LinkedServiceName>)
124122
125-
fsspec_handle = fsspec.open('abfs[s]://<container>/<path-to-file>', account_name = adls_account_name, sas_token=sas_key, mode="wt")
123+
fsspec_handle = fsspec.open('abfs[s]://<container>/<path-to-file>', storage_options={'linked_service': linked_service_name}, mode="wt")
126124
127125
with fsspec_handle.open() as f:
128126
data.to_csv(f)
129127
```
130-
128+
131129
## Upload file from local file system to default ADLS storage account of Synapse workspace
132130

133131
FSSPEC can upload a file from the local file system to a Synapse workspace default ADLS storage account.

includes/functions-opentelemetry-preview-note.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ ms.date: 05/17/2024
66
ms.author: glenga
77
---
88
> [!IMPORTANT]
9-
> OpenTelemery support for Azure Functions is currently in preview, and your app must be hosted in a [Flex Consumption plan](../articles/azure-functions/flex-consumption-plan.md) to use OpenTelemetry.
9+
> OpenTelemetry support for Azure Functions is currently in preview, and your app must be hosted in a [Flex Consumption plan](../articles/azure-functions/flex-consumption-plan.md) to use OpenTelemetry.

0 commit comments

Comments
 (0)