feat: UI Enhancements & refactoring

feat: UI Enhancements & refactoring

Author: Avijit-Microsoft

.devcontainer/setupEnv.sh

@@ -23,7 +23,9 @@ yarn install
 cd ../../
 
 echo "Setting up executable permission for shell scripts"
+sed -i 's/\r$//' ./infra/scripts/post_deployment.sh
 sudo chmod +x ./infra/scripts/docker-build.sh
+sudo chmod +x ./infra/scripts/post_deployment.sh
 sudo chmod +x ./src/ContentProcessorAPI/samples/upload_files.sh
 sudo chmod +x ./src/ContentProcessorAPI/samples/schemas/register_schema.sh
 

.github/workflows/test.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Install Backend Dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r src/ContentProcessorAPI/requirements.txt
+          pip install -r src/ContentProcessor/requirements.txt
           pip install pytest-cov
           pip install pytest-asyncio
 
@@ -43,7 +43,7 @@ jobs:
       - name: Check if Backend Test Files Exist
         id: check_backend_tests
         run: |
-          if [ -z "$(find src/ContentProcessorAPI/app/tests -type f -name 'test_*.py')" ]; then
+          if [ -z "$(find src/ContentProcessor/src/tests -type f -name 'test_*.py')" ]; then
             echo "No backend test files found, skipping backend tests."
             echo "skip_backend_tests=true" >> $GITHUB_ENV
           else
@@ -54,8 +54,8 @@ jobs:
       - name: Run Backend Tests with Coverage
         if: env.skip_backend_tests == 'false'
         run: |
-          pytest src/ContentProcessorAPI/app/tests
-          pytest --cov=. --cov-report=term-missing --cov-report=xml
+          cd src/ContentProcessor
+          python -m pytest -vv --cov=. --cov-report=xml --cov-report=term-missing --cov-fail-under=80
 
       - name: Skip Backend Tests
         if: env.skip_backend_tests == 'true'

azure.yaml

@@ -15,4 +15,12 @@ hooks:
     windows:
       shell: pwsh
       run: $timestamp = Get-Date -Format "yyyyMMdd-HHmmss"; $logFile = "azd_preprovision_$timestamp.log"; ./infra/scripts/docker-build.ps1 $env:AZURE_SUBSCRIPTION_ID $env:AZURE_ENV_NAME $env:AZURE_LOCATION $env:AZURE_RESOURCE_GROUP $env:USE_LOCAL_BUILD *>&1 | Tee-Object -FilePath $logFile
-
+  postprovision:
+    posix:
+      shell: sh
+      run: sed -i 's/\r$//' ./infra/scripts/post_deployment.sh; ./infra/scripts/post_deployment.sh
+      interactive: true
+    windows:
+      shell: pwsh
+      run: ./infra/scripts/post_deployment.ps1
+      interactive: true

docs/ConfigureAppAuthentication.md

@@ -73,13 +73,13 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
 3. Grab Scope Name for Impersonation
 
    - Select **Expose an API** in the left menu. Copy the Scope name, then paste it in some temporary place.  
-     The copied text will be used for Web Application Environment variable - **APP_MSAL_AUTH_SCOPE**.  
+     The copied text will be used for Web Application Environment variable - **APP_WEB_SCOPE**.  
      ![configure_app_registration_web_9](./Images/configure_app_registration_web_9.png)
 
 4. Grab Client Id for Web App
 
    - Select **Overview** in the left menu. Copy the Client Id, then paste it in some temporary place.  
-     The copied text will be used for Web Application Environment variable - **APP_MSAL_AUTH_CLIENT_ID**.  
+     The copied text will be used for Web Application Environment variable - **APP_WEB_CLIENT_ID**.  
      ![configure_app_registration_web_10](./Images/configure_app_registration_web_10.png)
 
 ## Step 3: Configure Application Registration - API Application
@@ -90,7 +90,7 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
      ![configure_app_registration_api_1](./Images/configure_app_registration_api_1.png)
 
    - Select **Expose an API** in the left menu. Copy the Scope name, then paste it in some temporary place.  
-     The copied text will be used for Web Application Environment variable - **APP_MSAL_TOKEN_SCOPE**.  
+     The copied text will be used for Web Application Environment variable - **APP_API_SCOPE**.  
      ![configure_app_registration_api_2](./Images/configure_app_registration_api_2.png)
 
 ## Step 4: Add Web Application's Client Id to Allowed Client Applications List in API Application Registration
@@ -112,7 +112,7 @@ Now, we will edit and deploy the Web Application Container with updated Environm
 
 1. Select **Containers** menu under **Application**. Then click **Environment variables** tab.
 ![update_env_app_1_1](./Images/update_env_app_1_1.png)
-2. Update 3 values which were taken in previous steps for **APP_MSAL_AUTH_CLIENT_ID**, **APP_MSAL_AUTH_SCOPE**, **APP_MSAL_TOKEN_SCOPE**.  
+2. Update 3 values which were taken in previous steps for **APP_WEB_CLIENT_ID**, **APP_WEB_SCOPE**, **APP_API_SCOPE**.  
 Click on **Save as a new revision**.
    The updated revision will be activated soon.
 

