Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
af7445e
commit
Tejasri-Microsoft Jun 3, 2026
b609ec2
Refactor infra code structure for improved readability and maintainab…
Harsh-Microsoft Jun 4, 2026
7495884
fix: add dependencies for AI model deployments in Bicep templates
Harsh-Microsoft Jun 4, 2026
b568ecf
extend role assignments for backend app service to include search ind…
Harsh-Microsoft Jun 5, 2026
00b8952
fixed avm infra implementation
Harsh-Microsoft Jun 5, 2026
1c8d484
added image model and updated container app managed environment imple…
Harsh-Microsoft Jun 9, 2026
ba34383
updated infra as per new version requirement
Harsh-Microsoft Jun 10, 2026
479a6cf
commit
Tejasri-Microsoft Jun 10, 2026
10e6184
fixed container app deployment issue
Harsh-Microsoft Jun 10, 2026
28f4abf
Merge branch 'psl-hb-infrachanges' of https://github.com/Harsh-Micros…
Tejasri-Microsoft Jun 11, 2026
7317f2d
Merge remote-tracking branch 'upstream/psl-TASfeature' into psl-hb-in…
Harsh-Microsoft Jun 11, 2026
58d6c67
Merge branch 'psl-hb-infrachanges' of https://github.com/Harsh-Micros…
Tejasri-Microsoft Jun 11, 2026
eea39cf
fixed role assignments in bicep flavour, added quotacheck and support…
Harsh-Microsoft Jun 11, 2026
d2c7ebc
fix role assignments and add container app env dns for avm flavour
Harsh-Microsoft Jun 11, 2026
0559d31
fixed openai endpoint and added few properties in log analytics in av…
Harsh-Microsoft Jun 12, 2026
2f223ce
updated script to use proxy api for waf deployment
Harsh-Microsoft Jun 12, 2026
cdbdbc0
rebuilt main.json
Harsh-Microsoft Jun 12, 2026
f0df556
Merge remote-tracking branch 'upstream/psl-TASfeature' into psl-hb-in…
Harsh-Microsoft Jun 15, 2026
46f29f4
added role assignment for exp deployment
Harsh-Microsoft Jun 15, 2026
814920a
commit
Tejasri-Microsoft Jun 15, 2026
aef6288
Merge branch 'psl-hb-infrachanges' of https://github.com/Harsh-Micros…
Tejasri-Microsoft Jun 16, 2026
e519732
updated modules and clean up
Harsh-Microsoft Jun 16, 2026
1a84717
updated modules
Harsh-Microsoft Jun 16, 2026
4046ea8
updated post deploy posix script in azure.yaml
Harsh-Microsoft Jun 16, 2026
8043470
rebuilt all main.json
Harsh-Microsoft Jun 16, 2026
4420a7b
updated main_custom.bicep and azure_custom.yaml
Harsh-Microsoft Jun 16, 2026
79f0677
commit post deployment changes
Tejasri-Microsoft Jun 16, 2026
198bd50
Merge branch 'psl-hb-infrachanges' of https://github.com/Harsh-Micros…
Tejasri-Microsoft Jun 16, 2026
b1a1f37
commit
Tejasri-Microsoft Jun 16, 2026
604ff86
commit of description
Tejasri-Microsoft Jun 17, 2026
6480ba9
commit
Tejasri-Microsoft Jun 17, 2026
9c2fdc6
Merge remote-tracking branch 'upstream/psl-TASfeature' into psl-hb-in…
Harsh-Microsoft Jun 17, 2026
828e7e3
updated hooks in azure_custom.yaml
Harsh-Microsoft Jun 17, 2026
2595f59
commit of post deployment
Tejasri-Microsoft Jun 18, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/agents/speckit.contentpack.agent.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ referenced in the KB registration.

### Step 3 — Register the Knowledge Base

