Merge branch 'main' of https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator into readme-updates

Dhruvkumar-Microsoft · Dhruvkumar-Microsoft · commit fd09e2c1e633 · 2025-12-30T13:34:08.000+05:30
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -14,8 +14,22 @@ name: "CodeQL Advanced"
 on:
   push:
     branches: [ "main", "dev", "demo" ]
+    paths:
+      - 'src/**/*.py'
+      - 'src/**/*.js'
+      - 'src/**/*.ts'
+      - 'src/**/*.tsx'
+      - 'tests/**/*.py'
+      - '.github/workflows/codeql.yml'
   pull_request:
     branches: [ "main", "dev", "demo" ]
+    paths:
+      - 'src/**/*.py'
+      - 'src/**/*.js'
+      - 'src/**/*.ts'
+      - 'src/**/*.tsx'
+      - 'tests/**/*.py'
+      - '.github/workflows/codeql.yml'
   schedule:
     - cron: '44 20 * * 2'
 
@@ -91,4 +105,4 @@ jobs:
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v4
       with:
-        category: "/language:${{matrix.language}}"
+        category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/deploy-linux.yml b/.github/workflows/deploy-linux.yml
@@ -1,12 +1,12 @@
 name: Deploy-Test-Cleanup (v2) Linux
 on:
   workflow_run:
-    workflows: ["Build Docker and Optional Push v3"]
+    workflows: ["Build Docker and Optional Push v4"]
     types:
       - completed
     branches:
       - main
-      - dev-v3
+      - dev-v4
       - hotfix
   workflow_dispatch:
     inputs:
diff --git a/.github/workflows/deploy-orchestrator.yml b/.github/workflows/deploy-orchestrator.yml
@@ -124,7 +124,7 @@ jobs:
     secrets: inherit
 
   cleanup-deployment:
-    if: always() && needs.deploy.result == 'success' && needs.deploy.outputs.RESOURCE_GROUP_NAME != '' && inputs.existing_webapp_url == '' && (inputs.trigger_type != 'workflow_dispatch' || inputs.cleanup_resources)
+    if: "!cancelled() && needs.deploy.outputs.RESOURCE_GROUP_NAME != '' && inputs.existing_webapp_url == '' && (inputs.trigger_type != 'workflow_dispatch' || inputs.cleanup_resources)"
     needs: [docker-build, deploy, e2e-test]
     uses: ./.github/workflows/job-cleanup-deployment.yml
     with:
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -126,7 +126,7 @@ jobs:
           elif [[ "${{ env.BRANCH_NAME }}" == "hotfix" ]]; then
             IMAGE_TAG="hotfix"
           else
-            IMAGE_TAG="latest_v3"
+            IMAGE_TAG="latest_v4"
           fi
 
           # Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
@@ -183,28 +183,9 @@ jobs:
 
           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 }}"
+          # Run PowerShell script with 'All' use case automatically selected
+          # Provide two inputs: '1' for keeping current subscription, '5' for All use cases
+          echo -e "1\n5" | pwsh -File infra/scripts/Selecting-Team-Config-And-Data.ps1 -ResourceGroup "${{ env.RESOURCE_GROUP_NAME }}"
 
           echo "=== Post-Deployment Script Completed Successfully ==="
 
diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml
@@ -7,6 +7,18 @@ on:
       - dev-v4
       - demo-v4
       - hotfix
+    paths:
+      - 'src/frontend/**'
+      - 'src/backend/**'
+      - 'src/mcp_server/**'
+      - '.github/workflows/docker-build-and-push.yml'
+      - 'infra/main.bicep'
+      - 'infra/modules/**/*.bicep'
+      - 'infra/*.parameters.json'
+      - 'infra/scripts/**'
+      - '.github/workflows/deploy.yml'
+      - 'azure.yaml'
+      - 'azure_custom.yaml'
   pull_request:
     types:
       - opened
@@ -18,6 +30,18 @@ on:
       - dev-v4
       - demo-v4
       - hotfix
+    paths:
+      - 'src/frontend/**'
+      - 'src/backend/**'
+      - 'src/mcp_server/**'
+      - '.github/workflows/docker-build-and-push.yml'
+      - 'infra/main.bicep'
+      - 'infra/modules/**/*.bicep'
+      - 'infra/*.parameters.json'
+      - 'infra/scripts/**'
+      - '.github/workflows/deploy.yml'
+      - 'azure.yaml'
+      - 'azure_custom.yaml'
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/job-deploy-linux.yml b/.github/workflows/job-deploy-linux.yml
@@ -173,7 +173,7 @@ jobs:
           set -e
           az account set --subscription "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
 
-          # Set environment variables for team_config_and_data.sh
+          # Set environment variables for selecting_team_config_and_data.sh
           export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
           export AZURE_RESOURCE_GROUP="${{ inputs.RESOURCE_GROUP_NAME }}"
           export BACKEND_URL="${{ steps.get_output_linux.outputs.BACKEND_URL }}"
