Skip to content

fix: Conditional Machine Learning output on deployment #1020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 4, 2024
Merged

fix: Conditional Machine Learning output on deployment #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 32 additions & 30 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,22 +338,22 @@ var defaultOpenAiDeployments = [

var openAiDeployments = concat(
defaultOpenAiDeployments,
useAdvancedImageProcessing
? [
{
name: azureOpenAIVisionModel
model: {
format: 'OpenAI'
name: azureOpenAIVisionModelName
version: azureOpenAIVisionModelVersion
}
sku: {
name: 'Standard'
capacity: azureOpenAIVisionModelCapacity
}
}
]
: []
useAdvancedImageProcessing
? [
{
name: azureOpenAIVisionModel
model: {
format: 'OpenAI'
name: azureOpenAIVisionModelName
version: azureOpenAIVisionModelVersion
}
sku: {
name: 'Standard'
capacity: azureOpenAIVisionModelCapacity
}
}
]
: []
)

module openai 'core/ai/cognitiveservices.bicep' = {
Expand Down Expand Up @@ -812,8 +812,8 @@ module workbook './app/workbook.bicep' = {
functionName: hostingModel == 'container' ? function_docker.outputs.functionName : function.outputs.functionName
websiteName: hostingModel == 'container' ? web_docker.outputs.FRONTEND_API_NAME : web.outputs.FRONTEND_API_NAME
adminWebsiteName: hostingModel == 'container'
? adminweb_docker.outputs.WEBSITE_ADMIN_NAME
: adminweb.outputs.WEBSITE_ADMIN_NAME
? adminweb_docker.outputs.WEBSITE_ADMIN_NAME
: adminweb.outputs.WEBSITE_ADMIN_NAME
eventGridSystemTopicName: eventgrid.outputs.name
logAnalyticsName: monitoring.outputs.logAnalyticsWorkspaceName
azureOpenAIResourceName: openai.outputs.name
Expand Down Expand Up @@ -972,12 +972,12 @@ module storage 'core/storage/storage-account.bicep' = {
sku: {
name: 'Standard_GRS'
}
deleteRetentionPolicy: azureSearchUseIntegratedVectorization
? {
enabled: true
days: 7
}
: {}
deleteRetentionPolicy: azureSearchUseIntegratedVectorization
? {
enabled: true
days: 7
}
: {}
containers: [
{
name: blobContainerName
Expand Down Expand Up @@ -1115,14 +1115,16 @@ output DOCUMENT_PROCESSING_QUEUE_NAME string = queueName
output ORCHESTRATION_STRATEGY string = orchestrationStrategy
output USE_KEY_VAULT bool = useKeyVault
output FRONTEND_WEBSITE_NAME string = hostingModel == 'code'
? web.outputs.FRONTEND_API_URI
: web_docker.outputs.FRONTEND_API_URI
? web.outputs.FRONTEND_API_URI
: web_docker.outputs.FRONTEND_API_URI
output ADMIN_WEBSITE_NAME string = hostingModel == 'code'
? adminweb.outputs.WEBSITE_ADMIN_URI
: adminweb_docker.outputs.WEBSITE_ADMIN_URI
? adminweb.outputs.WEBSITE_ADMIN_URI
: adminweb_docker.outputs.WEBSITE_ADMIN_URI
output LOGLEVEL string = logLevel
output CONVERSATION_FLOW string = conversationFlow
output USE_ADVANCED_IMAGE_PROCESSING bool = useAdvancedImageProcessing
output ADVANCED_IMAGE_PROCESSING_MAX_IMAGES int = advancedImageProcessingMaxImages
output AZURE_ML_WORKSPACE_NAME string = machineLearning.outputs.workspaceName
output RESOURCE_TOKEN string = resourceToken
output AZURE_ML_WORKSPACE_NAME string = orchestrationStrategy == 'prompt_flow'
? machineLearning.outputs.workspaceName
: ''
output RESOURCE_TOKEN string = resourceToken
Loading
Loading