chore: dev to main merge

Author: Avijit-Microsoft

.github/workflows/deploy-orchestrator.yml

@@ -77,10 +77,8 @@ env:
 
 jobs:
   docker-build:
+    if: inputs.trigger_type == 'workflow_dispatch' && inputs.build_docker_image == true
     uses: ./.github/workflows/job-docker-build.yml
-    with:
-      trigger_type: ${{ inputs.trigger_type }}
-      build_docker_image: ${{ inputs.build_docker_image }}
     secrets: inherit
 
   deploy:

.github/workflows/job-deploy-linux.yml

@@ -264,7 +264,7 @@ jobs:
           # Set ACR name only when building Docker image
           if [[ "$BUILD_DOCKER_IMAGE" == "true" ]]; then
             # Extract ACR name from login server and set as environment variable
-            AZURE_ENV_CONTAINER_REGISTRY_NAME=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}" | cut -d'.' -f1)
+            AZURE_ENV_CONTAINER_REGISTRY_NAME=$(echo "${{ vars.ACR_TEST_LOGIN_SERVER }}" | cut -d'.' -f1)
             azd env set AZURE_ENV_CONTAINER_REGISTRY_NAME="$AZURE_ENV_CONTAINER_REGISTRY_NAME"
             echo "Set ACR name to: $AZURE_ENV_CONTAINER_REGISTRY_NAME"
           else

.github/workflows/job-deploy-windows.yml

@@ -267,7 +267,7 @@ jobs:
           # Set ACR name only when building Docker image
           if ($env:BUILD_DOCKER_IMAGE -eq "true") {
             # Extract ACR name from login server (e.g., myacr.azurecr.io -> myacr)
-            $AZURE_ENV_CONTAINER_REGISTRY_NAME = ("${{ secrets.ACR_TEST_LOGIN_SERVER }}").Split('.')[0]
+            $AZURE_ENV_CONTAINER_REGISTRY_NAME = ("${{ vars.ACR_TEST_LOGIN_SERVER }}").Split('.')[0]
             azd env set AZURE_ENV_CONTAINER_REGISTRY_NAME="$AZURE_ENV_CONTAINER_REGISTRY_NAME"
             Write-Host "Set ACR name to: $AZURE_ENV_CONTAINER_REGISTRY_NAME"
           } else {

.github/workflows/job-deploy.yml

@@ -100,7 +100,7 @@ on:
         value: ${{ jobs.azure-setup.outputs.QUOTA_FAILED || 'false' }}
 
 env:
-  GPT_MIN_CAPACITY: 150
+  GPT_MIN_CAPACITY: 50
   IMAGE_MODEL_MIN_CAPACITY: 1
   BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.head_ref || github.ref_name }}
   WAF_ENABLED: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.waf_enabled || false) || false }}

.github/workflows/job-docker-build.yml

@@ -1,28 +1,22 @@
-name: Docker Build Job
+name: Build & Push Test Images (Feature Branch)
 
 on:
   workflow_call:
-    inputs:
-      trigger_type:
-        description: 'Trigger type (workflow_dispatch, pull_request, schedule)'
-        required: true
-        type: string
-      build_docker_image:
-        description: 'Build And Push Docker Image (Optional)'
-        required: false
-        default: false
-        type: boolean
     outputs:
       AZURE_ENV_IMAGE_TAG:
         description: "Generated Docker Image Tag"
         value: ${{ jobs.docker-build.outputs.AZURE_ENV_IMAGE_TAG }}
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  id-token: write  
 
 env:
   BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.head_ref || github.ref_name }}
 
 jobs:
   docker-build:
-    if: inputs.trigger_type == 'workflow_dispatch' && inputs.build_docker_image == true
     runs-on: ubuntu-latest
     environment: production
     outputs:
@@ -57,7 +51,10 @@ jobs:
 
       - name: Log in to Azure Container Registry
         shell: bash
-        run: az acr login --name ${{ secrets.ACR_TEST_LOGIN_SERVER }}
+        run: |
+          # Extract registry name from login server (e.g., myacr.azurecr.io -> myacr)
+          ACR_NAME=$(echo "${{ vars.ACR_TEST_LOGIN_SERVER }}" | cut -d'.' -f1)
+          az acr login --name "$ACR_NAME"
 
       - name: Build and Push Docker Image for Frontend Server
         id: build_push_frontend