@@ -184,7 +184,8 @@ jobs:
           export AZURE_ENV_NAME="${{ steps.get_output_linux.outputs.AZURE_ENV_NAME }}"
           
           # Upload team configurations and index sample data in one step
-          bash infra/scripts/team_config_and_data.sh "${{ inputs.RESOURCE_GROUP_NAME }}"
+          # Automatically select "6" (All use cases) for non-interactive deployment
+          echo "6" | bash infra/scripts/selecting_team_config_and_data.sh
 
       - name: Generate Deployment Summary
         if: always()
diff --git a/.github/workflows/job-deploy-windows.yml b/.github/workflows/job-deploy-windows.yml
@@ -179,8 +179,9 @@ jobs:
           $env:AZURE_AI_SEARCH_INDEX_NAME = "sample-dataset-index"
           $env:AZURE_ENV_NAME = "${{ steps.get_output_windows.outputs.AZURE_ENV_NAME }}"
 
-          # Run the script (PowerShell version)
-          & infra\scripts\Team-Config-And-Data.ps1 "${{ inputs.RESOURCE_GROUP_NAME }}"
+          # Upload team configurations and index sample data in one step
+          # Automatically select "6" (All use cases) for non-interactive deployment
+          bash -c "echo 6 | pwsh -File infra/scripts/Selecting-Team-Config-And-Data.ps1"
 
       - name: Generate Deployment Summary
         if: always()
diff --git a/.github/workflows/job-deploy.yml b/.github/workflows/job-deploy.yml
@@ -266,13 +266,13 @@ jobs:
             echo "Current branch: $BRANCH_NAME"
             
             if [[ "$BRANCH_NAME" == "main" ]]; then
-              IMAGE_TAG="latest_v3"
-            elif [[ "$BRANCH_NAME" == "dev-v3" ]]; then
-              IMAGE_TAG="dev_v3"
+              IMAGE_TAG="latest_v4"
+            elif [[ "$BRANCH_NAME" == "dev-v4" ]]; then
+              IMAGE_TAG="dev-v4"
             elif [[ "$BRANCH_NAME" == "hotfix" ]]; then
               IMAGE_TAG="hotfix"
             else
-              IMAGE_TAG="latest_v3"
+              IMAGE_TAG="latest_v4"
             fi
             echo "Using existing Docker image tag: $IMAGE_TAG"
           fi
diff --git a/.github/workflows/job-send-notification.yml b/.github/workflows/job-send-notification.yml
@@ -73,7 +73,7 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     env:
-      accelerator_name: "MACAE V3"
+      accelerator_name: "MACAE V4"
     steps:
       - name: Determine Test Suite Display Name
         id: test_suite
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -1,6 +1,14 @@
 name: PyLint
 
-on: [push]
+on: 
+  push:
+    paths:
+      - 'src/backend/**/*.py'
+      - 'src/mcp_server/**/*.py'
+      - 'src/backend/requirements.txt'
+      - '.flake8'
+      - '.github/workflows/pylint.yml'
+
 
 jobs:
   build:
@@ -24,4 +32,4 @@ jobs:
       
       - name: Run flake8 and pylint
         run: |
-          flake8 --config=.flake8 src/backend  # Specify the directory to lint
+          flake8 --config=.flake8 src/backend 
diff --git a/.github/workflows/test-automation-v2.yml b/.github/workflows/test-automation-v2.yml
@@ -31,7 +31,7 @@ env:
     MACAE_WEB_URL: ${{ inputs.MACAE_WEB_URL }}
     MACAE_URL_API: ${{ inputs.MACAE_URL_API }}
     MACAE_RG: ${{ inputs.MACAE_RG }}
-    accelerator_name: "MACAE v3"
+    accelerator_name: "MACAE v4"
 
 jobs:
   test:
diff --git a/.github/workflows/test-automation.yml b/.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 v3"
+      accelerator_name: "MACAE v4"
 
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,18 +7,35 @@ on:
       - dev
       - demo
       - hotfix
+    paths:
+      - 'src/backend/**/*.py'
+      - 'src/tests/**/*.py'
+      - 'src/mcp_server/**/*.py'
+      - 'src/**/pyproject.toml'
+      - 'pytest.ini'
+      - 'conftest.py'
+      - 'src/backend/requirements.txt'
+      - '.github/workflows/test.yml'
   pull_request:
     types:
       - opened
       - ready_for_review
       - reopened
       - synchronize
     branches:
-      - main
       - main
       - dev
       - demo
       - hotfix
+    paths:
+      - 'src/backend/**/*.py'
+      - 'src/tests/**/*.py'
+      - 'src/mcp_server/**/*.py'
+      - 'pytest.ini'
+      - 'conftest.py'
+      - 'src/backend/requirements.txt'
+      - 'src/**/pyproject.toml'
+      - '.github/workflows/test.yml'
 
 jobs:
   test:
