Merge branch 'dev-v3' of https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator into macae-BS-RFP2

Author: Dhruvkumar-Microsoft

.devcontainer/devcontainer.json

@@ -2,11 +2,12 @@
     "name": "Multi Agent Custom Automation Engine Solution Accelerator",
     "image": "mcr.microsoft.com/devcontainers/python:3.11-bullseye",
     "features": {
-        "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {"version": "latest"},
         "ghcr.io/azure/azure-dev/azd:latest": {},
         "ghcr.io/devcontainers/features/node:1": {},
         "ghcr.io/devcontainers/features/azure-cli:1": {},
-        "ghcr.io/jsburckhardt/devcontainer-features/uv:1": {}
+        "ghcr.io/jsburckhardt/devcontainer-features/uv:1": {"shellautocompletion": true,
+            "version": "latest"}
     },
     "customizations": {
         "vscode": {

.devcontainer/setupEnv.sh

@@ -1,25 +1,25 @@
-#!/bin/bash
-
-cd ./src/backend
-uv add -r requirements.txt
-
-cd ../frontend
-uv add -r requirements.txt
-
-cd ..
-
-
+#!/bin/sh
 
+echo "Pull latest code for the current branch"
+git fetch
+git pull
 
+set -e 
 
+echo "Setting up Backend..."
+cd ./src/backend
+uv sync --frozen
+cd ../../
 
+echo "Setting up Frontend..."
+cd ./src/frontend
+npm install
+pip install -r requirements.txt
+cd ../../
 
-# pip install --upgrade pip
-
-
-# (cd ./src/frontend; pip install -r requirements.txt)
-
-
-# (cd ./src/backend; pip install -r requirements.txt)
-
+echo "Setting up MCP..."
+cd ./src/mcp_server
+uv sync --frozen
+cd ../../
 
+echo "Setup complete! 🎉"

.github/workflows/azure-dev.yml

@@ -1,8 +1,5 @@
 name: Azure Template Validation
 on:
-  push:
-    branches:
-      - main
   workflow_dispatch:
 
 permissions:
@@ -13,19 +10,32 @@ permissions:
 jobs:
   template_validation_job:
     runs-on: ubuntu-latest
+    environment: production
     name: template validation
     steps:
-      - uses: actions/checkout@v4
-
-      - uses: microsoft/template-validation-action@Latest
+       # Step 1: Checkout the code from your repository 
+      - name: Checkout code 
+        uses: actions/checkout@v4 
+      # Step 2: Validate the Azure template using microsoft/template-validation-action 
+      - name: Validate Azure Template 
+        uses: microsoft/template-validation-action@Latest
+        with: 
+          validateAzd: true
+          useDevContainer: false
         id: validation
         env:
-          AZURE_CLIENT_ID: ${{ vars.AZURE_CLIENT_ID }}
-          AZURE_TENANT_ID: ${{ vars.AZURE_TENANT_ID }}
-          AZURE_SUBSCRIPTION_ID: ${{ vars.AZURE_SUBSCRIPTION_ID }}
-          AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }}
-          AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
+          AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} 
+          AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} 
+          AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} 
+          AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }} 
+          AZURE_ENV_NAME: ${{ secrets.AZURE_ENV_NAME }} 
+          AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }} 
+          AZURE_ENV_OPENAI_LOCATION : ${{ secrets.AZURE_AI_DEPLOYMENT_LOCATION }}
+          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

@@ -1,4 +1,4 @@
-name: Validate WAF Deployment
+name: Validate WAF Deployment v3
 
 on:
   push:
@@ -105,6 +105,10 @@ jobs:
         id: deploy
         run: |
           set -e
+
+          # Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
+            current_date=$(date -u +"%Y-%m-%dT%H:%M:%S.%7NZ")
+
           az deployment group create \
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
             --template-file infra/main.bicep \
@@ -117,6 +121,8 @@ jobs:
               enableMonitoring=true \
               enablePrivateNetworking=true \
               enableScalability=true \
+              createdBy="Pipeline" \
+              tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}"
               
 
       - name: Send Notification on Failure

.github/workflows/deploy.yml

@@ -1,19 +1,19 @@
-name: Validate Deployment
+name: Validate Deployment v3
 
 on:
   workflow_run:
-    workflows: ["Build Docker and Optional Push"]
+    workflows: ["Build Docker and Optional Push v3"]
     types:
       - completed
     branches:
       - main
+      - dev-v3
       - hotfix
-      - dev
   schedule:
     - cron: "0 11,23 * * *" # Runs at 11:00 AM and 11:00 PM GMT
   workflow_dispatch: #Allow manual triggering
 env:
-  GPT_MIN_CAPACITY: 150
+  GPT_MIN_CAPACITY: 1
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 jobs:
@@ -36,7 +36,7 @@ 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 AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
 
           chmod +x infra/scripts/checkquota.sh
@@ -116,15 +116,18 @@ jobs:
         id: deploy
         run: |
           if [[ "${{ env.BRANCH_NAME }}" == "main" ]]; then
-            IMAGE_TAG="latest"
-          elif [[ "${{ env.BRANCH_NAME }}" == "dev" ]]; then
-            IMAGE_TAG="dev"
+            IMAGE_TAG="latest_v3"
+          elif [[ "${{ env.BRANCH_NAME }}" == "dev-v3" ]]; then
+            IMAGE_TAG="dev_v3"
           elif [[ "${{ env.BRANCH_NAME }}" == "hotfix" ]]; then
             IMAGE_TAG="hotfix"
           else
             IMAGE_TAG="latest"
           fi
 
+          # Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
+            current_date=$(date -u +"%Y-%m-%dT%H:%M:%S.%7NZ")
+
           az deployment group create \
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
             --template-file infra/main.bicep \
