Merge pull request #404 from microsoft/microhacks-e2e

feat: Microhacks e2e

Author: blessing-sanusi

.gitignore

@@ -2,6 +2,7 @@
 # This .gitignore file was automatically created by Microsoft(R) Visual Studio.
 ################################################################################
 *.venv
+*.myenv
 *.vscode
 *.vs
 /LUISSchemaSerializationTool/.vs
@@ -10,3 +11,4 @@
 .fake
 .azure
 .idea
+/myenv

azure.yaml

@@ -23,39 +23,4 @@ hooks:
         echo $WEB_APP_URL
       shell: sh
       continueOnError: false
-      interactive: true
-# environment:
-#   name: conversation-knowledge-mining-solution-accelerator
-#   location: eastus
-
-# metadata:
-#     template: [email protected]
-# services:
-#     add-user-scripts:
-#         project: Deployment/scripts/add_user_scripts
-#         host: containerapp
-#         language: python
-#     app:
-#         project: App
-#         host: containerapp
-#         language: python
-#     fabric-scripts:
-#         project: Deployment/scripts/fabric_scripts
-#         host: containerapp
-#         language: python
-#     index-scripts:
-#         project: Deployment/scripts/index_scripts
-#         host: containerapp
-#         language: python
-#     km-charts-function:
-#         project: AzureFunctions/km-charts-function
-#         host: containerapp
-#         language: python
-#         docker:
-#             path: Dockerfile
-#     km-rag-function:
-#         project: AzureFunctions/km-rag-function
-#         host: containerapp
-#         language: python
-#         docker:
-#             path: Dockerfile
+      interactive: true

docs/CustomizingAzdParameters.md

@@ -8,41 +8,41 @@ By default this template will use the environment name as the prefix to prevent
 Change the Content Understanding Location (allowed values: Sweden Central, Australia East)
 
 ```shell
-azd env set AZURE_ENV_CU_LOCATION 'swedencentral'
+azd env set AZURE_CONTENT_UNDERSTANDING_LOCATION 'swedencentral'
 ```
 
 Change the Secondary Location (example: eastus2, westus2, etc.)
 
 ```shell
-azd env set AZURE_ENV_SECONDARY_LOCATION eastus2
+azd env set AZURE_SECONDARY_LOCATION eastus2
 ```
 
 Change the Model Deployment Type (allowed values: Standard, GlobalStandard)
 
 ```shell
-azd env set AZURE_ENV_MODEL_DEPLOYMENT_TYPE GlobalStandard
+azd env set AZURE_OPEN_AI_MODEL_DEPLOYMENT_TYPE GlobalStandard
 ```
 
 Set the Model Name (allowed values: gpt-4o-mini, gpt-4o, gpt-4)
 
 ```shell
-azd env set AZURE_ENV_MODEL_NAME gpt-4o-mini
+azd env set AZURE_OPEN_AI_DEPLOYMENT_MODEL gpt-4o-mini
 ```
 
 Change the Model Capacity (choose a number based on available GPT model capacity in your subscription)
 
 ```shell
-azd env set AZURE_ENV_MODEL_CAPACITY 30
+azd env set AZURE_OPEN_AI_DEPLOYMENT_MODEL_CAPACITY 30
 ```
 
 Change the Embedding Model 
 
 ```shell
-azd env set AZURE_ENV_EMBEDDING_MODEL_NAME text-embedding-ada-002
+azd env set AZURE_OPENAI_EMBEDDING_MODEL text-embedding-ada-002
 ```
 
 Change the Embedding Deployment Capacity (choose a number based on available embedding model capacity in your subscription)
 
 ```shell
-azd env set AZURE_ENV_EMBEDDING_MODEL_CAPACITY 80
+azd env set AZURE_OPENAI_EMBEDDING_MODEL_CAPACITY 80
 ```

infra/deploy_ai_foundry.bicep

@@ -183,7 +183,7 @@ resource aiServices 'Microsoft.CognitiveServices/accounts@2024-04-01-preview' =
   properties: {
     customSubDomainName: aiServicesName
     // apiProperties: {
-    //   // statisticsEnabled: false
+    //   statisticsEnabled: false
     // }
   }
 }
@@ -697,9 +697,14 @@ 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 aiSearchKey string = aiSearch.listAdminKeys().primaryKey
 
 output applicationInsightsId string = applicationInsights.id
 output logAnalyticsWorkspaceResourceName string = logAnalytics.name
 output storageAccountName string = storageNameCleaned
 
 output azureOpenAIKeyName string = azureOpenAIApiKeyEntry.name
+output azureOpenAIKey string = aiServices.listKeys().key1
+
+output azureProjectConnString string = '${split(aiHubProject.properties.discoveryUrl, '/')[2]};${subscription().subscriptionId};${resourceGroup().name};${aiHubProject.name}'
+output azureProjectName string = aiHubProject.name

infra/deploy_backend_docker.bicep

@@ -137,3 +137,5 @@ resource aiDeveloperAccessProj 'Microsoft.Authorization/roleAssignments@2022-04-
 }
 
 output appUrl string = appService.outputs.appUrl
+output reactAppLayoutConfig string = reactAppLayoutConfig
+output appInsightInstrumentationKey string = reference(applicationInsightsId, '2015-05-01').InstrumentationKey

