Skip to content

Commit 5082901

Browse files
Roopan-MicrosoftRoopan-Microsoft
committed
2 parents bdebf95 + a27b6df commit 5082901

File tree

17 files changed

+754
-268
lines changed

17 files changed

+754
-268
lines changed

‎azure.yaml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,24 @@ name: multi-agent-custom-automation-engine-solution-accelerator
33
metadata:
44
template: [email protected]
55
requiredVersions:
6-
azd: ">=1.15.0 !=1.17.1"
6+
azd: ">=1.15.0 !=1.17.1"
7+
hooks:
8+
postprovision:
9+
windows:
10+
run: |
11+
Write-Host "To upload Team Configurations to Cosmos. Run the following command in PowerShell:"
12+
Write-Host "infra\scripts\Upload-Team-Config.ps1" -ForegroundColor Cyan
13+
Write-Host ""
14+
Write-Host "To index Sample Data into Azure Search. Run the following command in PowerShell:"
15+
Write-Host "infra\scripts\Process-Sample-Data.ps1" -ForegroundColor Cyan
16+
shell: pwsh
17+
interactive: true
18+
posix:
19+
run: |
20+
echo "To upload Team Configurations to Cosmos. Run the following command in Bash:"
21+
echo "bash infra/scripts/upload_team_config.sh"
22+
echo ""
23+
echo "To index Sample Data into Azure Search. Run the following command in Bash:"
24+
echo "bash infra/scripts/process_sample_data.sh"
25+
shell: sh
26+
interactive: true

‎azure_custom.yaml‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,25 @@ services:
3838
shell: sh
3939
run: bash ../../infra/scripts/package_frontend.sh
4040
interactive: true
41-
continueOnError: false
41+
continueOnError: false
42+
43+
hooks:
44+
postprovision:
45+
windows:
46+
run: |
47+
Write-Host "To upload Team Configurations to Cosmos. Run the following command in PowerShell:"
48+
Write-Host "infra\scripts\Upload-Team-Config.ps1" -ForegroundColor Cyan
49+
Write-Host ""
50+
Write-Host "To index Sample Data into Azure Search. Run the following command in PowerShell:"
51+
Write-Host "infra\scripts\Process-Sample-Data.ps1" -ForegroundColor Cyan
52+
shell: pwsh
53+
interactive: true
54+
posix:
55+
run: |
56+
echo "To upload Team Configurations to Cosmos. Run the following command in Bash:"
57+
echo "bash infra/scripts/upload_team_config.sh"
58+
echo ""
59+
echo "To index Sample Data into Azure Search. Run the following command in Bash:"
60+
echo "bash infra/scripts/process_sample_data.sh"
61+
shell: sh
62+
interactive: true

