fix: Merge pull request #244 from microsoft/dev

fix: Merging dev changed to main branch

Author: Avijit-Microsoft

README.md

@@ -64,9 +64,9 @@ Please check the link [Azure Products by Region](https://azure.microsoft.com/en-
 
 -  GPT model from the drop-down list of values
 
--  GPT model deployment capacity
+-  GPT model deployment capacity (GPT-4, GPT-4o, and GPT-4o Mini)
 
--  Embedding model from the drop-down list of values
+-  Embedding model from the drop-down list of values (text-embedding-ada-002)
 
 -  Embedding model capacity
 
@@ -76,7 +76,8 @@ Please check the link [Azure Products by Region](https://azure.microsoft.com/en-
 - Navigate to the [Azure AI Foundry portal](https://ai.azure.com/)
 - Select the AI Project you are using for this accelerator if you are not already in the project.
 - Select `Management center` from the bottom left navigation menu
-- Select `Quota`, click the `GlobalStandard` dropdown and select the GPT model and region you are using for this accelerator to see your available quota. 
+- Select `Quota`, click the `GlobalStandard` dropdown and select the GPT model (`GPT-4 / GPT-4o / GPT-4o mini`) or embeddings model (`text-embedding-ada-002`) and region you are using for this accelerator to see your available quota. Please note `GPT-4o mini` and `text-embedding-ada-002` are used as default.
+
 - Request more quota or delete any unused model deployments as needed. 
 
 

infra/deploy_ai_foundry.bicep

@@ -658,3 +658,6 @@ output aiSearchId string = aiSearch.id
 output aiSearchTarget string = 'https://${aiSearch.name}.search.windows.net'
 output aiSearchService string = aiSearch.name
 output aiProjectName string = aiHubProject.name
+
+output applicationInsightsId string = applicationInsights.id
+output storageAccountName string = storageNameCleaned

infra/deploy_app_service.bicep

@@ -25,8 +25,8 @@ param HostingPlanSku string = 'P0v3'
 @description('Name of Web App')
 param WebsiteName string = '${ solutionName }-app-service'
 
-@description('Name of Application Insights')
-param ApplicationInsightsName string = '${ solutionName }-app-insights'
+// @description('Name of Application Insights')
+// param ApplicationInsightsName string = '${ solutionName }-app-insights'
 
 @description('Azure OpenAI Model Deployment Name')
 param AzureOpenAIModel string
@@ -64,6 +64,7 @@ param AZURE_COSMOSDB_DATABASE string = ''
 param AZURE_COSMOSDB_ENABLE_FEEDBACK string = 'True'
 
 param imageTag string
+param applicationInsightsId string
 // var WebAppImageName = 'DOCKER|byoaiacontainer.azurecr.io/byoaia-app:latest'
 
 // var WebAppImageName = 'DOCKER|ncwaappcontainerreg1.azurecr.io/ncqaappimage:v1.0.0'
@@ -155,10 +156,12 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
   properties: {
     serverFarmId: HostingPlanName
     siteConfig: {
+      alwaysOn: true
+      ftpsState: 'Disabled'
       appSettings: [
         {
           name: 'APPINSIGHTS_INSTRUMENTATIONKEY'
-          value: reference(ApplicationInsights.id, '2015-05-01').InstrumentationKey
+          value: reference(applicationInsightsId, '2015-05-01').InstrumentationKey
         }
         {
           name: 'AZURE_OPENAI_API_VERSION'
@@ -225,21 +228,33 @@ resource Website 'Microsoft.Web/sites@2020-06-01' = {
       linuxFxVersion: WebAppImageName
     }
   }
-  dependsOn: [HostingPlan]
-}
-
-resource ApplicationInsights 'Microsoft.Insights/components@2020-02-02' = {
-  name: ApplicationInsightsName
-  location: resourceGroup().location
-  tags: {
-    'hidden-link:${resourceId('Microsoft.Web/sites',ApplicationInsightsName)}': 'Resource'
+  resource basicPublishingCredentialsPoliciesFtp 'basicPublishingCredentialsPolicies' = {
+    name: 'ftp'
+    properties: {
+      allow: false
+    }
   }
-  properties: {
-    Application_Type: 'web'
+  resource basicPublishingCredentialsPoliciesScm 'basicPublishingCredentialsPolicies' = {
+    name: 'scm'
+    properties: {
+      allow: false
+    }
   }
-  kind: 'web'
+  dependsOn: [HostingPlan]
 }
 
+// resource ApplicationInsights 'Microsoft.Insights/components@2020-02-02' = {
+//   name: ApplicationInsightsName
+//   location: resourceGroup().location
+//   tags: {
+//     'hidden-link:${resourceId('Microsoft.Web/sites',ApplicationInsightsName)}': 'Resource'
+//   }
+//   properties: {
+//     Application_Type: 'web'
+//   }
+//   kind: 'web'
+// }
+
 resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2022-08-15' existing = {
   name: AZURE_COSMOSDB_ACCOUNT
 }
@@ -259,4 +274,5 @@ resource role 'Microsoft.DocumentDB/databaseAccounts/sqlRoleAssignments@2022-05-
   dependsOn: [Website]
 }
 
+output webAppUrl string = 'https://${WebsiteName}.azurewebsites.net'
 

infra/deploy_azure_function_charts.bicep

@@ -8,8 +8,8 @@ param sqlDbUser string
 param sqlDbPwd string
 // param managedIdentityObjectId string
 param imageTag string
+param storageAccountName string
 var functionAppName = '${solutionName}-charts-fn'
-var storageaccountname = '${solutionName}chartfnacc'
 var dockerImage = 'DOCKER|kmcontainerreg.azurecr.io/km-charts-function:${imageTag}'
 var environmentName = '${solutionName}-charts-fn-env'
 
@@ -18,19 +18,6 @@ var environmentName = '${solutionName}-charts-fn-env'
 // var sqlDbUser = 'sqladmin'
 // var sqlDbPwd = 'TestPassword_1234'
 
-resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = {
-  name: storageaccountname
-  location: resourceGroup().location
-  sku: {
-    name: 'Standard_LRS'
-  }
-  kind: 'StorageV2'
-  properties: {
-    accessTier: 'Hot'
-    allowSharedKeyAccess: false
-  }
-}
-
 resource managedenv 'Microsoft.App/managedEnvironments@2024-03-01' = {
   name: environmentName
   location: solutionLocation
@@ -69,8 +56,8 @@ resource azurefn 'Microsoft.Web/sites@2023-12-01' = {
     siteConfig: {
       appSettings: [
         {
-          name: 'AzureWebJobsStorage'
-          value: 'DefaultEndpointsProtocol=https;AccountName=${storageAccount};EndpointSuffix=core.windows.net'
+          name: 'AzureWebJobsStorage__accountname'
+          value: storageAccountName
         }
         {
           name: 'SQLDB_DATABASE'
@@ -104,13 +91,4 @@ resource azurefn 'Microsoft.Web/sites@2023-12-01' = {
   }
 }
 
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
-  name: guid(subscription().id, resourceGroup().id, azurefn.id, 'StorageBlobDataContributor')
-  scope: storageAccount
-  properties: {
-    roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe') // Storage Blob Data Contributor
-    principalId: azurefn.identity.principalId
-  }
-}
-
 

infra/deploy_azure_function_rag.bicep

@@ -20,8 +20,8 @@ param sqlDbUser string
 param sqlDbPwd string
 // param managedIdentityObjectId string
 param imageTag string
+param storageAccountName string
 var functionAppName = '${solutionName}-rag-fn'
-var storageaccountname = '${solutionName}ragfnacc'
 var dockerImage = 'DOCKER|kmcontainerreg.azurecr.io/km-rag-function:${imageTag}'
 var environmentName = '${solutionName}-rag-fn-env'
 
@@ -30,19 +30,6 @@ var environmentName = '${solutionName}-rag-fn-env'
 // var sqlDbUser = 'sqladmin'
 // var sqlDbPwd = 'TestPassword_1234'
 
-resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = {
-  name: storageaccountname
-  location: resourceGroup().location
-  sku: {
-    name: 'Standard_LRS'
-  }
-  kind: 'StorageV2'
-  properties: {
-    accessTier: 'Hot'
-    allowSharedKeyAccess: false
-  }
-}
-
 resource managedenv 'Microsoft.App/managedEnvironments@2024-03-01' = {
   name: environmentName
   location: solutionLocation
@@ -81,8 +68,8 @@ resource azurefn 'Microsoft.Web/sites@2023-12-01' = {
     siteConfig: {
       appSettings: [
         {
-          name: 'AzureWebJobsStorage'
-          value: 'DefaultEndpointsProtocol=https;AccountName=${storageAccount};EndpointSuffix=core.windows.net'
+          name: 'AzureWebJobsStorage__accountname'
+          value: storageAccountName
         }
         {
           name: 'PYTHON_ENABLE_INIT_INDEXING'
@@ -155,15 +142,6 @@ resource azurefn 'Microsoft.Web/sites@2023-12-01' = {
   }
 }
 
-resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
-  name: guid(subscription().id, resourceGroup().id, azurefn.id, 'StorageBlobDataContributor')
-  scope: storageAccount
-  properties: {
-    roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe') // Storage Blob Data Contributor
-    principalId: azurefn.identity.principalId
-  }
-}
-
 resource aiHubProject 'Microsoft.MachineLearningServices/workspaces@2024-01-01-preview' existing = {
   name: aiProjectName
 }

infra/main.bicep

@@ -192,6 +192,7 @@ module azureFunctionsCharts 'deploy_azure_function_charts.bicep' = {
     sqlDbUser: sqlDBModule.outputs.sqlDbUser
     sqlDbPwd:keyVault.getSecret('SQLDB-PASSWORD')
     // managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.objectId
+    storageAccountName:aifoundry.outputs.storageAccountName
   }
   dependsOn:[keyVault]
 }
@@ -217,6 +218,7 @@ module azureragFunctionsRag 'deploy_azure_function_rag.bicep' = {
     sqlDbPwd:keyVault.getSecret('SQLDB-PASSWORD')
     aiProjectName:aifoundry.outputs.aiProjectName
     // managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.objectId
+    storageAccountName:aifoundry.outputs.storageAccountName
   }
   dependsOn:[keyVault]
 }
@@ -235,6 +237,7 @@ module appserviceModule 'deploy_app_service.bicep' = {
   name: 'deploy_app_service'
   params: {
     imageTag: imageTag
+    applicationInsightsId: aifoundry.outputs.applicationInsightsId
     // identity:managedIdentityModule.outputs.managedIdentityOutput.id
     solutionName: solutionPrefix
     // solutionLocation: solutionLocation
@@ -258,3 +261,5 @@ module appserviceModule 'deploy_app_service.bicep' = {
   scope: resourceGroup(resourceGroup().name)
   dependsOn:[sqlDBModule]
 }
+
+output WEB_APP_URL string = appserviceModule.outputs.webAppUrl