Merge pull request #371 from microsoft/main

fix: downmerge from main to dev

Author: Roopan-Microsoft

.devcontainer/devcontainer.json

@@ -16,9 +16,9 @@
             ]
         }
     },
-    // "postStartCommand": "git pull origin main && python3 -m pip install -r infra/scripts/index_scripts/requirements.txt",
+    "postStartCommand": "git pull origin main && python3 -m pip install -r infra/scripts/index_scripts/requirements.txt && curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash && chmod +x ./scripts/quota_check_params.sh",
     "remoteUser": "vscode",
     "hostRequirements": {
         "memory": "4gb"
     }
-}
+}

.github/workflows/azure-dev.yml

@@ -1,9 +1,6 @@
 name: Azure Template Validation
 on:
-  #  workflow_dispatch:
-  push:
-      branches:
-        - dev 
+   workflow_dispatch:
 
 permissions:
   contents: read

.github/workflows/create-release.yml

@@ -0,0 +1,64 @@
+on:
+   push:
+    branches:
+      - main
+
+permissions:
+  contents: write
+  pull-requests: write
+
+name: Create-Release
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.workflow_run.head_sha }}
+
+      - uses: codfish/semantic-release-action@v3
+        id: semantic
+        with:
+          tag-format: 'v${version}'
+          additional-packages: |
+            ['conventional-changelog-conventionalcommits@7']
+          plugins: |
+            [
+              [
+                "@semantic-release/commit-analyzer",
+                {
+                  "preset": "conventionalcommits"
+                }
+              ],
+              [
+                "@semantic-release/release-notes-generator",
+                {
+                  "preset": "conventionalcommits",
+                  "presetConfig": {
+                    "types": [
+                      { type: 'feat', section: 'Features', hidden: false },
+                      { type: 'fix', section: 'Bug Fixes', hidden: false },
+                      { type: 'perf', section: 'Performance Improvements', hidden: false },
+                      { type: 'revert', section: 'Reverts', hidden: false },
+                      { type: 'docs', section: 'Other Updates', hidden: false },
+                      { type: 'style', section: 'Other Updates', hidden: false },
+                      { type: 'chore', section: 'Other Updates', hidden: false },
+                      { type: 'refactor', section: 'Other Updates', hidden: false },
+                      { type: 'test', section: 'Other Updates', hidden: false },
+                      { type: 'build', section: 'Other Updates', hidden: false },
+                      { type: 'ci', section: 'Other Updates', hidden: false }
+                    ]
+                  }
+                }
+              ],
+              '@semantic-release/github'
+            ]
+        env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - run: echo ${{ steps.semantic.outputs.release-version }}
+
+      - run: echo "$OUTPUTS"
+        env:
+          OUTPUTS: ${{ toJson(steps.semantic.outputs) }}

.github/workflows/deploy.yml

@@ -111,16 +111,17 @@ jobs:
           set -e
           az deployment group create \
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
-            --template-file infrastructure/deployment.json \
+            --template-file infra/main.json \
             --parameters \
-                HostingPlanName="${{ env.SOLUTION_PREFIX }}-plan" \
-                ApplicationInsightsName="appins-${{ env.SOLUTION_PREFIX }}" \
-                WebsiteName="webapp-${{ env.SOLUTION_PREFIX }}" \
-                CosmosDBName="db-cosmos-${{ env.SOLUTION_PREFIX }}" \
-                CosmosDBRegion="${{ env.AZURE_LOCATION }}" \
-                AzureSearchService="search-${{ env.SOLUTION_PREFIX }}" \
-                AzureOpenAIResource="aoai-${{ env.SOLUTION_PREFIX }}" \
-                WorkspaceName="worksp-${{ env.SOLUTION_PREFIX }}" 
+                environmentName="${{ env.SOLUTION_PREFIX }}" \
+                secondaryLocation="eastus2" \
+                deploymentType="GlobalStandard" \
+                gptModelName="gpt-4o" \
+                azureOpenaiAPIVersion="2024-05-01-preview" \
+                gptDeploymentCapacity="10" \
+                embeddingModel="text-embedding-ada-002" \
+                embeddingDeploymentCapacity="30" \
+                imageTag="latest"
       
       - name: Delete Bicep Deployment
         if: success()

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

@@ -72,8 +72,8 @@ jobs:
       - name: Build Docker Image and optionally push - Internal Registry
         uses: docker/build-push-action@v6
         with:
