Merge branch 'dev' into section-generate-fix

Author: Roopan-Microsoft

.github/workflows/deploy.yml

@@ -1,11 +1,11 @@
-name: CI-Validate Deployment
+name: Validate Deployment
 
 on:
     push:
       branches:
         - main
     schedule:
-      - cron: '0 6,18 * * *'  # Runs at 6:00 AM and 6:00 PM GMT
+      - cron: '0 9,21 * * *'  # Runs at 9:00 AM and 9:00 PM GMT
 
 jobs:
   deploy:
@@ -23,8 +23,52 @@ jobs:
         run: |
           az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
 
+      - name: Run Quota Check
+        id: quota-check
+        run: |
+          export AZURE_CLIENT_ID=${{ secrets.AZURE_CLIENT_ID }}
+          export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
+          export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
+          export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
+          export GPT_MIN_CAPACITY="30"
+          export TEXT_EMBEDDING_MIN_CAPACITY="30"
+
+          chmod +x scripts/checkquota.sh
+          if ! scripts/checkquota.sh; then
+            # If quota check fails due to insufficient quota, set the flag
+            if grep -q "No region with sufficient quota found" scripts/checkquota.sh; then
+              echo "QUOTA_FAILED=true" >> $GITHUB_ENV
+            fi
+            exit 1  # Fail the pipeline if any other failure occurs
+          fi
+
+
+      - name: Send Notification on Quota Failure
+        if: env.QUOTA_FAILED == 'true'
+        run: |
+          RUN_URL="https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          EMAIL_BODY=$(cat <<EOF
+          {
+            "body": "<p>Dear Team,</p><p>The quota check has failed, and the pipeline cannot proceed.</p><p><strong>Build URL:</strong> ${RUN_URL}</p><p>Please take necessary action.</p><p>Best regards,<br>Your Automation Team</p>"
+          }
+          EOF
+          )
+
+          curl -X POST "${{ secrets.LOGIC_APP_URL }}" \
+            -H "Content-Type: application/json" \
+            -d "$EMAIL_BODY" || echo "Failed to send notification"
+
+      - name: Fail Pipeline if Quota Check Fails
+        if: env.QUOTA_FAILED == 'true'
+        run: exit 1
+
       - name: Install Bicep CLI
         run: az bicep install
+      
+      - name: Set Deployment Region
+        run: |
+          echo "Selected Region: $VALID_REGION"
+          echo "AZURE_LOCATION=$VALID_REGION" >> $GITHUB_ENV
 
       - name: Generate Resource Group Name
         id: generate_rg_name
@@ -44,7 +88,7 @@ jobs:
           rg_exists=$(az group exists --name ${{ env.RESOURCE_GROUP_NAME }})
           if [ "$rg_exists" = "false" ]; then
             echo "Resource group does not exist. Creating..."
-            az group create --name ${{ env.RESOURCE_GROUP_NAME }} --location northcentralus || { echo "Error creating resource group"; exit 1; }
+            az group create --name ${{ env.RESOURCE_GROUP_NAME }} --location ${{ env.AZURE_LOCATION }} || { echo "Error creating resource group"; exit 1; }
           else
             echo "Resource group already exists."
           fi
@@ -72,7 +116,7 @@ jobs:
                 ApplicationInsightsName="appins-${{ env.SOLUTION_PREFIX }}" \
                 WebsiteName="webapp-${{ env.SOLUTION_PREFIX }}" \
                 CosmosDBName="db-cosmos-${{ env.SOLUTION_PREFIX }}" \
-                CosmosDBRegion="NorthCentralUS" \
+                CosmosDBRegion="${{ env.AZURE_LOCATION }}" \
                 AzureSearchService="search-${{ env.SOLUTION_PREFIX }}" \
                 AzureOpenAIResource="aoai-${{ env.SOLUTION_PREFIX }}" \
                 WorkspaceName="worksp-${{ env.SOLUTION_PREFIX }}" 

.github/workflows/docker-build-and-push.yml

