Skip to content

Commit 9cc6424

Browse files
Harsh-MicrosoftHarsh-Microsoft
committed
Merge branch 'dev-v4' into hb-psl-reduce-srch-time
2 parents cb4ff07 + 36b7a0a commit 9cc6424

12 files changed

Lines changed: 1584 additions & 1399 deletions

File tree

‎.github/workflows/agnext-biab-02-containerimage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
packages: write
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020
# - name: Download deps
2121
# run: |
2222
# curl -fsSL ${{ vars.AUTOGEN_WHL_URL }} -o agnext-biab-02/autogen_core-0.3.dev0-py3-none-any.whl

‎infra/main.bicep‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ var allTags = union(
225225
},
226226
tags
227227
)
228+
var existingTags = resourceGroup().tags ?? {}
228229
@description('Tag, Created by user name')
229230
param createdBy string = contains(deployer(), 'userPrincipalName')
230231
? split(deployer().userPrincipalName, '@')[0]
@@ -234,15 +235,17 @@ var deployerPrincipalType = contains(deployer(), 'userPrincipalName') ? 'User' :
234235
resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
235236
name: 'default'
236237
properties: {
237-
tags: {
238-
...resourceGroup().tags
239-
...allTags
240-
TemplateName: 'MACAE'
241-
Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
242-
CreatedBy: createdBy
243-
DeploymentName: deployment().name
244-
SolutionSuffix: solutionSuffix
245-
}
238+
tags: union(
239+
existingTags,
240+
allTags,
241+
{
242+
TemplateName: 'MACAE'
243+
Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
244+
CreatedBy: createdBy
245+
DeploymentName: deployment().name
246+
SolutionSuffix: solutionSuffix
247+
}
248+
)
246249
}
247250
}
248251