@@ -69,8 +66,8 @@ jobs:
           file: ./src/App/WebApp.Dockerfile
           push: true
           tags: |
-            ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-app:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}
-            ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-app:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}_${{ github.run_number }}
+            ${{ vars.ACR_TEST_LOGIN_SERVER }}/content-gen-app:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}
+            ${{ vars.ACR_TEST_LOGIN_SERVER }}/content-gen-app:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}_${{ github.run_number }}
 
       - name: Build and Push Docker Image for Backend Server
         id: build_push_backend
@@ -82,8 +79,8 @@ jobs:
           file: ./src/backend/ApiApp.Dockerfile
           push: true
           tags: |
-            ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-api:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}
-            ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-api:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}_${{ github.run_number }}
+            ${{ vars.ACR_TEST_LOGIN_SERVER }}/content-gen-api:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}
+            ${{ vars.ACR_TEST_LOGIN_SERVER }}/content-gen-api:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}_${{ github.run_number }}
 
       - name: Verify Docker Image Build
         shell: bash
@@ -95,7 +92,7 @@ jobs:
         if: always()
         shell: bash
         run: |
-          AZURE_ENV_CONTAINER_REGISTRY_SERVER=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}")
+          AZURE_ENV_CONTAINER_REGISTRY_SERVER=$(echo "${{ vars.ACR_TEST_LOGIN_SERVER }}")
           echo "## 🐳 Docker Build Job Summary" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY

docs/CustomizingAzdParameters.md

@@ -14,7 +14,7 @@ By default this template will use the environment name as the prefix to prevent
 | `AZURE_ENV_GPT_MODEL_NAME`              | string  | `gpt-5.1`                 | Specifies the GPT model name to deploy.                                       |
 | `AZURE_ENV_GPT_MODEL_VERSION`                    | string  | `2025-11-13`               | Sets the GPT model version.                                                   |
 | `AZURE_ENV_MODEL_DEPLOYMENT_TYPE`            | string  | `GlobalStandard`           | Defines the model deployment type (allowed: `Standard`, `GlobalStandard`).    |
-| `AZURE_ENV_GPT_MODEL_CAPACITY`                   | integer | `150`                      | Sets the GPT model token capacity (minimum: `10`).                            |
+| `AZURE_ENV_GPT_MODEL_CAPACITY`                   | integer | `50`                      | Sets the GPT model token capacity (minimum: `10`).                            |
 | `AZURE_ENV_IMAGE_MODEL_NAME`           | string  | `gpt-image-1-mini`         | Image model to deploy (allowed: `gpt-image-1-mini`, `gpt-image-1.5`, `none`). |
 | `AZURE_ENV_IMAGE_MODEL_CAPACITY`       | integer | `1`                        | Sets the image model deployment capacity in RPM (minimum: `1`).               |
 | `AZURE_ENV_OPENAI_API_VERSION`            | string  | `2025-01-01-preview`       | Specifies the API version for Azure OpenAI service.                           |

docs/DEPLOYMENT.md

@@ -139,7 +139,7 @@ When you start the deployment, most parameters will have **default values**, but
 | **GPT Model**                               | Choose from **gpt-4, gpt-4o, gpt-4o-mini, gpt-5.1**.                                                               | gpt-5.1           |
 | **GPT Model Version**                       | The version of the selected GPT model.                                                                    | 2025-11-13            |
 | **OpenAI API Version**                      | The Azure OpenAI API version to use.                                                                      | 2025-01-01-preview     |
-| **GPT Model Deployment Capacity**           | Configure capacity for **GPT models** (in thousands).                                                     | 150k                    |
+| **GPT Model Deployment Capacity**           | Configure capacity for **GPT models** (in thousands).                                                     | 50k                    |
 | **Image Model**                            | Choose from **gpt-image-1-mini, gpt-image-1.5**                                                                               | gpt-image-1-mini                  |
 | **Image Tag**                               | Docker image tag to deploy. Common values: `latest`, `dev`, `hotfix`.                                     | latest                 |
 | **Existing Log Analytics Workspace**        | To reuse an existing Log Analytics Workspace ID.                                                          | *(empty)*              |
@@ -150,7 +150,7 @@ When you start the deployment, most parameters will have **default values**, but
 <details>
   <summary><b>[Optional] Quota Recommendations</b></summary>
 
