Merge pull request #1349 from solliancenet/mg-aimodel-update-for-rele…

…ase-080 Cherry-picked commits from PR 1348 for Release 0.8.0
solliancenet · Aug 4, 2024 · b5236c3 · b5236c3
2 parents b527ea8 + 4a144db
commit b5236c3
Show file tree

Hide file tree

Showing 11 changed files with 878 additions and 822 deletions.
diff --git a/.gitignore b/.gitignore
@@ -383,6 +383,7 @@ log
 **/Deployment-Manifest.json
 **/Deployment-Manifest.*.json
 .azure
+**/gatekeeper-api-event-profile.json
 **/orchestration-api-event-profile.json
 **/core-api-event-profile.json
 **/vectorization-api-event-profile.json

diff --git a/deploy/common/data/resource-provider/FoundationaLLM.AIModel/.gitignore b/deploy/common/data/resource-provider/FoundationaLLM.AIModel/.gitignore
@@ -1,2 +1,2 @@
-completion-model.json
+completion-*model.json
 embedding-model.json
diff --git a/deploy/quick-start/azd-hooks/postprovision.ps1 b/deploy/quick-start/azd-hooks/postprovision.ps1
@@ -58,16 +58,21 @@ $env:GUID05 = $($(New-Guid).Guid)
 $env:GUID06 = $($(New-Guid).Guid)
 
 $envConfiguraitons = @{
-    "orchestration-api-event-profile"    = @{
-        template     = './config/orchestration-api-event-profile.template.json'
-        render       = './config/orchestration-api-event-profile.json'
-        variableName = 'FOUNDATIONALLM_ORCHESTRATION_API_EVENT_GRID_PROFILE'
-    }
     "core-api-event-profile"             = @{
         template     = './config/core-api-event-profile.template.json'
         render       = './config/core-api-event-profile.json'
         variableName = 'FOUNDATIONALLM_CORE_API_EVENT_GRID_PROFILE'
     }
+    "gatekeeper-api-event-profile"             = @{
+        template     = './config/gatekeeper-api-event-profile.template.json'
+        render       = './config/gatekeeper-api-event-profile.json'
+        variableName = 'FOUNDATIONALLM_GATEKEEPER_API_EVENT_GRID_PROFILE'
+    }
+    "orchestration-api-event-profile"    = @{
+        template     = './config/orchestration-api-event-profile.template.json'
+        render       = './config/orchestration-api-event-profile.json'
+        variableName = 'FOUNDATIONALLM_ORCHESTRATION_API_EVENT_GRID_PROFILE'
+    }
     "management-api-event-profile"       = @{
         template     = './config/management-api-event-profile.template.json'
         render       = './config/management-api-event-profile.json'

diff --git a/.../config/gatekeeper-api-event-profile.json → ...atekeeper-api-event-profile.template.json b/.../config/gatekeeper-api-event-profile.json → ...atekeeper-api-event-profile.template.json
@@ -1,4 +1,4 @@
-{
-    "EventProcessingCycleSeconds": 60,
-    "Topics": []
-}
+{
+    "EventProcessingCycleSeconds": 60,
+    "Topics": []
+}
diff --git a/deploy/standard/azd-hooks/utility/Generate-Config.ps1 b/deploy/standard/azd-hooks/utility/Generate-Config.ps1
@@ -462,11 +462,12 @@ $tokens.vectorizationJobMiClientId = $services["vectorizationjob"].miClientId
 
 $eventGridProfiles = @{}
 $eventGridProfileNames = @(
-    "orchestration-api-event-profile"
     "core-api-event-profile"
+    "gatekeeper-api-event-profile"
+    "orchestration-api-event-profile"
+    "management-api-event-profile"
     "vectorization-api-event-profile"
     "vectorization-worker-event-profile"
-    "management-api-event-profile"
 )
 foreach ($profileName in $eventGridProfileNames) {
     Write-Host "Populating $profileName..." -ForegroundColor Blue
@@ -482,11 +483,12 @@ foreach ($profileName in $eventGridProfileNames) {
     ).Replace('"', '\"')
 }
 
-$tokens.orchestrationApiEventGridProfile = $eventGridProfiles["orchestration-api-event-profile"]
 $tokens.coreApiEventGridProfile = $eventGridProfiles["core-api-event-profile"]
+$tokens.gatekeeperApiEventGridProfile = $eventGridProfiles["gatekeeper-api-event-profile"]
+$tokens.managementApiEventGridProfile = $eventGridProfiles["management-api-event-profile"]
+$tokens.orchestrationApiEventGridProfile = $eventGridProfiles["orchestration-api-event-profile"]
 $tokens.vectorizationApiEventGridProfile = $eventGridProfiles["vectorization-api-event-profile"]
 $tokens.vectorizationWorkerEventGridProfile = $eventGridProfiles["vectorization-worker-event-profile"]
-$tokens.managementApiEventGridProfile = $eventGridProfiles["management-api-event-profile"]
 $tokens.authKeyvaultUri = $authKeyvault.uri
 
 PopulateTemplate $tokens "..,config,appconfig.template.json" "..,config,appconfig.json"
@@ -523,6 +525,8 @@ $($ingress.frontendIngress).PSBase.Keys | ForEach-Object {
 
 PopulateTemplate $tokens "..,data,resource-provider,FoundationaLLM.Agent,FoundationaLLM.template.json" "..,..,common,data,resource-provider,FoundationaLLM.Agent,FoundationaLLM.json"
 PopulateTemplate $tokens "..,data,resource-provider,FoundationaLLM.AIModel,completion-model.template.json" "..,..,common,data,resource-provider,FoundationaLLM.AIModel,completion-model.json"
+PopulateTemplate $tokens "..,data,resource-provider,FoundationaLLM.AIModel,completion-4-model.template.json" "..,..,common,data,resource-provider,FoundationaLLM.AIModel,completion-4-model.json"
+PopulateTemplate $tokens "..,data,resource-provider,FoundationaLLM.AIModel,completion-4o-model.template.json" "..,..,common,data,resource-provider,FoundationaLLM.AIModel,completion-4o-model.json"
 PopulateTemplate $tokens "..,data,resource-provider,FoundationaLLM.AIModel,embedding-model.template.json" "..,..,common,data,resource-provider,FoundationaLLM.AIModel,embedding-model.json"
 PopulateTemplate $tokens "..,data,resource-provider,FoundationaLLM.Configuration,AzureAISearch.template.json" "..,..,common,data,resource-provider,FoundationaLLM.Configuration,AzureAISearch.json"
 PopulateTemplate $tokens "..,data,resource-provider,FoundationaLLM.Configuration,AzureContentSafety.template.json" "..,..,common,data,resource-provider,FoundationaLLM.Configuration,AzureContentSafety.json"