Skip to content

Commit 89503ad

Browse files
soguepamelafox
andauthored
Set Azure OpenAI API version in global configuration (#1399)
* Set Azure OpenAI API version in global configuration * Add Variable to CI Configurations * Set the latest API version as the default value for the variable. * Update app/backend/app.py * Add output for Azure OpenAI API version. * Update app/backend/app.py --------- Co-authored-by: Pamela Fox <[email protected]> Co-authored-by: Pamela Fox <[email protected]>
1 parent 648d438 commit 89503ad

File tree

6 files changed

+12
-2
lines changed

6 files changed

+12
-2
lines changed

.azdo/pipelines/azure-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ steps:
4444
AZURE_LOCATION: $(AZURE_LOCATION)
4545
AZD_INITIAL_ENVIRONMENT_CONFIG: $(AZD_INITIAL_ENVIRONMENT_CONFIG)
4646
AZURE_OPENAI_SERVICE: $(AZURE_OPENAI_SERVICE)
47+
AZURE_OPENAI_API_VERSION: $(AZURE_OPENAI_API_VERSION)
4748
AZURE_OPENAI_RESOURCE_GROUP: $(AZURE_OPENAI_RESOURCE_GROUP)
4849
AZURE_FORMRECOGNIZER_SERVICE: $(AZURE_FORMRECOGNIZER_SERVICE)
4950
AZURE_FORMRECOGNIZER_RESOURCE_GROUP: $(AZURE_FORMRECOGNIZER_RESOURCE_GROUP)

.github/workflows/azure-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
3131
# project specific
3232
AZURE_OPENAI_SERVICE: ${{ vars.AZURE_OPENAI_SERVICE }}
33+
AZURE_OPENAI_API_VERSION: ${{ vars.AZURE_OPENAI_API_VERSION }}
3334
AZURE_OPENAI_RESOURCE_GROUP: ${{ vars.AZURE_OPENAI_RESOURCE_GROUP }}
3435
AZURE_FORMRECOGNIZER_SERVICE: ${{ vars.AZURE_FORMRECOGNIZER_SERVICE }}
3536
AZURE_FORMRECOGNIZER_RESOURCE_GROUP: ${{ vars.AZURE_FORMRECOGNIZER_RESOURCE_GROUP }}

app/backend/app.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,9 +308,10 @@ async def setup_clients():
308308
else:
309309
endpoint = f"https://{AZURE_OPENAI_SERVICE}.openai.azure.com"
310310

311-
# Store on app.config for later use inside requests
311+
api_version = os.getenv("AZURE_OPENAI_API_VERSION") or "2024-03-01-preview"
312+
312313
openai_client = AsyncAzureOpenAI(
313-
api_version="2023-07-01-preview",
314+
api_version=api_version,
314315
azure_endpoint=endpoint,
315316
azure_ad_token_provider=token_provider,
316317
)

azure.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ services:
2323
pipeline:
2424
variables:
2525
- AZURE_OPENAI_SERVICE
26+
- AZURE_OPENAI_API_VERSION
2627
- AZURE_OPENAI_RESOURCE_GROUP
2728
- AZURE_FORMRECOGNIZER_SERVICE
2829
- AZURE_FORMRECOGNIZER_RESOURCE_GROUP

infra/main.bicep

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ param appServiceSkuName string // Set in main.parameters.json
4242
param openAiHost string // Set in main.parameters.json
4343
param isAzureOpenAiHost bool = startsWith(openAiHost, 'azure')
4444
param azureOpenAiCustomUrl string = ''
45+
param azureOpenAiApiVersion string = ''
4546

4647
param openAiServiceName string = ''
4748
param openAiResourceGroupName string = ''
@@ -244,6 +245,7 @@ module backend 'core/host/appservice.bicep' = {
244245
// Shared by all OpenAI deployments
245246
OPENAI_HOST: openAiHost
246247
AZURE_OPENAI_CUSTOM_URL: azureOpenAiCustomUrl
248+
AZURE_OPENAI_API_VERSION: azureOpenAiApiVersion
247249
AZURE_OPENAI_EMB_MODEL_NAME: embeddingModelName
248250
AZURE_OPENAI_CHATGPT_MODEL: chatGptModelName
249251
AZURE_OPENAI_GPT4V_MODEL: gpt4vModelName
@@ -598,6 +600,7 @@ output AZURE_OPENAI_GPT4V_MODEL string = gpt4vModelName
598600

599601
// Specific to Azure OpenAI
600602
output AZURE_OPENAI_SERVICE string = isAzureOpenAiHost ? openAi.outputs.name : ''
603+
output AZURE_OPENAI_API_VERSION string = isAzureOpenAiHost ? azureOpenAiApiVersion : ''
601604
output AZURE_OPENAI_RESOURCE_GROUP string = isAzureOpenAiHost ? openAiResourceGroup.name : ''
602605
output AZURE_OPENAI_CHATGPT_DEPLOYMENT string = isAzureOpenAiHost ? chatGptDeploymentName : ''
603606
output AZURE_OPENAI_EMB_DEPLOYMENT string = isAzureOpenAiHost ? embeddingDeploymentName : ''

infra/main.parameters.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@
8383
"azureOpenAiCustomUrl":{
8484
"value": "${AZURE_OPENAI_CUSTOM_URL}"
8585
},
86+
"azureOpenAiApiVersion":{
87+
"value": "${AZURE_OPENAI_API_VERSION}"
88+
},
8689
"openAiApiKey": {
8790
"value": "${OPENAI_API_KEY}"
8891
},

0 commit comments

Comments
 (0)