Skip to content

Commit d0e336a

Browse files
Rename capacity parameters to match deployment usage
- Rename gptModelCapacity to gptDeploymentCapacity - Rename embeddingModelCapacity to embeddingDeploymentCapacity - Update all references in bicep, parameter files, and CI workflow - Regenerate main.json from bicep template This aligns parameter names with their actual usage as deploymentCapacity and matches the environment variable naming convention.
1 parent 611b617 commit d0e336a

5 files changed

Lines changed: 43 additions & 17 deletions

File tree

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@ jobs:
208208
azureAiServiceLocation=${{ env.AZURE_LOCATION }} \
209209
gptModelDeploymentType="GlobalStandard" \
210210
gptModelName="gpt-4.1-mini" \
211-
gptModelCapacity=${{ env.GPT_CAPACITY }} \
211+
gptDeploymentCapacity=${{ env.GPT_CAPACITY }} \
212212
gptModelVersion="2025-04-14" \
213213
embeddingModelName="text-embedding-3-large" \
214-
embeddingModelCapacity=${{ env.TEXT_EMBEDDING_CAPACITY }} \
214+
embeddingDeploymentCapacity=${{ env.TEXT_EMBEDDING_CAPACITY }} \
215215
embeddingModelVersion="1" \
216216
enablePrivateNetworking=false \
217217
enableMonitoring=false \

infra/main.bicep

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ param gptModelVersion string = '2025-04-14'
4343

4444
@description('Optional. Capacity of the GPT model deployment:')
4545
@minValue(10)
46-
param gptModelCapacity int = 100
46+
param gptDeploymentCapacity int = 100
4747

4848
@minLength(1)
4949
@description('Optional. Name of the Text Embedding model to deploy:')
@@ -57,7 +57,7 @@ param embeddingModelVersion string = '1'
5757

5858
@description('Optional. Capacity of the Text Embedding model deployment:')
5959
@minValue(10)
60-
param embeddingModelCapacity int = 100
60+
param embeddingDeploymentCapacity int = 100
6161

6262
@description('Optional: Existing Log Analytics Workspace Resource ID')
6363
param existingLogAnalyticsWorkspaceId string = ''
@@ -164,14 +164,14 @@ var gptModelDeployment = {
164164
modelName: gptModelName
165165
deploymentName: gptModelName
166166
deploymentVersion: gptModelVersion
167-
deploymentCapacity: gptModelCapacity
167+
deploymentCapacity: gptDeploymentCapacity
168168
}
169169

170170
var embeddingModelDeployment = {
171171
modelName: embeddingModelName
172172
deploymentName: embeddingModelName
173173
deploymentVersion: embeddingModelVersion
174-
deploymentCapacity: embeddingModelCapacity
174+
deploymentCapacity: embeddingDeploymentCapacity
175175
}
176176

