fix: script changes for feature "psl-TASfeature"

.github/workflows/deploy-waf.yml

@@ -25,6 +25,7 @@ jobs:
       GPT_MIN_CAPACITY: 1
       O4_MINI_MIN_CAPACITY: 1
       GPT41_MINI_MIN_CAPACITY: 1
+      GPT_IMAGE_MIN_CAPACITY: 1
     steps:
       - name: Checkout Code
         uses: actions/checkout@v6
@@ -43,6 +44,7 @@ jobs:
           GPT_MIN_CAPACITY: ${{ env.GPT_MIN_CAPACITY }}
           O4_MINI_MIN_CAPACITY: ${{ env.O4_MINI_MIN_CAPACITY }}
           GPT41_MINI_MIN_CAPACITY: ${{ env.GPT41_MINI_MIN_CAPACITY }}
+          GPT_IMAGE_MIN_CAPACITY: ${{ env.GPT_IMAGE_MIN_CAPACITY }}
           AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
         run: |
           chmod +x infra/scripts/checkquota.sh

.github/workflows/deploy.yml

@@ -20,6 +20,7 @@ env:
   GPT_MIN_CAPACITY: 150
   O4_MINI_MIN_CAPACITY: 50
   GPT41_MINI_MIN_CAPACITY: 50
+  GPT_IMAGE_MIN_CAPACITY: 4
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 jobs:
@@ -50,6 +51,7 @@ jobs:
           GPT_MIN_CAPACITY: ${{ env.GPT_MIN_CAPACITY }}
           O4_MINI_MIN_CAPACITY: ${{ env.O4_MINI_MIN_CAPACITY }}
           GPT41_MINI_MIN_CAPACITY: ${{ env.GPT41_MINI_MIN_CAPACITY }}
+          GPT_IMAGE_MIN_CAPACITY: ${{ env.GPT_IMAGE_MIN_CAPACITY }}
           AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
         run: |
           chmod +x infra/scripts/checkquota.sh

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

@@ -348,19 +348,34 @@ jobs:
           INPUT_RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
           AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
           AZURE_RESOURCE_GROUP: ${{ inputs.RESOURCE_GROUP_NAME }}
+          AZURE_ENV_NAME: ${{ steps.get_output_linux.outputs.AZURE_ENV_NAME }}
           BACKEND_URL: ${{ steps.get_output_linux.outputs.BACKEND_URL }}
           AZURE_STORAGE_ACCOUNT_NAME: ${{ steps.get_output_linux.outputs.AZURE_STORAGE_ACCOUNT_NAME }}
-          AZURE_STORAGE_CONTAINER_NAME: sample-dataset
           AZURE_AI_SEARCH_NAME: ${{ steps.get_output_linux.outputs.AZURE_AI_SEARCH_NAME }}
-          AZURE_AI_SEARCH_INDEX_NAME: sample-dataset-index
-          AZURE_ENV_NAME: ${{ steps.get_output_linux.outputs.AZURE_ENV_NAME }}
+          # Needed by post_deploy.sh to resolve the principal id when the workflow
+          # is signed in as a service principal (no interactive user).
+          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
         run: |
           set -e
+
+          # Use the same login pattern as selecting_team_config_and_data.sh:
+          # confirm an Azure CLI session is active. The preceding "Refresh Azure
+          # login" step re-establishes credentials, so we only verify here.
+          if az account show >/dev/null 2>&1; then
+            echo "Already authenticated with Azure."
+          else
+            echo "ERROR: Not authenticated with Azure. The 'Refresh Azure login' step must run before this step."
+            exit 1
+          fi
           az account set --subscription "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
-
-          # Upload team configurations and index sample data in one step
-          # Automatically select "6" (All use cases) for non-interactive deployment
-          echo "6" | bash infra/scripts/selecting_team_config_and_data.sh
+
+          # Run the unified post-deploy script non-interactively.
+          # --use-case 7 installs all use cases; --resource-group enables fallbacks
+          # to deployment outputs / naming-convention if azd env values are missing.
+          bash infra/scripts/post_deploy.sh \
+            --resource-group "$INPUT_RESOURCE_GROUP_NAME" \
+            --use-case 7 \
+            --non-interactive
 
       - name: Generate Deployment Summary
         if: always()

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

