Merge pull request #215 from microsoft/PSL-deployment-update

fix: updated deployment files

Author: Avijit-Microsoft

README.md

@@ -159,6 +159,67 @@ Once you've opened the project in [Codespaces](#github-codespaces), in [Dev Cont
 
 You can view the permissions for your account and subscription by going to Azure portal, clicking 'Subscriptions' under 'Navigation' and then choosing your subscription from the list. If you try to search for your subscription and it does not come up, make sure no filters are selected. After selecting your subscription, select 'Access control (IAM)' and you can see the roles that are assigned to your account for this subscription. If you want to see more information about the roles, you can go to the 'Role assignments' tab and search by your account name and then click the role you want to view more information about.
 
+## Customizing resource names
+
+By default this template will use a default naming convention to prevent naming collisions within Azure.
+To override default naming conventions the following can be set.
+
+* `AZURE_ENV_CU_LOCATION` - The name of the Content Understanding Location
+* `AZURE_ENV_SECONDARY_LOCATION` - The name of the Secondary Location
+* `AZURE_ENV_MODEL_DEPLOYMENT_TYPE` - The name of the Model Deployment Type
+* `AZURE_ENV_MODEL_NAME` - The name of the Model Name
+* `AZURE_ENV_MODEL_CAPACITY` - The name of the Model Capacity
+* `AZURE_ENV_EMBEDDING_MODEL_NAME` - The name of the Embedding Model
+* `AZURE_ENV_EMBEDDING_MODEL_CAPACITY` - The name of the Embedding Deployment Capacity
+
+To override any of those resource names, run `azd env set <key> <value>` before running `azd up`.
+
+## Customizing deployments
+
+To customize the deployments, you can set the following environment variables:
+
+Change the Content Understanding Location:
+
+```shell
+azd env set AZURE_ENV_CU_LOCATION 'West US'
+```
+
+Change the Secondary Location:
+
+```shell
+azd env set AZURE_ENV_SECONDARY_LOCATION eastus2
+```
+
+Change the Model Deployment Type:
+
+```shell
+azd env set AZURE_ENV_MODEL_DEPLOYMENT_TYPE GlobalStandard
+```
+
+Set the Model Name:
+
+```shell
+azd env set AZURE_ENV_MODEL_NAME gpt-4o-mini
+```
+
+Change the Model Capacity:
+
+```shell
+azd env set AZURE_ENV_MODEL_CAPACITY 100
+```
+
+Change the Embedding Model:
+
+```shell
+azd env set AZURE_ENV_EMBEDDING_MODEL_NAME text-embedding-ada-002
+```
+
+Change the Embedding Deployment Capacity:
+
+```shell
+azd env set AZURE_ENV_EMBEDDING_MODEL_CAPACITY 80
+```
+
 ### Deploying with azd
 
 1. Login to Azure:

infra/deploy_app_service.bicep

@@ -6,10 +6,10 @@ targetScope = 'resourceGroup'
 @description('Solution Name')
 param solutionName string
 
-@description('Solution Location')
-param solutionLocation string
+// @description('Solution Location')
+// param solutionLocation string
 
-param identity string
+// param identity string
 
 @description('Name of App Service plan')
 param HostingPlanName string = '${ solutionName }-app-service-plan'
@@ -50,9 +50,9 @@ param USE_CHAT_HISTORY_ENABLED string = ''
 @description('Azure Cosmos DB Account')
 param AZURE_COSMOSDB_ACCOUNT string = ''
 
-@description('Azure Cosmos DB Account Key')
-@secure()
-param AZURE_COSMOSDB_ACCOUNT_KEY string = ''
+// @description('Azure Cosmos DB Account Key')
+// @secure()
+// param AZURE_COSMOSDB_ACCOUNT_KEY string = ''
 
 @description('Azure Cosmos DB Conversations Container')
 param AZURE_COSMOSDB_CONVERSATIONS_CONTAINER string = ''

infra/deploy_azure_function_charts.bicep

@@ -6,10 +6,10 @@ param sqlDbName string
 param sqlDbUser string
 @secure()
 param sqlDbPwd string
-param managedIdentityObjectId string
+// param managedIdentityObjectId string
 param imageTag string
 var functionAppName = '${solutionName}-charts-fn'
-var storageaccountname = '${solutionName}chartsfnacc'
+var storageaccountname = '${solutionName}chartfnacc'
 var dockerImage = 'DOCKER|kmcontainerreg.azurecr.io/km-charts-function:${imageTag}'
 var environmentName = '${solutionName}-charts-fn-env'
 

infra/deploy_azure_function_urls.bicep

@@ -1,6 +1,6 @@
 @description('Specifies the location for resources.')
 param solutionName string 
-param identity string
+// param identity string
 
 var chartsfunctionAppName = '${solutionName}-charts-fn'
 var chartsfunctionName = 'get_metrics'

infra/deploy_storage_account.bicep

@@ -10,7 +10,7 @@ param solutionName string
 param solutionLocation string
 
 @description('Name')
-param saName string = '${ solutionName }storageaccount'
+param saName string = '${ solutionName }storage'
 
 param keyVaultName string
 param managedIdentityObjectId string

infra/main.bicep