-By default, the **GPT-5.1 model capacity** in deployment is set to **150k tokens**, so we recommend updating the following:
+By default, the **GPT-5.1 model capacity** in deployment is set to **50k tokens**, so we recommend updating the following:
 
 > **For GPT-5.1 - increase the capacity post-deployment for optimal performance if required.**
 

docs/QuotaCheck.md

@@ -2,7 +2,7 @@
 
 Before deploying the Content Generation Solution Accelerator, **ensure sufficient quota availability** for the required models.
 
-> **For Global Standard | GPT-5.1 - ensure capacity to at least 150 tokens post-deployment for optimal performance.**
+> **For Global Standard | GPT-5.1 - ensure capacity to at least 50 tokens post-deployment for optimal performance.**
 
 > **For Global Standard | GPT-Image-1-mini - ensure capacity to at least 1 RPM (Requests Per Minute) for image generation.**
 
@@ -15,7 +15,7 @@ az login
 
 ### 📌 Default Models & Capacities:
 ```
-gpt-5.1:150,gpt-image-1-mini:1
+gpt-5.1:50,gpt-image-1-mini:1
 ```
 **Note:** GPT-5.1 capacity is in tokens, GPT-Image-1-mini capacity is in RPM (Requests Per Minute).
 ### 📌 Default Regions:
@@ -42,19 +42,19 @@ australiaeast, centralus, eastasia, eastus, eastus2, japaneast, northeurope, sou
    ```
 ✔️ Check specific model(s) in default regions:
   ```
-  ./quota_check_params.sh --models gpt-5.1:150,gpt-image-1-mini:1
+  ./quota_check_params.sh --models gpt-5.1:50,gpt-image-1-mini:1
   ```
 ✔️ Check default models in specific region(s):
   ```
 ./quota_check_params.sh --regions eastus,swedencentral
   ```
 ✔️ Passing Both models and regions:
   ```
-  ./quota_check_params.sh --models gpt-5.1:150,gpt-image-1-mini:1 --regions eastus,swedencentral
+  ./quota_check_params.sh --models gpt-5.1:50,gpt-image-1-mini:1 --regions eastus,swedencentral
   ```
 ✔️ All parameters combined:
   ```