@@ -348,24 +348,38 @@ jobs:
           azd auth login --client-id "${{ secrets.AZURE_CLIENT_ID }}" --federated-credential-provider "github" --tenant-id "${{ secrets.AZURE_TENANT_ID }}"
 
       - name: Run Post deployment scripts
-        shell: bash
+        shell: pwsh
         env:
           INPUT_RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
           AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
           AZURE_RESOURCE_GROUP: ${{ inputs.RESOURCE_GROUP_NAME }}
+          AZURE_ENV_NAME: ${{ steps.get_output_windows.outputs.AZURE_ENV_NAME }}
           BACKEND_URL: ${{ steps.get_output_windows.outputs.BACKEND_URL }}
           AZURE_STORAGE_ACCOUNT_NAME: ${{ steps.get_output_windows.outputs.AZURE_STORAGE_ACCOUNT_NAME }}
-          AZURE_STORAGE_CONTAINER_NAME: sample-dataset
           AZURE_AI_SEARCH_NAME: ${{ steps.get_output_windows.outputs.AZURE_AI_SEARCH_NAME }}
-          AZURE_AI_SEARCH_INDEX_NAME: sample-dataset-index
-          AZURE_ENV_NAME: ${{ steps.get_output_windows.outputs.AZURE_ENV_NAME }}
+          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+          PYTHONUTF8: '1'
+          PYTHONIOENCODING: 'utf-8'
         run: |