@@ -6,8 +6,6 @@ targetScope = 'resourceGroup'
 @description('A unique prefix for all resources in this deployment. This should be 3-10 characters long:')
 param environmentName string
 
-var solutionPrefix = environmentName
-
 @minLength(1)
 @description('Location for the Content Understanding service deployment:')
 @allowed(['West US'
@@ -68,8 +66,10 @@ param embeddingDeploymentCapacity int = 80
 
 param imageTag string = 'latest'
 
+var uniqueId = toLower(uniqueString(subscription().id, environmentName, resourceGroup().location))
+var solutionPrefix = 'km${padLeft(take(uniqueId, 12), 12, '0')}'
 var resourceGroupLocation = resourceGroup().location
-var resourceGroupName = resourceGroup().name
+// var resourceGroupName = resourceGroup().name
 
 var solutionLocation = resourceGroupLocation
 var baseUrl = 'https://raw.githubusercontent.com/microsoft/Conversation-Knowledge-Mining-Solution-Accelerator/main/'
@@ -191,7 +191,7 @@ module azureFunctionsCharts 'deploy_azure_function_charts.bicep' = {
     sqlDbName: sqlDBModule.outputs.sqlDbName
     sqlDbUser: sqlDBModule.outputs.sqlDbUser
     sqlDbPwd:keyVault.getSecret('SQLDB-PASSWORD')
-    managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.objectId
+    // managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.objectId
   }
   dependsOn:[keyVault]
 }
@@ -225,7 +225,7 @@ module azureFunctionURL 'deploy_azure_function_urls.bicep' = {
   name : 'deploy_azure_function_urls'
   params:{
     solutionName: solutionPrefix
-    identity:managedIdentityModule.outputs.managedIdentityOutput.id
+    // identity:managedIdentityModule.outputs.managedIdentityOutput.id
   }
   dependsOn:[azureFunctionsCharts,azureragFunctionsRag]
 }
@@ -235,9 +235,9 @@ module appserviceModule 'deploy_app_service.bicep' = {
   name: 'deploy_app_service'
   params: {
     imageTag: imageTag
-    identity:managedIdentityModule.outputs.managedIdentityOutput.id
+    // identity:managedIdentityModule.outputs.managedIdentityOutput.id
     solutionName: solutionPrefix
-    solutionLocation: solutionLocation
+    // solutionLocation: solutionLocation
     AzureOpenAIEndpoint:aifoundry.outputs.aiServicesTarget
     AzureOpenAIModel: gptModelName //'gpt-4o-mini'
     AzureOpenAIKey:keyVault.getSecret('AZURE-OPENAI-KEY')
@@ -250,7 +250,7 @@ module appserviceModule 'deploy_app_service.bicep' = {
     GRAPHRAG_URL:azureFunctionURL.outputs.functionURLsOutput.graphrag_function_url
     RAG_URL:azureFunctionURL.outputs.functionURLsOutput.rag_function_url
     AZURE_COSMOSDB_ACCOUNT: cosmosDBModule.outputs.cosmosAccountName
-    AZURE_COSMOSDB_ACCOUNT_KEY: keyVault.getSecret('AZURE-COSMOSDB-ACCOUNT-KEY')
+    // AZURE_COSMOSDB_ACCOUNT_KEY: keyVault.getSecret('AZURE-COSMOSDB-ACCOUNT-KEY')
     AZURE_COSMOSDB_CONVERSATIONS_CONTAINER: cosmosDBModule.outputs.cosmosContainerName
     AZURE_COSMOSDB_DATABASE: cosmosDBModule.outputs.cosmosDatabaseName
     AZURE_COSMOSDB_ENABLE_FEEDBACK:'True'

infra/main.bicepparam

@@ -1,11 +1,10 @@
 using './main.bicep'
 
 param environmentName = readEnvironmentVariable('AZURE_ENV_NAME', 'env_name')
-param contentUnderstandingLocation = 'West US'
-param secondaryLocation = 'eastus2'
-param deploymentType = 'GlobalStandard'
-param gptModelName = 'gpt-4o-mini'
-param gptDeploymentCapacity = 100
-param embeddingModel = 'text-embedding-ada-002'
-param embeddingDeploymentCapacity = 80
-
+param contentUnderstandingLocation = readEnvironmentVariable('AZURE_ENV_CU_LOCATION', 'West US')
+param secondaryLocation = readEnvironmentVariable('AZURE_ENV_SECONDARY_LOCATION', 'eastus2')
+param deploymentType = readEnvironmentVariable('AZURE_ENV_MODEL_DEPLOYMENT_TYPE', 'GlobalStandard')
+param gptModelName = readEnvironmentVariable('AZURE_ENV_MODEL_NAME', 'gpt-4o-mini')
+param gptDeploymentCapacity = int(readEnvironmentVariable('AZURE_ENV_MODEL_CAPACITY', '100'))
+param embeddingModel = readEnvironmentVariable('AZURE_ENV_EMBEDDING_MODEL_NAME', 'text-embedding-ada-002')
+param embeddingDeploymentCapacity = int(readEnvironmentVariable('AZURE_ENV_EMBEDDING_MODEL_CAPACITY', '80'))