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

Author: marktayl1

.gitignore

@@ -470,4 +470,6 @@ __pycache__/
 data/sample_code/
 # Bicep local files
 *.local*.bicepparam
-*.local*.parameters.json
+*.local*.parameters.json
+# Local debug/ops scripts (not for repo)
+scripts/

data/agent_teams/content_gen.json

@@ -395,7 +395,7 @@ Write-Host "2. Retail Customer Satisfaction"
 Write-Host "3. HR Employee Onboarding"
 Write-Host "4. Marketing Press Release"
 Write-Host "5. Contract Compliance Review"
-Write-Host "6. All"
+Write-Host "7. All"
 Write-Host "==============================================="
 Write-Host ""
 
@@ -404,7 +404,7 @@ do {
     $useCaseSelection = Read-Host "Please enter the number of the use case you would like to install."
 
     # Handle both numeric and text input for 'all'
-    if ($useCaseSelection -eq "all" -or $useCaseSelection -eq "6") {
+    if ($useCaseSelection -eq "all" -or $useCaseSelection -eq "7") {
         $selectedUseCase = "All"
         $useCaseValid = $true
         Write-Host "Selected: All use cases will be installed."
@@ -439,9 +439,13 @@ do {
         Write-Host "Selected: Contract Compliance Review"
         Write-Host "Note: If you choose to install a single use case, installation of other use cases will require re-running this script."
     }
+    elseif ($useCaseSelection -eq "6") {
+        $useCaseValid = $false
+        Write-Host "Invalid selection. Please enter a number from 1-5 or 7." -ForegroundColor Red
+    }
     else {
         $useCaseValid = $false
-        Write-Host "Invalid selection. Please enter a number from 1-6." -ForegroundColor Red
+        Write-Host "Invalid selection. Please enter a number from 1-5 or 7." -ForegroundColor Red
     }
 } while (-not $useCaseValid)
 
@@ -526,7 +530,7 @@ $isSampleDataFailed = $false
 $failedTeamConfigs = 0
 
 # Use Case 3 -----=--
-if($useCaseSelection -eq "3" -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "6") {
+if($useCaseSelection -eq "3" -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "7") {
     Write-Host "Uploading Team Configuration for HR Employee Onboarding..."
     $directoryPath = "data/agent_teams"
     $teamId = "00000000-0000-0000-0000-000000000001"
@@ -545,7 +549,7 @@ if($useCaseSelection -eq "3" -or $useCaseSelection -eq "all" -or $useCaseSelecti
 }
 
 # Use Case 4 -----=--
-if($useCaseSelection -eq "4" -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "6") {
+if($useCaseSelection -eq "4" -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "7") {
     Write-Host "Uploading Team Configuration for Marketing Press Release..."
     $directoryPath = "data/agent_teams"
     $teamId = "00000000-0000-0000-0000-000000000002"
@@ -566,7 +570,7 @@ if($useCaseSelection -eq "4" -or $useCaseSelection -eq "all" -or $useCaseSelecti
 $stIsPublicAccessDisabled = $false
 $srchIsPublicAccessDisabled = $false
 # Enable public access for resources
-if($useCaseSelection -eq "1"-or $useCaseSelection -eq "2" -or $useCaseSelection -eq "5"  -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "6"){
+if($useCaseSelection -eq "1"-or $useCaseSelection -eq "2" -or $useCaseSelection -eq "5" -or $useCaseSelection -eq "6" -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "7"){
     if ($ResourceGroup) {
         # Check if resource group has Type=WAF tag
         $rgTypeTag = (az group show --name $ResourceGroup --query "tags.Type" -o tsv 2>$null)
@@ -658,7 +662,7 @@ if($useCaseSelection -eq "1"-or $useCaseSelection -eq "2" -or $useCaseSelection
 
 
 
-if($useCaseSelection -eq "1" -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "6") {
+if($useCaseSelection -eq "1" -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "7") {
     Write-Host "Uploading Team Configuration for RFP Evaluation..."
     $directoryPath = "data/agent_teams"
     $teamId = "00000000-0000-0000-0000-000000000004"
@@ -732,7 +736,7 @@ if($useCaseSelection -eq "1" -or $useCaseSelection -eq "all" -or $useCaseSelecti
 }
 
 
-if($useCaseSelection -eq "5" -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "6") {
+if($useCaseSelection -eq "5" -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "7") {
     Write-Host "Uploading Team Configuration for Contract Compliance Review..."
     $directoryPath = "data/agent_teams"
     $teamId = "00000000-0000-0000-0000-000000000005"
@@ -805,7 +809,7 @@ if($useCaseSelection -eq "5" -or $useCaseSelection -eq "all" -or $useCaseSelecti
     Write-Host "Python script to index data for Contract Compliance Review successfully executed."
 }
 
-if($useCaseSelection -eq "2" -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "6") {
+if($useCaseSelection -eq "2" -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "7") {
     Write-Host "Uploading Team Configuration for Retail Customer Satisfaction..."
     $directoryPath = "data/agent_teams"
     $teamId = "00000000-0000-0000-0000-000000000003"
@@ -866,7 +870,7 @@ if ($isTeamConfigFailed -or $isSampleDataFailed) {
     Write-Host "`nOne or more tasks failed. Please check the error messages above."
     exit 1
 } else {
-    if($useCaseSelection -eq "1"-or $useCaseSelection -eq "2" -or $useCaseSelection -eq "5" -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "6"){
+    if($useCaseSelection -eq "1"-or $useCaseSelection -eq "2" -or $useCaseSelection -eq "5" -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "7"){
         Write-Host "`nTeam configuration upload and sample data processing completed successfully."
     }else {
         Write-Host "`nTeam configuration upload completed successfully."

infra/scripts/Selecting-Team-Config-And-Data.ps1

@@ -408,7 +408,7 @@ echo "2. Retail Customer Satisfaction"
 echo "3. HR Employee Onboarding"
 echo "4. Marketing Press Release"
 echo "5. Contract Compliance Review"
-echo "6. All"
+echo "7. All"
 echo "==============================================="
 echo ""
 
@@ -418,7 +418,7 @@ while [[ "$useCaseValid" != true ]]; do
     read -p "Please enter the number of the use case you would like to install: " useCaseSelection
 
     # Handle both numeric and text input for 'all'
-    if [[ "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
+    if [[ "$useCaseSelection" == "all" || "$useCaseSelection" == "7" ]]; then
         selectedUseCase="All"
         useCaseValid=true
         echo "Selected: All use cases will be installed."
@@ -447,9 +447,12 @@ while [[ "$useCaseValid" != true ]]; do
         useCaseValid=true
         echo "Selected: Contract Compliance Review"
         echo "Note: If you choose to install a single use case, installation of other use cases will require re-running this script."
+    elif [[ "$useCaseSelection" == "6" ]]; then
+        useCaseValid=false
+        echo -e "\033[31mInvalid selection. Please enter a number from 1-5 or 7.\033[0m"
     else
         useCaseValid=false
-        echo -e "\033[31mInvalid selection. Please enter a number from 1-6.\033[0m"
+        echo -e "\033[31mInvalid selection. Please enter a number from 1-5 or 7.\033[0m"
     fi
 done
 
@@ -523,7 +526,7 @@ isSampleDataFailed=false
 failedTeamConfigs=0
 
 # Use Case 3 - HR Employee Onboarding
-if [[ "$useCaseSelection" == "3" || "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
+if [[ "$useCaseSelection" == "3" || "$useCaseSelection" == "all" || "$useCaseSelection" == "7" ]]; then
     echo "Uploading Team Configuration for HR Employee Onboarding..."
     directoryPath="data/agent_teams"
     teamId="00000000-0000-0000-0000-000000000001"
@@ -538,7 +541,7 @@ if [[ "$useCaseSelection" == "3" || "$useCaseSelection" == "all" || "$useCaseSel
 fi
 
 # Use Case 4 - Marketing Press Release
-if [[ "$useCaseSelection" == "4" || "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
+if [[ "$useCaseSelection" == "4" || "$useCaseSelection" == "all" || "$useCaseSelection" == "7" ]]; then
     echo "Uploading Team Configuration for Marketing Press Release..."
     directoryPath="data/agent_teams"
     teamId="00000000-0000-0000-0000-000000000002"
@@ -553,7 +556,7 @@ if [[ "$useCaseSelection" == "4" || "$useCaseSelection" == "all" || "$useCaseSel
 fi
 
 # Enable public access for resources
-if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "2" || "$useCaseSelection" == "5" || "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
+if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "2" || "$useCaseSelection" == "5" || "$useCaseSelection" == "6" || "$useCaseSelection" == "all" || "$useCaseSelection" == "7" ]]; then
     if [[ -n "$ResourceGroup" ]]; then
         # Check if resource group has Type=WAF tag
         rgTypeTag=$(az group show --name "$ResourceGroup" --query "tags.Type" -o tsv 2>/dev/null)
@@ -643,7 +646,7 @@ if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "2" || "$useCaseSelec
 fi
 
 # Use Case 1 - RFP Evaluation
-if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
+if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "all" || "$useCaseSelection" == "7" ]]; then
     echo "Uploading Team Configuration for RFP Evaluation..."
     directoryPath="data/agent_teams"
     teamId="00000000-0000-0000-0000-000000000004"
@@ -706,7 +709,7 @@ if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "all" || "$useCaseSel
 fi
 
 # Use Case 5 - Contract Compliance Review
-if [[ "$useCaseSelection" == "5" || "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
+if [[ "$useCaseSelection" == "5" || "$useCaseSelection" == "all" || "$useCaseSelection" == "7" ]]; then
     echo "Uploading Team Configuration for Contract Compliance Review..."
     directoryPath="data/agent_teams"
     teamId="00000000-0000-0000-0000-000000000005"
@@ -769,7 +772,7 @@ if [[ "$useCaseSelection" == "5" || "$useCaseSelection" == "all" || "$useCaseSel
 fi
 
 # Use Case 2 - Retail Customer Satisfaction
-if [[ "$useCaseSelection" == "2" || "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
+if [[ "$useCaseSelection" == "2" || "$useCaseSelection" == "all" || "$useCaseSelection" == "7" ]]; then
     echo "Uploading Team Configuration for Retail Customer Satisfaction..."
     directoryPath="data/agent_teams"
     teamId="00000000-0000-0000-0000-000000000003"
@@ -821,7 +824,7 @@ if [[ "$isTeamConfigFailed" == true || "$isSampleDataFailed" == true ]]; then
     echo "One or more tasks failed. Please check the error messages above."
     exit 1
 else
-    if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "2" || "$useCaseSelection" == "5" || "$useCaseSelection" == "all" || "$useCaseSelection" == "6" ]]; then
+    if [[ "$useCaseSelection" == "1" || "$useCaseSelection" == "2" || "$useCaseSelection" == "5" || "$useCaseSelection" == "all" || "$useCaseSelection" == "7" ]]; then
         echo ""
         echo "Team configuration upload and sample data processing completed successfully."
     else

infra/scripts/selecting_team_config_and_data.sh

@@ -52,6 +52,7 @@ def check_team_exists(backend_url, team_id, user_principal_id):
     ("retail.json", "00000000-0000-0000-0000-000000000003"),
     ("rfp_analysis_team.json", "00000000-0000-0000-0000-000000000004"),
     ("contract_compliance_team.json", "00000000-0000-0000-0000-000000000005"),
+    ("ad_copy_team.json", "00000000-0000-0000-0000-000000000006"),
 ]
 
 upload_endpoint = backend_url.rstrip('/') + '/api/v4/upload_team_config'
@@ -65,15 +66,20 @@ def check_team_exists(backend_url, team_id, user_principal_id):
             print(f"Uploading file:  {filename}")
             team_exists = check_team_exists(backend_url, team_id, user_principal_id)            
             if team_exists:
+                # Delete existing team to allow re-upload with updated config
+                print(f"Team (ID: {team_id}) already exists. Deleting to re-upload with latest config...")
+                delete_endpoint = backend_url.rstrip('/') + f'/api/v4/team_configs/{team_id}'
+                headers = {
+                    'x-ms-client-principal-id': user_principal_id
+                }
                 try:
-                    with open(file_path, 'r', encoding='utf-8') as f:
-                        team_data = json.load(f)
-                        team_name = team_data.get('name', 'Unknown')
-                        print(f"Team '{team_name}' (ID: {team_id}) already exists!")
-                        continue
+                    delete_response = requests.delete(delete_endpoint, headers=headers)
+                    if delete_response.status_code == 200:
+                        print(f"Successfully deleted existing team (ID: {team_id}).")
+                    else:
+                        print(f"Warning: Could not delete existing team (ID: {team_id}). Status: {delete_response.status_code}. Will attempt upload anyway.")
                 except Exception as e:
-                    print(f"Error reading {filename}: {str(e)}")
-                    continue
+                    print(f"Warning: Exception deleting team (ID: {team_id}): {str(e)}. Will attempt upload anyway.")
 
             try:
                 with open(file_path, 'rb') as file_data:

infra/scripts/upload_team_config.py

@@ -241,8 +241,14 @@ def get_ai_project_client(self):
                 )
 
             endpoint = self.AZURE_AI_AGENT_ENDPOINT
+            # Extended HTTP timeouts to reduce transient "Request timed out"
+            # responses that cause the Magentic orchestrator to reset.
             self._ai_project_client = AIProjectClient(
-                endpoint=endpoint, credential=credential
+                endpoint=endpoint,
+                credential=credential,
+                connection_timeout=30,
+                read_timeout=180,
+                retry_total=5,
             )
 
             return self._ai_project_client

src/backend/common/config/app_config.py

@@ -332,9 +332,26 @@ async def process_request(
     try:
 
         async def run_orchestration_task():
-            await OrchestrationManager().run_orchestration(user_id, input_task)
-
-        background_tasks.add_task(run_orchestration_task)
+            try:
+                await OrchestrationManager().run_orchestration(user_id, input_task)
+            finally:
+                # Clear our slot if we're still the registered active task
+                current = orchestration_config.active_tasks.get(user_id)
+                if current is not None and current.done():
+                    orchestration_config.active_tasks.pop(user_id, None)
+
+        # Cancel any in-flight orchestration for this user before starting a new one
+        prior_task = orchestration_config.active_tasks.get(user_id)
+        if prior_task is not None and not prior_task.done():
+            try:
+                prior_task.cancel()
+            except Exception:
+                pass
+            orchestration_config.active_tasks.pop(user_id, None)
+
+        # Schedule new task and register it so subsequent requests can cancel it
+        new_task = asyncio.create_task(run_orchestration_task())
+        orchestration_config.active_tasks[user_id] = new_task
 
         return {
             "status": "Request started successfully",

src/backend/v4/api/router.py

@@ -91,6 +91,8 @@ def __init__(self):
         self.sockets: Dict[str, WebSocket] = {}  # user_id -> WebSocket
         self.clarifications: Dict[str, str] = {}  # m_plan_id -> clarification response
         self.max_rounds: int = 20  # Maximum replanning rounds
+        # Track in-flight orchestration tasks per user so a new plan cancels any old one
+        self.active_tasks: Dict[str, asyncio.Task] = {}  # user_id -> running asyncio.Task
 
         # Event-driven notification system for approvals and clarifications
         self._approval_events: Dict[str, asyncio.Event] = {}

src/backend/v4/config/settings.py

@@ -70,10 +70,15 @@ async def open(self) -> "MCPEnabledBase":
         self.creds = DefaultAzureCredential()
         if self._stack:
             await self._stack.enter_async_context(self.creds)
-        # Create AgentsClient
+        # Create AgentsClient with extended HTTP timeouts to reduce transient
+        # "Request timed out" responses on /threads/{id}/messages that cause the
+        # Magentic orchestrator to reset and re-run prior agents.
         self.client = AgentsClient(
             endpoint=self.project_endpoint,
             credential=self.creds,
+            connection_timeout=30,
+            read_timeout=180,
+            retry_total=5,
         )
         if self._stack:
             await self._stack.enter_async_context(self.client)