Merge pull request #1658 from solliancenet/mg-fix-qs-byo-oai-c-p

(0.8.1) Updating BYO OpenAI to reference correct instance
solliancenet · Sep 3, 2024 · 27f68c2 · 27f68c2
2 parents 3590962 + fc9cc61
commit 27f68c2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/deploy/common/data/resource-provider/FoundationaLLM.Configuration/.gitignore b/deploy/common/data/resource-provider/FoundationaLLM.Configuration/.gitignore
@@ -1,5 +1,7 @@
 AuthorizationAPI.json
 AzureContentSafety.json
+AzureEventGrid.json
+CoreAPI.json
 GatekeeperAPI.json
 GatekeeperIntegrationAPI.json
 GatewayAPI.json

diff --git a/deploy/quick-start/azd-hooks/postprovision.ps1 b/deploy/quick-start/azd-hooks/postprovision.ps1
@@ -143,14 +143,6 @@ $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'

diff --git a/deploy/quick-start/config/version.json b/deploy/quick-start/config/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "0.8.0"
+    "version": "0.8.1"
 }
diff --git a/deploy/quick-start/infra/main.bicep b/deploy/quick-start/infra/main.bicep
@@ -71,7 +71,7 @@ var azureOpenAiEndpoint = deployOpenAi ? openAi.outputs.endpoint : customerOpenA
 var azureOpenAiId = deployOpenAi ? openAi.outputs.id : customerOpenAi.id
 var azureOpenAi = deployOpenAi ? openAiInstance : existingOpenAiInstance
 var openAiInstance = {
-  name: openAi.outputs.name
+  name: '${abbrs.openAiAccounts}${resourceToken}'
   resourceGroup: rg.name
   subscriptionId: subscription().subscriptionId
 }
@@ -363,11 +363,11 @@ module openAi './shared/openai.bicep' =
   if (deployOpenAi) {
     dependsOn: [keyVault]
     name: 'openai-${timestamp}'
-    scope: rg
+    scope: resourceGroup(azureOpenAi.resourceGroup)
 
     params: {
       location: location
-      name: '${abbrs.openAiAccounts}${resourceToken}'
+      name: azureOpenAi.name
       sku: 'S0'
       tags: tags
 
@@ -613,10 +613,10 @@ module cosmosRoles './shared/sqlRoleAssignments.bicep' = [
 
 module openAiRoles './shared/openAiRoleAssignments.bicep' = [
   for target in openAiRoleTargets: {
-    scope: rg
+    scope: resourceGroup(azureOpenAi.resourceGroup)
     name: '${target}-openai-roles-${timestamp}'
     params: {
-      targetOpenAiName: openAiInstance.name
+      targetOpenAiName: azureOpenAi.name
       principalId: acaServices[indexOf(serviceNames, target)].outputs.miPrincipalId
       roleDefinitionNames: [
         'Cognitive Services OpenAI User'
@@ -628,10 +628,10 @@ module openAiRoles './shared/openAiRoleAssignments.bicep' = [
 
 module openAiContribRole './shared/openAiRoleAssignments.bicep' = [
   for target in openAiContribRoleTargets: {
-    scope: rg
+    scope: resourceGroup(azureOpenAi.resourceGroup)
     name: '${target}-openai-contrib-${timestamp}'
     params: {
-      targetOpenAiName: openAiInstance.name
+      targetOpenAiName: azureOpenAi.name
       principalId: acaServices[indexOf(serviceNames, target)].outputs.miPrincipalId
       roleDefinitionNames: [
         'Cognitive Services OpenAI Contributor'