resolved conflict

Author: Priyanka-Microsoft

.github/CODEOWNERS

@@ -2,4 +2,4 @@
 # Each line is a file pattern followed by one or more owners.
 
 # These owners will be the default owners for everything in the repo.
-* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft @marktayl1 @Fr4nc3 @Vinay-Microsoft @aniaroramsft
+* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft @marktayl1 @Fr4nc3 @Vinay-Microsoft @aniaroramsft @toherman-msft @nchandhi

.github/workflows/azure-dev.yml

@@ -1,8 +1,5 @@
 name: Azure Template Validation
 on:
-  push:
-    branches:
-      - main
   workflow_dispatch:
 
 permissions:
@@ -37,6 +34,8 @@ jobs:
           AZURE_ENV_MODEL_CAPACITY: 1
           AZURE_ENV_MODEL_4_1_CAPACITY: 1
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }}
+
       # Step 3: Print the result of the validation 
       - name: print result
         run: cat ${{ steps.validation.outputs.resultFile }}

.github/workflows/deploy-waf.yml

@@ -10,6 +10,10 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    env:
+      GPT_MIN_CAPACITY: 1
+      O4_MINI_MIN_CAPACITY: 1
+      GPT41_MINI_MIN_CAPACITY: 1
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
@@ -21,7 +25,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 +122,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

@@ -2,7 +2,7 @@ name: Validate Deployment v3
 
 on:
   workflow_run:
-    workflows: ["Build Docker and Optional Push"]
+    workflows: ["Build Docker and Optional Push v3"]
     types:
       - completed
     branches:
@@ -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
@@ -122,7 +126,7 @@ jobs:
           elif [[ "${{ env.BRANCH_NAME }}" == "hotfix" ]]; then
             IMAGE_TAG="hotfix"
           else
-            IMAGE_TAG="latest"
+            IMAGE_TAG="latest_v3"
           fi
 
           # Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
@@ -135,12 +139,12 @@ jobs:
               solutionName=${{ env.SOLUTION_PREFIX }} \
               location="${{ env.AZURE_LOCATION }}" \
               gptModelDeploymentType="GlobalStandard" \
-              gptModelName="gpt-4o" \
-              gptModelVersion="2024-08-06" \
+              gptModelName="gpt-4.1-mini" \
+              gptModelVersion="2025-04-14" \
               backendContainerImageTag="${IMAGE_TAG}" \
               frontendContainerImageTag="${IMAGE_TAG}" \
               azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \
-              gptModelCapacity=1 \
+              gptModelCapacity=50 \
               createdBy="Pipeline" \
               tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" \
             --output json
@@ -159,9 +163,10 @@ jobs:
       - name: Get Container App Backend URL
         id: get_backend_url
         run: |
+          # Get specifically the backend container app (not the MCP container app)
           CONTAINER_APP_NAME=$(az containerapp list \
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
-            --query "[0].name" -o tsv)
+            --query "[?starts_with(name, 'ca-') && !contains(name, 'mcp')].name" -o tsv)
 
           MACAE_URL_API=$(az containerapp show \
             --name "$CONTAINER_APP_NAME" \
@@ -171,6 +176,38 @@ jobs:
           echo "MACAE_URL_API=https://${MACAE_URL_API}" >> $GITHUB_OUTPUT
           echo "CONTAINER_APP=${CONTAINER_APP_NAME}" >> $GITHUB_OUTPUT
 
+      - name: Run Post deployment scripts
+        run: |
+          set -e
+          az account set --subscription "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
+
+          echo "Running post-deployment script..."
+          
+          # Extract required resource names from the deployment
+          STORAGE_ACCOUNT=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --resource-type "Microsoft.Storage/storageAccounts" --query "[0].name" -o tsv)
+          AI_SEARCH=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --resource-type "Microsoft.Search/searchServices" --query "[0].name" -o tsv)
+          
+          echo "Found Storage Account: $STORAGE_ACCOUNT"
+          echo "Found AI Search Service: $AI_SEARCH"
+          echo "Backend URL: ${{ steps.get_backend_url.outputs.MACAE_URL_API }}"
+          
+          # Run upload team config script with parameters
+          bash infra/scripts/upload_team_config.sh \
+            "${{ steps.get_backend_url.outputs.MACAE_URL_API }}" \
+            "data/agent_teams" \
+            "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
+          
+          # Run process sample data script with parameters
+          bash infra/scripts/process_sample_data.sh \
+            "$STORAGE_ACCOUNT" \
+            "sample-dataset" \
+            "$AI_SEARCH" \
+            "sample-dataset-index" \
+            "${{ env.RESOURCE_GROUP_NAME }}" \
+            "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
+
+          echo "=== Post-Deployment Script Completed Successfully ==="
+
       - name: Set Deployment Status
         id: deployment_status
         if: always()