‎docs/DeploymentGuide.md‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -370,16 +370,24 @@ The files for the dev container are located in `/.devcontainer/` folder.
370370
371371
- If you are using `venv`, create and activate your virtual environment for both the frontend and backend folders.
372372
373-
8. **Install requirements - frontend:**
373+
8. **Install requirements - Backend:**
374+
375+
- To install the requirement for backend -
376+
Open a terminal in the `src/backend` folder and run:
374377
375-
- In each of the frontend and backend folders -
376-
Open a terminal in the `src` folder and run:
377378
```bash
378-
pip install -r requirements.txt
379+
pip install uv
380+
uv sync
379381
```
380382
381383
9. **Build the frontend (important):**
382384
385+
- To install the requirement for frontend -
386+
Open a terminal in the `src/frontend` folder and run:
387+
```bash
388+
pip install -r requirements.txt
389+
```
390+
383391
- Before running the frontend server, you must build the frontend to generate the necessary `build/assets` directory.
384392
385393
From the `src/frontend` directory, run:
@@ -391,7 +399,7 @@ The files for the dev container are located in `/.devcontainer/` folder.
391399
392400
10. **Run the application:**
393401
394-
- From the src/backend directory:
402+
- From the src/backend directory activate the virtual environment created through step 8:
395403
396404
```bash
397405
python app_kernel.py
@@ -403,8 +411,17 @@ python app_kernel.py
403411
python frontend_server.py
404412
```
405413
406-
10. Open a browser and navigate to `http://localhost:3000`
407-
11. To see swagger API documentation, you can navigate to `http://localhost:8000/docs`
414+
11. Open a browser and navigate to `http://localhost:3000`
415+
12. To see swagger API documentation, you can navigate to `http://localhost:8000/docs`
416+
417+
418+
## Deploy Your local changes
419+
To Deploy your local changes rename the below files.
420+
1. Rename `azure.yaml` to `azure_custom2.yaml` and `azure_custom.yaml` to `azure.yaml`.
421+
2. Go to `infra` directory
422+
- Remove `main.bicep` to `main_custom2.bicep` and `main_custom.bicep` to `main.bicep`.
423+
Continue with the [deploying steps](#deploying-with-azd).
424+
408425
409426
## Debugging the solution locally
410427

‎infra/main.bicep‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,19 +1455,19 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
14551455
}
14561456
{
14571457
name: 'REASONING_MODEL_NAME'
1458-
value: ''
1458+
value: 'o3'
14591459
}
14601460
{
14611461
name: 'MCP_SERVER_ENDPOINT'
1462-
value: ''
1462+
value: 'https://${containerAppMcp.outputs.fqdn}/mcp'
14631463
}
14641464
{
14651465
name: 'MCP_SERVER_NAME'
14661466
value: 'MACAE MCP Server'
14671467
}
14681468
{
14691469
name: 'MCP_SERVER_DESCRIPTION'
1470-
value: ''
1470+
value: 'MACAE MCP Server Description'
14711471
}
14721472
{
14731473
name: 'AZURE_TENANT_ID'
@@ -1479,7 +1479,7 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
14791479
}
14801480
{
14811481
name: 'SUPPORTED_MODELS'
1482-
value: ''
1482+
value: '["o3","o4-mini","gpt-4.1","gpt-4.1-mini"]'
14831483
}
14841484
{
14851485
name: 'AZURE_AI_SEARCH_API_KEY'
@@ -1881,3 +1881,12 @@ output AZURE_AI_AGENT_ENDPOINT string = aiFoundryAiProjectEndpoint
18811881
output APP_ENV string = 'Prod'
18821882
output AI_FOUNDRY_RESOURCE_ID string = !useExistingAiFoundryAiProject ? aiFoundryAiServices.outputs.resourceId : existingAiFoundryAiProjectResourceId
18831883
output COSMOSDB_ACCOUNT_NAME string = cosmosDbResourceName
1884+
output AZURE_SEARCH_ENDPOINT string =searchService.outputs.endpoint
1885+
output AZURE_CLIENT_ID string = userAssignedIdentity!.outputs.clientId
1886+
output AZURE_TENANT_ID string = tenant().tenantId
1887+
output AZURE_AI_SEARCH_CONNECTION_NAME string = searchService.outputs.name
1888+
output AZURE_COGNITIVE_SERVICES string = 'https://cognitiveservices.azure.com/.default'
1889+
output REASONING_MODEL_NAME string = 'o3'
1890+
output MCP_SERVER_NAME string = 'MACAE MCP Server'
1891+
output MCP_SERVER_DESCRIPTION string = 'MACAE MCP Server Description'
1892+
output SUPPORTED_MODELS string = '["o3","o4-mini","gpt-4.1","gpt-4.1-mini"]'

‎infra/main_custom.bicep‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1466,6 +1466,18 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
14661466
name: 'APP_ENV'
14671467
value: 'Prod'
14681468
}
1469+
{
1470+
name: 'AZURE_AI_SEARCH_CONNECTION_NAME'
1471+
value: searchService.outputs.name
1472+
}
1473+
{
1474+
name: 'AZURE_AI_SEARCH_INDEX_NAME'
1475+
value: aiSearchIndexName
1476+
}
1477+
{
1478+
name: 'AZURE_AI_SEARCH_ENDPOINT'
1479+
value: searchService.outputs.endpoint
1480+
}
14691481
{
14701482
name: 'AZURE_COGNITIVE_SERVICES'
14711483
value: 'https://cognitiveservices.azure.com/.default'
@@ -1476,19 +1488,19 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
14761488
}
14771489
{
14781490
name: 'REASONING_MODEL_NAME'
1479-
value: ''
1491+
value: 'o3'
14801492
}
14811493
{
14821494
name: 'MCP_SERVER_ENDPOINT'
1483-
value: ''
1495+
value: 'https://${containerAppMcp.outputs.fqdn}/mcp'
14841496
}
14851497
{
14861498
name: 'MCP_SERVER_NAME'
14871499
value: 'MACAE MCP Server'
14881500
}
14891501
{
14901502
name: 'MCP_SERVER_DESCRIPTION'
1491-
value: ''
1503+
value: 'MACAE MCP Server Description'
14921504
}
14931505
{
14941506
name: 'AZURE_TENANT_ID'
@@ -1500,19 +1512,7 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
15001512
}
15011513
{
15021514
name: 'SUPPORTED_MODELS'
1503-
value: ''
1504-
}
1505-
{
1506-
name: 'AZURE_AI_SEARCH_CONNECTION_NAME'
1507-
value: aiSearchConnectionName
1508-
}
1509-
{
1510-
name: 'AZURE_AI_SEARCH_INDEX_NAME'
1511-
value: aiSearchIndexName
1512-
}
1513-
{
1514-
name: 'AZURE_AI_SEARCH_ENDPOINT'
1515-
value: searchService.outputs.endpoint
1515+
value: '["o3","o4-mini","gpt-4.1","gpt-4.1-mini"]'
15161516
}
15171517
{
15181518
name: 'AZURE_AI_SEARCH_API_KEY'
@@ -1530,10 +1530,6 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
15301530
name: 'AZURE_STORAGE_CONTAINER_NAME'
15311531
value: storageContainerName
15321532
}
1533-
{
1534-
name: 'AZURE_SEARCH_ENDPOINT'
1535-
value: searchService.outputs.endpoint
1536-
}
15371533
]
15381534
}
15391535
]
@@ -1943,3 +1939,12 @@ output AZURE_AI_AGENT_ENDPOINT string = aiFoundryAiProjectEndpoint
19431939
output APP_ENV string = 'Prod'
19441940
output AI_FOUNDRY_RESOURCE_ID string = !useExistingAiFoundryAiProject ? aiFoundryAiServices.outputs.resourceId : existingAiFoundryAiProjectResourceId
19451941
output COSMOSDB_ACCOUNT_NAME string = cosmosDbResourceName
1942+
output AZURE_SEARCH_ENDPOINT string =searchService.outputs.endpoint
1943+
output AZURE_CLIENT_ID string = userAssignedIdentity!.outputs.clientId
1944+
output AZURE_TENANT_ID string = tenant().tenantId
1945+
output AZURE_AI_SEARCH_CONNECTION_NAME string = searchService.outputs.name
1946+
output AZURE_COGNITIVE_SERVICES string = 'https://cognitiveservices.azure.com/.default'
1947+
output REASONING_MODEL_NAME string = 'o3'
1948+
output MCP_SERVER_NAME string = 'MACAE MCP Server'
1949+
output MCP_SERVER_DESCRIPTION string = 'MACAE MCP Server Description'
1950+
output SUPPORTED_MODELS string = '["o3","o4-mini","gpt-4.1","gpt-4.1-mini"]'

0 commit comments

Comments
 (0)