Merge remote-tracking branch 'origin/macae-v3-dev-v2-vip' into macae-BS-PlanPage

Author: blessing-sanusi

.github/workflows/deploy-waf.yml

@@ -109,13 +109,15 @@ jobs:
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
             --template-file infra/main.bicep \
             --parameters \
-              environmentName=${{ env.SOLUTION_PREFIX }} \
-              useWafAlignedArchitecture=true \
-              aiDeploymentsLocation='${{ env.AZURE_LOCATION }}' \
+              solutionName=${{ env.SOLUTION_PREFIX }} \
+              location="${{ env.AZURE_LOCATION }}" \
+              azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \
               gptModelCapacity=5 \
-              virtualMachineConfiguration='{"adminUsername": "adminuser", "adminPassword": "P@ssw0rd1234"}' \
-              logAnalyticsWorkspaceConfiguration='{"existingWorkspaceResourceId": ""}'
-
+              enableTelemetry=true \
+              enableMonitoring=true \
+              enablePrivateNetworking=true \
+              enableScalability=true \
+              
 
       - name: Send Notification on Failure
         if: failure()

.github/workflows/deploy.yml

@@ -129,19 +129,16 @@ jobs:
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
             --template-file infra/main.bicep \
             --parameters \
-              environmentName=${{ env.SOLUTION_PREFIX }} \
-              solutionLocation="${{ env.AZURE_LOCATION }}" \
-              modelDeploymentType="GlobalStandard" \
+              solutionName=${{ env.SOLUTION_PREFIX }} \
+              location="${{ env.AZURE_LOCATION }}" \
+              gptModelDeploymentType="GlobalStandard" \
               gptModelName="gpt-4o" \
               gptModelVersion="2024-08-06" \
-              imageTag="${IMAGE_TAG}" \
-              useWafAlignedArchitecture=false \
-              aiDeploymentsLocation='${{ env.AZURE_LOCATION }}' \
+              backendContainerImageTag="${IMAGE_TAG}" \
+              frontendContainerImageTag="${IMAGE_TAG}" \
+              azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \
               gptModelCapacity=150 \
-              logAnalyticsWorkspaceConfiguration='{"dataRetentionInDays": 30, "existingWorkspaceResourceId": ""}' \
-              applicationInsightsConfiguration='{"retentionInDays": 30}' \
-              virtualNetworkConfiguration='{"enabled": false}' \
-              webServerFarmConfiguration='{"skuCapacity": 1, "skuName": "B2"}' \
+              createdBy="Pipeline" \
             --output json
 
       - name: Extract Web App and API App URLs

.github/workflows/test.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Run tests with coverage
         if: env.skip_tests == 'false'
         run: |
-          pytest --cov=. --cov-report=term-missing --cov-report=xml
+          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'

.gitignore

@@ -460,4 +460,7 @@ __pycache__/
 .azure
 .github/copilot-instructions.md
 # Ignore sample code folder
-data/sample_code/
+data/sample_code/
+# Bicep local files
+*.local*.bicepparam
+*.local*.parameters.json

azure.yaml

@@ -3,4 +3,38 @@ name: multi-agent-custom-automation-engine-solution-accelerator
 metadata:
   template: [email protected]
 requiredVersions:
-  azd: ">=1.15.0 !=1.17.1"
+  azd: ">=1.15.0 !=1.17.1"
+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 ""
+        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 ""
+        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'
+        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 ""
+        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 ""
+        echo "${NC}You can access the deployed Frontend application at the following URL:"
+        echo "${Blue}https://$webSiteDefaultHostname"
+      shell: sh
+      interactive: true

azure_custom.yaml

@@ -38,4 +38,39 @@ services:
           shell: sh
           run: bash ../../infra/scripts/package_frontend.sh
           interactive: true
-          continueOnError: false
+          continueOnError: false
+
+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 ""
+        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 ""
+        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'
+        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 ""
+        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 ""
+        echo "${NC}You can access the deployed Frontend application at the following URL:"
+        echo "${Blue}https://$webSiteDefaultHostname"
+      shell: sh
+      interactive: true

data/agent_teams/hr.json