-          set -e
-          az account set --subscription "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
-
-          # Upload team configurations and index sample data in one step
-          # Automatically select "6" (All use cases) for non-interactive deployment
-          echo "6" | bash infra/scripts/selecting_team_config_and_data.sh
+          $ErrorActionPreference = "Stop"
+          # Confirm an Azure CLI session is active. The preceding "Refresh Azure
+          # login" step re-establishes credentials, so we only verify here.
+          az account show 2>$null | Out-Null
+          if ($LASTEXITCODE -ne 0) {
+            Write-Error "Not authenticated with Azure. The 'Refresh Azure login' step must run before this step."
+            exit 1
+          }
+          Write-Host "Already authenticated with Azure."
+          az account set --subscription "$env:AZURE_SUBSCRIPTION_ID"
+
+          # Run the unified PowerShell post-deploy script non-interactively.
+          # -UseCase 7 installs all use cases; -ResourceGroup enables fallbacks
+          # to deployment outputs / naming-convention if azd env values are missing.
+          ./infra/scripts/post_deploy.ps1 `
+            -ResourceGroup "$env:INPUT_RESOURCE_GROUP_NAME" `
+            -UseCase 7 `
+            -NonInteractive
+          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
       - name: Generate Deployment Summary
         if: always()

.github/workflows/job-deploy.yml

@@ -101,6 +101,7 @@ env:
   GPT_MIN_CAPACITY: 150
   O4_MINI_MIN_CAPACITY: 50
   GPT41_MINI_MIN_CAPACITY: 50
+  GPT_IMAGE_MIN_CAPACITY: 4
   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 }}
   EXP: ${{ inputs.trigger_type == 'workflow_dispatch' && (inputs.EXP || false) || false }}
@@ -309,6 +310,7 @@ jobs:
           GPT_MIN_CAPACITY: ${{ env.GPT_MIN_CAPACITY }}
           O4_MINI_MIN_CAPACITY: ${{ env.O4_MINI_MIN_CAPACITY }}
           GPT41_MINI_MIN_CAPACITY: ${{ env.GPT41_MINI_MIN_CAPACITY }}
+          GPT_IMAGE_MIN_CAPACITY: ${{ env.GPT_IMAGE_MIN_CAPACITY }}
           AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
         run: |
           chmod +x infra/scripts/checkquota.sh

infra/main.bicep

@@ -33,7 +33,7 @@ var deployerInfo = deployer()
 var deployingUserPrincipalId = deployerInfo.objectId
 
 // Restricting deployment to only supported Azure OpenAI regions validated with GPT-4o model
-@allowed(['australiaeast', 'eastus2', 'francecentral', 'japaneast', 'norwayeast', 'swedencentral', 'uksouth', 'westus', 'westus3'])
+@allowed(['polandcentral', 'uaenorth', 'australiaeast', 'eastus2', 'francecentral', 'japaneast', 'norwayeast', 'swedencentral', 'uksouth', 'westus', 'westus3'])
 @metadata({
   azd: {
     type: 'location'
@@ -137,8 +137,8 @@ param gpt5MiniModelCapacity int = 50
 @description('Optional. GPT image model deployment type. Defaults to GlobalStandard.')
 param gptImageModelDeploymentType string = 'GlobalStandard'
 
-@description('Optional. gpt-image-1.5 deployment capacity (RPM). Defaults to 5 to support concurrent marketing-image generation across multiple sessions.')
-param gptImageModelCapacity int = 5
+@description('Optional. gpt-image-1.5 deployment capacity (RPM). Defaults to 4 to support concurrent marketing-image generation across multiple sessions.')
+param gptImageModelCapacity int = 4
 
 @description('Optional. The tags to apply to all deployed Azure resources.')
 param tags resourceInput<'Microsoft.Resources/resourceGroups@2025-04-01'>.tags = {}

infra/main_custom.bicep

@@ -123,8 +123,8 @@ param gpt4_1ModelCapacity int = 150
 @description('Optional. o4-mini deployment capacity (thousand TPM). Used by the Magentic manager (multi-turn planning + reflection). Defaults to 100.')
 param gptReasoningModelCapacity int = 100
 
-@description('Optional. gpt-image-1.5 deployment capacity (RPM). Defaults to 5 to support concurrent marketing-image generation across multiple sessions.')
-param gptImageModelCapacity int = 5
+@description('Optional. gpt-image-1.5 deployment capacity (RPM). Defaults to 4 to support concurrent marketing-image generation across multiple sessions.')
+param gptImageModelCapacity int = 4
 
 @description('Optional. The tags to apply to all deployed Azure resources.')
 param tags resourceInput<'Microsoft.Resources/resourceGroups@2025-04-01'>.tags = {}

infra/scripts/checkquota.sh

@@ -7,12 +7,13 @@ SUBSCRIPTION_ID="${AZURE_SUBSCRIPTION_ID}"
 GPT_MIN_CAPACITY="${GPT_MIN_CAPACITY}"
 O4_MINI_MIN_CAPACITY="${O4_MINI_MIN_CAPACITY}"
 GPT41_MINI_MIN_CAPACITY="${GPT41_MINI_MIN_CAPACITY}"
+GPT_IMAGE_MIN_CAPACITY="${GPT_IMAGE_MIN_CAPACITY:-4}"
 
 echo "🔄 Validating required environment variables..."
 if [[ -z "$SUBSCRIPTION_ID" || -z "$REGIONS" ]]; then
     echo "❌ ERROR: Missing required environment variables."
     echo "Required: AZURE_SUBSCRIPTION_ID, AZURE_REGIONS"
-    echo "Optional: O4_MINI_MIN_CAPACITY (default: 50), GPT41_MINI_MIN_CAPACITY (default: 50)"
+    echo "Optional: O4_MINI_MIN_CAPACITY (default: 50), GPT41_MINI_MIN_CAPACITY (default: 50), GPT_IMAGE_MIN_CAPACITY (default: 4)"
     exit 1
 fi
 
@@ -28,6 +29,7 @@ declare -A MIN_CAPACITY=(
     ["OpenAI.GlobalStandard.o4-mini"]="${O4_MINI_MIN_CAPACITY}"
     ["OpenAI.GlobalStandard.gpt4.1"]="${GPT_MIN_CAPACITY}"
     ["OpenAI.GlobalStandard.gpt4.1-mini"]="${GPT41_MINI_MIN_CAPACITY}"
+    ["OpenAI.GlobalStandard.gpt-image-1.5"]="${GPT_IMAGE_MIN_CAPACITY}"
 )
 
 VALID_REGION=""