@@ -181,9 +218,20 @@ jobs:
             echo "SUCCESS=false" >> $GITHUB_OUTPUT
           fi
 
+  e2e-test:
+    needs: deploy
+    if: needs.deploy.outputs.DEPLOYMENT_SUCCESS == 'true'
+    uses: ./.github/workflows/test-automation.yml
+    with:
+      MACAE_WEB_URL: ${{ needs.deploy.outputs.WEBAPP_URL }}
+      MACAE_URL_API: ${{ needs.deploy.outputs.MACAE_URL_API }}
+      MACAE_RG: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}
+      MACAE_CONTAINER_APP: ${{ needs.deploy.outputs.CONTAINER_APP }}
+    secrets: inherit
+
   cleanup-deployment:
     if: always() && needs.deploy.outputs.RESOURCE_GROUP_NAME != ''
-    needs: [deploy]
+    needs: [deploy, e2e-test]
     runs-on: ubuntu-latest
     env:
       RESOURCE_GROUP_NAME: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}

.github/workflows/test-automation.yml

@@ -31,7 +31,7 @@ jobs:
       MACAE_URL_API: ${{ inputs.MACAE_URL_API }}
       MACAE_RG: ${{ inputs.MACAE_RG }}
       MACAE_CONTAINER_APP: ${{ inputs.MACAE_CONTAINER_APP }}
-      accelerator_name: "MACAE"
+      accelerator_name: "MACAE v3"
 
     steps:
       - name: Checkout repository

README.md

@@ -15,6 +15,9 @@ The Multi-Agent Custom Automation Engine solution accelerator allows users to sp
 </div>
 <br/>
 