@@ -1,6 +1,6 @@
 {
-  "id": "3",
-  "team_id": "team-3",
+  "id": "1",
+  "team_id": "team-1",
   "name": "Human Resources Team",
   "status": "visible",
   "created": "",
@@ -10,15 +10,15 @@
       "input_key": "",
       "type": "",
       "name": "HRHelperAgent",
-      "deployment_name": "gpt-4.1",
+      "deployment_name": "gpt-4.1-mini",
       "icon": "",
       "system_message": "You have access to a number of HR related MCP tools for tasks like employee onboarding, benefits management, policy guidance, and general HR inquiries. Use these tools to assist employees with their HR needs efficiently and accurately.If you need more information to accurately call these tools, do not make up answers, call the ProxyAgent for clarification.",
       "description": "An agent that has access to various HR tools to assist employees with onboarding, benefits, policies, and general HR inquiries.",
       "use_rag": false,
       "use_mcp": true,
       "use_bing": false,
       "use_reasoning": false,
-      "index_name": "macae-index",
+      "index_name": "",
       "index_foundry_name": "",
       "index_endpoint": "",
       "coding_tools": false
@@ -27,30 +27,30 @@
       "input_key": "",
       "type": "",
       "name": "TechnicalSupportAgent",
-      "deployment_name": "gpt-4.1",
+      "deployment_name": "gpt-4.1-mini",
       "icon": "",
       "system_message": "You have access to a number of technical support MCP tools for tasks such as provisioning laptops, setting up email accounts, troubleshooting, software/hardware issues, and IT support. Use these tools to assist employees with their technical needs efficiently and accurately.  If you need more information to accurately call these tools, do not make up answers, call the ProxyAgent for clarification.",
       "description": "An agent that has access to various technical support tools to assist employees with IT needs like laptop provisioning, email setup, troubleshooting, and software/hardware issues.",
       "use_rag": false,
       "use_mcp": true,
       "use_bing": false,
       "use_reasoning": false,
-      "index_name": "macae-index",
+      "index_name": "",
       "index_foundry_name": "",
-      "coding_tools": true
+      "coding_tools": false
     },
     {
       "input_key": "",
       "type": "",
       "name": "ProxyAgent",
-      "deployment_name": "gpt-4.1",
+      "deployment_name": "",
       "icon": "",
       "system_message": "",
       "description": "",
       "use_rag": false,
       "use_mcp": false,
       "use_bing": false,
-      "use_reasoning": true,
+      "use_reasoning": false,
       "index_name": "",
       "index_foundry_name": "",
       "coding_tools": false

data/agent_teams/marketing.json

@@ -1,70 +1,70 @@
 {
-  "id": "1",
-  "team_id": "team-1",
+  "id": "2",
+  "team_id": "team-2",
   "name": "Product Marketing Team",
-  "status": "",
+  "status": "visible",
   "created": "",
   "created_by": "",
   "agents": [
     {
       "input_key": "",
       "type": "",
-      "name": "CustomerDataAgent",
-      "deployment_name": "gpt-4.1",
+      "name": "ProductAgent",
+      "deployment_name": "gpt-4.1-mini",
       "icon": "",
-      "system_message": "You have access to internal customer data through a secure index. Use this data to answer questions about customers, their interactions with customer service, satisfaction, etc. Be mindful of privacy and compliance regulations when handling customer data.",
-      "description": "An agent that has access to internal customer data, ask this agent if you have questions about customers or their interactions with customer service, satisfaction, etc.",
-      "use_rag": true,
-      "use_mcp": false,
+      "system_message": "You are a Product agent. You have knowledge about product management, development, and compliance guidelines. When asked to call a function, you should summarize back what was done.",
+      "description": "This agent specializes in product management, development, and related tasks. It can provide information about products, manage inventory, handle product launches, analyze sales data, and coordinate with other teams like marketing and tech support.",
+      "use_rag": false,
+      "use_mcp": true,
       "use_bing": false,
       "use_reasoning": false,
-      "index_name": "macae-index",
+      "index_name": "",
       "index_foundry_name": "",
       "index_endpoint": "",
       "coding_tools": false
     },
     {
       "input_key": "",
       "type": "",
-      "name": "OrderDataAgent",
-      "deployment_name": "gpt-4.1",
+      "name": "MarketingAgent",
+      "deployment_name": "gpt-4.1-mini",
       "icon": "",
-      "system_message": "You have access to internal order, inventory, product, and fulfilment data through a secure index. Use this data to answer questions about products, shipping delays, customer orders, warehouse management, etc. Be mindful of privacy and compliance regulations when handling customer data.",
-      "description": "An agent that has access to internal order, inventory, product, and fulfilment data. Ask this agent if you have questions about products, shipping delays, customerr orders, warehouse management, etc.",
-      "use_rag": true,
-      "use_mcp": false,
+      "system_message": "You are a Marketing agent. You specialize in marketing strategy, campaign development, content creation, and market analysis. You help create effective marketing campaigns, analyze market data, and develop promotional content for products and services.",
+      "description": "This agent specializes in marketing, campaign management, and analyzing market data.",
+      "use_rag": false,
+      "use_mcp": true,
       "use_bing": false,
       "use_reasoning": false,
-      "index_name": "macae-index",
+      "index_name": "",
       "index_foundry_name": "",
       "coding_tools": true
     },
     {
       "input_key": "",
       "type": "",
-      "name": "AnalysisRecomendationAgent",
-      "deployment_name": "o4-mini",
+      "name": "ProxyAgent",
+      "deployment_name": "gpt-4.1-mini",
       "icon": "",
-      "system_message": "You are a reasoning agent that can analyze customer data and provide recommendations for improving customer satisfaction and retention. You do not have access to any data sources, but you can reason based on the information provided to you by other agents. Use your reasoning skills to identify patterns, trends, and insights that can help improve customer satisfaction and retention. Provide actionable recommendations based on your analysis. You have access to other agents that can answer questions and provide data about customers, products, orders, inventory, and fulfilment. Use these agents to gather information as needed.",
-      "description": "A reasoning agent that can analyze customer data and provide recommendations for improving customer satisfaction and retention.",
+      "system_message": "",
+      "description": "",
       "use_rag": false,
       "use_mcp": false,
       "use_bing": false,
-      "use_reasoning": true,
+      "use_reasoning": false,
       "index_name": "",
       "index_foundry_name": "",
       "coding_tools": false
     }
   ],
   "protected": false,
-  "description": "Team focused on individualized customer relationship management and overall customer satisfaction.",
+  "description": "Team focused on products and product marketing.",
   "logo": "",
   "plan": "",
   "starting_tasks": [
     {
       "id": "task-1",
-      "name": "Satisfaction Plan",
-      "prompt": "Create a  plan to improve Emily Thompson's satisfaction.​",
+      "name": "Draft a press release",
+      "prompt": "Write a press release about our current products​",
       "created": "",
       "creator": "",
       "logo": ""

data/agent_teams/retail.json

@@ -10,7 +10,7 @@
       "input_key": "",
       "type": "",
       "name": "CustomerDataAgent",
-      "deployment_name": "gpt-4.1",
+      "deployment_name": "gpt-4.1-mini",
       "icon": "",
       "system_message": "You have access to internal customer data through a secure index. Use this data to answer questions about customers, their interactions with customer service, satisfaction, etc. Be mindful of privacy and compliance regulations when handling customer data.",
       "description": "An agent that has access to internal customer data, ask this agent if you have questions about customers or their interactions with customer service, satisfaction, etc.",
@@ -27,7 +27,7 @@
       "input_key": "",
       "type": "",
       "name": "OrderDataAgent",
-      "deployment_name": "gpt-4.1",
+      "deployment_name": "gpt-4.1-mini",
       "icon": "",
       "system_message": "You have access to internal order, inventory, product, and fulfilment data through a secure index. Use this data to answer questions about products, shipping delays, customer orders, warehouse management, etc. Be mindful of privacy and compliance regulations when handling customer data.",
       "description": "An agent that has access to internal order, inventory, product, and fulfilment data. Ask this agent if you have questions about products, shipping delays, customerr orders, warehouse management, etc.",

docs/CustomizingAzdParameters.md

@@ -19,6 +19,8 @@ By default this template will use the environment name as the prefix to prevent
 | `AZURE_ENV_IMAGETAG`            | string | `latest`          | Docker image tag used for container deployments.                                                   |
 | `AZURE_ENV_ENABLE_TELEMETRY`    | bool   | `true`            | Enables telemetry for monitoring and diagnostics.                                                  |
 | `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID` | string  | Guide to get your [Existing Workspace ID](/docs/re-use-log-analytics.md) | Set this if you want to reuse an existing Log Analytics Workspace instead of creating a new one.     |
+| `AZURE_ENV_VM_ADMIN_USERNAME`  | string | `take(newGuid(), 20)`               | The administrator username for the virtual machine.         |
+| `AZURE_ENV_VM_ADMIN_PASSWORD`  | string | `newGuid()`               | The administrator password for the virtual machine.         |
 ---
 
 ## How to Set a Parameter