177177
var openAiDeployments = [

infra/main.json

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.42.1.51946",
9-
"templateHash": "14044897368623114174"
9+
"templateHash": "6929838218794441010"
1010
}
1111
},
1212
"parameters": {
@@ -64,7 +64,7 @@
6464
"description": "Optional. Version of the GPT model to deploy."
6565
}
6666
},
67-
"gptModelCapacity": {
67+
"gptDeploymentCapacity": {
6868
"type": "int",
6969
"defaultValue": 100,
7070
"minValue": 10,
@@ -90,7 +90,7 @@
9090
"description": "Optional. Version of the Text Embedding model to deploy."
9191
}
9292
},
93-
"embeddingModelCapacity": {
93+
"embeddingDeploymentCapacity": {
9494
"type": "int",
9595
"defaultValue": 100,
9696
"minValue": 10,
@@ -226,13 +226,13 @@
226226
"modelName": "[parameters('gptModelName')]",
227227
"deploymentName": "[parameters('gptModelName')]",
228228
"deploymentVersion": "[parameters('gptModelVersion')]",
229-
"deploymentCapacity": "[parameters('gptModelCapacity')]"
229+
"deploymentCapacity": "[parameters('gptDeploymentCapacity')]"
230230
},
231231
"embeddingModelDeployment": {
232232
"modelName": "[parameters('embeddingModelName')]",
233233
"deploymentName": "[parameters('embeddingModelName')]",
234234
"deploymentVersion": "[parameters('embeddingModelVersion')]",
235-
"deploymentCapacity": "[parameters('embeddingModelCapacity')]"
235+
"deploymentCapacity": "[parameters('embeddingDeploymentCapacity')]"
236236
},
237237
"openAiDeployments": [
238238
{
@@ -26702,6 +26702,10 @@
2670226702
},
2670326703
"keyValues": {
2670426704
"value": [
26705+
{
26706+
"name": "ApplicationInsights:ConnectionString",
26707+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
26708+
},
2670526709
{
2670626710
"name": "Application:AIServices:GPT-4o-mini:Endpoint",
2670726711
"value": "[reference('avmOpenAi').outputs.endpoint.value]"
@@ -28778,6 +28782,7 @@
2877828782
}
2877928783
},
2878028784
"dependsOn": [
28785+
"applicationInsights",
2878128786
"avmCosmosDB",
2878228787
"avmOpenAi",
2878328788
"avmSearchSearchServices",
@@ -36561,8 +36566,8 @@
3656136566
}
3656236567
},
3656336568
"dependsOn": [
36564-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
3656536569
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
36570+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
3656636571
"userAssignedIdentity",
3656736572
"virtualNetwork"
3656836573
]
@@ -42285,8 +42290,8 @@
4228542290
},
4228642291
"dependsOn": [
4228742292
"avmOpenAi",
42288-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
4228942293
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
42294+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
4229042295
"virtualNetwork"
4229142296
]
4229242297
},
@@ -49866,6 +49871,27 @@
4986649871
"description": "Contains Azure OpenAI Embedding Model Deployment Name."
4986749872
},
4986849873
"value": "[variables('embeddingModelDeployment').deploymentName]"
49874+
},
49875+
"APPLICATIONINSIGHTS_CONNECTION_STRING": {
49876+
"type": "string",
49877+
"metadata": {
49878+
"description": "Contains Application Insights Connection String."
49879+
},
49880+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.connectionString.value, '')]"
49881+
},
49882+
"APPLICATIONINSIGHTS_INSTRUMENTATION_KEY": {
49883+
"type": "string",
49884+
"metadata": {
49885+
"description": "Contains Application Insights Instrumentation Key."
49886+
},
49887+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.instrumentationKey.value, '')]"
49888+
},
49889+
"APPLICATIONINSIGHTS_NAME": {
49890+
"type": "string",
49891+
"metadata": {
49892+
"description": "Contains Application Insights Name."
49893+
},
49894+
"value": "[if(parameters('enableMonitoring'), reference('applicationInsights').outputs.name.value, '')]"
4986949895
}
4987049896
}
4987149897
}

infra/main.parameters.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"gptModelName": {
1818
"value": "${AZURE_ENV_GPT_MODEL_NAME}"
1919
},
20-
"gptModelCapacity": {
20+
"gptDeploymentCapacity": {
2121
"value": "${AZURE_ENV_GPT_MODEL_CAPACITY}"
2222
},
2323
"gptModelVersion": {
@@ -29,7 +29,7 @@
2929
"embeddingModelVersion": {
3030
"value": "${AZURE_ENV_EMBEDDING_MODEL_VERSION}"
3131
},
32-
"embeddingModelCapacity": {
32+
"embeddingDeploymentCapacity": {
3333
"value": "${AZURE_ENV_EMBEDDING_DEPLOYMENT_CAPACITY}"
3434
},
3535
"existingLogAnalyticsWorkspaceId": {

infra/main.waf.parameters.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"gptModelName": {
1818
"value": "${AZURE_ENV_GPT_MODEL_NAME}"
1919
},
20-
"gptModelCapacity": {
20+
"gptDeploymentCapacity": {
2121
"value": "${AZURE_ENV_GPT_MODEL_CAPACITY}"
2222
},
2323
"gptModelVersion": {
@@ -29,7 +29,7 @@
2929
"embeddingModelVersion": {
3030
"value": "${AZURE_ENV_EMBEDDING_MODEL_VERSION}"
3131
},
32-
"embeddingModelCapacity": {
32+
"embeddingDeploymentCapacity": {
3333
"value": "${AZURE_ENV_EMBEDDING_DEPLOYMENT_CAPACITY}"
3434
},
3535
"existingLogAnalyticsWorkspaceId": {

0 commit comments

Comments
 (0)