infra/main.bicep

@@ -239,4 +239,41 @@ module frontend_docker 'deploy_frontend_docker.bicep'= {
   scope: resourceGroup(resourceGroup().name)
 }
 
+output SOLUTION_NAME string = solutionPrefix
+output RESOURCE_GROUP_NAME string = resourceGroup().name
+output RESOURCE_GROUP_LOCATION string = solutionLocation
+output ENVIRONMENT_NAME string = environmentName
+output AZURE_CONTENT_UNDERSTANDING_LOCATION string = contentUnderstandingLocation
+output AZURE_SECONDARY_LOCATION string = secondaryLocation
+output APPINSIGHTS_INSTRUMENTATIONKEY string = backend_docker.outputs.appInsightInstrumentationKey
+output AZURE_AI_PROJECT_CONN_STRING string = aifoundry.outputs.azureProjectConnString
+output AZURE_AI_PROJECT_NAME string = aifoundry.outputs.azureProjectName
+output AZURE_AI_SEARCH_API_KEY string = aifoundry.outputs.aiSearchKey
+output AZURE_AI_SEARCH_ENDPOINT string = aifoundry.outputs.aiSearchTarget
+output AZURE_AI_SEARCH_INDEX string = 'call_transcripts_index'
+output AZURE_COSMOSDB_ACCOUNT string = cosmosDBModule.outputs.cosmosAccountName
+output AZURE_COSMOSDB_CONVERSATIONS_CONTAINER string = 'conversations'
+output AZURE_COSMOSDB_DATABASE string = 'db_conversation_history'
+output AZURE_COSMOSDB_ENABLE_FEEDBACK string = 'True'
+output AZURE_OPEN_AI_DEPLOYMENT_MODEL string = gptModelName
+output AZURE_OPEN_AI_DEPLOYMENT_MODEL_CAPACITY int = gptDeploymentCapacity
+output AZURE_OPEN_AI_ENDPOINT string = aifoundry.outputs.aiServicesTarget
+output AZURE_OPENAI_API_KEY string = aifoundry.outputs.azureOpenAIKey
+output AZURE_OPEN_AI_MODEL_DEPLOYMENT_TYPE string = deploymentType
+output AZURE_OPENAI_EMBEDDING_MODEL string = embeddingModel
+output AZURE_OPENAI_EMBEDDING_MODEL_CAPACITY int = embeddingDeploymentCapacity
+output AZURE_OPENAI_API_VERSION string = azureOpenAIApiVersion
+output AZURE_OPENAI_RESOURCE string = aifoundry.outputs.aiServicesName
+output OPENAI_API_VERSION string = azureOpenAIApiVersion
+output REACT_APP_LAYOUT_CONFIG string = backend_docker.outputs.reactAppLayoutConfig
+output SQLDB_DATABASE string = sqlDBModule.outputs.sqlDbName
+output SQLDB_SERVER string = sqlDBModule.outputs.sqlServerName
+output SQLDB_USER_MID string = managedIdentityModule.outputs.managedIdentityBackendAppOutput.clientId
+output SQLDB_USERNAME string = sqlDBModule.outputs.sqlDbUser
+output USE_AI_PROJECT_CLIENT string = 'False'
+output USE_CHAT_HISTORY_ENABLED string = 'True'
+output DISPLAY_CHART_DEFAULT string = 'False'
+
+output API_APP_URL string = backend_docker.outputs.appUrl
 output WEB_APP_URL string = frontend_docker.outputs.appUrl
+

infra/main.bicepparam

@@ -1,10 +1,10 @@
 using './main.bicep'
 
 param environmentName = readEnvironmentVariable('AZURE_ENV_NAME', 'env_name')
-param contentUnderstandingLocation = readEnvironmentVariable('AZURE_ENV_CU_LOCATION', 'swedencentral')
-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', '30'))
-param embeddingModel = readEnvironmentVariable('AZURE_ENV_EMBEDDING_MODEL_NAME', 'text-embedding-ada-002')
-param embeddingDeploymentCapacity = int(readEnvironmentVariable('AZURE_ENV_EMBEDDING_MODEL_CAPACITY', '80'))
+param contentUnderstandingLocation = readEnvironmentVariable('AZURE_CONTENT_UNDERSTANDING_LOCATION', 'swedencentral')
+param secondaryLocation = readEnvironmentVariable('AZURE_SECONDARY_LOCATION', 'eastus2')
+param deploymentType = readEnvironmentVariable('AZURE_OPEN_AI_MODEL_DEPLOYMENT_TYPE', 'GlobalStandard')
+param gptModelName = readEnvironmentVariable('AZURE_OPEN_AI_DEPLOYMENT_MODEL', 'gpt-4o-mini')
+param gptDeploymentCapacity = int(readEnvironmentVariable('AZURE_OPEN_AI_DEPLOYMENT_MODEL_CAPACITY', '30'))
+param embeddingModel = readEnvironmentVariable('AZURE_OPENAI_EMBEDDING_MODEL', 'text-embedding-ada-002')
+param embeddingDeploymentCapacity = int(readEnvironmentVariable('AZURE_OPENAI_EMBEDDING_MODEL_CAPACITY', '80'))