update upload team_config scripts

update documentation for team configuration and sample data processing
Added new scripts `Team-Config-And-Data.ps1` and `team_config_and_data.sh`  to upload team configurations and process sample data.

Author: Harsh-Microsoft

azure.yaml

@@ -13,6 +13,12 @@ hooks:
         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:
@@ -22,5 +28,11 @@ hooks:
         echo ""
         echo "To index Sample Data into Azure Search. Run the following command in Bash:"
         echo "bash infra/scripts/process_sample_data.sh"
+        echo ""
+        echo "To upload team configurations and index sample data both in one command, you can use the following command in Bash:"
+        echo "bash infra/scripts/team_config_and_data.sh"
+        echo ""
+        echo "You can access the deployed Frontend application at the following URL:"
+        echo "https://$webSiteDefaultHostname"
       shell: sh
       interactive: true

azure_custom.yaml

@@ -49,6 +49,12 @@ hooks:
         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:
@@ -58,5 +64,11 @@ hooks:
         echo ""
         echo "To index Sample Data into Azure Search. Run the following command in Bash:"
         echo "bash infra/scripts/process_sample_data.sh"
+        echo ""
+        echo "If you want to run both scripts as single command, you can use the following command in Bash:"
+        echo "bash infra/scripts/team_config_and_data.sh"
+        echo ""
+        echo "You can access the deployed Frontend application at the following URL:"
+        echo "https://$webSiteDefaultHostname"
       shell: sh
       interactive: true

docs/DeploymentGuide.md

@@ -239,11 +239,47 @@ Once you've opened the project in [Codespaces](#github-codespaces), [Dev Contain
    - This deployment will take _4-6 minutes_ to provision the resources in your account and set up the solution with sample data.
    - If you encounter an error or timeout during deployment, changing the location may help, as there could be availability constraints for the resources.
 
