Skip to content

Commit 3e0b75c

Browse files
authored
fix: Fix Machine Learning output on deployment (#1020)
1 parent 4e7136f commit 3e0b75c

File tree

2 files changed

+191
-189
lines changed

2 files changed

+191
-189
lines changed

infra/main.bicep

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -338,22 +338,22 @@ var defaultOpenAiDeployments = [
338338

339339
var openAiDeployments = concat(
340340
defaultOpenAiDeployments,
341-
useAdvancedImageProcessing
342-
? [
343-
{
344-
name: azureOpenAIVisionModel
345-
model: {
346-
format: 'OpenAI'
347-
name: azureOpenAIVisionModelName
348-
version: azureOpenAIVisionModelVersion
349-
}
350-
sku: {
351-
name: 'Standard'
352-
capacity: azureOpenAIVisionModelCapacity
353-
}
354-
}
355-
]
356-
: []
341+
useAdvancedImageProcessing
342+
? [
343+
{
344+
name: azureOpenAIVisionModel
345+
model: {
346+
format: 'OpenAI'
347+
name: azureOpenAIVisionModelName
348+
version: azureOpenAIVisionModelVersion
349+
}
350+
sku: {
351+
name: 'Standard'
352+
capacity: azureOpenAIVisionModelCapacity
353+
}
354+
}
355+
]
356+
: []
357357
)
358358

359359
module openai 'core/ai/cognitiveservices.bicep' = {
@@ -812,8 +812,8 @@ module workbook './app/workbook.bicep' = {
812812
functionName: hostingModel == 'container' ? function_docker.outputs.functionName : function.outputs.functionName
813813
websiteName: hostingModel == 'container' ? web_docker.outputs.FRONTEND_API_NAME : web.outputs.FRONTEND_API_NAME
814814
adminWebsiteName: hostingModel == 'container'
815-
? adminweb_docker.outputs.WEBSITE_ADMIN_NAME
816-
: adminweb.outputs.WEBSITE_ADMIN_NAME
815+
? adminweb_docker.outputs.WEBSITE_ADMIN_NAME
816+
: adminweb.outputs.WEBSITE_ADMIN_NAME
817817
eventGridSystemTopicName: eventgrid.outputs.name
818818
logAnalyticsName: monitoring.outputs.logAnalyticsWorkspaceName
819819
azureOpenAIResourceName: openai.outputs.name
@@ -972,12 +972,12 @@ module storage 'core/storage/storage-account.bicep' = {
972972
sku: {
973973
name: 'Standard_GRS'
974974
}
975-
deleteRetentionPolicy: azureSearchUseIntegratedVectorization
976-
? {
977-
enabled: true
978-
days: 7
979-
}
980-
: {}
975+
deleteRetentionPolicy: azureSearchUseIntegratedVectorization
976+
? {
977+
enabled: true
978+
days: 7
979+
}
980+
: {}
981981
containers: [
982982
{
983983
name: blobContainerName
@@ -1115,14 +1115,16 @@ output DOCUMENT_PROCESSING_QUEUE_NAME string = queueName
11151115
output ORCHESTRATION_STRATEGY string = orchestrationStrategy
11161116
output USE_KEY_VAULT bool = useKeyVault
11171117
output FRONTEND_WEBSITE_NAME string = hostingModel == 'code'
1118-
? web.outputs.FRONTEND_API_URI
1119-
: web_docker.outputs.FRONTEND_API_URI
1118+
? web.outputs.FRONTEND_API_URI
1119+
: web_docker.outputs.FRONTEND_API_URI
11201120
output ADMIN_WEBSITE_NAME string = hostingModel == 'code'
1121-
? adminweb.outputs.WEBSITE_ADMIN_URI
1122-
: adminweb_docker.outputs.WEBSITE_ADMIN_URI
1121+
? adminweb.outputs.WEBSITE_ADMIN_URI
1122+
: adminweb_docker.outputs.WEBSITE_ADMIN_URI
11231123
output LOGLEVEL string = logLevel
11241124
output CONVERSATION_FLOW string = conversationFlow
11251125
output USE_ADVANCED_IMAGE_PROCESSING bool = useAdvancedImageProcessing
11261126
output ADVANCED_IMAGE_PROCESSING_MAX_IMAGES int = advancedImageProcessingMaxImages
1127-
output AZURE_ML_WORKSPACE_NAME string = machineLearning.outputs.workspaceName
1128-
output RESOURCE_TOKEN string = resourceToken
1127+
output AZURE_ML_WORKSPACE_NAME string = orchestrationStrategy == 'prompt_flow'
1128+
? machineLearning.outputs.workspaceName
1129+
: ''
1130+
output RESOURCE_TOKEN string = resourceToken

0 commit comments

Comments
 (0)