@@ -1,17 +1,20 @@
-name: Build and Push Docker Image
+name: Build Docker and Optional Push
 
 on:
+  push:
+    branches: [main, dev, demo]
   pull_request:
-    types: [closed]
-    branches:
-      - main
-      - dev
-      - demo
-  workflow_dispatch: # Add this line to enable manual triggering
+    branches: [main, dev, demo]
+    types:
+      - opened
+      - ready_for_review
+      - reopened
+      - synchronize
+  merge_group:
+  workflow_dispatch:
 
 jobs:
   build-and-push:
-    if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
 
     steps:
@@ -37,26 +40,34 @@ jobs:
           username: ${{ secrets.ACR_DEV_USERNAME }}
           password: ${{ secrets.ACR_DEV_PASSWORD }}
 
-      - name: Set Docker image tag
-        id: docker_tag
-        run: |
-          if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
-            echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
-            echo "TAG=dev" >> $GITHUB_ENV
-          elif [[ "${{ github.ref }}" == "refs/heads/demo" ]]; then
-            echo "TAG=demo" >> $GITHUB_ENV
-          fi
+      - name: Get current date
+        id: date
+        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
 
-      - name: Build and push Docker image
-        if: ${{ github.ref_name == 'main' }}
-        run: |
-          docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/webapp:${{ env.TAG }} -f WebApp.Dockerfile .
-          docker push ${{ secrets.ACR_LOGIN_SERVER }}/webapp:${{ env.TAG }}
+      - name: Get registry
+        id: registry
+        run: echo "registry=${{ github.ref_name == 'main' && secrets.ACR_LOGIN_SERVER || secrets.ACR_DEV_LOGIN_SERVER }}" >> $GITHUB_OUTPUT
 
-      - name: Build and push Docker image (Dev/Demo)
-        if: ${{ github.ref_name == 'dev' || github.ref_name == 'demo' }}
+      - name: Determine Tag Name Based on Branch
+        id: determine_tag
         run: |
-          docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/webapp:latest -f WebApp.Dockerfile .
-          docker push ${{ secrets.ACR_LOGIN_SERVER }}/webapp:latest
-          
+          if [[ "${{ github.ref_name }}" == "main" ]]; then
+            echo "tagname=latest" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.ref_name }}" == "dev" ]]; then
+            echo "tagname=dev" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.ref_name }}" == "demo" ]]; then
+            echo "tagname=demo" >> $GITHUB_OUTPUT
+          else
+            echo "tagname=default" >> $GITHUB_OUTPUT
+        
+          fi
+
+      - name: Build Docker Image and optionally push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: WebApp.Dockerfile
+          push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' }}
+          tags: |
+            ${{ steps.registry.outputs.registry }}/webapp:${{ steps.determine_tag.outputs.tagname }}
+            ${{ steps.registry.outputs.registry }}/webapp:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}

.github/workflows/pr-title-checker.yml

@@ -1,4 +1,4 @@
-name: "pr-title-checker"
+name: "PR Title Checker"
 
 on:
   pull_request_target:

.github/workflows/pylint.yml

@@ -1,4 +1,4 @@
-name: Code Quality Workflow
+name: PyLint
 
 on: [push]
 

.github/workflows/stale-bot.yml

@@ -1,4 +1,4 @@
-name: 'Close stale issues and PRs'
+name: 'Stale Bot'
 on:
   schedule:
     - cron: '30 1 * * *'

.github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: Tests
+name: Test Workflow with Coverage
 
 on:
   push:

.gitignore

@@ -7,4 +7,5 @@ __pycache__/
 static
 scripts/config.json
 venv
-myenv
+myenv
+frontend/coverage

README.md

@@ -15,7 +15,7 @@ User story
 
 This solution accelerator is a powerful tool that helps you create your own AI assistant(s). The accelerator can be used by any customer looking for reusable architecture and code snippets to build an AI assistant(s) with their own enterprise data. 
 