-          context: .
-          file: WebApp.Dockerfile
+          context: ./src
+          file: ./src/WebApp.Dockerfile
           push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'dependabotchanges' }}
           tags: |
             ${{ steps.registry.outputs.int_registry }}/webapp:${{ steps.determine_tag.outputs.tagname }}
@@ -83,8 +83,8 @@ jobs:
         if: ${{ github.ref_name == 'main' }}
         uses: docker/build-push-action@v6
         with:
-          context: .
-          file: WebApp.Dockerfile
+          context: ./src
+          file: ./src/WebApp.Dockerfile
           push: ${{github.ref_name == 'main' }}
           tags: |
             ${{ steps.registry.outputs.ext_registry }}/webapp:${{ steps.determine_tag.outputs.tagname }}

.github/workflows/node.js.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: frontend
+        working-directory: src/frontend
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 21.x]
+        node-version: [18.x, 21.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -28,7 +28,8 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'
-        cache-dependency-path: '**/package-lock.json'
+        cache-dependency-path: 'src/frontend/package-lock.json'
     - run: npm ci
+    - run: npm install --save-dev jest-environment-jsdom  # Install missing package
     - run: NODE_OPTIONS=--max_old_space_size=8192 npm run build --if-present
     - run: npm run test --if-present

.github/workflows/pylint.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r requirements-dev.txt
+          pip install -r src/requirements-dev.txt
           
       # Step 3: Run all code quality checks
       - name: Pylint

.github/workflows/python-app.yml

@@ -25,10 +25,10 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements-dev.txt
+        pip install -r src/requirements-dev.txt
     - name: Test with pytest
       run: |
-        export PYTHONPATH=$(pwd)
+        export PYTHONPATH=$(pwd)/src
         pytest -v --show-capture=stdout -k "not integration"
 
   test_windows:
@@ -43,8 +43,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements-dev.txt
+        pip install -r src/requirements-dev.txt
     - name: Test with pytest
       run: |
-        $env:PYTHONPATH=$pwd
+        $env:PYTHONPATH="$pwd\src"
         pytest -v --show-capture=stdout -k "not integration"

.github/workflows/tests.yml

@@ -29,7 +29,7 @@ jobs:
 
       - name: Install Backend Dependencies
         run: |
-          python -m pip install -r requirements.txt
+          python -m pip install -r src/requirements.txt
           python -m pip install coverage pytest-cov
           python -m pip install azure-keyvault-secrets
 
@@ -79,21 +79,21 @@ jobs:
             ${{ runner.os }}-node-
       
       - name: Navigate to frontend directory
-        run: cd frontend
+        run: cd src/frontend
 
       - name: Install Frontend Dependencies
         run: |
-          cd frontend  # Change to the frontend directory
+          cd src/frontend  # Change to the frontend directory
           npm install  # Install dependencies from frontend/package.json
 
       - name: Run Frontend Tests with Coverage
         run: |
-          cd frontend  # Change to the frontend directory
+          cd src/frontend  # Change to the frontend directory
           if npm run test -- --coverage; then
             echo "Tests completed, checking coverage."
             # Check coverage report and ensure it meets threshold
-            if [ -f frontend/coverage/lcov-report/index.html ]; then
-              COVERAGE=$(cat frontend/coverage/lcov-report/index.html | grep -oP 'total: \K[0-9]+(\.[0-9]+)?')
+            if [ -f src/frontend/coverage/lcov-report/index.html ]; then
+              COVERAGE=$(cat src/frontend/coverage/lcov-report/index.html | grep -oP 'total: \K[0-9]+(\.[0-9]+)?')
               if (( $(echo "$COVERAGE < 80" | bc -l) )); then
                 echo "Coverage is below 80%, failing the job."
                 exit 1
@@ -107,5 +107,5 @@ jobs:
         with:
           name: frontend-coverage
           path: |
-            frontend/coverage/  # Correct path to frontend coverage
-            frontend/coverage/lcov-report/  # Correct path to frontend lcov report
+            src/frontend/coverage/  # Correct path to frontend coverage
+            src/frontend/coverage/lcov-report/  # Correct path to frontend lcov report

.gitignore

@@ -1,12 +1,12 @@
 .venv
-frontend/node_modules
+
 .env
 .azure/
 __pycache__/
 .ipynb_checkpoints/
-static
-scripts/config.json
+
+
 venv
 myenv
-frontend/coverage
+
 scriptsenv/