Skip to content

Commit 78583e1

Browse files
zedhaquepamelafoxZed Haque
authored
Adding support for Azure OpenAI Deployment Types (Global Standard, Standard, Provisioned) (#2014)
* Update deploy_features.md * Update azure-dev.yml * Update azure.yaml * Update main.parameters.json * Update main.bicep * Update azure-dev.yml * Update azure.yaml * Update main.parameters.json * Update main.bicep * Update deploy_features.md * Update docs/deploy_features.md Co-authored-by: Pamela Fox <[email protected]> * Update docs/deploy_features.md Co-authored-by: Pamela Fox <[email protected]> * Update docs/deploy_features.md Co-authored-by: Pamela Fox <[email protected]> * Update infra/main.parameters.json Co-authored-by: Pamela Fox <[email protected]> * Update infra/main.parameters.json Co-authored-by: Pamela Fox <[email protected]> * Update infra/main.parameters.json Co-authored-by: Pamela Fox <[email protected]> * Update azure-dev.yml * Update azure.yaml * Update deploy_features.md * Update main.bicep * added params for gpt4v * Update azure.yml and azure-dev.yml * Update main.bicep --------- Co-authored-by: Pamela Fox <[email protected]> Co-authored-by: Zed Haque <[email protected]>
1 parent 07362d4 commit 78583e1

File tree

5 files changed

+68
-16
lines changed

5 files changed

+68
-16
lines changed

‎.azdo/pipelines/azure-dev.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,18 @@ steps:
6666
AZURE_OPENAI_CHATGPT_DEPLOYMENT: $(AZURE_OPENAI_CHATGPT_DEPLOYMENT)
6767
AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY: $(AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY)
6868
AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION: $(AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION)
69+
AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU: $(AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU)
6970
AZURE_OPENAI_EMB_MODEL_NAME: $(AZURE_OPENAI_EMB_MODEL_NAME)
7071
AZURE_OPENAI_EMB_DEPLOYMENT: $(AZURE_OPENAI_EMB_DEPLOYMENT)
7172
AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY: $(AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY)
7273
AZURE_OPENAI_EMB_DEPLOYMENT_VERSION: $(AZURE_OPENAI_EMB_DEPLOYMENT_VERSION)
74+
AZURE_OPENAI_EMB_DEPLOYMENT_SKU: $(AZURE_OPENAI_EMB_DEPLOYMENT_SKU)
7375
AZURE_OPENAI_EMB_DIMENSIONS: $(AZURE_OPENAI_EMB_DIMENSIONS)
76+
AZURE_OPENAI_GPT4V_MODEL: $(AZURE_OPENAI_GPT4V_MODEL)
77+
AZURE_OPENAI_GPT4V_DEPLOYMENT: $(AZURE_OPENAI_GPT4V_DEPLOYMENT)
78+
AZURE_OPENAI_GPT4V_DEPLOYMENT_CAPACITY: $(AZURE_OPENAI_GPT4V_DEPLOYMENT_CAPACITY)
79+
AZURE_OPENAI_GPT4V_DEPLOYMENT_VERSION: $(AZURE_OPENAI_GPT4V_DEPLOYMENT_VERSION)
80+
AZURE_OPENAI_GPT4V_DEPLOYMENT_SKU: $(AZURE_OPENAI_GPT4V_DEPLOYMENT_SKU)
7481
OPENAI_HOST: $(OPENAI_HOST)
7582
OPENAI_API_KEY: $(OPENAI_API_KEY)
7683
OPENAI_ORGANIZATION: $(OPENAI_ORGANIZATION)

‎azure.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,18 @@ pipeline:
6464
- AZURE_OPENAI_CHATGPT_DEPLOYMENT
6565
- AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY
6666
- AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION
67+
- AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU
6768
- AZURE_OPENAI_EMB_MODEL_NAME
6869
- AZURE_OPENAI_EMB_DEPLOYMENT
6970
- AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY
7071
- AZURE_OPENAI_EMB_DEPLOYMENT_VERSION
72+
- AZURE_OPENAI_EMB_DEPLOYMENT_SKU
7173
- AZURE_OPENAI_EMB_DIMENSIONS
74+
- AZURE_OPENAI_GPT4V_MODEL
75+
- AZURE_OPENAI_GPT4V_DEPLOYMENT
76+
- AZURE_OPENAI_GPT4V_DEPLOYMENT_CAPACITY
77+
- AZURE_OPENAI_GPT4V_DEPLOYMENT_VERSION
78+
- AZURE_OPENAI_GPT4V_DEPLOYMENT_SKU
7279
- OPENAI_HOST
7380
- OPENAI_API_KEY
7481
- OPENAI_ORGANIZATION

‎docs/deploy_features.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@ Execute the following commands inside your terminal:
5959
azd env set AZURE_OPENAI_CHATGPT_MODEL gpt-4o-mini
6060
```
6161

62+
1. To set the Azure OpenAI deployment SKU name, run this command with [the desired SKU name](https://learn.microsoft.com/azure/ai-services/openai/how-to/deployment-types#deployment-types).
63+
64+
```bash
65+
azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU GlobalStandard
66+
```
67+
6268
1. To set the Azure OpenAI deployment capacity, run this command with the desired capacity.
6369

6470
```bash
@@ -97,6 +103,7 @@ Execute the following commands inside your terminal:
97103
> * `azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT chat` to set the name of your old GPT 3.5 deployment.
98104
> * `azd env set AZURE_OPENAI_CHATGPT_MODEL gpt-35-turbo` to set the name of your old GPT 3.5 model.
99105
> * `azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY 30` to set the capacity of your old GPT 3.5 deployment.
106+
> * `azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU Standard` to set the Sku name back to Standard.
100107
> * `azd env set AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION 0613` to set the version number of your old GPT 3.5.
101108
> * `azd up` to update the provisioned resources.
102109
>

‎infra/main.bicep‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,33 +109,46 @@ param computerVisionSkuName string // Set in main.parameters.json
109109
param chatGptModelName string = ''
110110
param chatGptDeploymentName string = ''
111111
param chatGptDeploymentVersion string = ''
112+
param chatGptDeploymentSkuName string = ''
112113
param chatGptDeploymentCapacity int = 0
114+
113115
var chatGpt = {
114116
modelName: !empty(chatGptModelName)
115117
? chatGptModelName
116118
: startsWith(openAiHost, 'azure') ? 'gpt-35-turbo' : 'gpt-3.5-turbo'
117119
deploymentName: !empty(chatGptDeploymentName) ? chatGptDeploymentName : 'chat'
118120
deploymentVersion: !empty(chatGptDeploymentVersion) ? chatGptDeploymentVersion : '0613'
121+
deploymentSkuName: !empty(chatGptDeploymentSkuName) ? chatGptDeploymentSkuName : 'Standard'
119122
deploymentCapacity: chatGptDeploymentCapacity != 0 ? chatGptDeploymentCapacity : 30
120123
}
121124

122125
param embeddingModelName string = ''
123126
param embeddingDeploymentName string = ''
124127
param embeddingDeploymentVersion string = ''
128+
param embeddingDeploymentSkuName string = ''
125129
param embeddingDeploymentCapacity int = 0
126130
param embeddingDimensions int = 0
127131
var embedding = {
128132
modelName: !empty(embeddingModelName) ? embeddingModelName : 'text-embedding-ada-002'
129133
deploymentName: !empty(embeddingDeploymentName) ? embeddingDeploymentName : 'embedding'
130134
deploymentVersion: !empty(embeddingDeploymentVersion) ? embeddingDeploymentVersion : '2'
135+
deploymentSkuName: !empty(embeddingDeploymentSkuName) ? embeddingDeploymentSkuName : 'Standard'
131136
deploymentCapacity: embeddingDeploymentCapacity != 0 ? embeddingDeploymentCapacity : 30
132137
dimensions: embeddingDimensions != 0 ? embeddingDimensions : 1536
133138
}
134139

135-
param gpt4vModelName string = 'gpt-4o'
136-
param gpt4vDeploymentName string = 'gpt-4o'
137-
param gpt4vModelVersion string = '2024-05-13'
138-
param gpt4vDeploymentCapacity int = 10
140+
param gpt4vModelName string = ''
141+
param gpt4vDeploymentName string = ''
142+
param gpt4vModelVersion string = ''
143+
param gpt4vDeploymentSkuName string = ''
144+
param gpt4vDeploymentCapacity int = 0
145+
var gpt4v = {
146+
modelName: !empty(gpt4vModelName) ? gpt4vModelName : 'gpt-4o'
147+
deploymentName: !empty(gpt4vDeploymentName) ? gpt4vDeploymentName : 'gpt-4o'
148+
deploymentVersion: !empty(gpt4vModelVersion) ? gpt4vModelVersion : '2024-05-13'
149+
deploymentSkuName: !empty(gpt4vDeploymentSkuName) ? gpt4vDeploymentSkuName : 'Standard'
150+
deploymentCapacity: gpt4vDeploymentCapacity != 0 ? gpt4vDeploymentCapacity : 10
151+
}
139152

140153
param tenantId string = tenant().tenantId
141154
param authTenantId string = ''
@@ -322,12 +335,12 @@ var appEnvVariables = {
322335
AZURE_OPENAI_EMB_MODEL_NAME: embedding.modelName
323336
AZURE_OPENAI_EMB_DIMENSIONS: embedding.dimensions
324337
AZURE_OPENAI_CHATGPT_MODEL: chatGpt.modelName
325-
AZURE_OPENAI_GPT4V_MODEL: gpt4vModelName
338+
AZURE_OPENAI_GPT4V_MODEL: gpt4v.modelName
326339
// Specific to Azure OpenAI
327340
AZURE_OPENAI_SERVICE: isAzureOpenAiHost && deployAzureOpenAi ? openAi.outputs.name : ''
328341
AZURE_OPENAI_CHATGPT_DEPLOYMENT: chatGpt.deploymentName
329342
AZURE_OPENAI_EMB_DEPLOYMENT: embedding.deploymentName
330-
AZURE_OPENAI_GPT4V_DEPLOYMENT: useGPT4V ? gpt4vDeploymentName : ''
343+
AZURE_OPENAI_GPT4V_DEPLOYMENT: useGPT4V ? gpt4v.deploymentName : ''
331344
AZURE_OPENAI_API_VERSION: azureOpenAiApiVersion
332345
AZURE_OPENAI_API_KEY_OVERRIDE: azureOpenAiApiKey
333346
AZURE_OPENAI_CUSTOM_URL: azureOpenAiCustomUrl
@@ -453,7 +466,7 @@ var defaultOpenAiDeployments = [
453466
version: chatGpt.deploymentVersion
454467
}
455468
sku: {
456-
name: 'Standard'
469+
name: chatGpt.deploymentSkuName
457470
capacity: chatGpt.deploymentCapacity
458471
}
459472
}
@@ -465,7 +478,7 @@ var defaultOpenAiDeployments = [
465478
version: embedding.deploymentVersion
466479
}
467480
sku: {
468-
name: 'Standard'
481+
name: embedding.deploymentSkuName
469482
capacity: embedding.deploymentCapacity
470483
}
471484
}
@@ -476,15 +489,15 @@ var openAiDeployments = concat(
476489
useGPT4V
477490
? [
478491
{
479-
name: gpt4vDeploymentName
492+
name: gpt4v.deploymentName
480493
model: {
481494
format: 'OpenAI'
482-
name: gpt4vModelName
483-
version: gpt4vModelVersion
495+
name: gpt4v.modelName
496+
version: gpt4v.deploymentVersion
484497
}
485498
sku: {
486-
name: 'Standard'
487-
capacity: gpt4vDeploymentCapacity
499+
name: gpt4v.deploymentSkuName
500+
capacity: gpt4v.deploymentCapacity
488501
}
489502
}
490503
]
@@ -960,15 +973,15 @@ output AZURE_RESOURCE_GROUP string = resourceGroup.name
960973
output OPENAI_HOST string = openAiHost
961974
output AZURE_OPENAI_EMB_MODEL_NAME string = embedding.modelName
962975
output AZURE_OPENAI_CHATGPT_MODEL string = chatGpt.modelName
963-
output AZURE_OPENAI_GPT4V_MODEL string = gpt4vModelName
976+
output AZURE_OPENAI_GPT4V_MODEL string = gpt4v.modelName
964977

965978
// Specific to Azure OpenAI
966979
output AZURE_OPENAI_SERVICE string = isAzureOpenAiHost && deployAzureOpenAi ? openAi.outputs.name : ''
967980
output AZURE_OPENAI_API_VERSION string = isAzureOpenAiHost ? azureOpenAiApiVersion : ''
968981
output AZURE_OPENAI_RESOURCE_GROUP string = isAzureOpenAiHost ? openAiResourceGroup.name : ''
969982
output AZURE_OPENAI_CHATGPT_DEPLOYMENT string = isAzureOpenAiHost ? chatGpt.deploymentName : ''
970983
output AZURE_OPENAI_EMB_DEPLOYMENT string = isAzureOpenAiHost ? embedding.deploymentName : ''
971-
output AZURE_OPENAI_GPT4V_DEPLOYMENT string = isAzureOpenAiHost ? gpt4vDeploymentName : ''
984+
output AZURE_OPENAI_GPT4V_DEPLOYMENT string = isAzureOpenAiHost ? gpt4v.deploymentName : ''
972985

973986
output AZURE_SPEECH_SERVICE_ID string = useSpeechOutputAzure ? speech.outputs.resourceId : ''
974987
output AZURE_SPEECH_SERVICE_LOCATION string = useSpeechOutputAzure ? speech.outputs.location : ''

‎infra/main.parameters.json‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@
9898
"chatGptDeploymentVersion":{
9999
"value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_VERSION}"
100100
},
101+
"chatGptDeploymentSkuName":{
102+
"value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_SKU}"
103+
},
101104
"chatGptDeploymentCapacity":{
102105
"value": "${AZURE_OPENAI_CHATGPT_DEPLOYMENT_CAPACITY}"
103106
},
@@ -110,14 +113,29 @@
110113
"embeddingDeploymentVersion":{
111114
"value": "${AZURE_OPENAI_EMB_DEPLOYMENT_VERSION}"
112115
},
116+
"embeddingDeploymentSkuName":{
117+
"value": "${AZURE_OPENAI_EMB_DEPLOYMENT_SKU}"
118+
},
113119
"embeddingDeploymentCapacity":{
114120
"value": "${AZURE_OPENAI_EMB_DEPLOYMENT_CAPACITY}"
115121
},
116122
"embeddingDimensions": {
117123
"value": "${AZURE_OPENAI_EMB_DIMENSIONS}"
118124
},
125+
"gpt4vModelName":{
126+
"value": "${AZURE_OPENAI_GPT4V_MODEL}"
127+
},
128+
"gpt4vDeploymentName": {
129+
"value": "${AZURE_OPENAI_GPT4V_DEPLOYMENT}"
130+
},
131+
"gpt4vDeploymentVersion":{
132+
"value": "${AZURE_OPENAI_GPT4V_DEPLOYMENT_VERSION}"
133+
},
134+
"gpt4vDeploymentSkuName":{
135+
"value": "${AZURE_OPENAI_GPT4V_DEPLOYMENT_SKU}"
136+
},
119137
"gpt4vDeploymentCapacity":{
120-
"value": "${AZURE_OPENAI_GPT4V_DEPLOYMENT_CAPACITY=10}"
138+
"value": "${AZURE_OPENAI_GPT4V_DEPLOYMENT_CAPACITY}"
121139
},
122140
"openAiHost": {
123141
"value": "${OPENAI_HOST=azure}"

0 commit comments

Comments
 (0)