Skip to content

Commit 31e9428

Browse files
author
Jill Grant
authored
Merge pull request #285858 from v-albemi/quickstart-python
Freshness - Azure App Service
2 parents cd6cd4c + 9a6ec3e commit 31e9428

13 files changed

+47
-47
lines changed

articles/app-service/includes/deploy-intelligent-apps/deploy-intelligent-apps-linux-python-pivot.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ You can use Azure App Service to work with popular AI frameworks like LangChain
1313
#### Prerequisites
1414

1515
- An [Azure OpenAI resource](/azure/ai-services/openai/quickstart?pivots=programming-language-csharp&tabs=command-line%2Cpython#set-up) or an [OpenAI account](https://platform.openai.com/overview).
16-
- A Flask web application. Create the sample app using our [quickstart](../../quickstart-python.md?tabs=flask%2Cwindows%2Cazure-cli%2Cvscode-deploy%2Cdeploy-instructions-azportal%2Cterminal-bash%2Cdeploy-instructions-zip-azcli#1---sample-application).
16+
- A Flask web application. Create the sample app using our [quickstart](../../quickstart-python.md?tabs=flask%2Cwindows%2Cazure-cli%2Cvscode-deploy%2Cdeploy-instructions-azportal%2Cterminal-bash%2Cdeploy-instructions-zip-azcli#sample-application).
1717

1818
### Setup flask web app
1919

20-
For this Flask web application, we are building off the [quickstart](../../quickstart-python.md?tabs=flask%2Cwindows%2Cazure-cli%2Cvscode-deploy%2Cdeploy-instructions-azportal%2Cterminal-bash%2Cdeploy-instructions-zip-azcli#1---sample-application) app and updating the *app.py* file to send and receive requests to an Azure OpenAI OR OpenAI service using LangChain.
20+
For this Flask web application, we are building off the [quickstart](../../quickstart-python.md?tabs=flask%2Cwindows%2Cazure-cli%2Cvscode-deploy%2Cdeploy-instructions-azportal%2Cterminal-bash%2Cdeploy-instructions-zip-azcli#sample-application) app and updating the *app.py* file to send and receive requests to an Azure OpenAI OR OpenAI service using LangChain.
2121

2222
First, copy, and replace the *index.html* file with the following code:
2323

@@ -282,7 +282,7 @@ client = AzureOpenAI(
282282
)
283283
```
284284

285-
Once the credentials are added to the application, youll then need to enable managed identity in your application and grant access to the resource.
285+
Once the credentials are added to the application, you'll then need to enable managed identity in your application and grant access to the resource.
286286

287287
1. In your web app resource, navigate to the **Identity** blade and turn on **System assigned** and click **Save**
288288
2. Once System assigned identity is turned on, it registers the web app with Microsoft Entra ID and the web app can be granted permissions to access protected resources.

articles/app-service/includes/quickstart-python/create-app-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Azure CLI commands can be run on a computer with the [Azure CLI installed](/cli/
88

99
Azure CLI has a command `az webapp up` that will create the necessary resources and deploy your application in a single step.
1010

11-
If necessary, login to Azure using [az login](/cli/azure/authenticate-azure-cli).
11+
If necessary, log in to Azure using [az login](/cli/azure/authenticate-azure-cli).
1212

1313
```azurecli
1414
az login
@@ -24,7 +24,7 @@ az webapp up --runtime PYTHON:3.9 --sku B1 --logs
2424
* The `--sku` parameter defines the size (CPU, memory) and cost of the app service plan. This example uses the B1 (Basic) service plan, which will incur a small cost in your Azure subscription. For a full list of App Service plans, view the [App Service pricing](https://azure.microsoft.com/pricing/details/app-service/linux/) page.
2525
* The `--logs` flag configures default logging required to enable viewing the log stream immediately after launching the webapp.
2626
* You can optionally specify a name with the argument `--name <app-name>`. If you don't provide one, then a name will be automatically generated.
27-
* You can optionally include the argument `--location <location-name>` where `<location_name>` is an available Azure region. You can retrieve a list of allowable regions for your Azure account by running the [`az account list-locations`](/cli/azure/appservice#az-appservice-list-locations) command.
27+
* You can optionally include the argument `--location <location-name>` where `<location_name>` is an available Azure region. You can retrieve a list of allowable regions for your Azure account by running the [`az appservice list-locations`](/cli/azure/appservice#az-appservice-list-locations) command.
2828

2929
The command may take a few minutes to complete. While the command is running, it provides messages about creating the resource group, the App Service plan, and the app resource, configuring logging, and doing ZIP deployment. It then gives the message, "You can launch the app at http://&lt;app-name&gt;.azurewebsites.net", which is the app's URL on Azure.
3030

articles/app-service/includes/quickstart-python/create-app-service-azure-portal-1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ ms.date: 01/29/2022
77
In the Azure portal:
88

99
1. Enter *app services* in the search bar at the top of the Azure portal.
10-
1. Select the item labeled **App Services** under the under **Services** heading on the menu that appears below the search bar.
10+
1. Select the item labeled **App Services** under the **Services** heading on the menu that appears below the search bar.

articles/app-service/includes/quickstart-python/create-app-service-azure-portal-4.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ms.author: daberry
44
ms.topic: include
55
ms.date: 07/26/2023
66
---
7-
The App Service plan controls how many resources (CPU/memory) are available to your app and the cost of those resources.<br>
7+
The App Service plan controls the amount of resources (CPU/memory) that are available to your app and the cost of those resources.<br>
88
<br>
9-
For this example, under **Dev/Test**, select the **Basic B1** plan. The Basic B1 plan will incur a small charge against your Azure account but is recommended for better performance over the Free F1 plan.<br>
9+
For this example, under **Dev/Test**, select the **Basic B1** plan. The Basic B1 plan will incur a small charge against your Azure account but is recommended for better performance over the Free F1 plan.<br>
1010
<br>
1111
When finished, select **Select** to apply your changes.

articles/app-service/includes/quickstart-python/deploy-local-git-azure-portal-3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ ms.author: daberry
44
ms.topic: include
55
ms.date: 01/29/2022
66
---
7-
After saving, the page will refresh and display the address for the remote Git repository.<br>
7+
After you save the page, it will refresh and display the address for the remote Git repository.<br>
88
<br>
99
Copy the value of the **Git Clone Uri** as this value will be used to set up a Git remote in a later step.

articles/app-service/includes/quickstart-python/deploy-local-git-azure-portal-4.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ms.author: daberry
44
ms.topic: include
55
ms.date: 07/26/2023
66
---
7-
On the *Deployment Center* page
7+
On the *Deployment Center* page:
88

99
1. Navigate to the **Local Git/FTPS credentials** tab.
1010
1. Locate the local git username and password under the **Application scope** credentials.

articles/app-service/includes/quickstart-python/deploy-local-git.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ms.author: cephalin
44
ms.topic: include
55
ms.date: 01/29/2022
66
---
7-
You can deploy your application code from a local Git repository to Azure by configuring a [Git remote](https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes) in your local repo pointing at Azure to push code to. The URL of the remote repository and Git credentials needed for configuration can be retrieved using either the Azure portal or the Azure CLI.
7+
You can deploy your application code from a local Git repository to Azure by configuring a [Git remote](https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes) in your local repo that points at the repo you want to push code to. The URL of the remote repository and Git credentials needed for configuration can be retrieved using either the Azure portal or the Azure CLI.
88

99
### [Azure portal](#tab/deploy-instructions-azportal)
1010

@@ -21,7 +21,7 @@ Next, in the root directory of your application, configure a [Git remote](https:
2121
git remote add azure <git-deployment-url>
2222
```
2323

24-
You can now push code from your local Git repository to Azure using the Git remote you just configured. The default deployment branch for App Service is `master`, but many Git repositories are moving away from `master` to `main`. You can either specify the mapping from local branch name to remote branch name in the push (as shown below), or you can configure your [`DEPLOYMENT_BRANCH` app setting](../../deploy-local-git.md?tabs=cli#change-deployment-branch).
24+
You can now push code from your local Git repository to Azure using the Git remote you just configured. The default deployment branch for App Service is `master`, but many Git repositories are moving away from `master` and using `main`. You can either specify the mapping from local branch name to remote branch name in the push (as shown below), or you can configure your [`DEPLOYMENT_BRANCH` app setting](../../deploy-local-git.md?tabs=cli#change-deployment-branch).
2525

2626
```bash
2727
git push azure main:master
@@ -31,11 +31,11 @@ The first time you push code to Azure, Git will prompt you for the Azure deploym
3131

3232
### [Azure CLI](#tab/deploy-instructions-azcli)
3333

34-
First, configure the deployment source for your web app to be local Git using the `az webapp deployment source` command. This command will output the URL of the remote Git repository that you will be pushing code to. Make a copy of this value as you will need it in a later step.
34+
First, configure the deployment source for your web app to be local Git using the `az webapp deployment source` command. This command will output the URL of the remote Git repository that you'll be pushing code to. Make a copy of this value as you'll need it in a later step.
3535

3636
[!INCLUDE [CLI deploy configure](./deploy-local-instructions-cli-1.md)]
3737

38-
Retrieve the deployment credentials for your application. These will be needed for Git to authenticate to Azure when you push code to Azure in a later step.
38+
Retrieve the deployment credentials for your application. Git will need these to authenticate to Azure when you push code to Azure in a later step.
3939

4040
[!INCLUDE [CLI deploy retrieve credentials](./deploy-local-instructions-cli-2.md)]
4141

@@ -45,10 +45,10 @@ Next, in the root directory of your application, configure a [Git remote](https:
4545
git remote add azure <git-deployment-url>
4646
```
4747

48-
You can now push code from your local Git repository to Azure using the Git remote you just configured. The default deployment branch for App Service is `master`, but many Git repositories are moving away from `master` to `main`. You can either specify the mapping from local branch name to remote branch name in the push (as shown below), or you can configure your [`DEPLOYMENT_BRANCH` app setting](../../deploy-local-git.md?tabs=cli#change-deployment-branch).
48+
You can now push code from your local Git repository to Azure using the Git remote you just configured. The default deployment branch for App Service is `master`, but many Git repositories are moving away from `master` and using `main`. You can either specify the mapping from local branch name to remote branch name in the push (as shown below), or you can configure your [`DEPLOYMENT_BRANCH` app setting](../../deploy-local-git.md?tabs=cli#change-deployment-branch).
4949

5050
```bash
5151
git push azure main:master
5252
```
5353

54-
The first time you push code to Azure, Git will prompt you for the Azure deployment credentials you obtained in a previous step. Git will then cache these credentials so you won't have to reenter them on subsequent deployments.
54+
The first time you push code to Azure, Git will prompt you for the Azure deployment credentials you obtained in a previous step. Git will then cache these credentials so you won't have to re-enter them on subsequent deployments.

articles/app-service/includes/quickstart-python/stream-logs-azure-portal-1.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ ms.author: daberry
44
ms.topic: include
55
ms.date: 01/29/2022
66
---
7-
First, you need to enable streaming logs in Azure App Service. Navigate to page for the App Service instance in the Azure portal.<br>
7+
First, you need to enable streaming logs in Azure App Service. Navigate to the page for the App Service instance in the Azure portal.<br>
88
<br>
9-
1. Select the **App Service logs** under the **Monitoring** heading in the menu on the left side of the page.
9+
1. Select **App Service logs** under the **Monitoring** heading in the menu on the left side of the page.
1010
1. Change the **Application Logging** property from **Off** to **File System**.
1111
1. Enter a retention period of 30 days for the logs.
1212
1. Select **Save** to save your changes.

articles/app-service/includes/quickstart-python/stream-logs-azure-portal-2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ ms.author: daberry
44
ms.topic: include
55
ms.date: 01/29/2022
66
---
7-
Select the **Log stream** item from the menu under the **Monitoring** section. Refresh the home page in the app or attempt other requests to generate some log messages.<br>
7+
Select **Log stream** from the **Monitoring** section in the navigation pane on the left. Refresh the home page in the app or attempt other requests to generate some log messages.<br>
88
<br>
9-
You will see any log messages generated by your app and messages generated by the service in the output.
9+
You'll see any log messages generated by your app and messages generated by the service in the output.

articles/app-service/includes/quickstart-python/stream-logs-visual-studio-code-2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ ms.author: daberry
44
ms.topic: include
55
ms.date: 01/29/2022
66
---
7-
The console logs appear in VS Code's Output window. Refresh the home page in the app or attempt other requests to generate some log messages.<br>
7+
The console logs appear in the VS Code Output window. Refresh the home page in the app or attempt other requests to generate some log messages.<br>
88
<br>
9-
You will see any log messages generated by your app as well as other messages generated by the service in the output.
9+
You'll see any log messages generated by your app as well as other messages generated by the service in the output.

0 commit comments

Comments
 (0)