Skip to content
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

Aoai update50 #530

Merged
merged 3 commits into from
Feb 13, 2024
Merged

Aoai update50 #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31a3cf0
adding scale-out
krnese Feb 13, 2024
e9c8fe1
adding param
krnese Feb 13, 2024
cf809ca
Merge branch 'main' into aoai-update50
krnese Feb 13, 2024
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
82 changes: 81 additions & 1 deletion fsi/solutions/generativeAi/EnterpriseAIPortal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,85 @@
"validationMessage": "The prefix must be 1-10 characters."
},
"visible": true
},
{
"name": "aiIntentionText",
"type": "Microsoft.Common.TextBlock",
"visible": true,
"options": {
"text": "Select the architecture setup for the Azure Open AI workload. You can select if you want to deploy a single instance into a single region, or create multiple instances across multiple regions using API Management for load balancing and distribution of traffic.",
"link": {
"label": "Learn more",
"uri": "https://learn.microsoft.com/azure/ai-services/openai/overview"
}
}
},
{
"name": "aiIntention",
"type": "Microsoft.Common.DropDown",
"label": "Architecture setup",
"placeholder": "",
"defaultValue": "Deploy Azure Open AI to a single Azure region into a single subscription.",
"toolTip": "",
"multiselect": false,
"multiLine": true,
"selectAll": false,
"defaultDescription": "Select the architecture for this deployment.",
"filter": true,
"constraints": {
"allowedValues": [
{
"label": "Deploy Azure Open AI to a single Azure region into a single subscription.",
"description": "Deploy the Azure Open AI workload fondation with optional services into a single Azure region.",
"value": "Single"
},
{
"label": "Deploy Azure Open AI to multiple Azure regions using API Management.",
"description": "Deploy Azure Open AI workload foundation across multiple Azure region, and optionally across multple subscriptions, using APIM for load balancing and distribution of traffic.",
"value": "Multiple"
}
],
"required": true
},
"visible": true
},
{
"name": "aiMultiLocationsApi",
"type": "Microsoft.Solutions.ArmApiControl",
"request": {
"method": "GET",
"path": "locations?api-version=2019-11-01"
}
},
{
"name": "aiMultiLocation",
"type": "Microsoft.Common.DropDown",
"label": "Select the additional Azure region for the Azure Open AI workload",
"filter": true,
"toolTip": "Select the additional Azure region for the Azure Open AI workload",
"constraints": {
"allowedValues": "[map(steps('basics').aiMultiLocationsApi.value,(item) => parse(concat('{\"label\":\"',item.displayName,'\",\"value\":\"',item.name,'\"}')))]",
"required": true
},
"visible": "[equals(steps('basics').aiIntention, 'Multiple')]"
},
{
"name": "aoAiMulti",
"type": "Microsoft.Common.InfoBox",
"visible": "[equals(steps('basics').aiIntention, 'Multiple')]",
"options": {
"icon": "None",
"text": "<b> </b><img src='https://raw.githubusercontent.com/microsoft/industry/main/fsi/docs/aoai_multi_region.svg'>"
}
},
{
"name": "aoAiSingle",
"type": "Microsoft.Common.InfoBox",
"visible": "[equals(steps('basics').aiIntention, 'Single')]",
"options": {
"icon": "None",
"text": "<b> </b><img src='https://raw.githubusercontent.com/microsoft/industry/main/fsi/docs/aoai_single_region.svg'>"
}
}
]
},
Expand Down Expand Up @@ -1896,7 +1975,8 @@
"visionSystemIdentity": "[steps('aiAuxiliarySettings').aiVisionSystemIdentity]",
"visionMonCreation": "[steps('aiAuxiliarySettings').aiVisionMonCreation]",
"visionRestrictOutboundNetworkAccess": "[steps('aiAuxiliarySettings').aiVisionRestrictOutboundNetworkAccess]",
"aiUseCaseSelection": "[steps('aiAuxiliarySettings').aiUseCaseSelection]"
"aiUseCaseSelection": "[steps('aiAuxiliarySettings').aiUseCaseSelection]",
"aiMultiLocation": "[steps('basics').aiMultiLocation]"
},
"kind": "Subscription",
"location": "[steps('basics').resourceScope.location.name]",
Expand Down
4 changes: 4 additions & 0 deletions fsi/solutions/generativeAi/aoaiArm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,10 @@
"aiUseCaseSelection": {
"type": "string",
"defaultValue": ""
},
"aiMultiLocation": {
"type": "string",
"defaultValue": ""
}
},
"variables": {
Expand Down
Loading