From b48e1f3b35e3afa345befa3e46ed4f3d347c05fa Mon Sep 17 00:00:00 2001 From: Marlene <57748216+marlenezw@users.noreply.github.com> Date: Wed, 18 Dec 2024 15:36:39 +0000 Subject: [PATCH 1/2] Configure Azure Developer Pipeline From 462fea2c4fc7d1dfad2e35bd6932c439312f9c80 Mon Sep 17 00:00:00 2001 From: Marlene <57748216+marlenezw@users.noreply.github.com> Date: Wed, 18 Dec 2024 16:16:16 +0000 Subject: [PATCH 2/2] makingeastus2 default --- README.md | 10 +++++----- docs/README.md | 10 +++++----- docs/workshop/lab_setup.py | 2 +- infra/main.bicep | 4 ++-- infra/main.bicepparam | 2 +- infra/main.test.bicep | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 67a14009..23541cab 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ This project template provides the following features: * **Azure account**. If you're new to Azure, [get an Azure account for free](https://azure.microsoft.com/free/cognitive-search/) and you'll get some free Azure credits to get started. See [guide to deploying with the free trial](docs/deploy_lowcost.md). * **Azure subscription with access enabled for the Azure OpenAI Service**. If your access request to Azure OpenAI Service doesn't match the [acceptance criteria](https://learn.microsoft.com/legal/cognitive-services/openai/limited-access?context=%2Fazure%2Fcognitive-services%2Fopenai%2Fcontext%2Fcontext), you can use [OpenAI public API](https://platform.openai.com/docs/api-reference/introduction) instead. - Ability to deploy `gpt-4o` and `gpt-4o-mini`. - - We recommend using `swedencentral`, as this region has access to all models and services required. + - We recommend using `eastus2`, as this region has access to all models and services required. * **Azure subscription with access enabled for [Bing Search API](https://www.microsoft.com/en-us/bing/apis/bing-web-search-api)** * **Azure subscription with access enabled for [Azure AI Search](https://azure.microsoft.com/en-gb/products/ai-services/ai-search)** @@ -105,9 +105,9 @@ The easiest way to get started is GitHub Codespaces, since it will setup all the azd up ``` - You will be prompted to select some details about your deployed resources, including location. As a reminder we recommend `Sweden Central` as the region for this project. + You will be prompted to select some details about your deployed resources, including location. As a reminder we recommend `East US 2` as the region for this project. Once the deployment is complete you should be able to scroll up in your terminal and see the url that the app has been deployed to. It should look similar to this - `Ingress Updated. Access your app at https://env-name.codespacesname.swedencentral.azurecontainerapps.io/`. Navigate to the link to try out the app straight away! + `Ingress Updated. Access your app at https://env-name.codespacesname.eastus2.azurecontainerapps.io/`. Navigate to the link to try out the app straight away! 5. Once the above steps are completed you can [test the sample](#testing-the-sample). @@ -185,7 +185,7 @@ Once you've opened the project in [Codespaces](#github-codespaces), [Dev Contain azd up ``` - This project uses `gpt-4o` and `gpt-4o-mini which may not be available in all Azure regions. Check for [up-to-date region availability](https://learn.microsoft.com/azure/ai-services/openai/concepts/models#standard-deployment-model-availability) and select a region during deployment accordingly. We recommend using Sweden Central for this project. + This project uses `gpt-4o` and `gpt-4o-mini which may not be available in all Azure regions. Check for [up-to-date region availability](https://learn.microsoft.com/azure/ai-services/openai/concepts/models#standard-deployment-model-availability) and select a region during deployment accordingly. We recommend using East US 2 for this project. After running azd up, you may be asked the following question during `Github Setup`: @@ -309,7 +309,7 @@ azd pipeline config ### Region Availability This template uses `gpt-4o` and `gpt-4o-mini` which may not be available in all Azure regions. Check for [up-to-date region availability](https://learn.microsoft.com/azure/ai-services/openai/concepts/models#standard-deployment-model-availability) and select a region during deployment accordingly - * We recommend using Sweden Central + * We recommend using East US 2 ### Costs diff --git a/docs/README.md b/docs/README.md index 67a14009..23541cab 100644 --- a/docs/README.md +++ b/docs/README.md @@ -69,7 +69,7 @@ This project template provides the following features: * **Azure account**. If you're new to Azure, [get an Azure account for free](https://azure.microsoft.com/free/cognitive-search/) and you'll get some free Azure credits to get started. See [guide to deploying with the free trial](docs/deploy_lowcost.md). * **Azure subscription with access enabled for the Azure OpenAI Service**. If your access request to Azure OpenAI Service doesn't match the [acceptance criteria](https://learn.microsoft.com/legal/cognitive-services/openai/limited-access?context=%2Fazure%2Fcognitive-services%2Fopenai%2Fcontext%2Fcontext), you can use [OpenAI public API](https://platform.openai.com/docs/api-reference/introduction) instead. - Ability to deploy `gpt-4o` and `gpt-4o-mini`. - - We recommend using `swedencentral`, as this region has access to all models and services required. + - We recommend using `eastus2`, as this region has access to all models and services required. * **Azure subscription with access enabled for [Bing Search API](https://www.microsoft.com/en-us/bing/apis/bing-web-search-api)** * **Azure subscription with access enabled for [Azure AI Search](https://azure.microsoft.com/en-gb/products/ai-services/ai-search)** @@ -105,9 +105,9 @@ The easiest way to get started is GitHub Codespaces, since it will setup all the azd up ``` - You will be prompted to select some details about your deployed resources, including location. As a reminder we recommend `Sweden Central` as the region for this project. + You will be prompted to select some details about your deployed resources, including location. As a reminder we recommend `East US 2` as the region for this project. Once the deployment is complete you should be able to scroll up in your terminal and see the url that the app has been deployed to. It should look similar to this - `Ingress Updated. Access your app at https://env-name.codespacesname.swedencentral.azurecontainerapps.io/`. Navigate to the link to try out the app straight away! + `Ingress Updated. Access your app at https://env-name.codespacesname.eastus2.azurecontainerapps.io/`. Navigate to the link to try out the app straight away! 5. Once the above steps are completed you can [test the sample](#testing-the-sample). @@ -185,7 +185,7 @@ Once you've opened the project in [Codespaces](#github-codespaces), [Dev Contain azd up ``` - This project uses `gpt-4o` and `gpt-4o-mini which may not be available in all Azure regions. Check for [up-to-date region availability](https://learn.microsoft.com/azure/ai-services/openai/concepts/models#standard-deployment-model-availability) and select a region during deployment accordingly. We recommend using Sweden Central for this project. + This project uses `gpt-4o` and `gpt-4o-mini which may not be available in all Azure regions. Check for [up-to-date region availability](https://learn.microsoft.com/azure/ai-services/openai/concepts/models#standard-deployment-model-availability) and select a region during deployment accordingly. We recommend using East US 2 for this project. After running azd up, you may be asked the following question during `Github Setup`: @@ -309,7 +309,7 @@ azd pipeline config ### Region Availability This template uses `gpt-4o` and `gpt-4o-mini` which may not be available in all Azure regions. Check for [up-to-date region availability](https://learn.microsoft.com/azure/ai-services/openai/concepts/models#standard-deployment-model-availability) and select a region during deployment accordingly - * We recommend using Sweden Central + * We recommend using East US 2 ### Costs diff --git a/docs/workshop/lab_setup.py b/docs/workshop/lab_setup.py index 3ca47d48..c42b3f38 100755 --- a/docs/workshop/lab_setup.py +++ b/docs/workshop/lab_setup.py @@ -149,7 +149,7 @@ def create_azd_environment(*, azure_env_name: str, subscription: str): # Create new environment if it doesn't exist azd_cmd = [ 'azd', 'env', 'new', azure_env_name, - '--location', 'swedencentral', + '--location', 'eastus2', '--subscription', subscription ] subprocess.run(azd_cmd, check=True) diff --git a/infra/main.bicep b/infra/main.bicep index 3163e6b8..e4b545db 100644 --- a/infra/main.bicep +++ b/infra/main.bicep @@ -5,7 +5,7 @@ targetScope = 'subscription' @description('Name which is used to generate a short unique hash for each resource') param environmentName string -@allowed(['swedencentral','eastus2','northcentralus','francecentral']) +@allowed(['eastus2','swedencentral','northcentralus','francecentral']) @minLength(1) @description('Primary location for all resources') @metadata({ @@ -13,7 +13,7 @@ param environmentName string type: 'location' } }) -param location string = 'swedencentral' +param location string = 'eastus2' param containerRegistryName string = '' param aiHubName string = '' diff --git a/infra/main.bicepparam b/infra/main.bicepparam index ef9d5a7f..a405c393 100644 --- a/infra/main.bicepparam +++ b/infra/main.bicepparam @@ -1,7 +1,7 @@ using './main.bicep' param environmentName = readEnvironmentVariable('AZURE_ENV_NAME', 'MY_ENV') -param location = readEnvironmentVariable('AZURE_LOCATION', 'swedencentral') +param location = readEnvironmentVariable('AZURE_LOCATION', 'eastus2') param principalId = readEnvironmentVariable('AZURE_PRINCIPAL_ID', '') param resourceGroupName = readEnvironmentVariable('AZURE_RESOURCE_GROUP', '') diff --git a/infra/main.test.bicep b/infra/main.test.bicep index cdfb5c18..46940aac 100644 --- a/infra/main.test.bicep +++ b/infra/main.test.bicep @@ -6,7 +6,7 @@ targetScope = 'subscription' param environmentName string = 'testing' -param location string = 'swedencentral' +param location string = 'eastus2' module main 'main.bicep' = { name: 'main'