Skip to content

Commit 31f949e

Browse files
Avijit-MicrosoftAvijit-Microsoft
authored
chore: clean up legacy Azure OpenAI endpoint variables and dependencies
2 parents d5c511c + df1cb46 commit 31f949e

5 files changed

Lines changed: 28 additions & 42 deletions

File tree

‎infra/main.bicep‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -887,10 +887,7 @@ module containerAppBackend 'br/public:avm/res/app/container-app:0.19.0' = {
887887
name: 'AZURE_BLOB_CONTAINER_NAME'
888888
value: appStorageContainerName
889889
}
890-
{
891-
name: 'AZURE_OPENAI_ENDPOINT'
892-
value: 'https://${aiServices.outputs.name}.openai.azure.com/'
893-
}
890+
894891
{
895892
name: 'MIGRATOR_AGENT_MODEL_DEPLOY'
896893
value: modelDeployment.name
@@ -1072,7 +1069,6 @@ output WEB_APP_URL string = 'https://${containerAppFrontend.outputs.fqdn}'
10721069
output COSMOSDB_ENDPOINT string = cosmosDb.outputs.endpoint
10731070
output AZURE_BLOB_ACCOUNT_NAME string = storageAccount.outputs.name
10741071
output AZURE_BLOB_ENDPOINT string = 'https://${storageAccount.outputs.name}.blob.core.windows.net/'
1075-
output AZURE_OPENAI_ENDPOINT string = 'https://${aiServices.outputs.name}.openai.azure.com/'
10761072
output AZURE_AI_AGENT_PROJECT_NAME string = aiServices.outputs.aiProjectInfo.name
10771073
output AZURE_AI_AGENT_ENDPOINT string = aiServices.outputs.aiProjectInfo.apiEndpoint
10781074
output AZURE_AI_AGENT_PROJECT_CONNECTION_STRING string = aiServices.outputs.aiProjectInfo.apiEndpoint

‎infra/main.json‎

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.38.33.27573",
9-
"templateHash": "1145171199122742153"
8+
"version": "0.39.26.7824",
9+
"templateHash": "2370409474947563562"
1010
},
1111
"name": "Modernize Your Code Solution Accelerator",
12-
"description": "CSA CTO Gold Standard Solution Accelerator for Modernize Your Code. \n"
12+
"description": "CSA CTO Gold Standard Solution Accelerator for Modernize Your Code. \r\n"
1313
},
1414
"parameters": {
1515
"solutionName": {
@@ -4694,8 +4694,8 @@
46944694
"metadata": {
46954695
"_generator": {
46964696
"name": "bicep",
4697-
"version": "0.38.33.27573",
4698-
"templateHash": "11189353177117695367"
4697+
"version": "0.39.26.7824",
4698+
"templateHash": "2800010620686653519"
46994699
}
47004700
},
47014701
"definitions": {
@@ -23608,8 +23608,8 @@
2360823608
"metadata": {
2360923609
"_generator": {
2361023610
"name": "bicep",
23611-
"version": "0.38.33.27573",
23612-
"templateHash": "13645014962264885823"
23611+
"version": "0.39.26.7824",
23612+
"templateHash": "13240149286290962746"
2361323613
},
2361423614
"name": "AI Services and Project Module",
2361523615
"description": "This module creates an AI Services resource and an AI Foundry project within it. It supports private networking, OpenAI deployments, and role assignments."
@@ -24949,8 +24949,8 @@
2494924949
"metadata": {
2495024950
"_generator": {
2495124951
"name": "bicep",
24952-
"version": "0.38.33.27573",
24953-
"templateHash": "14773633292567160969"
24952+
"version": "0.39.26.7824",
24953+
"templateHash": "13950096942977548927"
2495424954
}
2495524955
},
2495624956
"definitions": {
@@ -26661,8 +26661,8 @@
2666126661
"metadata": {
2666226662
"_generator": {
2666326663
"name": "bicep",
26664-
"version": "0.38.33.27573",
26665-
"templateHash": "14205022069293553223"
26664+
"version": "0.39.26.7824",
26665+
"templateHash": "12797226417049698978"
2666626666
}
2666726667
},
2666826668
"definitions": {
@@ -26815,8 +26815,8 @@
2681526815
"metadata": {
2681626816
"_generator": {
2681726817
"name": "bicep",
26818-
"version": "0.38.33.27573",
26819-
"templateHash": "12063034585175087716"
26818+
"version": "0.39.26.7824",
26819+
"templateHash": "422299638943108486"
2682026820
}
2682126821
},
2682226822
"definitions": {
@@ -27033,8 +27033,8 @@
2703327033
"metadata": {
2703427034
"_generator": {
2703527035
"name": "bicep",
27036-
"version": "0.38.33.27573",
27037-
"templateHash": "14773633292567160969"
27036+
"version": "0.39.26.7824",
27037+
"templateHash": "13950096942977548927"
2703827038
}
2703927039
},
2704027040
"definitions": {
@@ -28745,8 +28745,8 @@
2874528745
"metadata": {
2874628746
"_generator": {
2874728747
"name": "bicep",
28748-
"version": "0.38.33.27573",
28749-
"templateHash": "14205022069293553223"
28748+
"version": "0.39.26.7824",
28749+
"templateHash": "12797226417049698978"
2875028750
}
2875128751
},
2875228752
"definitions": {
@@ -28899,8 +28899,8 @@
2889928899
"metadata": {
2890028900
"_generator": {
2890128901
"name": "bicep",
28902-
"version": "0.38.33.27573",
28903-
"templateHash": "12063034585175087716"
28902+
"version": "0.39.26.7824",
28903+
"templateHash": "422299638943108486"
2890428904
}
2890528905
},
2890628906
"definitions": {
@@ -29198,8 +29198,8 @@
2919829198
"metadata": {
2919929199
"_generator": {
2920029200
"name": "bicep",
29201-
"version": "0.38.33.27573",
29202-
"templateHash": "8737165639797720533"
29201+
"version": "0.39.26.7824",
29202+
"templateHash": "12528046637724897516"
2920329203
}
2920429204
},
2920529205
"definitions": {
@@ -37443,8 +37443,8 @@
3744337443
"metadata": {
3744437444
"_generator": {
3744537445
"name": "bicep",
37446-
"version": "0.38.33.27573",
37447-
"templateHash": "7725000075924948023"
37446+
"version": "0.39.26.7824",
37447+
"templateHash": "18109506630393182768"
3744837448
}
3744937449
},
3745037450
"definitions": {
@@ -41306,8 +41306,8 @@
4130641306
"metadata": {
4130741307
"_generator": {
4130841308
"name": "bicep",
41309-
"version": "0.38.33.27573",
41310-
"templateHash": "5400870525857167617"
41309+
"version": "0.39.26.7824",
41310+
"templateHash": "6879410075649987426"
4131141311
}
4131241312
},
4131341313
"definitions": {
@@ -48477,7 +48477,7 @@
4847748477
{
4847848478
"name": "cmsabackend",
4847948479
"image": "[format('cmsacontainerreg.azurecr.io/cmsabackend:{0}', parameters('imageVersion'))]",
48480-
"env": "[concat(createArray(createObject('name', 'COSMOSDB_ENDPOINT', 'value', reference('cosmosDb').outputs.endpoint.value), createObject('name', 'COSMOSDB_DATABASE', 'value', reference('cosmosDb').outputs.databaseName.value), createObject('name', 'COSMOSDB_BATCH_CONTAINER', 'value', reference('cosmosDb').outputs.containerNames.value.batch), createObject('name', 'COSMOSDB_FILE_CONTAINER', 'value', reference('cosmosDb').outputs.containerNames.value.file), createObject('name', 'COSMOSDB_LOG_CONTAINER', 'value', reference('cosmosDb').outputs.containerNames.value.log), createObject('name', 'AZURE_BLOB_ACCOUNT_NAME', 'value', reference('storageAccount').outputs.name.value), createObject('name', 'AZURE_BLOB_CONTAINER_NAME', 'value', variables('appStorageContainerName')), createObject('name', 'AZURE_OPENAI_ENDPOINT', 'value', format('https://{0}.openai.azure.com/', reference('aiServices').outputs.name.value)), createObject('name', 'MIGRATOR_AGENT_MODEL_DEPLOY', 'value', variables('modelDeployment').name), createObject('name', 'PICKER_AGENT_MODEL_DEPLOY', 'value', variables('modelDeployment').name), createObject('name', 'FIXER_AGENT_MODEL_DEPLOY', 'value', variables('modelDeployment').name), createObject('name', 'SEMANTIC_VERIFIER_AGENT_MODEL_DEPLOY', 'value', variables('modelDeployment').name), createObject('name', 'SYNTAX_CHECKER_AGENT_MODEL_DEPLOY', 'value', variables('modelDeployment').name), createObject('name', 'SELECTION_MODEL_DEPLOY', 'value', variables('modelDeployment').name), createObject('name', 'TERMINATION_MODEL_DEPLOY', 'value', variables('modelDeployment').name), createObject('name', 'AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME', 'value', variables('modelDeployment').name), createObject('name', 'AI_PROJECT_ENDPOINT', 'value', reference('aiServices').outputs.aiProjectInfo.value.apiEndpoint), createObject('name', 'AZURE_AI_AGENT_PROJECT_CONNECTION_STRING', 'value', reference('aiServices').outputs.aiProjectInfo.value.apiEndpoint), createObject('name', 'AZURE_AI_AGENT_PROJECT_NAME', 'value', reference('aiServices').outputs.aiProjectInfo.value.name), createObject('name', 'AZURE_AI_AGENT_RESOURCE_GROUP_NAME', 'value', resourceGroup().name), createObject('name', 'AZURE_AI_AGENT_SUBSCRIPTION_ID', 'value', subscription().subscriptionId), createObject('name', 'AZURE_AI_AGENT_ENDPOINT', 'value', reference('aiServices').outputs.aiProjectInfo.value.apiEndpoint), createObject('name', 'AZURE_CLIENT_ID', 'value', reference('appIdentity').outputs.clientId.value), createObject('name', 'APP_ENV', 'value', 'prod')), if(parameters('enableMonitoring'), createArray(createObject('name', 'APPLICATIONINSIGHTS_INSTRUMENTATION_KEY', 'value', reference('applicationInsights').outputs.instrumentationKey.value), createObject('name', 'APPLICATIONINSIGHTS_CONNECTION_STRING', 'value', reference('applicationInsights').outputs.connectionString.value)), createArray()))]",
48480+
"env": "[concat(createArray(createObject('name', 'COSMOSDB_ENDPOINT', 'value', reference('cosmosDb').outputs.endpoint.value), createObject('name', 'COSMOSDB_DATABASE', 'value', reference('cosmosDb').outputs.databaseName.value), createObject('name', 'COSMOSDB_BATCH_CONTAINER', 'value', reference('cosmosDb').outputs.containerNames.value.batch), createObject('name', 'COSMOSDB_FILE_CONTAINER', 'value', reference('cosmosDb').outputs.containerNames.value.file), createObject('name', 'COSMOSDB_LOG_CONTAINER', 'value', reference('cosmosDb').outputs.containerNames.value.log), createObject('name', 'AZURE_BLOB_ACCOUNT_NAME', 'value', reference('storageAccount').outputs.name.value), createObject('name', 'AZURE_BLOB_CONTAINER_NAME', 'value', variables('appStorageContainerName')), createObject('name', 'MIGRATOR_AGENT_MODEL_DEPLOY', 'value', variables('modelDeployment').name), createObject('name', 'PICKER_AGENT_MODEL_DEPLOY', 'value', variables('modelDeployment').name), createObject('name', 'FIXER_AGENT_MODEL_DEPLOY', 'value', variables('modelDeployment').name), createObject('name', 'SEMANTIC_VERIFIER_AGENT_MODEL_DEPLOY', 'value', variables('modelDeployment').name), createObject('name', 'SYNTAX_CHECKER_AGENT_MODEL_DEPLOY', 'value', variables('modelDeployment').name), createObject('name', 'SELECTION_MODEL_DEPLOY', 'value', variables('modelDeployment').name), createObject('name', 'TERMINATION_MODEL_DEPLOY', 'value', variables('modelDeployment').name), createObject('name', 'AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME', 'value', variables('modelDeployment').name), createObject('name', 'AI_PROJECT_ENDPOINT', 'value', reference('aiServices').outputs.aiProjectInfo.value.apiEndpoint), createObject('name', 'AZURE_AI_AGENT_PROJECT_CONNECTION_STRING', 'value', reference('aiServices').outputs.aiProjectInfo.value.apiEndpoint), createObject('name', 'AZURE_AI_AGENT_PROJECT_NAME', 'value', reference('aiServices').outputs.aiProjectInfo.value.name), createObject('name', 'AZURE_AI_AGENT_RESOURCE_GROUP_NAME', 'value', resourceGroup().name), createObject('name', 'AZURE_AI_AGENT_SUBSCRIPTION_ID', 'value', subscription().subscriptionId), createObject('name', 'AZURE_AI_AGENT_ENDPOINT', 'value', reference('aiServices').outputs.aiProjectInfo.value.apiEndpoint), createObject('name', 'AZURE_CLIENT_ID', 'value', reference('appIdentity').outputs.clientId.value), createObject('name', 'APP_ENV', 'value', 'prod')), if(parameters('enableMonitoring'), createArray(createObject('name', 'APPLICATIONINSIGHTS_INSTRUMENTATION_KEY', 'value', reference('applicationInsights').outputs.instrumentationKey.value), createObject('name', 'APPLICATIONINSIGHTS_CONNECTION_STRING', 'value', reference('applicationInsights').outputs.connectionString.value)), createArray()))]",
4848148481
"resources": {
4848248482
"cpu": 1,
4848348483
"memory": "2.0Gi"
@@ -51644,10 +51644,6 @@
5164451644
"type": "string",
5164551645
"value": "[format('https://{0}.blob.core.windows.net/', reference('storageAccount').outputs.name.value)]"
5164651646
},
51647-
"AZURE_OPENAI_ENDPOINT": {
51648-
"type": "string",
51649-
"value": "[format('https://{0}.openai.azure.com/', reference('aiServices').outputs.name.value)]"
51650-
},
5165151647
"AZURE_AI_AGENT_PROJECT_NAME": {
5165251648
"type": "string",
5165351649
"value": "[reference('aiServices').outputs.aiProjectInfo.value.name]"

‎infra/main_custom.bicep‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -921,10 +921,7 @@ module containerAppBackend 'br/public:avm/res/app/container-app:0.19.0' = {
921921
name: 'AZURE_BLOB_CONTAINER_NAME'
922922
value: appStorageContainerName
923923
}
924-
{
925-
name: 'AZURE_OPENAI_ENDPOINT'
926-
value: 'https://${aiServices.outputs.name}.openai.azure.com/'
927-
}
924+
928925
{
929926
name: 'MIGRATOR_AGENT_MODEL_DEPLOY'
930927
value: modelDeployment.name
@@ -1113,7 +1110,6 @@ output COSMOSDB_ENDPOINT string = cosmosDb.outputs.endpoint
11131110
output AZURE_BLOB_ACCOUNT_NAME string = storageAccount.outputs.name
11141111
output AZURE_BLOB_ENDPOINT string = 'https://${storageAccount.outputs.name}.blob.core.windows.net/'
11151112
output AZURE_CONTAINER_REGISTRY_ENDPOINT string = containerRegistry.properties.loginServer
1116-
output AZURE_OPENAI_ENDPOINT string = 'https://${aiServices.outputs.name}.openai.azure.com/'
11171113
output AZURE_AI_AGENT_PROJECT_NAME string = aiServices.outputs.aiProjectInfo.name
11181114
output AZURE_AI_AGENT_ENDPOINT string = aiServices.outputs.aiProjectInfo.apiEndpoint
11191115
output AZURE_AI_AGENT_RESOURCE_GROUP_NAME string = resourceGroup().name

‎src/backend/common/config/config.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ def __init__(self):
3939
self.azure_service_bus_namespace = os.getenv("AZURE_SERVICE_BUS_NAMESPACE")
4040
self.azure_queue_name = os.getenv("AZURE_QUEUE_NAME")
4141

42-
self.azure_openai_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT")
4342
self.ai_project_endpoint = os.getenv("AI_PROJECT_ENDPOINT")
4443
self.migrator_agent_model_deploy = os.getenv("MIGRATOR_AGENT_MODEL_DEPLOY")
4544
self.picker_agent_model_deploy = os.getenv("PICKER_AGENT_MODEL_DEPLOY")

‎src/backend/requirements.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ typing-extensions
3636
python-jose[cryptography]
3737
passlib[bcrypt]
3838
semantic-kernel[azure]==1.32.2
39-
openai==2.0.0
4039
sqlparse
4140
sqlglot
4241
unittest2

0 commit comments

Comments
 (0)