Merge branch 'dev-v3' into macae-rfa-agent-framework

Author: Fr4nc3

.github/workflows/deploy.yml

@@ -13,7 +13,7 @@ on:
     - 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
@@ -140,7 +140,7 @@ 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
@@ -181,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/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."

docs/AVMPostDeploymentGuide.md

@@ -0,0 +1,124 @@
+# AVM Post Deployment Guide
+
+> **📋 Note**: This guide is specifically for post-deployment steps after using the AVM template. For complete deployment from scratch, see the main [Deployment Guide](./DeploymentGuide.md).
+
+---
+
+This document provides guidance on post-deployment steps after deploying the Multi-Agent Custom Automation Engine Solution Accelerator from the [AVM (Azure Verified Modules) repository](https://github.com/Azure/bicep-registry-modules/tree/main/avm/ptn/sa/multi-agent-custom-automation-engine).
+
+## Overview
+
+After deploying the infrastructure using AVM, you'll need to complete the application layer setup, which includes:
+- Configuring team agent configurations
+- Processing and uploading sample datasets
+- Setting up Azure AI Search indexes
+- Configuring blob storage containers
+- Setting up application authentication
+
+## Prerequisites
+
+Before starting the post-deployment process, ensure you have the following:
+
+### Required Software
+
+1. **[PowerShell](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell?view=powershell-7.4)** <small>(v7.0+ recommended)</small> - Available for Windows, macOS, and Linux
+
+2. **[Azure CLI](https://learn.microsoft.com/en-us/cli/azure/install-azure-cli)** <small>(v2.50+)</small> - Command-line tool for managing Azure resources
+
+3. **[Python](https://www.python.org/downloads/)** <small>(v3.9+ recommended)</small> - Required for data processing scripts
+
+4. **[Git](https://git-scm.com/downloads/)** - Version control system for cloning the repository
+
+### Azure Requirements
+
+5. **Azure Access** - One of the following roles on the subscription or resource group:
+   - `Contributor` 
+   - `Owner`
+
+6. **Deployed Infrastructure** - A successful Multi-Agent Custom Automation Engine deployment from the [AVM repository](https://github.com/Azure/bicep-registry-modules/tree/main/avm/ptn/sa/multi-agent-custom-automation-engine)
+
+#### **Important Note for PowerShell Users**
+
+If you encounter issues running PowerShell scripts due to execution policy restrictions, you can temporarily adjust the `ExecutionPolicy` by running the following command in an elevated PowerShell session:
+
+```powershell
+Set-ExecutionPolicy -Scope Process -ExecutionPolicy Bypass
+```
+
+This will allow the scripts to run for the current session without permanently changing your system's policy.
+
+## Post-Deployment Steps
+
+### Step 1: Clone the Repository
+
+First, clone this repository to access the post-deployment scripts:
+
+```powershell
+git clone https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator.git
+```
+```powershell
+cd Multi-Agent-Custom-Automation-Engine-Solution-Accelerator
+```
+
+### Step 2: Run the Post-Deployment Script
+
+The post-deployment process is automated through a single PowerShell or Bash script that completes the following tasks in approximately 5-10 minutes:
+
+#### What the Script Does:
+1. **Configure Team Agent Settings** - Upload HR, Marketing, and Retail team configurations
+2. **Process Sample Datasets** - Upload and index sample customer data, analytics, and business metrics
+3. **Set Up Azure AI Search** - Create and configure search indexes for agent data retrieval
+4. **Configure Blob Storage** - Set up containers for document and data storage
+
+#### Execute the Script:
+
+1. **Choose the appropriate command based on your deployment method and OS:**
+
+   **If you deployed using custom templates, ARM/Bicep deployments, or `az deployment group` commands:**
+
+   - **For PowerShell (Windows/Linux/macOS):**
+     ```powershell
+     .\infra\scripts\Team-Config-And-Data.ps1 -ResourceGroup "<your-resource-group-name>"
+     ```
+
+   - **For Bash (Linux/macOS/WSL):**
+     ```bash
+     bash infra/scripts/team_config_and_data.sh "<your-resource-group-name>"
+     ```
+   
+   **If you deployed using `azd up` command:**
+
+   - **For PowerShell (Windows/Linux/macOS):**
+     ```powershell
+     .\infra\scripts\Team-Config-And-Data.ps1
+     ```
+
+   - **For Bash (Linux/macOS/WSL):**
+     ```bash
+     bash infra/scripts/team_config_and_data.sh
+     ```
+   
+   > **Note**: Replace `<your-resource-group-name>` with the actual name of the resource group containing your deployed Azure resources.
+
+   > **💡 Tip**: Since this guide is for AVM deployments, you'll most likely use the first command with the `-ResourceGroup` parameter.
+
+### Step 3: Provide Required Information
+
+During script execution, you'll be prompted for:
+
+- You'll be prompted to authenticate with Azure if not already logged in
+- Select the appropriate Azure subscription
+
+#### Resource Validation
+- The script will automatically detect and validate your deployed Azure resources
+- Confirmation prompts will appear before making configuration changes
+
+### Step 4: Post Deployment Script Completion
+
+Upon successful completion, you'll see a success message.
+
+**🎉 Congratulations!** Your post-deployment configuration is complete.
+
+### Step 5: Set Up App Authentication (Optional)
+
+Follow the steps in [Set Up Authentication in Azure App Service](azure_app_service_auth_setup.md) to add app authentication to your web app running on Azure App Service.

infra/main.bicep

@@ -235,6 +235,7 @@ resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
       TemplateName: 'MACAE'
       Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
       CreatedBy: createdBy
+      DeploymentName: deployment().name
     }
   }
 }

infra/main_custom.bicep

@@ -234,6 +234,7 @@ resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
       TemplateName: 'MACAE'
       Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
       CreatedBy: createdBy
+      DeploymentName: deployment().name
     }
   }
 }

infra/scripts/Process-Sample-Data.ps1

@@ -5,7 +5,8 @@ param(
     [string]$BlobContainer,
     [string]$AiSearch,
     [string]$AiSearchIndex,
-    [string]$ResourceGroup
+    [string]$ResourceGroup,
+    [string]$AzSubscriptionId
 )
 
 # Get parameters from azd env, if not provided
@@ -29,7 +30,9 @@ if (-not $ResourceGroup) {
     $ResourceGroup = $(azd env get-value AZURE_RESOURCE_GROUP)
 }
 
-$AzSubscriptionId = $(azd env get-value AZURE_SUBSCRIPTION_ID)
+if (-not $AzSubscriptionId) {
+    $AzSubscriptionId = $(azd env get-value AZURE_SUBSCRIPTION_ID)
+}
 
 # Check if all required arguments are provided
 if (-not $StorageAccount -or -not $BlobContainer -or -not $AiSearch) {