Skip to content

Commit 798d627

Browse files
committed
azd up working, issue with input_tasks
1 parent e4a92f5 commit 798d627

File tree

6 files changed

+35
-26
lines changed

6 files changed

+35
-26
lines changed

azure.yaml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
# yaml-language-server: $schema=https://raw.githubusercontent.com/Azure/azure-dev/main/schemas/v1.0/azure.yaml.json
2-
environment:
3-
name: multi-agent-custom-automation-engine-solution-accelerator
4-
location: eastus
2+
53
name: multi-agent-custom-automation-engine-solution-accelerator
6-
# metadata:
7-
# template: [email protected]
8-
parameters:
9-
baseUrl:
10-
type: string
11-
default: 'https://github.com/TravisHilbert/Modernize-your-code-solution-accelerator'
12-
deployment:
13-
mode: Incremental
14-
template: ./infra/main.bicep # Path to the main.bicep file inside the 'deployment' folder
4+
metadata:
5+
6+
services:
7+
backend:
8+
project: src/backend
9+
host: containerapp
10+
language: python
11+
docker:
12+
path: Dockerfile
13+
frontend:
14+
project: src/frontend
15+
host: containerapp
16+
language: python
17+
docker:
18+
path: Dockerfile

infra/main.bicep

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
@description('Location for all resources.')
2-
param location string = 'EastUS2' //Fixed for model availability, change back to resourceGroup().location
2+
param location string //Fixed for model availability, change back to resourceGroup().location
3+
34

45
@description('Location for OpenAI resources.')
56
param azureOpenAILocation string = 'japaneast' //Fixed for model availability
67

78

89

910
@description('A prefix to add to the start of all resource names. Note: A "unique" suffix will also be added')
10-
param prefix string = 'macaeo'
11+
param prefix string = take('macaeo-${uniqueString(resourceGroup().id)}', 10)
1112

1213
@description('Tags to apply to all deployed resources')
1314
param tags object = {}

infra/main.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.34.44.8038",
9-
"templateHash": "2906892014954666053"
8+
"version": "0.28.1.47646",
9+
"templateHash": "1631755345697758847"
1010
}
1111
},
1212
"parameters": {
1313
"location": {
1414
"type": "string",
15-
"defaultValue": "EastUS2",
1615
"metadata": {
1716
"description": "Location for all resources."
1817
}
@@ -26,7 +25,7 @@
2625
},
2726
"prefix": {
2827
"type": "string",
29-
"defaultValue": "macaeo",
28+
"defaultValue": "[take(format('macaeo-{0}', uniqueString(resourceGroup().id)), 10)]",
3029
"metadata": {
3130
"description": "A prefix to add to the start of all resource names. Note: A \"unique\" suffix will also be added"
3231
}
@@ -245,6 +244,7 @@
245244
},
246245
"dependsOn": [
247246
"aiServices",
247+
"aoaiUserRoleDefinition",
248248
"containerApp"
249249
]
250250
},
@@ -403,9 +403,9 @@
403403
"dependsOn": [
404404
"aiServices",
405405
"appInsights",
406+
"cosmos::autogenDb",
406407
"containerAppEnv",
407408
"cosmos",
408-
"cosmos::autogenDb",
409409
"cosmos::autogenDb::memoryContainer",
410410
"pullIdentity"
411411
],
@@ -500,8 +500,8 @@
500500
"metadata": {
501501
"_generator": {
502502
"name": "bicep",
503-
"version": "0.34.44.8038",
504-
"templateHash": "10664495342911727649"
503+
"version": "0.28.1.47646",
504+
"templateHash": "9096960510978747660"
505505
}
506506
},
507507
"parameters": {
@@ -638,8 +638,8 @@
638638
"metadata": {
639639
"_generator": {
640640
"name": "bicep",
641-
"version": "0.34.44.8038",
642-
"templateHash": "12550713338937452696"
641+
"version": "0.28.1.47646",
642+
"templateHash": "8215150938757657777"
643643
}
644644
},
645645
"parameters": {
@@ -1028,8 +1028,8 @@
10281028
"metadata": {
10291029
"_generator": {
10301030
"name": "bicep",
1031-
"version": "0.34.44.8038",
1032-
"templateHash": "11364190519186458619"
1031+
"version": "0.28.1.47646",
1032+
"templateHash": "15814429030073463584"
10331033
}
10341034
},
10351035
"parameters": {

next-steps.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ To troubleshoot any issues, see [troubleshooting](#troubleshooting).
1717

1818
### Configure environment variables for running services
1919

20-
Configure environment variables for running services by updating `settings` in [main.parameters.json](./infra/main.parameters.json).
20+
Environment variables can be configured by modifying the `env` settings in [resources.bicep](./infra/resources.bicep).
21+
To define a secret, add the variable as a `secretRef` pointing to a `secrets` entry or a stored KeyVault secret.
2122

2223
### Configure CI/CD pipeline
2324

src/backend/requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
fastapi
22
uvicorn
3+
autogen-agentchat==0.4.0dev1
4+
autogen-core==0.4.0dev1
35
azure-cosmos
46
azure-monitor-opentelemetry
57
azure-monitor-events-extension
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit f467ba7b0977045e04ca581b42b8d028b4027531

0 commit comments

Comments
 (0)