Skip to content

Commit 231f14e

Browse files
updated bicep code for dall-e removal
1 parent 78e5d92 commit 231f14e

File tree

4 files changed

+11
-23
lines changed

4 files changed

+11
-23
lines changed

content-gen/infra/main.bicep

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,10 @@ param gptModelName string = 'gpt-5.1'
6565
@description('Optional. Version of the GPT model to deploy.')
6666
param gptModelVersion string = '2025-11-13'
6767

68-
@description('Optional. Image model to deploy: gpt-image-1, gpt-image-1.5, dall-e-3, or none to skip.')
68+
@description('Optional. Image model to deploy: gpt-image-1, gpt-image-1.5, or none to skip.')
6969
@allowed([
7070
'gpt-image-1'
7171
'gpt-image-1.5'
72-
'dall-e-3'
7372
'none'
7473
])
7574
param imageModelChoice string = 'gpt-image-1'
@@ -86,7 +85,7 @@ param gptModelCapacity int = 150
8685

8786
@minValue(1)
8887
@description('Optional. Image model deployment capacity (RPM).')
89-
param dalleModelCapacity int = 1
88+
param imageModelCapacity int = 1
9089

9190
@description('Optional. Existing Log Analytics Workspace Resource ID.')
9291
param existingLogAnalyticsWorkspaceId string = ''
@@ -222,11 +221,6 @@ var imageModelConfig = {
222221
version: '2025-12-16'
223222
sku: 'GlobalStandard'
224223
}
225-
'dall-e-3': {
226-
name: 'dall-e-3'
227-
version: '3.0'
228-
sku: 'Standard'
229-
}
230224
none: {
231225
name: ''
232226
version: ''
@@ -242,7 +236,7 @@ var imageModelDeployment = imageModelChoice != 'none' ? [
242236
model: imageModelConfig[imageModelChoice].name
243237
sku: {
244238
name: imageModelConfig[imageModelChoice].sku
245-
capacity: dalleModelCapacity
239+
capacity: imageModelCapacity
246240
}
247241
version: imageModelConfig[imageModelChoice].version
248242
raiPolicyName: 'Microsoft.Default'

content-gen/infra/main.json

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.40.2.10011",
9-
"templateHash": "13692784047172844036"
9+
"templateHash": "8403017938611050215"
1010
},
1111
"name": "Intelligent Content Generation Accelerator",
1212
"description": "Solution Accelerator for multimodal marketing content generation using Microsoft Agent Framework.\n"
@@ -106,11 +106,10 @@
106106
"allowedValues": [
107107
"gpt-image-1",
108108
"gpt-image-1.5",
109-
"dall-e-3",
110109
"none"
111110
],
112111
"metadata": {
113-
"description": "Optional. Image model to deploy: gpt-image-1, gpt-image-1.5, dall-e-3, or none to skip."
112+
"description": "Optional. Image model to deploy: gpt-image-1, gpt-image-1.5, or none to skip."
114113
}
115114
},
116115
"azureOpenaiAPIVersion": {
@@ -135,7 +134,7 @@
135134
"description": "Optional. AI model deployment token capacity."
136135
}
137136
},
138-
"dalleModelCapacity": {
137+
"imageModelCapacity": {
139138
"type": "int",
140139
"defaultValue": 1,
141140
"minValue": 1,
@@ -300,18 +299,13 @@
300299
"version": "2025-12-16",
301300
"sku": "GlobalStandard"
302301
},
303-
"dall-e-3": {
304-
"name": "dall-e-3",
305-
"version": "3.0",
306-
"sku": "Standard"
307-
},
308302
"none": {
309303
"name": "",
310304
"version": "",
311305
"sku": ""
312306
}
313307
},
314-
"imageModelDeployment": "[if(not(equals(parameters('imageModelChoice'), 'none')), createArray(createObject('format', 'OpenAI', 'name', variables('imageModelConfig')[parameters('imageModelChoice')].name, 'model', variables('imageModelConfig')[parameters('imageModelChoice')].name, 'sku', createObject('name', variables('imageModelConfig')[parameters('imageModelChoice')].sku, 'capacity', parameters('dalleModelCapacity')), 'version', variables('imageModelConfig')[parameters('imageModelChoice')].version, 'raiPolicyName', 'Microsoft.Default')), createArray())]",
308+
"imageModelDeployment": "[if(not(equals(parameters('imageModelChoice'), 'none')), createArray(createObject('format', 'OpenAI', 'name', variables('imageModelConfig')[parameters('imageModelChoice')].name, 'model', variables('imageModelConfig')[parameters('imageModelChoice')].name, 'sku', createObject('name', variables('imageModelConfig')[parameters('imageModelChoice')].sku, 'capacity', parameters('imageModelCapacity')), 'version', variables('imageModelConfig')[parameters('imageModelChoice')].version, 'raiPolicyName', 'Microsoft.Default')), createArray())]",
315309
"aiFoundryAiServicesModelDeployment": "[concat(variables('baseModelDeployments'), variables('imageModelDeployment'))]",
316310
"aiFoundryAiProjectDescription": "Content Generation AI Foundry Project",
317311
"logAnalyticsWorkspaceResourceName": "[format('log-{0}', variables('solutionSuffix'))]",

content-gen/infra/main.parameters.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"imageModelChoice": {
2727
"value": "${imageModelChoice}"
2828
},
29-
"dalleModelCapacity": {
30-
"value": "${dalleModelCapacity}"
29+
"imageModelCapacity": {
30+
"value": "${imageModelCapacity}"
3131
},
3232
"embeddingModel": {
3333
"value": "${embeddingModel}"

content-gen/infra/main.waf.parameters.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"imageModelChoice": {
2727
"value": "${imageModelChoice}"
2828
},
29-
"dalleModelCapacity": {
30-
"value": "${dalleModelCapacity}"
29+
"imageModelCapacity": {
30+
"value": "${imageModelCapacity}"
3131
},
3232
"embeddingModel": {
3333
"value": "${embeddingModel}"

0 commit comments

Comments
 (0)