-It leverages Azure Open AI Service and Azure AI Search, to identify relevant documents, summarize unstructured information, and generate Word document templates using your own data. 
+It leverages Azure OpenAI Service and Azure AI Search, to identify relevant documents, summarize unstructured information, and generate Word document templates using your own data. 
 
 **Scenario**
 
@@ -44,13 +44,13 @@ One-click deploy
 
 ### Prerequisites
 
-To use this solution accelerator, you will need access to an [Azure subscription](https://azure.microsoft.com/free/) with permission to create resource groups and resources. While not required, a prior understanding of Azure Open AI and Azure AI Search will be helpful.
+To use this solution accelerator, you will need access to an [Azure subscription](https://azure.microsoft.com/free/) with permission to create resource groups and resources. While not required, a prior understanding of Azure OpenAI and Azure AI Search will be helpful.
 
 For additional training and support, please see:
 
-1. [Azure Open AI](https://learn.microsoft.com/en-us/azure/ai-services/openai/) 
+1. [Azure OpenAI](https://learn.microsoft.com/en-us/azure/ai-services/openai/) 
 2. [Azure AI Search](https://learn.microsoft.com/en-us/azure/search/) 
-3. [Azure AI Studio](https://learn.microsoft.com/en-us/azure/ai-studio/) 
+3. [Azure AI Foundry](https://learn.microsoft.com/en-us/azure/ai-studio/) 
 
 ### Solution accelerator architecture
 ![image](/docs/images/architecture.png)
@@ -62,7 +62,7 @@ For additional training and support, please see:
 ### **How to install/deploy**
 
 1. Please check the link [Azure Products by Region](
-https://azure.microsoft.com/en-us/explore/global-infrastructure/products-by-region/?products=all&regions=all) and choose a region where Azure AI Search, Azure OpenAI Service, and Azure AI Studio are available. If you are using the included sample data set, verify Document Intelligence (Form Recognizer) is available.
+https://azure.microsoft.com/en-us/explore/global-infrastructure/products-by-region/?products=all&regions=all) and choose a region where Azure AI Search, Azure OpenAI Service, and Azure AI Foundry are available. If you are using the included sample data set, verify Document Intelligence (Form Recognizer) is available.
 
 2. Click the following deployment button to create the required resources for this accelerator in your Azure Subscription.
 

WebApp.Dockerfile

@@ -7,6 +7,7 @@ USER node
 RUN npm ci  
 COPY --chown=node:node ./frontend/ ./frontend  
 WORKDIR /home/node/app/frontend
+RUN npm install --save-dev @types/node @types/jest
 RUN NODE_OPTIONS=--max_old_space_size=8192 npm run build
 
 FROM python:3.11-alpine 
@@ -27,4 +28,4 @@ COPY --from=frontend /home/node/app/static  /usr/src/app/static/
 WORKDIR /usr/src/app  
 EXPOSE 80  
 
-CMD ["gunicorn"  , "-b", "0.0.0.0:80", "app:app"]
+CMD ["gunicorn"  , "-b", "0.0.0.0:80", "app:app"]

docs/README_LOCAL.md

@@ -27,7 +27,7 @@ NOTE: You may find you need to set: MacOS: `export NODE_OPTIONS="--max-old-space
 [More information about Azure OpenAI on your data](https://learn.microsoft.com/en-us/azure/cognitive-services/openai/concepts/use-your-data)
 
 1. Update the `AZURE_OPENAI_*` environment variables as described above. 
-2. To connect to your data, you need to specify an Azure Cognitive Search index to use. You can [create this index yourself](https://learn.microsoft.com/en-us/azure/search/search-get-started-portal) or use the [Azure AI Studio](https://oai.azure.com/portal/chat) to create the index for you.
+2. To connect to your data, you need to specify an Azure Cognitive Search index to use. You can [create this index yourself](https://learn.microsoft.com/en-us/azure/search/search-get-started-portal) or use the [Azure AI Foundry](https://oai.azure.com/portal/chat) to create the index for you.
 
     These variables are required when adding your data with Azure AI Search:
     - `DATASOURCE_TYPE` (should be set to `AzureCognitiveSearch`)