‎infra/main.json‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.39.26.7824",
9-
"templateHash": "8027163253572555334"
8+
"version": "0.40.2.10011",
9+
"templateHash": "11659042024779211153"
1010
},
1111
"name": "Multi-Agent Custom Automation Engine",
1212
"description": "This module contains the resources required to deploy the [Multi-Agent Custom Automation Engine solution accelerator](https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) for both Sandbox environments and WAF aligned environments.\n\n> **Note:** This module is not intended for broad, generic use, as it was designed by the Commercial Solution Areas CTO team, as a Microsoft Solution Accelerator. Feature requests and bug fix requests are welcome if they support the needs of this organization but may not be incorporated if they aim to make this module more generic than what it needs to be for its primary use case. This module will likely be updated to leverage AVM resource modules in the future. This may result in breaking changes in upcoming versions when these features are implemented.\n"
@@ -399,6 +399,7 @@
399399
},
400400
"replicaLocation": "[variables('replicaRegionPairs')[parameters('location')]]",
401401
"allTags": "[union(createObject('azd-env-name', parameters('solutionName')), parameters('tags'))]",
402+
"existingTags": "[coalesce(resourceGroup().tags, createObject())]",
402403
"deployerPrincipalType": "[if(contains(deployer(), 'userPrincipalName'), 'User', 'ServicePrincipal')]",
403404
"useExistingLogAnalytics": "[not(empty(parameters('existingLogAnalyticsWorkspaceId')))]",
404405
"existingLawSubscription": "[if(variables('useExistingLogAnalytics'), split(parameters('existingLogAnalyticsWorkspaceId'), '/')[2], '')]",
@@ -502,7 +503,7 @@
502503
"apiVersion": "2021-04-01",
503504
"name": "default",
504505
"properties": {
505-
"tags": "[shallowMerge(createArray(resourceGroup().tags, variables('allTags'), createObject('TemplateName', 'MACAE', 'Type', if(parameters('enablePrivateNetworking'), 'WAF', 'Non-WAF'), 'CreatedBy', parameters('createdBy'), 'DeploymentName', deployment().name, 'SolutionSuffix', variables('solutionSuffix'))))]"
506+
"tags": "[union(variables('existingTags'), variables('allTags'), createObject('TemplateName', 'MACAE', 'Type', if(parameters('enablePrivateNetworking'), 'WAF', 'Non-WAF'), 'CreatedBy', parameters('createdBy'), 'DeploymentName', deployment().name, 'SolutionSuffix', variables('solutionSuffix')))]"
506507
}
507508
},
508509
"avmTelemetry": {
@@ -4911,8 +4912,8 @@
49114912
"metadata": {
49124913
"_generator": {
49134914
"name": "bicep",
4914-
"version": "0.39.26.7824",
4915-
"templateHash": "17693629099431521233"
4915+
"version": "0.40.2.10011",
4916+
"templateHash": "16969845928384020185"
49164917
}
49174918
},
49184919
"definitions": {
@@ -22443,8 +22444,8 @@
2244322444
"metadata": {
2244422445
"_generator": {
2244522446
"name": "bicep",
22446-
"version": "0.39.26.7824",
22447-
"templateHash": "7473169155225322335"
22447+
"version": "0.40.2.10011",
22448+
"templateHash": "8742987061721021759"
2244822449
}
2244922450
},
2245022451
"definitions": {
@@ -22751,7 +22752,7 @@
2275122752
},
2275222753
"type": "Microsoft.Authorization/roleAssignments",
2275322754
"apiVersion": "2022-04-01",
22754-
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
22755+
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
2275522756
"name": "[coalesce(tryGet(coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()], 'name'), guid(resourceId('Microsoft.CognitiveServices/accounts', parameters('name')), coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].principalId, coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId))]",
2275622757
"properties": {
2275722758
"roleDefinitionId": "[coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId]",
@@ -25430,9 +25431,9 @@
2543025431
}
2543125432
},
2543225433
"dependsOn": [
25433-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
2543425434
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
2543525435
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
25436+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
2543625437
"logAnalyticsWorkspace",
2543725438
"userAssignedIdentity",
2543825439
"virtualNetwork"
@@ -25471,8 +25472,8 @@
2547125472
"metadata": {
2547225473
"_generator": {
2547325474
"name": "bicep",
25474-
"version": "0.39.26.7824",
25475-
"templateHash": "13634050148372048883"
25475+
"version": "0.40.2.10011",
25476+
"templateHash": "7507285802464480889"
2547625477
}
2547725478
},
2547825479
"parameters": {
@@ -34462,8 +34463,8 @@
3446234463
"metadata": {
3446334464
"_generator": {
3446434465
"name": "bicep",
34465-
"version": "0.39.26.7824",
34466-
"templateHash": "13074777962389399773"
34466+
"version": "0.40.2.10011",
34467+
"templateHash": "8640881069237947782"
3446734468
}
3446834469
},
3446934470
"definitions": {
@@ -35400,7 +35401,7 @@
3540035401
},
3540135402
"type": "Microsoft.Insights/diagnosticSettings",
3540235403
"apiVersion": "2021-05-01-preview",
35403-
"scope": "[format('Microsoft.Web/sites/{0}', parameters('name'))]",
35404+
"scope": "[resourceId('Microsoft.Web/sites', parameters('name'))]",
3540435405
"name": "[coalesce(tryGet(coalesce(parameters('diagnosticSettings'), createArray())[copyIndex()], 'name'), format('{0}-diagnosticSettings', parameters('name')))]",
3540535406
"properties": {
3540635407
"copy": [
@@ -35475,8 +35476,8 @@
3547535476
"metadata": {
3547635477
"_generator": {
3547735478
"name": "bicep",
35478-
"version": "0.39.26.7824",
35479-
"templateHash": "11666262061409473778"
35479+
"version": "0.40.2.10011",
35480+
"templateHash": "10706743168754451638"
3548035481
},
3548135482
"name": "Site App Settings",
3548235483
"description": "This module deploys a Site App Setting."
@@ -47021,8 +47022,8 @@
4702147022
"metadata": {
4702247023
"_generator": {
4702347024
"name": "bicep",
47024-
"version": "0.39.26.7824",
47025-
"templateHash": "13854536965493424643"
47025+
"version": "0.40.2.10011",
47026+
"templateHash": "14874963049736669838"
4702647027
}
4702747028
},
4702847029
"parameters": {

‎infra/main_custom.bicep‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ var allTags = union(
224224
},
225225
tags
226226
)
227+
var existingTags = resourceGroup().tags ?? {}
227228
@description('Tag, Created by user name')
228229
param createdBy string = contains(deployer(), 'userPrincipalName')
229230
? split(deployer().userPrincipalName, '@')[0]
@@ -233,14 +234,17 @@ var deployerPrincipalType = contains(deployer(), 'userPrincipalName') ? 'User' :
233234
resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
234235
name: 'default'
235236
properties: {
236-
tags: {
237-
...allTags
238-
TemplateName: 'MACAE'
239-
Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
240-
CreatedBy: createdBy
241-
DeploymentName: deployment().name
242-
SolutionSuffix: solutionSuffix
243-
}
237+
tags: union(
238+
existingTags,
239+
allTags,
240+
{
241+
TemplateName: 'MACAE'
242+
Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
243+
CreatedBy: createdBy
244+
DeploymentName: deployment().name
245+
SolutionSuffix: solutionSuffix
246+
}
247+
)
244248
}
245249
}
246250

‎src/backend/pyproject.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ dependencies = [
2727
"pytest-cov==5.0.0",
2828
"python-dotenv==1.1.1",
2929
"python-multipart==0.0.20",
30-
"semantic-kernel==1.35.3",
30+
"semantic-kernel==1.39.3",
3131
"uvicorn==0.35.0",
3232
"pylint-pydantic==0.3.5",
3333
"pexpect==4.9.0",
34-
"mcp==1.13.1",
34+
"mcp==1.23.0",
35+
"werkzeug==3.1.5",
36+
"azure-core==1.38.0",
3537
"agent-framework>=1.0.0b251105",
3638
]

‎src/backend/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fastapi
22
uvicorn
3-
3+
autogen-agentchat==0.7.5
44
azure-cosmos
55
azure-monitor-opentelemetry
66
azure-monitor-events-extension

0 commit comments

Comments
 (0)