docs/Images/update_env_app_1_1.png

@@ -131,21 +131,25 @@ module containerAppWeb 'deploy_container_app.bicep' = {
         value: containerAppApiEndpoint
       }
       {
-        name: 'APP_MSAL_AUTH_CLIENT_ID'
+        name: 'APP_WEB_CLIENT_ID'
         value: '<APP_REGISTRATION_CLIENTID>'
       }
       {
-        name: 'APP_MSAL_AUTH_AUTHORITY'
+        name: 'APP_WEB_AUTHORITY'
         value: '${environment().authentication.loginEndpoint}/${tenant().tenantId}'
       }
       {
-        name: 'APP_MSAL_AUTH_SCOPE'
+        name: 'APP_WEB_SCOPE'
         value: '<FRONTEND_API_SCOPE>'
       }
       {
-        name: 'APP_MSAL_TOKEN_SCOPE'
+        name: 'APP_API_SCOPE'
         value: '<BACKEND_API_SCOPE>'
       }
+      {
+        name: 'APP_CONSOLE_LOG_ENABLED'
+        value: 'false'
+      }
     ]
     minReplicas: minReplicaContainerWeb
     maxReplicas: maxReplicaContainerWeb

infra/container_app/deploy_container_app_api_web.bicep

@@ -213,23 +213,6 @@ resource aiHub 'Microsoft.MachineLearningServices/workspaces@2023-08-01-preview'
       aiServicesDeployments
     ]
   }
-
-  resource aiServiceContentUnderstandingConnection 'connections@2024-07-01-preview' = {
-    name: '${aiHubName}-cu-connection-AzureOpenAI'
-    properties: {
-      category: 'AIServices'
-      target: aiServices_CU.properties.endpoint
-      authType: 'AAD'
-      isSharedToAll: true
-      metadata: {
-        ApiType: 'Azure'
-        ResourceId: aiServices_CU.id
-      }
-    }
-    dependsOn: [
-      aiServicesDeployments
-    ]
-  }
 }
 
 resource aiHubProject 'Microsoft.MachineLearningServices/workspaces@2024-01-01-preview' = {

infra/deploy_ai_foundry.bicep

@@ -3,49 +3,31 @@
 targetScope = 'resourceGroup'
 
 param environmentName string
-
+ 
 var uniqueId = toLower(uniqueString(subscription().id, environmentName, resourceGroup().location))
 var solutionName = 'cps-${padLeft(take(uniqueId, 12), 12, '0')}'
-
+ 
 var containerNameCleaned = replace('cr${solutionName }', '-', '')
-
+ 
 @description('Provide a location for the registry.')
 param location string = resourceGroup().location
-
+ 
 @description('Provide a tier of your Azure Container Registry.')
-param acrSku string = 'Premium'
-
+param acrSku string = 'Basic'
+ 
 resource containerRegistry 'Microsoft.ContainerRegistry/registries@2021-09-01' = {
   name: containerNameCleaned
   location: location
   sku: {
     name: acrSku
   }
   properties: {
-    adminUserEnabled: true
-    dataEndpointEnabled: false
-    networkRuleBypassOptions: 'AzureServices'
-    networkRuleSet: {
-      defaultAction: 'Allow'
-    }
-    policies: {
-      quarantinePolicy: {
-        status: 'disabled'
-      }
-      retentionPolicy: {
-        status: 'enabled'
-        days: 7
-      }
-      trustPolicy: {
-        status: 'disabled'
-        type: 'Notary'
-      }
-    }
     publicNetworkAccess: 'Enabled'
     zoneRedundancy: 'Disabled'
   }
 }
-
+ 
 output createdAcrName string = containerNameCleaned
 output createdAcrId string = containerRegistry.id
 output acrEndpoint string = containerRegistry.properties.loginServer
+ 

infra/deploy_container_registry.bicep

@@ -32,7 +32,6 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' = {
     enabledForDiskEncryption: true
     enabledForTemplateDeployment: true
     enableRbacAuthorization: true
-    enablePurgeProtection: true
     publicNetworkAccess: 'enabled'
     // networkAcls: {
     //   bypass: 'AzureServices'

infra/deploy_keyvault.bicep

@@ -41,6 +41,9 @@ param gptModelName string = 'gpt-4o'
 
 @minLength(1)
 @description('Version of the GPT model to deploy:')
+@allowed([
+  '2024-08-06'
+])
 param gptModelVersion string = '2024-08-06'
 
 //var gptModelVersion = '2024-02-15-preview'
@@ -248,3 +251,8 @@ module updateContainerApp './container_app/deploy_container_app_api_web.bicep' =
   }
   dependsOn: [roleAssignments]
 }
+
+output CONTAINER_WEB_APP_NAME string = containerApps.outputs.containerAppWebName
+output CONTAINER_API_APP_NAME string = containerApps.outputs.containerAppApiName
+output CONTAINER_WEB_APP_FQDN string = containerApps.outputs.containweAppWebEndPoint
+output CONTAINER_API_APP_FQDN string = containerApps.outputs.containweAppApiEndPoint