- ./quota_check_params.sh --models gpt-5.1:150,gpt-image-1-mini:1 --regions eastus,swedencentral --verbose
+ ./quota_check_params.sh --models gpt-5.1:50,gpt-image-1-mini:1 --regions eastus,swedencentral --verbose
   ```
 
 ### **Sample Output**

infra/main.bicep

@@ -56,7 +56,7 @@ param secondaryLocation string = 'uksouth'
   azd: {
     type: 'location'
     usageName: [
-      'OpenAI.GlobalStandard.gpt-5.1,150'
+      'OpenAI.GlobalStandard.gpt-5.1,50'
       'OpenAI.GlobalStandard.gpt-image-1-mini,1'
     ]
   }
@@ -92,7 +92,7 @@ param azureOpenaiAPIVersion string = '2025-01-01-preview'
 
 @minValue(10)
 @description('Optional. AI model deployment token capacity.')
-param gptModelCapacity int = 150
+param gptModelCapacity int = 50
 
 @minValue(1)
 @description('Optional. Image model deployment capacity (RPM).')
@@ -675,6 +675,11 @@ module aiServicesPrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.1
       ]
     }
   }
+  dependsOn: [
+    aiFoundryAiServices
+    virtualNetwork
+    avmPrivateDnsZones
+  ]
 }
 
 module aiFoundryAiServicesProject 'modules/ai-project.bicep' = if (!useExistingAiFoundryAiProject) {
@@ -750,12 +755,12 @@ module aiSearch 'br/public:avm/res/search/search-service:0.12.0' = {
     roleAssignments: [
       {
         principalId: userAssignedIdentity.outputs.principalId
-        roleDefinitionIdOrName: 'Search Index Data Contributor'
+        roleDefinitionIdOrName: '8ebe5a00-799e-43f5-93ac-243d3dce84a7' // Search Index Data Contributor
         principalType: 'ServicePrincipal'
       }
       {
         principalId: userAssignedIdentity.outputs.principalId
-        roleDefinitionIdOrName: 'Search Service Contributor'
+        roleDefinitionIdOrName: '7ca78c08-252a-4471-8644-bb5ff32d4ba0' // Search Service Contributor
         principalType: 'ServicePrincipal'
       }
     ]
@@ -802,7 +807,7 @@ module storageAccount 'br/public:avm/res/storage/storage-account:0.32.0' = {
     roleAssignments: [
       {
         principalId: userAssignedIdentity.outputs.principalId
-        roleDefinitionIdOrName: 'Storage Blob Data Contributor'
+        roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' // Storage Blob Data Contributor
         principalType: 'ServicePrincipal'
       }
     ]

infra/main.json

@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.43.8.12551",
-      "templateHash": "11476101976733556609"
+      "version": "0.44.1.10279",
+      "templateHash": "6689866125639874285"
     },
     "name": "Intelligent Content Generation Accelerator",
     "description": "Solution Accelerator for multimodal marketing content generation using Microsoft Agent Framework.\n"
@@ -79,7 +79,7 @@
         "azd": {
           "type": "location",
           "usageName": [
-            "OpenAI.GlobalStandard.gpt-5.1,150",
+            "OpenAI.GlobalStandard.gpt-5.1,50",
             "OpenAI.GlobalStandard.gpt-image-1-mini,1"
           ]
         },
@@ -134,7 +134,7 @@
     },
     "gptModelCapacity": {
       "type": "int",
-      "defaultValue": 150,
+      "defaultValue": 50,
       "minValue": 10,
       "metadata": {
         "description": "Optional. AI model deployment token capacity."
@@ -4849,8 +4849,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.43.8.12551",
-              "templateHash": "10553796402276006272"
+              "version": "0.44.1.10279",
+              "templateHash": "6557649947950257832"
             }
           },
           "parameters": {
@@ -26158,8 +26158,7 @@
       },
       "dependsOn": [
         "aiFoundryAiServices",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
+        "avmPrivateDnsZones",
         "virtualNetwork"
       ]
     },
@@ -26199,8 +26198,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.43.8.12551",
-              "templateHash": "10492947109706449236"
+              "version": "0.44.1.10279",
+              "templateHash": "10687287011543111358"
             }
           },
           "parameters": {
@@ -26337,8 +26336,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.43.8.12551",
-              "templateHash": "11951897391539128934"
+              "version": "0.44.1.10279",
+              "templateHash": "11714054478009335704"
             }
           },
           "parameters": {
@@ -26461,8 +26460,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.43.8.12551",
-              "templateHash": "12839007615076660968"
+              "version": "0.44.1.10279",
+              "templateHash": "15628220945119743042"
             }
           },
           "parameters": {
@@ -26568,12 +26567,12 @@
             "value": [
               {
                 "principalId": "[reference('userAssignedIdentity').outputs.principalId.value]",
-                "roleDefinitionIdOrName": "Search Index Data Contributor",
+                "roleDefinitionIdOrName": "8ebe5a00-799e-43f5-93ac-243d3dce84a7",
                 "principalType": "ServicePrincipal"
               },
               {
                 "principalId": "[reference('userAssignedIdentity').outputs.principalId.value]",
-                "roleDefinitionIdOrName": "Search Service Contributor",
+                "roleDefinitionIdOrName": "7ca78c08-252a-4471-8644-bb5ff32d4ba0",
                 "principalType": "ServicePrincipal"
               }
             ]
@@ -28682,7 +28681,7 @@
             "value": [
               {
                 "principalId": "[reference('userAssignedIdentity').outputs.principalId.value]",
-                "roleDefinitionIdOrName": "Storage Blob Data Contributor",
+                "roleDefinitionIdOrName": "ba92f5b4-2d11-453d-a403-e96b0029c9fe",
                 "principalType": "ServicePrincipal"
               }
             ]
@@ -43605,8 +43604,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.43.8.12551",
-              "templateHash": "1750084008268987068"
+              "version": "0.44.1.10279",
+              "templateHash": "5713718252926392689"
             }
           },
           "definitions": {
@@ -44644,8 +44643,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.43.8.12551",
-                      "templateHash": "3262149826084752172"
+                      "version": "0.44.1.10279",
+                      "templateHash": "2616621918371988230"
                     },
                     "name": "Site App Settings",
                     "description": "This module deploys a Site App Setting."
@@ -45693,8 +45692,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.43.8.12551",
-              "templateHash": "4497918681275542632"
+              "version": "0.44.1.10279",
+              "templateHash": "3218681246740688998"
             }
           },
           "parameters": {