Skip to content

Commit 2ba094c

Browse files
Priyanka-MicrosoftPriyanka-Microsoft
authored
Merge branch 'Azure-Samples:dev' into dev
2 parents 49f8deb + cb60eae commit 2ba094c

File tree

1 file changed

+27
-26
lines changed

1 file changed

+27
-26
lines changed

‎infra/main.json‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.37.4.10188",
9-
"templateHash": "10150019308123091137"
9+
"templateHash": "11248205616546713756"
1010
}
1111
},
1212
"parameters": {
@@ -257,7 +257,7 @@
257257
},
258258
"azureOpenAIVisionModel": {
259259
"type": "string",
260-
"defaultValue": "gpt-4",
260+
"defaultValue": "gpt-4.1",
261261
"metadata": {
262262
"description": "Optional. Azure OpenAI Vision Model Deployment Name."
263263
}
@@ -269,6 +269,13 @@
269269
"description": "Optional. Azure OpenAI Vision Model Name."
270270
}
271271
},
272+
"azureOpenAIVisionModelVersion": {
273+
"type": "string",
274+
"defaultValue": "2025-04-14",
275+
"metadata": {
276+
"description": "Optional. Azure OpenAI Vision Model Version."
277+
}
278+
},
272279
"azureOpenAIVisionModelCapacity": {
273280
"type": "int",
274281
"defaultValue": 10,
@@ -696,7 +703,6 @@
696703
}
697704
}
698705
],
699-
"openAiDeployments": "[concat(variables('defaultOpenAiDeployments'), if(parameters('useAdvancedImageProcessing'), createArray(createObject('name', parameters('azureOpenAIVisionModel'), 'model', createObject('format', 'OpenAI', 'name', parameters('azureOpenAIVisionModelName')), 'sku', createObject('name', 'GlobalStandard', 'capacity', parameters('azureOpenAIVisionModelCapacity')))), createArray()))]",
700706
"enablePrivateNetworkingSpeech": false,
701707
"webServerFarmResourceName": "[variables('hostingPlanName')]",
702708
"postgresDBFqdn": "[format('{0}.postgres.database.azure.com', variables('postgresResourceName'))]",
@@ -22951,7 +22957,7 @@
2295122957
"value": "[parameters('azureOpenAISkuName')]"
2295222958
},
2295322959
"deployments": {
22954-
"value": "[variables('openAiDeployments')]"
22960+
"value": "[variables('defaultOpenAiDeployments')]"
2295522961
},
2295622962
"userAssignedResourceId": {
2295722963
"value": "[reference('managedIdentityModule').outputs.resourceId.value]"
@@ -22986,7 +22992,7 @@
2298622992
"_generator": {
2298722993
"name": "bicep",
2298822994
"version": "0.37.4.10188",
22989-
"templateHash": "10460226250821772608"
22995+
"templateHash": "16505240488755356349"
2299022996
}
2299122997
},
2299222998
"parameters": {
@@ -23205,7 +23211,7 @@
2320523211
"_generator": {
2320623212
"name": "bicep",
2320723213
"version": "0.37.4.10188",
23208-
"templateHash": "14152583833401091682"
23214+
"templateHash": "6474769167245807917"
2320923215
},
2321023216
"name": "Cognitive Services",
2321123217
"description": "This module deploys a Cognitive Service."
@@ -23302,9 +23308,8 @@
2330223308
},
2330323309
"version": {
2330423310
"type": "string",
23305-
"nullable": true,
2330623311
"metadata": {
23307-
"description": "Optional. The version of Cognitive Services account deployment model."
23312+
"description": "Required. The version of Cognitive Services account deployment model."
2330823313
}
2330923314
}
2331023315
},
@@ -25593,7 +25598,7 @@
2559325598
"_generator": {
2559425599
"name": "bicep",
2559525600
"version": "0.37.4.10188",
25596-
"templateHash": "10460226250821772608"
25601+
"templateHash": "16505240488755356349"
2559725602
}
2559825603
},
2559925604
"parameters": {
@@ -25812,7 +25817,7 @@
2581225817
"_generator": {
2581325818
"name": "bicep",
2581425819
"version": "0.37.4.10188",
25815-
"templateHash": "14152583833401091682"
25820+
"templateHash": "6474769167245807917"
2581625821
},
2581725822
"name": "Cognitive Services",
2581825823
"description": "This module deploys a Cognitive Service."
@@ -25909,9 +25914,8 @@
2590925914
},
2591025915
"version": {
2591125916
"type": "string",
25912-
"nullable": true,
2591325917
"metadata": {
25914-
"description": "Optional. The version of Cognitive Services account deployment model."
25918+
"description": "Required. The version of Cognitive Services account deployment model."
2591525919
}
2591625920
}
2591725921
},
@@ -28201,7 +28205,7 @@
2820128205
"_generator": {
2820228206
"name": "bicep",
2820328207
"version": "0.37.4.10188",
28204-
"templateHash": "10460226250821772608"
28208+
"templateHash": "16505240488755356349"
2820528209
}
2820628210
},
2820728211
"parameters": {
@@ -28420,7 +28424,7 @@
2842028424
"_generator": {
2842128425
"name": "bicep",
2842228426
"version": "0.37.4.10188",
28423-
"templateHash": "14152583833401091682"
28427+
"templateHash": "6474769167245807917"
2842428428
},
2842528429
"name": "Cognitive Services",
2842628430
"description": "This module deploys a Cognitive Service."
@@ -28517,9 +28521,8 @@
2851728521
},
2851828522
"version": {
2851928523
"type": "string",
28520-
"nullable": true,
2852128524
"metadata": {
28522-
"description": "Optional. The version of Cognitive Services account deployment model."
28525+
"description": "Required. The version of Cognitive Services account deployment model."
2852328526
}
2852428527
}
2852528528
},
@@ -46718,7 +46721,7 @@
4671846721
"_generator": {
4671946722
"name": "bicep",
4672046723
"version": "0.37.4.10188",
46721-
"templateHash": "10460226250821772608"
46724+
"templateHash": "16505240488755356349"
4672246725
}
4672346726
},
4672446727
"parameters": {
@@ -46937,7 +46940,7 @@
4693746940
"_generator": {
4693846941
"name": "bicep",
4693946942
"version": "0.37.4.10188",
46940-
"templateHash": "14152583833401091682"
46943+
"templateHash": "6474769167245807917"
4694146944
},
4694246945
"name": "Cognitive Services",
4694346946
"description": "This module deploys a Cognitive Service."
@@ -47034,9 +47037,8 @@
4703447037
},
4703547038
"version": {
4703647039
"type": "string",
47037-
"nullable": true,
4703847040
"metadata": {
47039-
"description": "Optional. The version of Cognitive Services account deployment model."
47041+
"description": "Required. The version of Cognitive Services account deployment model."
4704047042
}
4704147043
}
4704247044
},
@@ -49323,7 +49325,7 @@
4932349325
"_generator": {
4932449326
"name": "bicep",
4932549327
"version": "0.37.4.10188",
49326-
"templateHash": "10460226250821772608"
49328+
"templateHash": "16505240488755356349"
4932749329
}
4932849330
},
4932949331
"parameters": {
@@ -49542,7 +49544,7 @@
4954249544
"_generator": {
4954349545
"name": "bicep",
4954449546
"version": "0.37.4.10188",
49545-
"templateHash": "14152583833401091682"
49547+
"templateHash": "6474769167245807917"
4954649548
},
4954749549
"name": "Cognitive Services",
4954849550
"description": "This module deploys a Cognitive Service."
@@ -49639,9 +49641,8 @@
4963949641
},
4964049642
"version": {
4964149643
"type": "string",
49642-
"nullable": true,
4964349644
"metadata": {
49644-
"description": "Optional. The version of Cognitive Services account deployment model."
49645+
"description": "Required. The version of Cognitive Services account deployment model."
4964549646
}
4964649647
}
4964749648
},
@@ -55159,9 +55160,9 @@
5515955160
}
5516055161
},
5516155162
"dependsOn": [
55162-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
55163-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
5516455163
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
55164+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
55165+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
5516555166
"managedIdentityModule",
5516655167
"virtualNetwork"
5516755168
]

0 commit comments

Comments
 (0)