updated the waf and nonwaf pipeline

Author: Dhruvkumar-Microsoft

.github/workflows/deploy-waf.yml

@@ -6,6 +6,7 @@ on:
       - main
   schedule:
     - cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT
+  workflow_dispatch:
 
 jobs:
   deploy:
@@ -21,7 +22,9 @@ jobs:
           export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
           export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
           export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
-          export GPT_MIN_CAPACITY="150"
+          export GPT_MIN_CAPACITY="1"
+          export O4_MINI_MIN_CAPACITY="1"
+          export GPT41_MINI_MIN_CAPACITY="1"
           export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
 
           chmod +x infra/scripts/checkquota.sh
@@ -116,7 +119,9 @@ jobs:
               solutionName=${{ env.SOLUTION_PREFIX }} \
               location="${{ env.AZURE_LOCATION }}" \
               azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \
-              gptModelCapacity=5 \
+              gptModelCapacity=${{ env.GPT_MIN_CAPACITY }} \
+              gpt4_1ModelCapacity=${{ env.GPT41_MINI_MIN_CAPACITY }} \
+              gptReasoningModelCapacity=${{ env.O4_MINI_MIN_CAPACITY }} \
               enableTelemetry=true \
               enableMonitoring=true \
               enablePrivateNetworking=true \

.github/workflows/deploy.yml

@@ -13,7 +13,9 @@ on:
     - cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT
   workflow_dispatch: #Allow manual triggering
 env:
-  GPT_MIN_CAPACITY: 1
+  GPT_MIN_CAPACITY: 150
+  O4_MINI_MIN_CAPACITY: 50
+  GPT41_MINI_MIN_CAPACITY: 50
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 jobs:
@@ -36,7 +38,9 @@ jobs:
           export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
           export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
           export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
-          export GPT_MIN_CAPACITY="1"
+          export GPT_MIN_CAPACITY="150"
+          export O4_MINI_MIN_CAPACITY="50"
+          export GPT41_MINI_MIN_CAPACITY="50"
           export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
 
           chmod +x infra/scripts/checkquota.sh

infra/scripts/checkquota.sh

@@ -5,6 +5,8 @@ IFS=', ' read -ra REGIONS <<< "$AZURE_REGIONS"
 
 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}"
 AZURE_CLIENT_ID="${AZURE_CLIENT_ID}"
 AZURE_TENANT_ID="${AZURE_TENANT_ID}"
 AZURE_CLIENT_SECRET="${AZURE_CLIENT_SECRET}"
@@ -17,8 +19,10 @@ if ! az login --service-principal -u "$AZURE_CLIENT_ID" -p "$AZURE_CLIENT_SECRET
 fi
 
 echo "🔄 Validating required environment variables..."
-if [[ -z "$SUBSCRIPTION_ID" || -z "$GPT_MIN_CAPACITY" || -z "$REGIONS" ]]; then
+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)"
     exit 1
 fi
 
@@ -31,9 +35,9 @@ echo "✅ Azure subscription set successfully."
 
 # Define models and their minimum required capacities
 declare -A MIN_CAPACITY=(
-    ["OpenAI.GlobalStandard.o4-mini"]=50
-    ["OpenAI.GlobalStandard.gpt4.1"]=150
-    ["OpenAI.GlobalStandard.gpt4.1-mini"]=50
+    ["OpenAI.GlobalStandard.o4-mini"]="${O4_MINI_MIN_CAPACITY}"
+    ["OpenAI.GlobalStandard.gpt4.1"]="${GPT_MIN_CAPACITY}"
+    ["OpenAI.GlobalStandard.gpt4.1-mini"]="${GPT41_MINI_MIN_CAPACITY}"
 )
 
 VALID_REGION=""

infra/scripts/upload_team_config.py

@@ -40,7 +40,6 @@ def check_team_exists(backend_url, team_id, user_principal_id):
 backend_url = sys.argv[1]
 directory_path = sys.argv[2]
 user_principal_id = sys.argv[3] if len(sys.argv) > 3 and sys.argv[3].strip() != "" else "00000000-0000-0000-0000-000000000000"
-print("User principal from py : " + user_principal_id)
 
 # Convert to absolute path if provided as relative
 directory_path = os.path.abspath(directory_path)