-5. Once the deployment has completed successfully, open the [Azure Portal](https://portal.azure.com/), go to the deployed resource group, find the App Service, and get the app URL from `Default domain`.
+5. After deployment completes, you can upload Team Configurations using command printed in the terminal. The command will look like one of the following. Run the appropriate command for your shell from the project root:
 
-6. When Deployment is complete, follow steps in [Set Up Authentication in Azure App Service](../docs/azure_app_service_auth_setup.md) to add app authentication to your web app running on Azure App Service
+  - **For Bash (Linux/macOS/WSL):**
+    ```bash
+    bash infra/scripts/upload_team_config.sh
+    ```
 
-7. If you are done trying out the application, you can delete the resources by running `azd down`.
+  - **For PowerShell (Windows):**
+    ```powershell
+    infra\scripts\Upload-Team-Config.ps1
+    ```
+
+6. After deployment completes, you can index Sample Data into Search Service using command printed in the terminal. The command will look like one of the following. Run the appropriate command for your shell from the project root:
+
+  - **For Bash (Linux/macOS/WSL):**
+    ```bash
+    bash infra/scripts/process_sample_data.sh
+    ```
+
+  - **For PowerShell (Windows):**
+    ```powershell
+    infra\scripts\Process-Sample-Data.ps1
+    ```
+
+7. To upload team configurations and index sample data in one step. Run the appropriate command for your shell from the project root:
+
+  - **For Bash (Linux/macOS/WSL):**
+    ```bash
+    bash infra/scripts/team_config_and_data.sh
+    ```
+
+  - **For PowerShell (Windows):**
+    ```powershell
+    infra\scripts\Team-Config-And-Data.ps1
+    ```
+
+8. Once the deployment has completed successfully, open the [Azure Portal](https://portal.azure.com/), go to the deployed resource group, find the App Service, and get the app URL from `Default domain`.
+
+9. When Deployment is complete, follow steps in [Set Up Authentication in Azure App Service](../docs/azure_app_service_auth_setup.md) to add app authentication to your web app running on Azure App Service
+
+10. If you are done trying out the application, you can delete the resources by running `azd down`.
 
 
 ### 🛠️ Troubleshooting

infra/main.bicep

@@ -2046,3 +2046,4 @@ output MCP_SERVER_NAME string = 'MACAE MCP Server'
 output MCP_SERVER_DESCRIPTION string = 'MACAE MCP Server Description'
 output SUPPORTED_MODELS string = '["o3","o4-mini","gpt-4.1","gpt-4.1-mini"]'
 output AZURE_AI_SEARCH_API_KEY string = '<Deployed-Search-ApiKey>'
+output BACKEND_URL string = 'https://${containerApp.outputs.fqdn}'

infra/main_custom.bicep

@@ -2081,3 +2081,4 @@ output MCP_SERVER_NAME string = 'MACAE MCP Server'
 output MCP_SERVER_DESCRIPTION string = 'MACAE MCP Server Description'
 output SUPPORTED_MODELS string = '["o3","o4-mini","gpt-4.1","gpt-4.1-mini"]'
 output AZURE_AI_SEARCH_API_KEY string = '<Deployed-Search-ApiKey>'
+output BACKEND_URL string = 'https://${containerApp.outputs.fqdn}'

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

@@ -0,0 +1,74 @@
+#Requires -Version 7.0
+
+param(
+    [string]$backendUrl,
+    [string]$DirectoryPath,
+    [string]$StorageAccount,
+    [string]$BlobContainer,
+    [string]$AiSearch,
+    [string]$AiSearchIndex,
+    [string]$ResourceGroup
+)
+
+# Get parameters from azd env, if not provided
+if (-not $backendUrl) {
+    $backendUrl = $(azd env get-value BACKEND_URL)
+}
+if (-not $DirectoryPath) {
+    $DirectoryPath = "data/agent_teams"
+}
+if (-not $StorageAccount) {
+    $StorageAccount = $(azd env get-value AZURE_STORAGE_ACCOUNT_NAME)
+}
+
+if (-not $BlobContainer) {
+    $BlobContainer = $(azd env get-value AZURE_STORAGE_CONTAINER_NAME)
+}
+
+if (-not $AiSearch) {
+    $AiSearch = $(azd env get-value AZURE_AI_SEARCH_NAME)
+}
+
+if (-not $AiSearchIndex) {
+    $AiSearchIndex = $(azd env get-value AZURE_AI_SEARCH_INDEX_NAME)
+}
+
+if (-not $ResourceGroup) {
+    $ResourceGroup = $(azd env get-value AZURE_RESOURCE_GROUP)
+}
+
+# Check if all required arguments are provided
+if (-not $backendUrl -or -not $DirectoryPath -or -not $StorageAccount -or -not $BlobContainer -or -not $AiSearch -or -not $AiSearchIndex -or -not $ResourceGroup) {
+    Write-Host "Usage: .\Team-Config-And-Data.ps1 -backendUrl <backendUrl> -DirectoryPath <DirectoryPath> -StorageAccount <StorageAccount> -BlobContainer <BlobContainer> -AiSearch <AiSearch> [-AiSearchIndex <AISearchIndexName>] [-ResourceGroup <ResourceGroupName>]"
+    exit 1
+}
+
+$isTeamConfigFailed = $false
+$isSampleDataFailed = $false
+# Upload Team Configuration
+Write-Host "Uploading Team Configuration..."
+try {
+    .\infra\scripts\Upload-Team-Config.ps1 -backendUrl $backendUrl -DirectoryPath $DirectoryPath
+} catch {
+    Write-Host "Error: Uploading team configuration failed."
+    $isTeamConfigFailed = $true
+}
+
+Write-Host "`n----------------------------------------"
+Write-Host "----------------------------------------`n"
+
+# Process Sample Data
+Write-Host "Processing Sample Data..."
+try {
+    .\infra\scripts\Process-Sample-Data.ps1 -StorageAccount $StorageAccount -BlobContainer $BlobContainer -AiSearch $AiSearch -AiSearchIndex $AiSearchIndex -ResourceGroup $ResourceGroup
+} catch {
+    Write-Host "Error: Processing sample data failed."
+    $isSampleDataFailed = $true
+}
+
+if ($isTeamConfigFailed -or $isSampleDataFailed) {
+    Write-Host "`nOne or more tasks failed. Please check the error messages above."
+    exit 1
+} else {
+    Write-Host "`nBoth team configuration upload and sample data processing completed successfully."
+}

infra/scripts/Upload-Team-Config.ps1

@@ -1,34 +1,23 @@
 #Requires -Version 7.0
 
 param(
-    [string]$CosmosDbName,
-    [string]$DatabaseName,
-    [string]$ContainerName,
-    [string]$DirectoryPath,
-    [string]$ResourceGroup
+    [string]$backendUrl,
+    [string]$DirectoryPath
 )
 
 # Get parameters from azd env, if not provided
-if (-not $CosmosDbName) {
-    $CosmosDbName = $(azd env get-value COSMOSDB_ACCOUNT_NAME)
-}
-if (-not $DatabaseName) {
-    $DatabaseName = $(azd env get-value COSMOSDB_DATABASE)
-}
-if (-not $ContainerName) {
-    $ContainerName = $(azd env get-value COSMOSDB_CONTAINER)
+if (-not $backendUrl) {
+    $backendUrl = $(azd env get-value BACKEND_URL)
 }
 if (-not $DirectoryPath) {
     $DirectoryPath = "data/agent_teams"
 }
-if (-not $ResourceGroup) {
-    $ResourceGroup = $(azd env get-value AZURE_RESOURCE_GROUP)
-}
+
 $AzSubscriptionId = $(azd env get-value AZURE_SUBSCRIPTION_ID)
 
 # Check if all required arguments are provided
-if (-not $CosmosDbName -or -not $DatabaseName -or -not $ContainerName -or -not $DirectoryPath) {
-    Write-Host "Usage: .\infra\scripts\Upload-Team-Config.ps1 -CosmosDbName <CosmosDbName> -DatabaseName <DatabaseName> -ContainerName <ContainerName> -DirectoryPath <DirectoryPath> [-ResourceGroup <ResourceGroupName>]"
+if (-not $backendUrl -or -not $DirectoryPath) {
+    Write-Host "Usage: .\infra\scripts\Upload-Team-Config.ps1 -backendUrl <backendUrl> -DirectoryPath <DirectoryPath>"
     exit 1
 }
 
@@ -95,23 +84,6 @@ if ($currentSubscriptionId -ne $AzSubscriptionId) {
 
 $userPrincipalId = $(az ad signed-in-user show --query id -o tsv)
 
-$cosmosIsPublicAccessDisabled = $false
-if ($ResourceGroup) {
-    $cosmosPublicAccess = $(az cosmosdb show --name $CosmosDbName --resource-group $ResourceGroup --query "publicNetworkAccess" -o tsv)
-    if ($cosmosPublicAccess -eq "Disabled") {
-        $cosmosIsPublicAccessDisabled = $true
-        Write-Host "Enabling public access for CosmosDB: $CosmosDbName"
-        az cosmosdb update --name $CosmosDbName --resource-group $ResourceGroup --public-network-access enabled --output none
-        if ($LASTEXITCODE -ne 0) {
-            Write-Host "Error: Failed to enable public access for CosmosDB."
-            exit 1
-        }
-        Write-Host "Public access enabled for CosmosDB: $CosmosDbName"
-    } else {
-        Write-Host "Public access is already enabled for CosmosDB: $CosmosDbName"
-    }
-}
-
 # Determine the correct Python command
 $pythonCmd = $null
 
@@ -173,21 +145,10 @@ Write-Host "Requirements installed"
 
 # Run the Python script to upload team configuration
 Write-Host "Running the python script to upload team configuration"
-$process = Start-Process -FilePath $pythonCmd -ArgumentList "infra/scripts/team-config-scripts/upload_team_config.py", $CosmosDbName, $DatabaseName, $ContainerName, $DirectoryPath, $userPrincipalId -Wait -NoNewWindow -PassThru
+$process = Start-Process -FilePath $pythonCmd -ArgumentList "infra/scripts/upload_team_config.py", $backendUrl, $DirectoryPath, $userPrincipalId -Wait -NoNewWindow -PassThru
 if ($process.ExitCode -ne 0) {
     Write-Host "Error: Team configuration upload failed."
     exit 1
 }
 
-#disable public access for cosmos
-if ($cosmosIsPublicAccessDisabled) {
-    Write-Host "Disabling public access for CosmosDB: $CosmosDbName"
-    az cosmosdb update --name $CosmosDbName --resource-group $ResourceGroup --public-network-access disabled --output none
-    if ($LASTEXITCODE -ne 0) {
-        Write-Host "Error: Failed to disable public access for CosmosDB."
-        exit 1
-    }
-    Write-Host "Public access disabled for CosmosDB: $CosmosDbName"
-}
-
 Write-Host "Script executed successfully. Team configuration uploaded."

infra/scripts/requirements.txt

@@ -1,5 +1,4 @@
-azure-search-documents == 11.5.3
-azure-identity == 1.24.0
-azure-storage-blob == 12.26.0
-semantic-kernel==1.35.3
-azure-cosmos==4.9.0
+azure-search-documents==11.5.3
+azure-identity==1.24.0
+azure-storage-blob==12.26.0
+requests==2.32.5