@@ -137,8 +140,9 @@ jobs:
               backendContainerImageTag="${IMAGE_TAG}" \
               frontendContainerImageTag="${IMAGE_TAG}" \
               azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \
-              gptModelCapacity=150 \
+              gptModelCapacity=1 \
               createdBy="Pipeline" \
+              tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" \
             --output json
 
       - name: Extract Web App and API App URLs
@@ -177,20 +181,9 @@ 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, e2e-test]
+    needs: [deploy]
     runs-on: ubuntu-latest
     env:
       RESOURCE_GROUP_NAME: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}

.github/workflows/docker-build-and-push.yml

@@ -1,11 +1,11 @@
-name: Build Docker and Optional Push
+name: Build Docker and Optional Push v3
 
 on:
   push:
     branches:
       - main
-      - dev
-      - demo
+      - dev-v3
+      - demo-v3
       - hotfix
   pull_request:
     types:
@@ -15,8 +15,8 @@ on:
       - synchronize
     branches:
       - main
-      - dev
-      - demo
+      - dev-v3
+      - demo-v3
       - hotfix
   workflow_dispatch:
 
@@ -32,7 +32,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Log in to Azure Container Registry
-        if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' }}
+        if: ${{ github.ref_name == 'main' || github.ref_name == 'dev-v3'|| github.ref_name == 'demo-v3' || github.ref_name == 'hotfix' }}
         uses: azure/docker-login@v2
         with:
           login-server: ${{ secrets.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io' }}
@@ -52,11 +52,11 @@ jobs:
         id: determine_tag
         run: |
           if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
-            echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
-            echo "TAG=dev" >> $GITHUB_ENV
-          elif [[ "${{ github.ref }}" == "refs/heads/demo" ]]; then
-            echo "TAG=demo" >> $GITHUB_ENV
+            echo "TAG=latest_v3" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/dev-v3" ]]; then
+            echo "TAG=dev_v3" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/demo-v3" ]]; then
+            echo "TAG=demo_v3" >> $GITHUB_ENV
           elif [[ "${{ github.ref }}" == "refs/heads/hotfix" ]]; then
             echo "TAG=hotfix" >> $GITHUB_ENV
           else
@@ -88,4 +88,14 @@ jobs:
           push: ${{ env.TAG != 'pullrequest-ignore' }}
           tags: |
             ${{ steps.registry.outputs.ext_registry }}/macaefrontend:${{ env.TAG }}
-            ${{ steps.registry.outputs.ext_registry }}/macaefrontend:${{ env.HISTORICAL_TAG }}
+            ${{ steps.registry.outputs.ext_registry }}/macaefrontend:${{ env.HISTORICAL_TAG }}
+      
+      - name: Build and optionally push MCP Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: ./src/mcp_server
+          file: ./src/mcp_server/Dockerfile
+          push: ${{ env.TAG != 'pullrequest-ignore' }}
+          tags: |
+            ${{ steps.registry.outputs.ext_registry }}/macaemcp:${{ env.TAG }}
+            ${{ steps.registry.outputs.ext_registry }}/macaemcp:${{ env.HISTORICAL_TAG }}

.github/workflows/test.yml

@@ -48,12 +48,29 @@ jobs:
             echo "Test files found, running tests."
             echo "skip_tests=false" >> $GITHUB_ENV
           fi
+
       - name: Run tests with coverage
         if: env.skip_tests == 'false'
         run: |
-          pytest --cov=. --cov-report=term-missing --cov-report=xml --ignore=tests/e2e-test/tests
+          pytest --cov=. --cov-report=term-missing --cov-report=xml \
+            --ignore=tests/e2e-test/tests \
+            --ignore=src/backend/tests/test_app.py \
+            --ignore=src/tests/agents/test_foundry_integration.py \
+            --ignore=src/tests/mcp_server/test_factory.py \
+            --ignore=src/tests/mcp_server/test_hr_service.py \
+            --ignore=src/backend/tests/test_config.py \
+            --ignore=src/tests/agents/test_human_approval_manager.py \
+            --ignore=src/backend/tests/test_team_specific_methods.py \
+            --ignore=src/backend/tests/models/test_messages.py \
+            --ignore=src/backend/tests/test_otlp_tracing.py \
+            --ignore=src/backend/tests/auth/test_auth_utils.py
+
+      # - name: Run tests with coverage
+      #   if: env.skip_tests == 'false'
+      #   run: |
+      #     pytest --cov=. --cov-report=term-missing --cov-report=xml --ignore=tests/e2e-test/tests
 
       - name: Skip coverage report if no tests
         if: env.skip_tests == 'true'
         run: |
-          echo "Skipping coverage report because no tests were found."
+          echo "Skipping coverage report because no tests were found."

README.md

@@ -29,11 +29,6 @@ The solution leverages Azure OpenAI Service, Azure Container Apps, Azure Cosmos
 |![image](./docs/images/readme/agent_flow.png)|
 |---|
 
-### How to customize
-If you'd like to customize the solution accelerator, here are some common areas to start:
-
-[Custom scenario](./docs/CustomizeSolution.md)
-
 <br/>
 
 ### Additional resources
@@ -72,6 +67,8 @@ Quick deploy
 ### How to install or deploy
 Follow the quick deploy steps on the deployment guide to deploy this solution to your own Azure subscription.
 
+> **Note:** This solution accelerator requires **Azure Developer CLI (azd) version 1.18.0 or higher**. Please ensure you have the latest version installed before proceeding with deployment. [Download azd here](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/install-azd).
+
 [Click here to launch the deployment guide](./docs/DeploymentGuide.md)
 <br/><br/>