Skip to content

Commit

Permalink
Merge pull request #303 from Azure-Samples/eastus2_as_default
Browse files Browse the repository at this point in the history
Eastus2 as default
  • Loading branch information
marlenezw authored Dec 18, 2024
2 parents 1b00e79 + 462fea2 commit c7171b7
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)**

Expand Down Expand Up @@ -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).

Expand Down Expand Up @@ -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`:
Expand Down Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)**

Expand Down Expand Up @@ -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).

Expand Down Expand Up @@ -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`:
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/workshop/lab_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions infra/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ 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({
azd: {
type: 'location'
}
})
param location string = 'swedencentral'
param location string = 'eastus2'

param containerRegistryName string = ''
param aiHubName string = ''
Expand Down
2 changes: 1 addition & 1 deletion infra/main.bicepparam
Original file line number Diff line number Diff line change
@@ -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', '')

Expand Down
2 changes: 1 addition & 1 deletion infra/main.test.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
targetScope = 'subscription'

param environmentName string = 'testing'
param location string = 'swedencentral'
param location string = 'eastus2'

module main 'main.bicep' = {
name: 'main'
Expand Down

0 comments on commit c7171b7

Please sign in to comment.