Add an entry to `infra/scripts/seed_knowledge_bases.py` in the `KNOWLEDGE_BASES`
Add an entry to `infra/scripts/post-provision/seed_knowledge_bases.py` in the `KNOWLEDGE_BASES`
dict. Place it before the `# ── Example Pack ──` comment block:

```python
Expand Down Expand Up @@ -203,7 +203,7 @@ and **never hallucinate data**.

## Registering in the Deployment Script

Edit `infra/scripts/Selecting-Team-Config-And-Data.ps1`. Search for `NEW CONTENT PACK`
Edit `infra/scripts/post-provision/Selecting-Team-Config-And-Data.ps1`. Search for `NEW CONTENT PACK`
— each insertion point has a comment template. There are **4 things** to do:

| # | What | Where |
Expand Down Expand Up @@ -245,7 +245,7 @@ After adding your entry, update `$allOption` to `N + 1` so "All" is always last.
azd up

# 2. Provision pack resources — select your pack or "All"
./infra/scripts/Selecting-Team-Config-And-Data.ps1 -ResourceGroup <rg>
./infra/scripts/post-provision/Selecting-Team-Config-And-Data.ps1 -ResourceGroup <rg>
```

---
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-waf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ jobs:
GPT41_MINI_MIN_CAPACITY: ${{ env.GPT41_MINI_MIN_CAPACITY }}
AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
run: |
chmod +x infra/scripts/checkquota.sh
if ! infra/scripts/checkquota.sh; then
chmod +x infra/scripts/pre-provision/checkquota.sh
if ! infra/scripts/pre-provision/checkquota.sh; then
# If quota check fails due to insufficient quota, set the flag
if grep -q "No region with sufficient quota found" infra/scripts/checkquota.sh; then
if grep -q "No region with sufficient quota found" infra/scripts/pre-provision/checkquota.sh; then
echo "QUOTA_FAILED=true" >> $GITHUB_ENV
fi
exit 1 # Fail the pipeline if any other failure occurs
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ jobs:
GPT41_MINI_MIN_CAPACITY: ${{ env.GPT41_MINI_MIN_CAPACITY }}
AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
run: |
chmod +x infra/scripts/checkquota.sh
if ! infra/scripts/checkquota.sh; then
chmod +x infra/scripts/pre-provision/checkquota.sh
if ! infra/scripts/pre-provision/checkquota.sh; then
# If quota check fails due to insufficient quota, set the flag
if grep -q "No region with sufficient quota found" infra/scripts/checkquota.sh; then
if grep -q "No region with sufficient quota found" infra/scripts/pre-provision/checkquota.sh; then
echo "QUOTA_FAILED=true" >> $GITHUB_ENV
fi
exit 1 # Fail the pipeline if any other failure occurs
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:

# 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 -e "1\n5" | pwsh -File infra/scripts/post-provision/Selecting-Team-Config-And-Data.ps1 -ResourceGroup "${{ env.RESOURCE_GROUP_NAME }}"

echo "=== Post-Deployment Script Completed Successfully ==="

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job-deploy-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ jobs:
# Upload team configurations and index sample data in one step
# Automatically select "6" (All use cases) for non-interactive deployment
echo "6" | bash infra/scripts/selecting_team_config_and_data.sh
echo "6" | bash infra/scripts/post-provision/selecting_team_config_and_data.sh
- name: Generate Deployment Summary
if: always()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/job-deploy-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ jobs:
# Upload team configurations and index sample data in one step
# Automatically select "6" (All use cases) for non-interactive deployment
echo "6" | bash infra/scripts/selecting_team_config_and_data.sh
echo "6" | bash infra/scripts/post-provision/selecting_team_config_and_data.sh
- name: Generate Deployment Summary
if: always()
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/job-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,10 @@ jobs:
GPT41_MINI_MIN_CAPACITY: ${{ env.GPT41_MINI_MIN_CAPACITY }}
AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
run: |
chmod +x infra/scripts/checkquota.sh
if ! infra/scripts/checkquota.sh; then
chmod +x infra/scripts/pre-provision/checkquota.sh
if ! infra/scripts/pre-provision/checkquota.sh; then
# If quota check fails due to insufficient quota, set the flag
if grep -q "No region with sufficient quota found" infra/scripts/checkquota.sh; then
if grep -q "No region with sufficient quota found" infra/scripts/pre-provision/checkquota.sh; then
echo "QUOTA_FAILED=true" >> $GITHUB_ENV
fi
exit 1 # Fail the pipeline if any other failure occurs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate-bicep-params.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
paths:
- 'infra/**/*.bicep'
- 'infra/**/*.parameters.json'
- 'infra/scripts/validate_bicep_params.py'
- 'infra/scripts/pre-provision/validate_bicep_params.py'
workflow_dispatch:

