Skip to content

Commit e6bc3f2

Browse files
committed
Merge branch 'feature/azd-semantickernel' of https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator into feature/azd-semantickernel
2 parents 9036a05 + 7be331c commit e6bc3f2

35 files changed

+1519
-1617
lines changed

.github/workflows/azure-dev.yml renamed to .github/workflows/azure-dev-validation.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
name: Azure Template Validation
22
on:
3+
push:
4+
branches:
5+
- dev
6+
- main
7+
- feature/azd-semantickernel
38
workflow_dispatch:
49

510
permissions:

infra/main.bicep

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,39 @@
1+
targetScope = 'resourceGroup'
12
@description('Location for all resources.')
23
param location string = 'EastUS2' //Fixed for model availability, change back to resourceGroup().location
34

4-
@description('Location for OpenAI resources.')
5-
param azureOpenAILocation string = 'japaneast' //Fixed for model availability
6-
7-
8-
9-
@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'
5+
@allowed([
6+
'australiaeast'
7+
'brazilsouth'
8+
'canadacentral'
9+
'canadaeast'
10+
'eastus'
11+
'eastus2'
12+
'francecentral'
13+
'germanywestcentral'
14+
'japaneast'
15+
'koreacentral'
16+
'northcentralus'
17+
'norwayeast'
18+
'polandcentral'
19+
'southafricanorth'
20+
'southcentralus'
21+
'southindia'
22+
'swedencentral'
23+
'switzerlandnorth'
24+
'uaenorth'
25+
'uksouth'
26+
'westeurope'
27+
'westus'
28+
'westus3'
29+
])
30+
@description('Location for all Ai services resources. This location can be different from the resource group location.')
31+
param azureOpenAILocation string = 'eastus2' // The location used for all deployed resources. This location must be in the same region as the resource group.
32+
33+
@minLength(3)
34+
@maxLength(20)
35+
@description('Prefix for all resources created by this template. This prefix will be used to create unique names for all resources. The prefix must be unique within the resource group.')
36+
param prefix string = take('macaeo-${uniqueString(resourceGroup().id)}', 10)
1137

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

src/backend/agents/base_agent.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
Step,
2222
StepStatus,
2323
)
24+
2425
from src.backend.event_utils import track_event_if_configured
2526

2627

0 commit comments

Comments
 (0)