@@ -73,4 +90,4 @@ jobs:
       - 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."
diff --git a/src/backend/common/utils/utils_af.py b/src/backend/common/utils/utils_af.py
@@ -17,27 +17,40 @@
 
 async def find_first_available_team(team_service: TeamService, user_id: str) -> str:
     """
-    Check teams in priority order (4 to 1) and return the first available team ID.
-    Priority: RFP (4) -> Retail (3) -> Marketing (2) -> HR (1)
+    Check teams in priority order and return the first available team ID.
+    First tries default teams in priority order, then falls back to any available team.
+    Priority: RFP (4) -> Retail (3) -> Marketing (2) -> HR (1) -> Any available team
     """
+    # Standard team priority order
     team_priority_order = [
         "00000000-0000-0000-0000-000000000004",  # RFP
         "00000000-0000-0000-0000-000000000003",  # Retail
         "00000000-0000-0000-0000-000000000002",  # Marketing
         "00000000-0000-0000-0000-000000000001",  # HR
     ]
 
+    # First, check standard teams in priority order
     for team_id in team_priority_order:
         try:
             team_config = await team_service.get_team_configuration(team_id, user_id)
             if team_config is not None:
-                print(f"Found available team: {team_id}")
+                print(f"Found available standard team: {team_id}")
                 return team_id
         except Exception as e:
             print(f"Error checking team {team_id}: {str(e)}")
             continue
 
-    print("No teams found in priority order")
+    # If no standard teams found, check for any available teams
+    try:
+        all_teams = await team_service.get_all_team_configurations()
+        if all_teams:
+            first_team = all_teams[0]
+            print(f"Found available custom team: {first_team.team_id}")
+            return first_team.team_id
+    except Exception as e:
+        print(f"Error checking for any available teams: {str(e)}")
+
+    print("No teams found in database")
     return None
 
 
diff --git a/src/backend/v4/api/router.py b/src/backend/v4/api/router.py
@@ -119,33 +119,47 @@ async def init_team(
         memory_store = await DatabaseFactory.get_database(user_id=user_id)
         team_service = TeamService(memory_store)
 
-        # Find the first available team from 4 to 1, or use HR as fallback
         init_team_id = await find_first_available_team(team_service, user_id)
-        if not init_team_id:
-            init_team_id = "00000000-0000-0000-0000-000000000001"  # HR fallback
-            print("No available teams found, using HR fallback")
-        else:
-            print(f"Using first available team: {init_team_id}")
 
+        # Get current team if user has one
         user_current_team = await memory_store.get_current_team(user_id=user_id)
-        if not user_current_team:
-            print("User has no current team, setting to default:", init_team_id)
+
+        # If no teams available and no current team, return empty state to allow custom team upload
+        if not init_team_id and not user_current_team:
+            print("No teams found in database. System ready for custom team upload.")
+            return {
+                "status": "No teams configured. Please upload a team configuration to get started.",
+                "team_id": None,
+                "team": None,
+                "requires_team_upload": True,
+            }
+
+        # Use current team if available, otherwise use found team
+        if user_current_team:
+            init_team_id = user_current_team.team_id
+            print(f"Using user's current team: {init_team_id}")
+        elif init_team_id:
+            print(f"Using first available team: {init_team_id}")
             user_current_team = await team_service.handle_team_selection(
                 user_id=user_id, team_id=init_team_id
             )
             if user_current_team:
                 init_team_id = user_current_team.team_id
-        else:
-            init_team_id = user_current_team.team_id
+
         # Verify the team exists and user has access to it
         team_configuration = await team_service.get_team_configuration(
             init_team_id, user_id
         )
         if team_configuration is None:
-            raise HTTPException(
-                status_code=404,
-                detail=f"Team configuration '{init_team_id}' not found or access denied",
-            )
+            # If team doesn't exist, clear current team and return empty state
+            await memory_store.delete_current_team(user_id)
+            print(f"Team configuration '{init_team_id}' not found. Cleared current team.")
+            return {
+                "status": "Current team configuration not found. Please select or upload a team configuration.",
+                "team_id": None,
+                "team": None,
+                "requires_team_upload": True,
+            }
 
         # Set as current team in memory
         team_config.set_current_team(
diff --git a/src/backend/v4/magentic_agents/common/lifecycle.py b/src/backend/v4/magentic_agents/common/lifecycle.py
diff --git a/src/backend/v4/magentic_agents/foundry_agent.py b/src/backend/v4/magentic_agents/foundry_agent.py
diff --git a/src/frontend/src/components/common/TeamSelector.tsx b/src/frontend/src/components/common/TeamSelector.tsx
diff --git a/src/frontend/src/pages/HomePage.tsx b/src/frontend/src/pages/HomePage.tsx
diff --git a/src/frontend/src/services/TeamService.tsx b/src/frontend/src/services/TeamService.tsx
