Skip to content

Commit f65fa10

Browse files
authored
Merge pull request #285404 from MicrosoftDocs/main
8/23/2024 AM Publish
2 parents 922b691 + a5fd116 commit f65fa10

File tree

31 files changed

+1188
-1515
lines changed

31 files changed

+1188
-1515
lines changed

.openpublishing.publish.config.json

Lines changed: 1027 additions & 1429 deletions
Large diffs are not rendered by default.

articles/ai-services/speech-service/includes/release-notes/release-notes-tts.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ ms.custom: references_regions
4848
| it-IT | Italian (Italy) | Male | it-IT-GiuseppeMultilingualNeural |
4949
| ko-KR | Korean (Korea) | Male | ko-KR-HyunsuMultilingualNeural |
5050

51-
- Enhance the following current multilingual voices with better quality and additional features.
51+
- Enhance the following current multilingual voices with better quality.
5252

53-
| Locale | Language | Gender | Voice name | Note |
54-
|--------|--------|--------|------------|----------------|
55-
| zh-CN | Chinese (Mandarin, Simplified) | Female | zh-CN-XiaoxiaoMultilingualNeural | Support styles: `affectionate`, `cheerful`, `empathetic`, `excited`, `poetry-reading`, `sorry`, `story`. |
56-
| en-US | English (United States) | Male | en-US-AndrewMultilingualNeural | Overall quality update |
57-
| en-US | English (United States) | Female | en-US-AvaMultilingualNeural | Overall quality update |
53+
| Locale | Language | Gender | Voice name|
54+
|--------|--------|--------|------------|
55+
| en-US | English (United States) | Male | en-US-AndrewMultilingualNeural |
56+
| en-US | English (United States) | Female | en-US-AvaMultilingualNeural |
5857

