Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/AzureGPTQuotaSettings.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
3. **Go to** the `Management Center` from the bottom-left navigation menu.
4. Select `Quota`
- Click on the `GlobalStandard` dropdown.
- Select the required **GPT model** (`GPT-4, GPT-4o`).
- Select the required **GPT model** (`GPT-4, GPT-5.1`).
- Choose the **region** where the deployment is hosted.
5. Request More Quota or delete any unused model deployments as needed.
2 changes: 1 addition & 1 deletion docs/CustomizingAzdParameters.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ By default this template will use the environment name as the prefix to prevent
| `AZURE_LOCATION` | string | `<User selects during deployment>` | Location of the Azure resources. Controls where the infrastructure will be deployed. |
| `AZURE_ENV_AI_SERVICE_LOCATION` | string | `<User selects during deployment>` | Location of the Azure resources. Controls where the Azure AI Services will be deployed. |
| `AZURE_ENV_MODEL_DEPLOYMENT_TYPE` | string | `GlobalStandard` | Change the Model Deployment Type (allowed values: Standard, GlobalStandard). |
| `AZURE_ENV_GPT_MODEL_NAME` | string | `gpt-5.1` | Set the Model Name (allowed values: gpt-5.1). |
| `AZURE_ENV_GPT_MODEL_NAME` | string | `gpt-5.1` | Set the Model Name (default: gpt-5.1). |
| `AZURE_ENV_GPT_MODEL_VERSION` | string | `2025-11-13` | Set the Azure model version (allowed values: 2025-11-13) |
| `AZURE_ENV_GPT_MODEL_CAPACITY` | integer | `150` | Set the Model Capacity (choose a number based on available GPT model capacity in your subscription). |
| `AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID`| string | Guide to get your [Existing Workspace ID](re-use-log-analytics.md) | Set this if you want to reuse an existing Log Analytics Workspace instead of creating a new one. |
Expand Down
4 changes: 2 additions & 2 deletions docs/EXAMPLE-CustomizingAzdParameters.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ Change the Model Deployment Type (allowed values: Standard, GlobalStandard)
azd env set AZURE_ENV_MODEL_DEPLOYMENT_TYPE GlobalStandard
```

Set the Model Name (allowed values: gpt-4o)
Set the Model Name (default: gpt-5.1)

```shell
azd env set AZURE_ENV_MODEL_NAME gpt-4o
azd env set AZURE_ENV_GPT_MODEL_NAME gpt-5.1
```

Change the Model Capacity (choose a number based on available GPT model capacity in your subscription)
Expand Down
8 changes: 4 additions & 4 deletions docs/quota_check.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Check Quota Availability Before Deployment

Before deploying the accelerator, **ensure sufficient quota availability** for the required model.
> **For Global Standard | GPT-4o - the capacity to at least 200K tokens for optimal performance.**
> **For Global Standard | GPT-5.1 - ensure capacity is at least 200K tokens for optimal performance.**

### Login if you have not done so already
```
Expand All @@ -14,7 +14,7 @@ az login --use-device-code

### 📌 Default Models & Capacities:
```
gpt-4o:150
gpt-5.1:150
```
### 📌 Default Regions:
```
Expand All @@ -40,15 +40,15 @@ eastus, uksouth, eastus2, northcentralus, swedencentral, westus, westus2, southc
```
✔️ Check specific model(s) in default regions:
```
./quota_check_params.sh --models gpt-4o:150
./quota_check_params.sh --models gpt-5.1:150
```
✔️ Check default models in specific region(s):
```
./quota_check_params.sh --regions eastus,westus
```
✔️ Passing Both models and regions:
```
./quota_check_params.sh --models gpt-4o:150 --regions eastus,westus2
./quota_check_params.sh --models gpt-5.1:150 --regions eastus,westus2
```
✔️ All parameters combined:
```
Expand Down
47 changes: 25 additions & 22 deletions infra/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -902,24 +902,27 @@ module cosmosDb 'modules/cosmosDb.bicep' = {
// and then updates the container apps to run the freshly built images.
var placeholderContainerImage = 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'

module containerRegistry 'br/public:avm/res/container-registry/registry:0.12.1' = {
name: take('avm.res.container-registry.registry.${solutionSuffix}', 64)
params: {
#disable-next-line BCP334 // solutionSuffix always yields a name of sufficient length at deployment time
name: take('cr${solutionSuffix}', 50)
location: location
acrSku: enableRedundancy ? 'Premium' : 'Standard'
acrAdminUserEnabled: false
zoneRedundancy: enableRedundancy ? 'Enabled' : 'Disabled'
roleAssignments: [
{
principalId: appIdentity.outputs.principalId
principalType: 'ServicePrincipal'
roleDefinitionIdOrName: 'AcrPull'
}
]
tags: allTags
enableTelemetry: enableTelemetry
resource containerRegistry 'Microsoft.ContainerRegistry/registries@2025-11-01' = {
name: take('cr${solutionSuffix}${take(uniqueString(resourceGroup().id), 4)}', 50)
location: location
sku: {
name: enablePrivateNetworking || enableRedundancy ? 'Premium' : 'Standard'
Comment on lines +905 to +909
}
properties: {
adminUserEnabled: false
publicNetworkAccess: enablePrivateNetworking ? 'Disabled' : 'Enabled'
zoneRedundancy: enableRedundancy && enablePrivateNetworking ? 'Enabled' : 'Disabled'
}
tags: allTags
}

resource acrPullRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
name: guid(subscription().subscriptionId, resourceGroup().id, containerRegistry.name, 'AcrPull')
scope: containerRegistry
properties: {
principalId: appIdentity.outputs.principalId
principalType: 'ServicePrincipal'
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7f951dda-4ed3-4680-a7ca-43fe172d538d')
}
}

Expand Down Expand Up @@ -981,7 +984,7 @@ module containerAppBackend 'br/public:avm/res/app/container-app:0.22.0' = {
}
registries: [
{
server: containerRegistry.outputs.loginServer
server: containerRegistry.properties.loginServer
identity: appIdentity.outputs.resourceId
}
]
Expand Down Expand Up @@ -1168,7 +1171,7 @@ module containerAppFrontend 'br/public:avm/res/app/container-app:0.22.0' = {
}
registries: [
{
server: containerRegistry.outputs.loginServer
server: containerRegistry.properties.loginServer
identity: appIdentity.outputs.resourceId
}
]
Expand Down Expand Up @@ -1247,9 +1250,9 @@ output SYNTAX_CHECKER_AGENT_MODEL_DEPLOY string = modelDeployment.name
// Consumed by the post-provision script (scripts/build_and_push_images.*) to build
// and push the application images and update the container apps.
@description('Login server of the Azure Container Registry provisioned for this deployment.')
output AZURE_CONTAINER_REGISTRY_ENDPOINT string = containerRegistry.outputs.loginServer
output AZURE_CONTAINER_REGISTRY_ENDPOINT string = containerRegistry.properties.loginServer
@description('Name of the Azure Container Registry provisioned for this deployment.')
output AZURE_CONTAINER_REGISTRY_NAME string = containerRegistry.outputs.name
output AZURE_CONTAINER_REGISTRY_NAME string = containerRegistry.name
@description('Image tag used when building and pushing the backend/frontend images.')
output AZURE_ENV_IMAGE_TAG string = imageTag
@description('Name of the backend container app to update with the freshly built image.')
Expand Down
Loading