Skip to content

Commit 84ddce6

Browse files
fosteramandafosteramanda
authored
Removing model deployment from standard setup with byo aoai connection (#257)
* fixing bicep to remove model deployment * Removing deployment * fixing param * fixing param
1 parent 1942a6d commit 84ddce6

File tree

4 files changed

+35
-164
lines changed

4 files changed

+35
-164
lines changed

‎samples/microsoft/infrastructure-setup/43-standard-agent-setup-with-customization/azuredeploy.json‎

Lines changed: 27 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"metadata": {
55
"_generator": {
66
"name": "bicep",
7-
"version": "0.36.1.42791",
8-
"templateHash": "2337720295327678084"
7+
"version": "0.36.177.2456",
8+
"templateHash": "7964587460658122710"
99
}
1010
},
1111
"parameters": {
@@ -30,7 +30,9 @@
3030
"westus",
3131
"westus3",
3232
"westeurope",
33-
"southeastasia"
33+
"southeastasia",
34+
"canadacentral",
35+
"centralus"
3436
],
3537
"metadata": {
3638
"description": "The Azure region where your AI Foundry resource and project will be created."
@@ -65,41 +67,6 @@
6567
"description": "The display name of the project"
6668
}
6769
},
68-
"modelName": {
69-
"type": "string",
70-
"defaultValue": "gpt-4o",
71-
"metadata": {
72-
"description": "The name of the model you want to deploy"
73-
}
74-
},
75-
"modelFormat": {
76-
"type": "string",
77-
"defaultValue": "OpenAI",
78-
"metadata": {
79-
"description": "The provider of your model"
80-
}
81-
},
82-
"modelVersion": {
83-
"type": "string",
84-
"defaultValue": "2024-05-13",
85-
"metadata": {
86-
"description": "The version of your model"
87-
}
88-
},
89-
"modelSkuName": {
90-
"type": "string",
91-
"defaultValue": "GlobalStandard",
92-
"metadata": {
93-
"description": "The sku of your model deployment"
94-
}
95-
},
96-
"modelCapacity": {
97-
"type": "int",
98-
"defaultValue": 1,
99-
"metadata": {
100-
"description": "The tokens per minute (TPM) of your model deployment"
101-
}
102-
},
10370
"aiSearchResourceId": {
10471
"type": "string",
10572
"defaultValue": "",
@@ -196,8 +163,8 @@
196163
"metadata": {
197164
"_generator": {
198165
"name": "bicep",
199-
"version": "0.36.1.42791",
200-
"templateHash": "171266152524516775"
166+
"version": "0.36.177.2456",
167+
"templateHash": "16553804520604147601"
201168
}
202169
},
203170
"parameters": {
@@ -346,8 +313,8 @@
346313
"metadata": {
347314
"_generator": {
348315
"name": "bicep",
349-
"version": "0.36.1.42791",
350-
"templateHash": "9251412253783334218"
316+
"version": "0.36.177.2456",
317+
"templateHash": "1453662494083447759"
351318
}
352319
},
353320
"parameters": {
@@ -571,21 +538,6 @@
571538
},
572539
"location": {
573540
"value": "[parameters('location')]"
574-
},
575-
"modelName": {
576-
"value": "[parameters('modelName')]"
577-
},
578-
"modelFormat": {
579-
"value": "[parameters('modelFormat')]"
580-
},
581-
"modelVersion": {
582-
"value": "[parameters('modelVersion')]"
583-
},
584-
"modelSkuName": {
585-
"value": "[parameters('modelSkuName')]"
586-
},
587-
"modelCapacity": {
588-
"value": "[parameters('modelCapacity')]"
589541
}
590542
},
591543
"template": {
@@ -594,8 +546,8 @@
594546
"metadata": {
595547
"_generator": {
596548
"name": "bicep",
597-
"version": "0.36.1.42791",
598-
"templateHash": "15237577532071055442"
549+
"version": "0.36.177.2456",
550+
"templateHash": "10711245918135899159"
599551
}
600552
},
601553
"parameters": {
@@ -604,21 +556,6 @@
604556
},
605557
"location": {
606558
"type": "string"
607-
},
608-
"modelName": {
609-
"type": "string"
610-
},
611-
"modelFormat": {
612-
"type": "string"
613-
},
614-
"modelVersion": {
615-
"type": "string"
616-
},
617-
"modelSkuName": {
618-
"type": "string"
619-
},
620-
"modelCapacity": {
621-
"type": "int"
622559
}
623560
},
624561
"resources": [
@@ -645,25 +582,6 @@
645582
"publicNetworkAccess": "Enabled",
646583
"disableLocalAuth": false
647584
}
648-
},
649-
{
650-
"type": "Microsoft.CognitiveServices/accounts/deployments",
651-
"apiVersion": "2025-04-01-preview",
652-
"name": "[format('{0}/{1}', parameters('accountName'), parameters('modelName'))]",
653-
"sku": {
654-
"capacity": "[parameters('modelCapacity')]",
655-
"name": "[parameters('modelSkuName')]"
656-
},
657-
"properties": {
658-
"model": {
659-
"name": "[parameters('modelName')]",
660-
"format": "[parameters('modelFormat')]",
661-
"version": "[parameters('modelVersion')]"
662-
}
663-
},
664-
"dependsOn": [
665-
"[resourceId('Microsoft.CognitiveServices/accounts', parameters('accountName'))]"
666-
]
667585
}
668586
],
669587
"outputs": {
@@ -762,8 +680,8 @@
762680
"metadata": {
763681
"_generator": {
764682
"name": "bicep",
765-
"version": "0.36.1.42791",
766-
"templateHash": "8439794156070145716"
683+
"version": "0.36.177.2456",
684+
"templateHash": "5762548021801344318"
767685
}
768686
},
769687
"parameters": {
@@ -971,8 +889,8 @@
971889
"metadata": {
972890
"_generator": {
973891
"name": "bicep",
974-
"version": "0.36.1.42791",
975-
"templateHash": "2454897475102921474"
892+
"version": "0.36.177.2456",
893+
"templateHash": "1630418642552914053"
976894
}
977895
},
978896
"parameters": {
@@ -1026,8 +944,8 @@
1026944
"metadata": {
1027945
"_generator": {
1028946
"name": "bicep",
1029-
"version": "0.36.1.42791",
1030-
"templateHash": "15310151330407972444"
947+
"version": "0.36.177.2456",
948+
"templateHash": "17551715511504513729"
1031949
}
1032950
},
1033951
"parameters": {
@@ -1083,8 +1001,8 @@
10831001
"metadata": {
10841002
"_generator": {
10851003
"name": "bicep",
1086-
"version": "0.36.1.42791",
1087-
"templateHash": "12828603143685936423"
1004+
"version": "0.36.177.2456",
1005+
"templateHash": "14520822405888680131"
10881006
}
10891007
},
10901008
"parameters": {
@@ -1147,8 +1065,8 @@
11471065
"metadata": {
11481066
"_generator": {
11491067
"name": "bicep",
1150-
"version": "0.36.1.42791",
1151-
"templateHash": "5469011444914133614"
1068+
"version": "0.36.177.2456",
1069+
"templateHash": "14867846200503976585"
11521070
}
11531071
},
11541072
"parameters": {
@@ -1242,8 +1160,8 @@
12421160
"metadata": {
12431161
"_generator": {
12441162
"name": "bicep",
1245-
"version": "0.36.1.42791",
1246-
"templateHash": "3513717760768716645"
1163+
"version": "0.36.177.2456",
1164+
"templateHash": "1464171439866795767"
12471165
}
12481166
},
12491167
"parameters": {
@@ -1368,8 +1286,8 @@
13681286
"metadata": {
13691287
"_generator": {
13701288
"name": "bicep",
1371-
"version": "0.36.1.42791",
1372-
"templateHash": "16917631713139178555"
1289+
"version": "0.36.177.2456",
1290+
"templateHash": "18181560941432638927"
13731291
}
13741292
},
13751293
"parameters": {
@@ -1447,8 +1365,8 @@
14471365
"metadata": {
14481366
"_generator": {
14491367
"name": "bicep",
1450-
"version": "0.36.1.42791",
1451-
"templateHash": "10571339129853945528"
1368+
"version": "0.36.177.2456",
1369+
"templateHash": "12823752392500271535"
14521370
}
14531371
},
14541372
"parameters": {

‎samples/microsoft/infrastructure-setup/43-standard-agent-setup-with-customization/azuredeploy.parameters.json‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
2-
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
2+
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
5-
"location": {},
5+
"location": {
6+
"value": "westus"
7+
},
68
"aiFoundryName": {
79
"value": ""
810
},
@@ -21,20 +23,11 @@
2123
"existingAoaiResourceId": {
2224
"value": ""
2325
},
24-
"modelName": {
25-
"value": ""
26-
},
27-
"modelFormat": {
26+
"projectCapHost": {
2827
"value": ""
2928
},
30-
"modelVersion": {
29+
"accountCapHost": {
3130
"value": ""
32-
},
33-
"modelSkuName": {
34-
"value": ""
35-
},
36-
"modelCapacity": {
37-
"value": 0
3831
}
3932
}
4033
}

‎samples/microsoft/infrastructure-setup/43-standard-agent-setup-with-customization/main.bicep‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
'westus3'
2020
'westeurope'
2121
'southeastasia'
22+
'canadacentral'
23+
'centralus'
2224
])
2325
@description('The Azure region where your AI Foundry resource and project will be created.')
2426
param location string = 'westus'
@@ -36,22 +38,6 @@ param projectDescription string = 'some description'
3638
@description('The display name of the project')
3739
param displayName string = 'project'
3840

39-
// Model deployment parameters
40-
@description('The name of the model you want to deploy')
41-
param modelName string = 'gpt-4o'
42-
43-
@description('The provider of your model')
44-
param modelFormat string = 'OpenAI'
45-
46-
@description('The version of your model')
47-
param modelVersion string = '2024-05-13'
48-
49-
@description('The sku of your model deployment')
50-
param modelSkuName string = 'GlobalStandard'
51-
52-
@description('The tokens per minute (TPM) of your model deployment')
53-
param modelCapacity int = 1
54-
5541
// Optionally bring existing resources
5642
@description('The AI Search Service full ARM Resource ID. This is an optional field, and if not provided, the resource will be created.')
5743
param aiSearchResourceId string = ''
@@ -150,11 +136,6 @@ module aiAccount 'modules-standard/ai-account-identity.bicep' = {
150136
params: {
151137
accountName: accountName
152138
location: location
153-
modelName: modelName
154-
modelFormat: modelFormat
155-
modelVersion: modelVersion
156-
modelSkuName: modelSkuName
157-
modelCapacity: modelCapacity
158139
}
159140
dependsOn: [
160141
validateExistingResources, aiDependencies

‎samples/microsoft/infrastructure-setup/43-standard-agent-setup-with-customization/modules-standard/ai-account-identity.bicep‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11

22
param accountName string
33
param location string
4-
param modelName string
5-
param modelFormat string
6-
param modelVersion string
7-
param modelSkuName string
8-
param modelCapacity int
94

105
resource account 'Microsoft.CognitiveServices/accounts@2025-04-01-preview' = {
116
name: accountName
@@ -32,22 +27,6 @@ resource account 'Microsoft.CognitiveServices/accounts@2025-04-01-preview' = {
3227
}
3328
}
3429

35-
resource modelDeployment 'Microsoft.CognitiveServices/accounts/deployments@2025-04-01-preview'= {
36-
parent: account
37-
name: modelName
38-
sku : {
39-
capacity: modelCapacity
40-
name: modelSkuName
41-
}
42-
properties: {
43-
model:{
44-
name: modelName
45-
format: modelFormat
46-
version: modelVersion
47-
}
48-
}
49-
}
50-
5130
output accountName string = account.name
5231
output accountID string = account.id
5332
output accountTarget string = account.properties.endpoint

0 commit comments

Comments
 (0)