Merge remote-tracking branch 'origin/dev' into psl-fix-dependabot

Author: Shubhangi-Microsoft

.coverage

@@ -35,8 +35,8 @@ updates:
   # npm dependencies - grouped
   - package-ecosystem: "npm"
     directories:
-      - "/src/app/frontend"
-      - "/src/app/frontend-server"
+      - "/src/App"
+      - "/src/App/server"
     schedule:
       interval: "monthly"
     target-branch: "dependabotchanges"

.github/dependabot.yml

@@ -1,6 +1,14 @@
 name: Azure Dev Deploy
 on:
   workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - 'infra/**'
+      - 'azure*.yaml'
+      - '.github/workflows/azure-dev.yml'
+
 
 permissions:
   contents: read

.github/workflows/azure-dev.yml

@@ -14,6 +14,10 @@ on:
   schedule:
     - cron: '17 11 * * 0'
 
+concurrency:
+  group: codeql-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze

.github/workflows/codeql.yml

@@ -6,8 +6,10 @@ on:
     paths:
       - 'src/**'
       - '!src/tests/**'
+      - '!src/pytest.ini'
       - 'infra/**/*.bicep'
       - 'infra/**/*.json'
+      - 'infra/scripts/**'
       - '*.yaml'
       - 'scripts/**'
       - '.github/workflows/deploy-*.yml'

.github/workflows/deploy-v2.yml

@@ -8,10 +8,10 @@ on:
       - demo
     paths:
       - 'src/backend/**'
-      - 'src/app/frontend/**'
-      - 'src/app/frontend-server/**'
-      - '.github/workflows/docker-build.yml'
-  pull_request:
+      - 'src/App/**'
+      - 'src/App/server/**'
+      - 'src/App/WebApp.Dockerfile'
+      - 'src/App/.dockerignore'
     types:
       - opened
       - ready_for_review
@@ -23,15 +23,22 @@ on:
       - demo
     paths:
       - 'src/backend/**'
-      - 'src/app/frontend/**'
-      - 'src/app/frontend-server/**'
+      - 'src/App/**'
+      - 'src/App/server/**'
+      - 'src/App/WebApp.Dockerfile'
+      - 'src/App/.dockerignore'
       - '.github/workflows/docker-build.yml'
   workflow_dispatch:
 
 permissions:
   contents: read
   actions: read
   id-token: write  # Required for OIDC-based Azure authentication
+
+concurrency:
+  group: docker-build-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
@@ -83,8 +90,8 @@ jobs:
       - name: Build and Push Docker Image for Frontend Server
         uses: docker/build-push-action@v6
         with:
-          context: ./src/app
-          file: ./src/app/WebApp.Dockerfile
+          context: ./src/App
+          file: ./src/App/WebApp.Dockerfile
           push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo'  || github.ref_name == 'dependabotchanges'  }}
           tags: |
             ${{ secrets.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io' }}/content-gen-app:${{ steps.determine_tag.outputs.tagname }}

.github/workflows/docker-build.yml

@@ -65,8 +65,8 @@ jobs:
         env:
           DOCKER_BUILD_SUMMARY: false
         with:
-          context: ./src/app
-          file: ./src/app/WebApp.Dockerfile
+          context: ./src/App
+          file: ./src/App/WebApp.Dockerfile
           push: true
           tags: |
             ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-app:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}

.github/workflows/job-docker-build.yml

@@ -2,6 +2,18 @@ name: PyLint
 
 on: 
   push:
+    branches:
+      - main
+      - dev
+    paths:
+      - 'src/backend/**/*.py'
+      - 'src/backend/requirements*.txt'
+      - '.flake8'
+      - '.github/workflows/pylint.yml'
+  pull_request:
+    branches:
+      - main
+      - dev
     paths:
       - 'src/backend/**/*.py'
       - 'src/backend/requirements*.txt'
@@ -12,6 +24,10 @@ permissions:
   contents: read
   actions: read
 
+concurrency:
+  group: pylint-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -25,6 +41,8 @@ jobs:
         uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: src/backend/requirements*.txt
 
       - name: Install dependencies
         run: |

.github/workflows/pylint.yml

@@ -6,8 +6,9 @@ on:
       - main
       - dev
     paths:
-      - '**/*.py'
+      - 'src/**/*.py'
       - 'src/backend/requirements*.txt'
+      - 'src/pytest.ini'
       - '.github/workflows/test.yml'
   pull_request:
     types:
@@ -19,14 +20,19 @@ on:
       - main
       - dev
     paths:
-      - '**/*.py'
+      - 'src/**/*.py'
       - 'src/backend/requirements*.txt'
+      - 'src/pytest.ini'
       - '.github/workflows/test.yml'
 
 permissions:
   contents: read
   actions: read
 
+concurrency:
+  group: test-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   backend_tests:
     runs-on: ubuntu-latest
@@ -39,6 +45,8 @@ jobs:
         uses: actions/setup-python@v6
         with:
           python-version: "3.11"
+          cache: 'pip'
+          cache-dependency-path: src/backend/requirements*.txt
 
       - name: Install Backend Dependencies
         run: |

.github/workflows/test.yml

@@ -36,15 +36,15 @@ eggs/
 *.swo
 
 # Node
-/src/app/frontend/node_modules/
-/src/app/frontend-server/node_modules/
-/src/app/frontend-server/static/
-/src/app/frontend-server/*.zip
+/src/App/node_modules/
+/src/App/server/node_modules/
+/src/App/server/static/
+/src/App/server/*.zip
 node_modules/
 
 # Build output
-/src/app/static/
-/src/app/frontend/dist/
+/src/App/static/
+/src/App/dist/
 
 # Logs
 *.log