+**Note:** With any AI solutions you create using these templates, you are responsible for assessing all associated risks and for complying with all applicable laws and safety standards. Learn more in the transparency documents for [Agent Service](https://learn.microsoft.com/en-us/azure/ai-foundry/responsible-ai/agents/transparency-note) and [Agent Framework](https://github.com/microsoft/agent-framework/blob/main/TRANSPARENCY_FAQ.md).
+<br/>
+
 <h2><img src="./docs/images/readme/solution-overview.png" width="48" />
 Solution overview
 </h2>
@@ -72,8 +75,8 @@ Follow the quick deploy steps on the deployment guide to deploy this solution to
 [Click here to launch the deployment guide](./docs/DeploymentGuide.md)
 <br/><br/>
 
-| [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) | [![Open in Dev Containers](https://img.shields.io/static/v1?style=for-the-badge&label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) |
-|---|---|
+| [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) | [![Open in Dev Containers](https://img.shields.io/static/v1?style=for-the-badge&label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) | [![Open in Visual Studio Code Web](https://img.shields.io/static/v1?style=for-the-badge&label=Visual%20Studio%20Code%20(Web)&message=Open&color=blue&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/azure/?vscode-azure-exp=foundry&agentPayload=eyJiYXNlVXJsIjogImh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS9taWNyb3NvZnQvTXVsdGktQWdlbnQtQ3VzdG9tLUF1dG9tYXRpb24tRW5naW5lLVNvbHV0aW9uLUFjY2VsZXJhdG9yL3JlZnMvaGVhZHMvbWFpbi9pbmZyYS92c2NvZGVfd2ViIiwgImluZGV4VXJsIjogIi9pbmRleC5qc29uIiwgInZhcmlhYmxlcyI6IHsiYWdlbnRJZCI6ICIiLCAiY29ubmVjdGlvblN0cmluZyI6ICIiLCAidGhyZWFkSWQiOiAiIiwgInVzZXJNZXNzYWdlIjogIiIsICJwbGF5Z3JvdW5kTmFtZSI6ICIiLCAibG9jYXRpb24iOiAiIiwgInN1YnNjcmlwdGlvbklkIjogIiIsICJyZXNvdXJjZUlkIjogIiIsICJwcm9qZWN0UmVzb3VyY2VJZCI6ICIiLCAiZW5kcG9pbnQiOiAiIn0sICJjb2RlUm91dGUiOiBbImFpLXByb2plY3RzLXNkayIsICJweXRob24iLCAiZGVmYXVsdC1henVyZS1hdXRoIiwgImVuZHBvaW50Il19) | 
+|---|---|---|
 
 <br/>
 

azure.yaml

@@ -8,33 +8,60 @@ hooks:
   postdeploy:
     windows:
       run: |
-        Write-Host "To upload Team Configurations to Cosmos. Run the following command in PowerShell:"
-        Write-Host "infra\scripts\Upload-Team-Config.ps1" -ForegroundColor Cyan
         Write-Host ""
-        Write-Host "To index Sample Data into Azure Search. Run the following command in PowerShell:"
-        Write-Host "infra\scripts\Process-Sample-Data.ps1" -ForegroundColor Cyan
+        Write-Host "===============================================================" -ForegroundColor Yellow
+        Write-Host " POST-DEPLOYMENT STEPS (PowerShell) " -ForegroundColor Green
+        Write-Host "===============================================================" -ForegroundColor Yellow
         Write-Host ""
-        Write-Host "To upload team configurations and index sample data both in one command, you can use the following command in PowerShell:"
-        Write-Host "infra\scripts\Team-Config-And-Data.ps1" -ForegroundColor Cyan
+
+        Write-Host " STEP 1: Upload Team Configurations to Cosmos DB" -ForegroundColor White
+        Write-Host "  👉 Run the following command in PowerShell:" -ForegroundColor White
+        Write-Host "   infra\scripts\Upload-Team-Config.ps1" -ForegroundColor Cyan
+        Write-Host ""
+
+        Write-Host " STEP 2: Index Sample Data into Azure Search" -ForegroundColor White
+        Write-Host "  👉 Run the following command in PowerShell:" -ForegroundColor White
+        Write-Host "   infra\scripts\Process-Sample-Data.ps1" -ForegroundColor Cyan
+        Write-Host ""
+
+        Write-Host "💡 Alternatively, you can run above BOTH steps together using:" -ForegroundColor Yellow
+        Write-Host "   infra\scripts\Team-Config-And-Data.ps1" -ForegroundColor Cyan
+        Write-Host ""
+
+        Write-Host "🌐 Access your deployed Frontend application at:" -ForegroundColor Green
+        Write-Host "   https://$env:webSiteDefaultHostname" -ForegroundColor Cyan
         Write-Host ""
-        Write-Host "You can access the deployed Frontend application at the following URL:"
-        Write-Host "https://$env:webSiteDefaultHostname" -ForegroundColor Cyan
       shell: pwsh
       interactive: true
     posix:
       run: |
         Blue='\033[0;34m'
+        Green='\033[0;32m'
+        Yellow='\033[1;33m'
         NC='\033[0m'
-        echo "To upload Team Configurations to Cosmos. Run the following command in Bash:"
-        echo "${Blue}bash infra/scripts/upload_team_config.sh"
+
+        echo ""
+        echo "${Yellow}==============================================================="
+        echo "${Green} POST-DEPLOYMENT STEPS (Bash) "
+        echo "${Yellow}===============================================================${NC}"
+        echo ""
+
+        echo " STEP 1: Upload Team Configurations to Cosmos DB"
+        echo "  👉 Run the following command in Bash:"
+        echo "   ${Blue}bash infra/scripts/upload_team_config.sh${NC}"
+        echo ""
+
+        echo " STEP 2: Index Sample Data into Azure Search"
+        echo "  👉 Run the following command in Bash:"
+        echo "   ${Blue}bash infra/scripts/process_sample_data.sh${NC}"
         echo ""
-        echo "${NC}To index Sample Data into Azure Search. Run the following command in Bash:"
-        echo "${Blue}bash infra/scripts/process_sample_data.sh"
+
+        echo "💡 Alternatively, you can run above BOTH steps together using:"
+        echo "   ${Blue}bash infra/scripts/team_config_and_data.sh${NC}"
         echo ""
-        echo "${NC}To upload team configurations and index sample data both in one command, you can use the following command in Bash:"
-        echo "${Blue}bash infra/scripts/team_config_and_data.sh"
+
+        echo "🌐 Access your deployed Frontend application at:"
+        echo "   ${Blue}https://$webSiteDefaultHostname${NC}"
         echo ""
-        echo "${NC}You can access the deployed Frontend application at the following URL:"
-        echo "${Blue}https://$webSiteDefaultHostname"
       shell: sh
       interactive: true

azure_custom.yaml

@@ -45,33 +45,60 @@ hooks:
   postdeploy:
     windows:
       run: |
-        Write-Host "To upload Team Configurations to Cosmos. Run the following command in PowerShell:"
-        Write-Host "infra\scripts\Upload-Team-Config.ps1" -ForegroundColor Cyan
         Write-Host ""
-        Write-Host "To index Sample Data into Azure Search. Run the following command in PowerShell:"
-        Write-Host "infra\scripts\Process-Sample-Data.ps1" -ForegroundColor Cyan
+        Write-Host "===============================================================" -ForegroundColor Yellow
+        Write-Host " POST-DEPLOYMENT STEPS (PowerShell) " -ForegroundColor Green
+        Write-Host "===============================================================" -ForegroundColor Yellow
         Write-Host ""
-        Write-Host "If you want to run both scripts as single command, you can use the following command in PowerShell:"
-        Write-Host "infra\scripts\Team-Config-And-Data.ps1" -ForegroundColor Cyan
+
+        Write-Host " STEP 1: Upload Team Configurations to Cosmos DB" -ForegroundColor White
+        Write-Host "  👉 Run the following command in PowerShell:" -ForegroundColor White
+        Write-Host "   infra\scripts\Upload-Team-Config.ps1" -ForegroundColor Cyan
+        Write-Host ""
+
+        Write-Host " STEP 2: Index Sample Data into Azure Search" -ForegroundColor White
+        Write-Host "  👉 Run the following command in PowerShell:" -ForegroundColor White
+        Write-Host "   infra\scripts\Process-Sample-Data.ps1" -ForegroundColor Cyan
+        Write-Host ""
+
+        Write-Host "💡 Alternatively, you can run above BOTH steps together using:" -ForegroundColor Yellow
+        Write-Host "   infra\scripts\Team-Config-And-Data.ps1" -ForegroundColor Cyan
+        Write-Host ""
+
+        Write-Host "🌐 Access your deployed Frontend application at:" -ForegroundColor Green
+        Write-Host "   https://$env:webSiteDefaultHostname" -ForegroundColor Cyan
         Write-Host ""
-        Write-Host "You can access the deployed Frontend application at the following URL:"
-        Write-Host "https://$env:webSiteDefaultHostname" -ForegroundColor Cyan
       shell: pwsh
       interactive: true
     posix:
       run: |
         Blue='\033[0;34m'
+        Green='\033[0;32m'
+        Yellow='\033[1;33m'
         NC='\033[0m'
-        echo "To upload Team Configurations to Cosmos. Run the following command in Bash:"
-        echo "${Blue}bash infra/scripts/upload_team_config.sh"
+
         echo ""
-        echo "${NC}To index Sample Data into Azure Search. Run the following command in Bash:"
-        echo "${Blue}bash infra/scripts/process_sample_data.sh"
+        echo "${Yellow}==============================================================="
+        echo "${Green} POST-DEPLOYMENT STEPS (Bash) "
+        echo "${Yellow}===============================================================${NC}"
         echo ""
-        echo "${NC}If you want to run both scripts as single command, you can use the following command in Bash:"
-        echo "${Blue}bash infra/scripts/team_config_and_data.sh"
+
+        echo " STEP 1: Upload Team Configurations to Cosmos DB"
+        echo "  👉 Run the following command in Bash:"
+        echo "   ${Blue}bash infra/scripts/upload_team_config.sh${NC}"
+        echo ""
+
+        echo " STEP 2: Index Sample Data into Azure Search"
+        echo "  👉 Run the following command in Bash:"
+        echo "   ${Blue}bash infra/scripts/process_sample_data.sh${NC}"
+        echo ""
+
+        echo "💡 Alternatively, you can run above BOTH steps together using:"
+        echo "   ${Blue}bash infra/scripts/team_config_and_data.sh${NC}"
+        echo ""
+
+        echo "🌐 Access your deployed Frontend application at:"
+        echo "   ${Blue}https://$webSiteDefaultHostname${NC}"
         echo ""
-        echo "${NC}You can access the deployed Frontend application at the following URL:"
-        echo "${Blue}https://$webSiteDefaultHostname"
       shell: sh
       interactive: true