chore: dev to main PR

.github/dependabot.yml

@@ -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/workflows/azure-dev.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set timestamp and env name
         shell: bash

.github/workflows/broken-links-checker.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Get changed markdown files (PR only)
         id: changed-markdown-files
         if: github.event_name == 'pull_request'
-        uses: tj-actions/changed-files@e0021407031f5be11a464abee9a0776171c79891 # v46
+        uses: tj-actions/changed-files@22103cc46bda19c2b464ffe86db46df6922fd323 # v46
         with:
           files: |
             **/*.md
@@ -35,7 +35,7 @@ jobs:
       - name: Check Broken Links in Changed Markdown Files
         id: lychee-check-pr
         if: github.event_name == 'pull_request' && steps.changed-markdown-files.outputs.any_changed == 'true'
-        uses: lycheeverse/lychee-action@v2.7.0
+        uses: lycheeverse/lychee-action@v2.8.0
         with:
           args: >
             --verbose --no-progress --exclude ^https?://
@@ -48,7 +48,7 @@ jobs:
       - name: Check Broken Links in All Markdown Files in Entire Repo (Manual Trigger)
         id: lychee-check-manual
         if: github.event_name == 'workflow_dispatch'
-        uses: lycheeverse/lychee-action@v2.7.0
+        uses: lycheeverse/lychee-action@v2.8.0
         with:
           args: >
             --verbose --no-progress --exclude ^https?://

.github/workflows/create-release.yml

@@ -15,11 +15,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         ref: ${{ github.sha }}
 
-    - uses: codfish/semantic-release-action@v3
+    - uses: codfish/semantic-release-action@v5
       id: semantic
       with:
         tag-format: 'v${version}'

.github/workflows/docker-build.yml

@@ -8,8 +8,7 @@ on:
       - demo
     paths:
       - 'src/backend/**'
-      - 'src/app/frontend/**'
-      - 'src/app/frontend-server/**'
+      - 'src/App/**'
       - '.github/workflows/docker-build.yml'
   pull_request:
     types:
@@ -23,8 +22,7 @@ on:
       - demo
     paths:
       - 'src/backend/**'
-      - 'src/app/frontend/**'
-      - 'src/app/frontend-server/**'
+      - 'src/App/**'
       - '.github/workflows/docker-build.yml'
   workflow_dispatch:
 
@@ -44,10 +42,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to Azure (OIDC)
         if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo')) || (github.event_name == 'workflow_dispatch' && (github.ref_name == 'dependabotchanges'||github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo')) }}
@@ -86,17 +84,17 @@ jobs:
 
          fi      
       - name: Build and Push Docker Image for Frontend Server
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         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 }}
             ${{ secrets.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io' }}/content-gen-app:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}
 
       - name: Build and Push Docker Image for Backend Server
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: ./src/backend
           file: ./src/backend/ApiApp.Dockerfile

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

@@ -46,7 +46,7 @@ jobs:
           echo "Generated unique Docker tag: $UNIQUE_TAG"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to Azure (OIDC)
         uses: azure/login@v2
@@ -65,16 +65,16 @@ 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 }}
             ${{ secrets.ACR_TEST_LOGIN_SERVER }}/content-gen-app:${{ steps.generate_docker_tag.outputs.AZURE_ENV_IMAGE_TAG }}_${{ github.run_number }}
 
       - name: Build and Push Docker Image for Backend Server
         id: build_push_backend
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         env:
           DOCKER_BUILD_SUMMARY: false
         with:

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

@@ -17,6 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'merge_group' }}
     steps:
-      - uses: amannn/action-semantic-pull-request@v5
+      - uses: amannn/action-semantic-pull-request@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/scheduled-Dependabot-PRs-Auto-Merge.yml

@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install GitHub CLI
         run: |

.github/workflows/stale-bot.yml

@@ -67,7 +67,7 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload CSV Report of Inactive Branches
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: merged-branches-report
           path: merged_branches_report.csv

.github/workflows/test-automation-v2.yml

@@ -136,7 +136,7 @@ jobs:
 
       - name: Upload test report
         id: upload_report
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: test-report

.github/workflows/test.yml

@@ -28,6 +28,7 @@ on:
 permissions:
   contents: read
   actions: read
+  pull-requests: write
 
 concurrency:
   group: test-${{ github.ref }}
@@ -69,7 +70,19 @@ jobs:
       - name: Run Backend Tests with Coverage
         if: env.skip_backend_tests == 'false'
         run: |
-          pytest --cov=. --cov-report=term-missing --cov-report=xml ./src/tests
+          pytest --cov=. --cov-report=term-missing --cov-report=xml --junitxml=pytest.xml ./src/tests
+
+      - name: Pytest Coverage Comment
+        if: |
+          always() &&
+          github.event_name == 'pull_request' &&
+          github.event.pull_request.head.repo.fork == false &&
+          env.skip_backend_tests == 'false'
+        uses: MishaKav/pytest-coverage-comment@26f986d2599c288bb62f623d29c2da98609e9cd4  # v1.6.0
+        with:
+          pytest-xml-coverage-path: coverage.xml
+          junitxml-path: pytest.xml
+          report-only-changed-files: true
 
       - name: Skip Backend Tests
         if: env.skip_backend_tests == 'true'

.gitignore

@@ -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

azure.yaml

@@ -8,7 +8,6 @@ metadata:
 
 requiredVersions:
   azd: '>= 1.18.0 != 1.23.9'
-  bicep: '>= 0.33.0'
 
 parameters:
   solutionPrefix:

azure_custom.yaml

@@ -11,7 +11,7 @@ infra:
 
 services:
   frontend:
-    project: ./src/app/frontend-server
+    project: ./src/App/server
     language: js
     host: appservice
     dist: ./dist

docs/AZD_DEPLOYMENT.md

@@ -239,7 +239,7 @@ Error: az acr build failed
 **Solution**: Check the Dockerfile and ensure all required files are present:
 ```bash
 # Manual build for debugging
-cd src/app
+cd src/App
 docker build -f WebApp.Dockerfile -t content-gen-app:test .
 ```
 
@@ -251,7 +251,7 @@ Error: az webapp deploy failed
 
 **Solution**: Ensure the frontend builds successfully:
 ```bash
-cd src/app/frontend
+cd src/App
 npm install
 npm run build
 ```

docs/TECHNICAL_GUIDE.md

@@ -142,7 +142,7 @@ pip install -r requirements.txt
 python app.py
 
 # Frontend
-cd src/app/frontend
+cd src/App
 npm install
 npm run dev
 ```

infra/main.bicep

@@ -285,7 +285,7 @@ var existingTags = existingResourceGroup.tags ?? {}
 // ============== //
 
 #disable-next-line no-deployments-resources
-resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableTelemetry) {
+resource avmTelemetry 'Microsoft.Resources/deployments@2025-04-01' = if (enableTelemetry) {
   name: '46d3xbcp.ptn.sa-contentgeneration.${replace('-..--..-', '.', '-')}.${substring(uniqueString(deployment().name, solutionLocation), 0, 4)}'
   properties: {
     mode: 'Incremental'
@@ -507,7 +507,7 @@ var dnsZoneIndex = {
 }
 
 @batchSize(5)
-module avmPrivateDnsZones 'br/public:avm/res/network/private-dns-zone:0.8.0' = [
+module avmPrivateDnsZones 'br/public:avm/res/network/private-dns-zone:0.8.1' = [
   for (zone, i) in privateDnsZones: if (enablePrivateNetworking) {
     name: take('avm.res.network.private-dns-zone.${replace(zone, '.', '-')}', 64)
     params: {
@@ -525,7 +525,7 @@ module avmPrivateDnsZones 'br/public:avm/res/network/private-dns-zone:0.8.0' = [
 ]
 
 // ========== AI Foundry: AI Services ========== //
-module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.14.1'  = if (!useExistingAiFoundryAiProject) {
+module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.14.2'  = if (!useExistingAiFoundryAiProject) {
   name: take('avm.res.cognitive-services.account.${aiFoundryAiServicesResourceName}', 64)
   params: {
     name: aiFoundryAiServicesResourceName
@@ -589,7 +589,7 @@ module aiFoundryAiServices 'br/public:avm/res/cognitive-services/account:0.14.1'
 }
 
 // Create private endpoint for AI Services AFTER the account is fully provisioned
-module aiServicesPrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.11.1' = if (!useExistingAiFoundryAiProject && enablePrivateNetworking) {
+module aiServicesPrivateEndpoint 'br/public:avm/res/network/private-endpoint:0.12.0' = if (!useExistingAiFoundryAiProject && enablePrivateNetworking) {
   name: take('pep-ai-services-${aiFoundryAiServicesResourceName}', 64)
   params: {
     name: 'pep-${aiFoundryAiServicesResourceName}'
@@ -714,7 +714,7 @@ module aiSearch 'br/public:avm/res/search/search-service:0.12.0' = {
 }
 
 // ========== AI Search Connection to AI Services ========== //
-resource aiSearchFoundryConnection 'Microsoft.CognitiveServices/accounts/projects/connections@2025-09-01' = if (!useExistingAiFoundryAiProject) {
+resource aiSearchFoundryConnection 'Microsoft.CognitiveServices/accounts/projects/connections@2025-12-01' = if (!useExistingAiFoundryAiProject) {
   name: '${aiFoundryAiServicesResourceName}/${aiFoundryAiProjectResourceName}/${aiSearchConnectionName}'
   properties: {
     category: 'CognitiveSearch'
@@ -735,7 +735,7 @@ var productImagesContainer = 'product-images'
 var generatedImagesContainer = 'generated-images'
 var dataContainer = 'data'
 
-module storageAccount 'br/public:avm/res/storage/storage-account:0.31.1' = {
+module storageAccount 'br/public:avm/res/storage/storage-account:0.32.0' = {
   name: take('avm.res.storage.storage-account.${storageAccountName}', 64)
   params: {
     name: storageAccountName
@@ -803,7 +803,7 @@ var cosmosDBDatabaseName = 'content_generation_db'
 var cosmosDBConversationsContainer = 'conversations'
 var cosmosDBProductsContainer = 'products'
 
-module cosmosDB 'br/public:avm/res/document-db/database-account:0.18.0' = {
+module cosmosDB 'br/public:avm/res/document-db/database-account:0.19.0' = {
   name: take('avm.res.document-db.database-account.${cosmosDBResourceName}', 64)
   params: {
     name: 'cosmos-${solutionSuffix}'