Merge pull request #1554 from solliancenet/mg-cp-1347-into-080

CP of PR 1347 into Release 0.8.0
solliancenet · Aug 21, 2024 · 119d3b6 · 119d3b6
2 parents 5c4b399 + b683a87
commit 119d3b6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/deploy/common/scripts/Set-FllmAzureProviders.ps1 b/deploy/common/scripts/Set-FllmAzureProviders.ps1
@@ -9,8 +9,8 @@
 .PARAMETER deploymentType
     Specifies whether to use quickstart or standard providers. Acceptable values are 'QuickStart' or 'Standard'.
 
-.PARAMETER providers
-    An array of Azure resource providers to check and register if not already registered.
+.PARAMETER listOnly
+    Writes the list of standard and quickstart providers to a file then exits.
 
 .EXAMPLE
     ./Register-AzureProviders.ps1 -deploymentType "Standard"
@@ -27,7 +27,8 @@
 #>
 
 param (
-    [string]$deploymentType
+    [parameter(Mandatory = $true)][string]$deploymentType,
+    [parameter(Mandatory = $false)][bool]$listOnly = $false
 )
 
 # Set Debugging and Error Handling
@@ -82,6 +83,15 @@ $quickStartProviders = @(
     "Microsoft.Storage/storageAccounts"
 )
 
+if($listOnly) {
+    "Standard Providers:" | Out-File -FilePath "fllm.providers.txt"
+    $standardProviders | Out-File -FilePath "fllm.providers.txt" -Append
+
+    "QuickStart Providers:" | Out-File -FilePath "fllm.providers.txt" -Append
+    $quickStartProviders | Out-File -FilePath "fllm.providers.txt" -Append
+    exit
+}
+
 # Select the appropriate list of providers based on the parameter
 if ($deploymentType -eq "Standard") {
     $providers = $standardProviders
@@ -105,4 +115,4 @@ foreach ($provider in $providers) {
     }
 }
 
-Write-Host -ForegroundColor Green "Provider registration check and update completed."
+Write-Host -ForegroundColor Green "Provider registration check and update completed."
diff --git a/deploy/quick-start/azd-hooks/postprovision.ps1 b/deploy/quick-start/azd-hooks/postprovision.ps1
@@ -143,6 +143,14 @@ $configurations = @{
         template = './data/resource-provider/FoundationaLLM.AIModel/completion-model.template.json'
         render   = '../common/data/resource-provider/FoundationaLLM.AIModel/completion-model.json'
     }
+    "completion-4-model" = @{
+        template = './data/resource-provider/FoundationaLLM.AIModel/completion-4-model.template.json'
+        render   = '../common/data/resource-provider/FoundationaLLM.AIModel/completion-4-model.json'
+    }
+    "completion-4o-model" = @{
+        template = './data/resource-provider/FoundationaLLM.AIModel/completion-4o-model.template.json'
+        render   = '../common/data/resource-provider/FoundationaLLM.AIModel/completion-4o-model.json'
+    }
     "embedding-model"  = @{
         template = './data/resource-provider/FoundationaLLM.AIModel/embedding-model.template.json'
         render   = '../common/data/resource-provider/FoundationaLLM.AIModel/embedding-model.json'