env:
Expand All @@ -39,7 +39,7 @@ jobs:
run: |
set +e
RUN_URL="https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
python infra/scripts/validate_bicep_params.py --dir infra --strict --no-color \
python infra/scripts/pre-provision/validate_bicep_params.py --dir infra --strict --no-color \
--json-output infra_results.json \
--html-output email_body.html \
--accelerator-name "${ACCELERATOR_NAME}" \
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ appsettings.json
# Distribution / packaging
.Python
build/
!infra/scripts/build/
!infra/scripts/build/**
develop-eggs/
dist/
downloads/
Expand Down
6 changes: 3 additions & 3 deletions azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ hooks:

Write-Host " Upload Team Configurations, index sample data and create the Knowledge base from content Packs" -ForegroundColor White
Write-Host " 👉 Run the following command in Bash:" -ForegroundColor White
Write-Host " bash infra/scripts/post_deploy.sh" -ForegroundColor Cyan
Write-Host " bash infra/scripts/post-provision/post_deploy.sh" -ForegroundColor Cyan
Write-Host ""

Write-Host "🌐 Access your deployed Frontend application at:" -ForegroundColor Green
Expand All @@ -35,7 +35,7 @@ hooks:

Write-Host " Upload Team Configurations, index sample data and create the Knowledge base from content Packs" -ForegroundColor White
Write-Host " 👉 Run the following command in PowerShell:" -ForegroundColor White
Write-Host " infra\scripts\post_deploy.ps1" -ForegroundColor Cyan
Write-Host " infra\scripts\post-provision\post_deploy.ps1" -ForegroundColor Cyan
Write-Host ""

Write-Host "🌐 Access your deployed Frontend application at:" -ForegroundColor Green
Expand All @@ -60,7 +60,7 @@ hooks:

printf "Upload Team Configurations, index sample data and create the Knowledge base from content Packs:\n"
printf " 👉 Run the following command in Bash:\n"
printf " ${Blue}bash infra/scripts/post_deploy.sh${NC}\n\n"
printf " ${Blue}bash infra/scripts/post-provision/post_deploy.sh${NC}\n\n"

printf "🌐 Access your deployed Frontend application at:\n"
printf " ${Blue}https://%s${NC}\n\n" "$webSiteDefaultHostname"
Expand Down
17 changes: 9 additions & 8 deletions azure_custom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ services:
prepackage:
windows:
shell: pwsh
run: ../../infra/scripts/package_frontend.ps1
run: ../../infra/scripts/build/package_frontend.ps1
interactive: true
continueOnError: false
posix:
shell: sh
run: bash ../../infra/scripts/package_frontend.sh
run: bash ../../infra/scripts/build/package_frontend.sh
interactive: true
continueOnError: false

Expand All @@ -56,9 +56,9 @@ hooks:
Write-Host "===============================================================" -ForegroundColor Yellow
Write-Host ""

Write-Host " Upload Team Configurations and index sample data" -ForegroundColor White
Write-Host " Upload Team Configurations, index sample data and create the Knowledge base from content Packs" -ForegroundColor White
Write-Host " 👉 Run the following command in Bash:" -ForegroundColor White
Write-Host " bash infra/scripts/selecting_team_config_and_data.sh" -ForegroundColor Cyan
Write-Host " bash infra/scripts/post-provision/post_deploy.sh" -ForegroundColor Cyan
Write-Host ""

Write-Host "🌐 Access your deployed Frontend application at:" -ForegroundColor Green
Expand All @@ -72,9 +72,9 @@ hooks:
Write-Host "===============================================================" -ForegroundColor Yellow
Write-Host ""

Write-Host " Upload Team Configurations and index sample data" -ForegroundColor White
Write-Host " Upload Team Configurations, index sample data and create the Knowledge base from content Packs" -ForegroundColor White
Write-Host " 👉 Run the following command in PowerShell:" -ForegroundColor White
Write-Host " infra\scripts\Selecting-Team-Config-And-Data.ps1" -ForegroundColor Cyan
Write-Host " infra\scripts\post-provision\post_deploy.ps1" -ForegroundColor Cyan
Write-Host ""

Write-Host "🌐 Access your deployed Frontend application at:" -ForegroundColor Green
Expand All @@ -97,11 +97,12 @@ hooks:
printf "${Green} POST-DEPLOYMENT STEPS (Bash)\n"
printf "${Yellow}===============================================================${NC}\n\n"

printf "Upload Team Configurations and index sample data:\n"
printf "Upload Team Configurations, index sample data and create the Knowledge base from content Packs:\n"
printf " 👉 Run the following command in Bash:\n"
printf " ${Blue}bash infra/scripts/selecting_team_config_and_data.sh${NC}\n\n"
printf " ${Blue}bash infra/scripts/post-provision/post_deploy.sh${NC}\n\n"

printf "🌐 Access your deployed Frontend application at:\n"
printf " ${Blue}https://%s${NC}\n\n" "$webSiteDefaultHostname"

shell: sh
interactive: true
6 changes: 3 additions & 3 deletions content_packs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ referenced in the KB registration.

### Step 3 — Register the Knowledge Base

Add an entry to `infra/scripts/seed_knowledge_bases.py` in the `KNOWLEDGE_BASES`
Add an entry to `infra/scripts/post-provision/seed_knowledge_bases.py` in the `KNOWLEDGE_BASES`
dict. Place it before the `# ── Example Pack ──` comment block:

```python
Expand Down Expand Up @@ -199,7 +199,7 @@ and **never hallucinate data**.

## Registering in the Deployment Script

Edit `infra/scripts/Selecting-Team-Config-And-Data.ps1`. Search for `NEW CONTENT PACK`
Edit `infra/scripts/post-provision/Selecting-Team-Config-And-Data.ps1`. Search for `NEW CONTENT PACK`
— each insertion point has a comment template. There are **4 things** to do:

| # | What | Where |
Expand Down Expand Up @@ -241,7 +241,7 @@ After adding your entry, update `$allOption` to `N + 1` so "All" is always last.
azd up

# 2. Provision pack resources — select your pack or "All"
./infra/scripts/Selecting-Team-Config-And-Data.ps1 -ResourceGroup <rg>
./infra/scripts/post-provision/Selecting-Team-Config-And-Data.ps1 -ResourceGroup <rg>
```

---
Expand Down
12 changes: 6 additions & 6 deletions content_packs/example_pack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Replace `datasets/data/<your_data>` with your source data. Supported formats:

### Step 4 — Register the Knowledge Base

Add an entry to `infra/scripts/seed_knowledge_bases.py` in the `KNOWLEDGE_BASES` dict:
Add an entry to `infra/scripts/post-provision/seed_knowledge_bases.py` in the `KNOWLEDGE_BASES` dict:

```python
# ── Your Pack ──
Expand Down Expand Up @@ -184,7 +184,7 @@ Create `agent_teams/your_pack.json`. Key fields:

### Step 6 — Register your pack in the deployment script

Edit `infra/scripts/Selecting-Team-Config-And-Data.ps1`. There are **4 locations**
Edit `infra/scripts/post-provision/Selecting-Team-Config-And-Data.ps1`. There are **4 locations**
to update (each is marked with a `NEW CONTENT PACK` comment block in the script):

| # | Section | What to add |
Expand All @@ -206,22 +206,22 @@ azd up

# 2. Provision pack resources (indexes, blob uploads, team configs, KBs)
# Run the post-deploy script and select your pack or "All"
./infra/scripts/Selecting-Team-Config-And-Data.ps1 -ResourceGroup <rg>
./infra/scripts/post-provision/Selecting-Team-Config-And-Data.ps1 -ResourceGroup <rg>
```

The script handles everything: team config upload, data indexing, and KB seeding.
For manual runs of individual steps:

```bash
# Upload team config only
python infra/scripts/upload_team_config.py \
python infra/scripts/post-provision/upload_team_config.py \
"https://<backend-url>" \
"content_packs/your_pack/agent_teams" \
"<user-principal-id>" \
"<team-uuid>"

# Seed KBs only (after indexes exist)
python infra/scripts/seed_knowledge_bases.py
python infra/scripts/post-provision/seed_knowledge_bases.py
```

---
Expand Down Expand Up @@ -249,7 +249,7 @@ Use this checklist to verify completeness:
- [ ] `content_packs/<pack>/datasets/` contains source data files
- [ ] `content_packs/<pack>/agent_teams/<pack>.json` exists with valid agents
- [ ] At least one agent has `"use_knowledge_base": true` with a valid `knowledge_base_name`
- [ ] KB entry added to `infra/scripts/seed_knowledge_bases.py` (index_name matches pack.json)
- [ ] KB entry added to `infra/scripts/post-provision/seed_knowledge_bases.py` (index_name matches pack.json)
- [ ] `team_id` is a stable UUID (prevents duplicate teams on re-upload)
- [ ] `starting_tasks` has at least one example prompt
- [ ] Agent `system_message` instructs the agent to use its search tool (not hallucinate)
Expand Down
4 changes: 2 additions & 2 deletions docs/AVMPostDeploymentGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ The post-deployment process is automated through a single PowerShell or Bash scr
- **For PowerShell (Windows/Linux/macOS):**

```powershell
infra\scripts\Selecting-Team-Config-And-Data.ps1 -ResourceGroup "<your-resource-group-name>"
infra\scripts\post-provision\Selecting-Team-Config-And-Data.ps1 -ResourceGroup "<your-resource-group-name>"
```

- **For Bash (Linux/macOS/WSL):**
```bash
bash infra/scripts/selecting_team_config_and_data.sh --resource-group "<your-resource-group-name>"
bash infra/scripts/post-provision/selecting_team_config_and_data.sh --resource-group "<your-resource-group-name>"
```

> **Note**: Replace `<your-resource-group-name>` with the actual name of the resource group containing your deployed Azure resources.
Expand Down
4 changes: 2 additions & 2 deletions docs/DeploymentGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -345,12 +345,12 @@ After successful deployment:

- **For Bash (Linux/macOS/WSL):**
```bash
bash infra/scripts/selecting_team_config_and_data.sh
bash infra/scripts/post-provision/selecting_team_config_and_data.sh
```

- **For PowerShell (Windows):**
```powershell
infra\scripts\Selecting-Team-Config-And-Data.ps1
infra\scripts\post-provision\Selecting-Team-Config-And-Data.ps1
```


Expand Down
2 changes: 1 addition & 1 deletion docs/quota_check.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ The final table lists regions with available quota. You can select any of these
**To check quota for the deployment**

```sh
curl -L -o quota_check_params.sh "https://raw.githubusercontent.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator/main/infra/scripts/quota_check_params.sh"
curl -L -o quota_check_params.sh "https://raw.githubusercontent.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator/main/infra/scripts/pre-provision/quota_check_params.sh"
chmod +x quota_check_params.sh
./quota_check_params.sh
```
Expand Down
Loading
Loading