59-
- Two en-US multilingual voices now support styles. See the [Voice styles and roles](../../language-support.md?tabs=tts#voice-styles-and-roles) for more information.
58+
- Three multilingual voices now support styles. See the [Voice styles and roles](../../language-support.md?tabs=tts#voice-styles-and-roles) for more information.
6059
- en-US-SerenaMultilingualNeural: `empathetic`, `excited`, `friendly`, `shy`, `serious`, `relieved`, and `sad`.
6160
- en-US-AndrewMultilingualNeural: `empathetic` and `relieved`.
61+
- zh-CN-XiaoxiaoMultilingualNeural: `affectionate`, `cheerful`, `empathetic`, `excited`, `poetry-reading`, `sorry`, and `story`.
6262

6363
### July 2024 release
6464

articles/ai-studio/concepts/evaluation-metrics-built-in.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.custom:
99
- build-2024
1010
ms.topic: conceptual
1111
ms.date: 5/21/2024
12-
ms.reviewer: eur
12+
ms.reviewer: mithigpe
1313
ms.author: lagayhar
1414
author: lgayhardt
1515
---

articles/ai-studio/how-to/deploy-models-llama.md

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ The Meta Llama 3.1 collection of multilingual large language models (LLMs) is a
3737
The following models are available:
3838

3939
* [Meta-Llama-3.1-405B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3.1-405B-Instruct)
40-
* [Meta-Llama-3.1-70B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3.1-70B-Instruct)
41-
* [Meta-Llama-3.1-8B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3.1-8B-Instruct)
40+
* [Meta-Llama-3.1-70B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3.1-70B-Instruct/version/1/registry/azureml-meta)
41+
* [Meta-Llama-3.1-8B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3.1-8B-Instruct/version/1/registry/azureml-meta)
4242

4343

4444
# [Meta Llama-3](#tab/meta-llama-3)
@@ -48,8 +48,8 @@ Meta developed and released the Meta Llama 3 family of large language models (LL
4848

4949
The following models are available:
5050

51-
* [Meta-Llama-3-70B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3-70B-Instruct)
52-
* [Meta-Llama-3-8B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3-8B-Instruct)
51+
* [Meta-Llama-3-70B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3-70B-Instruct/version/6/registry/azureml-meta)
52+
* [Meta-Llama-3-8B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3-8B-Instruct/version/6/registry/azureml-meta)
5353

5454

5555
# [Meta Llama-2](#tab/meta-llama-2)
@@ -59,9 +59,9 @@ Meta has developed and publicly released the Llama 2 family of large language mo
5959

6060
The following models are available:
6161

62-
* [Llama-2-70b-chat](https://aka.ms/azureai/landing/Llama-2-70b-chat)
63-
* [Llama-2-13b-chat](https://aka.ms/azureai/landing/Llama-2-13b-chat)
64-
* [Llama-2-7b-chat](https://aka.ms/azureai/landing/Llama-2-7b-chat)
62+
* [Llama-2-70b-chat](https://ai.azure.com/explore/models/Llama-2-70b-chat/version/20/registry/azureml-meta)
63+
* [Llama-2-13b-chat](https://ai.azure.com/explore/models/Llama-2-13b-chat/version/20/registry/azureml-meta)
64+
* [Llama-2-7b-chat](https://ai.azure.com/explore/models/Llama-2-7b-chat/version/24/registry/azureml-meta)
6565

6666

6767
---
@@ -362,8 +362,8 @@ The Meta Llama 3.1 collection of multilingual large language models (LLMs) is a
362362
The following models are available:
363363

364364
* [Meta-Llama-3.1-405B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3.1-405B-Instruct)
365-
* [Meta-Llama-3.1-70B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3.1-70B-Instruct)
366-
* [Meta-Llama-3.1-8B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3.1-8B-Instruct)
365+
* [Meta-Llama-3.1-70B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3.1-70B-Instruct/version/1/registry/azureml-meta)
366+
* [Meta-Llama-3.1-8B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3.1-8B-Instruct/version/1/registry/azureml-meta)
367367

368368

369369
# [Meta Llama-3](#tab/meta-llama-3)
@@ -373,8 +373,8 @@ Meta developed and released the Meta Llama 3 family of large language models (LL
373373

374374
The following models are available:
375375

376-
* [Meta-Llama-3-70B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3-70B-Instruct)
377-
* [Meta-Llama-3-8B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3-8B-Instruct)
376+
* [Meta-Llama-3-70B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3-70B-Instruct/version/6/registry/azureml-meta)
377+
* [Meta-Llama-3-8B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3-8B-Instruct/version/6/registry/azureml-meta)
378378

379379

380380
# [Meta Llama-2](#tab/meta-llama-2)
@@ -384,9 +384,9 @@ Meta has developed and publicly released the Llama 2 family of large language mo
384384

385385
The following models are available:
386386

387-
* [Llama-2-70b-chat](https://aka.ms/azureai/landing/Llama-2-70b-chat)
388-
* [Llama-2-13b-chat](https://aka.ms/azureai/landing/Llama-2-13b-chat)
389-
* [Llama-2-7b-chat](https://aka.ms/azureai/landing/Llama-2-7b-chat)
387+
* [Llama-2-70b-chat](https://ai.azure.com/explore/models/Llama-2-70b-chat/version/20/registry/azureml-meta)
388+
* [Llama-2-13b-chat](https://ai.azure.com/explore/models/Llama-2-13b-chat/version/20/registry/azureml-meta)
389+
* [Llama-2-7b-chat](https://ai.azure.com/explore/models/Llama-2-7b-chat/version/24/registry/azureml-meta)
390390

391391

392392
---
@@ -710,8 +710,8 @@ The Meta Llama 3.1 collection of multilingual large language models (LLMs) is a
710710
The following models are available:
711711
712712
* [Meta-Llama-3.1-405B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3.1-405B-Instruct)
713-
* [Meta-Llama-3.1-70B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3.1-70B-Instruct)
714-
* [Meta-Llama-3.1-8B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3.1-8B-Instruct)
713+
* [Meta-Llama-3.1-70B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3.1-70B-Instruct/version/1/registry/azureml-meta)
714+
* [Meta-Llama-3.1-8B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3.1-8B-Instruct/version/1/registry/azureml-meta)
715715
716716
717717
# [Meta Llama-3](#tab/meta-llama-3)
@@ -721,8 +721,8 @@ Meta developed and released the Meta Llama 3 family of large language models (LL
721721
722722
The following models are available:
723723
724-
* [Meta-Llama-3-70B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3-70B-Instruct)
725-
* [Meta-Llama-3-8B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3-8B-Instruct)
724+
* [Meta-Llama-3-70B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3-70B-Instruct/version/6/registry/azureml-meta)
725+
* [Meta-Llama-3-8B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3-8B-Instruct/version/6/registry/azureml-meta)
726726
727727
728728
# [Meta Llama-2](#tab/meta-llama-2)
@@ -732,9 +732,9 @@ Meta has developed and publicly released the Llama 2 family of large language mo
732732
733733
The following models are available:
734734
735-
* [Llama-2-70b-chat](https://aka.ms/azureai/landing/Llama-2-70b-chat)
736-
* [Llama-2-13b-chat](https://aka.ms/azureai/landing/Llama-2-13b-chat)
737-
* [Llama-2-7b-chat](https://aka.ms/azureai/landing/Llama-2-7b-chat)
735+
* [Llama-2-70b-chat](https://ai.azure.com/explore/models/Llama-2-70b-chat/version/20/registry/azureml-meta)
736+
* [Llama-2-13b-chat](https://ai.azure.com/explore/models/Llama-2-13b-chat/version/20/registry/azureml-meta)
737+
* [Llama-2-7b-chat](https://ai.azure.com/explore/models/Llama-2-7b-chat/version/24/registry/azureml-meta)
738738
739739
740740
---
@@ -1070,8 +1070,8 @@ The Meta Llama 3.1 collection of multilingual large language models (LLMs) is a
10701070
The following models are available:
10711071

10721072
* [Meta-Llama-3.1-405B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3.1-405B-Instruct)
1073-
* [Meta-Llama-3.1-70B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3.1-70B-Instruct)
1074-
* [Meta-Llama-3.1-8B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3.1-8B-Instruct)
1073+
* [Meta-Llama-3.1-70B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3.1-70B-Instruct/version/1/registry/azureml-meta)
1074+
* [Meta-Llama-3.1-8B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3.1-8B-Instruct/version/1/registry/azureml-meta)
10751075

10761076

10771077
# [Meta Llama-3](#tab/meta-llama-3)
@@ -1081,8 +1081,8 @@ Meta developed and released the Meta Llama 3 family of large language models (LL
10811081

10821082
The following models are available:
10831083

1084-
* [Meta-Llama-3-70B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3-70B-Instruct)
1085-
* [Meta-Llama-3-8B-Instruct](https://aka.ms/azureai/landing/Meta-Llama-3-8B-Instruct)
1084+
* [Meta-Llama-3-70B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3-70B-Instruct/version/6/registry/azureml-meta)
1085+
* [Meta-Llama-3-8B-Instruct](https://ai.azure.com/explore/models/Meta-Llama-3-8B-Instruct/version/6/registry/azureml-meta)
10861086

10871087

10881088
# [Meta Llama-2](#tab/meta-llama-2)
@@ -1092,9 +1092,9 @@ Meta has developed and publicly released the Llama 2 family of large language mo
10921092

10931093
The following models are available:
10941094

1095-
* [Llama-2-70b-chat](https://aka.ms/azureai/landing/Llama-2-70b-chat)
1096-
* [Llama-2-13b-chat](https://aka.ms/azureai/landing/Llama-2-13b-chat)
1097-
* [Llama-2-7b-chat](https://aka.ms/azureai/landing/Llama-2-7b-chat)
1095+
* [Llama-2-70b-chat](https://ai.azure.com/explore/models/Llama-2-70b-chat/version/20/registry/azureml-meta)
1096+
* [Llama-2-13b-chat](https://ai.azure.com/explore/models/Llama-2-13b-chat/version/20/registry/azureml-meta)
1097+
* [Llama-2-7b-chat](https://ai.azure.com/explore/models/Llama-2-7b-chat/version/24/registry/azureml-meta)
10981098

10991099

11001100
---
@@ -1446,7 +1446,7 @@ For more examples of how to use Meta Llama, see the following examples and tutor
14461446
| Description | Language | Sample |
14471447
|-------------------------------------------|-------------------|------------------------------------------------------------------- |
14481448
| CURL request | Bash | [Link](https://aka.ms/meta-llama-3.1-405B-instruct-webrequests) |
1449-
| Azure AI Inference package for JavaScript | JavaScript | [Link](https://aka.ms/azsdk/azure-ai-inference/javascript/samples) |
1449+
| Azure AI Inference package for JavaScript | JavaScript | [Link](https://github.com/Azure/azureml-examples/blob/main/sdk/typescript/README.md) |
14501450
| Azure AI Inference package for Python | Python | [Link](https://aka.ms/azsdk/azure-ai-inference/python/samples) |
14511451
| Python web requests | Python | [Link](https://aka.ms/meta-llama-3.1-405B-instruct-webrequests) |
14521452
| OpenAI SDK (experimental) | Python | [Link](https://aka.ms/meta-llama-3.1-405B-instruct-openai) |
@@ -1476,4 +1476,4 @@ It is a good practice to start with a low number of instances and scale up as ne
14761476
* [Deploy models as serverless APIs](deploy-models-serverless.md)
14771477
* [Consume serverless API endpoints from a different Azure AI Studio project or hub](deploy-models-serverless-connect.md)
14781478
* [Region availability for models in serverless API endpoints](deploy-models-serverless-availability.md)
1479-
* [Plan and manage costs (marketplace)](costs-plan-manage.md#monitor-costs-for-models-offered-through-the-azure-marketplace)
1479+
* [Plan and manage costs (marketplace)](costs-plan-manage.md#monitor-costs-for-models-offered-through-the-azure-marketplace)

articles/app-service/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@
192192
href: tutorial-connect-msi-key-vault-javascript.md
193193
- name: Use PHP
194194
href: tutorial-connect-msi-key-vault-php.md
195+
- name: Use Python
196+
href: tutorial-connect-msi-key-vault-python.md
195197
- name: Connect by using app identity
196198
items:
197199
- name: Managed identity overview
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
title: 'Tutorial: Python connect to Azure services securely with Key Vault'
3+
description: Learn how to secure connectivity to back-end Azure services that don't support managed identity natively from a Python web app
4+
ms.devlang: python
5+
# ms.devlang: python, azurecli
6+
ms.topic: tutorial
7+
ms.date: 08/23/2024
8+
author: cephalin
9+
ms.author: cephalin
10+
11+
ms.reviewer: madsd
12+
ms.custom: devx-track-azurecli, devx-track-python, AppServiceConnectivity
13+
---
14+
15+
# Tutorial: Secure Cognitive Service connection from Python App Service using Key Vault
16+
17+
[!INCLUDE [tutorial-content-above-code](./includes/tutorial-connect-msi-key-vault/introduction.md)]
18+
19+
## Configure Python app
20+
21+
Clone the sample repository locally and deploy the sample application to App Service. Replace *\<app-name>* with a unique name.
22+
23+
```azurecli-interactive
24+
# Clone and prepare sample application
25+
git clone https://github.com/Azure-Samples/app-service-language-detector.git
26+
cd app-service-language-detector/python
27+
zip -r default.zip .
28+
29+
# Save app name as variable for convenience
30+
appName=<app-name>
31+
32+
az appservice plan create --resource-group $groupName --name $appName --sku FREE --location $region --is-linux
33+
az webapp create --resource-group $groupName --plan $appName --name $appName --runtime "python:3.11"
34+
az webapp config appsettings set --resource-group $groupName --name $appName --settings SCM_DO_BUILD_DURING_DEPLOYMENT=true
35+
az webapp deploy --resource-group $groupName --name $appName --src-path ./default.zip
36+
```
37+
38+
The preceding commands:
39+
40+
* Create a linux app service plan
41+
* Create a web app for Python 3.11
42+
* Configure the web app to install the python packages on deployment
43+
* Upload the zip file, and install the python packages
44+
45+
## Configure secrets as app settings
46+
47+
[!INCLUDE [tutorial-content-below-code](./includes/tutorial-connect-msi-key-vault/cleanup.md)]

articles/azure-functions/functions-run-local.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ If you don't have these tools installed, you need to instead [get a valid access
345345
## <a name="project-file-deployment"></a>Deploy project files
346346

347347
::: zone pivot="programming-language-csharp,programming-language-javascript,programming-language-powershell,programming-language-python,programming-language-typescript"
348-
To publish your local code to a function app in Azure, use the [`func azure functionapp publish publish`](./functions-core-tools-reference.md#func-azure-functionapp-publish) command, as in the following example:
348+
To publish your local code to a function app in Azure, use the [`func azure functionapp publish`](./functions-core-tools-reference.md#func-azure-functionapp-publish) command, as in the following example:
349349

350350
```
351351
func azure functionapp publish <FunctionAppName>
226 KB
Loading
-166 KB
Loading
-172 KB
Loading

0 commit comments

Comments
 (0)