Moving from Document Generation to Content Generation.

.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 {
     "name": "azd-template",
     "image": "mcr.microsoft.com/devcontainers/python:3.11-bullseye",
-    "forwardPorts": [50505],
+    "forwardPorts": [3000, 5000],
     "features": {
         "ghcr.io/devcontainers/features/node:1": {
             "nodeGypDependencies": true,

.devcontainer/setup_env.sh

@@ -2,6 +2,3 @@
 
 git fetch
 git pull
-
-# provide execute permission to quotacheck script
-sudo chmod +x ./scripts/quota_check_params.sh

.github/workflows/azure-dev.yml

@@ -1,6 +1,6 @@
 name: Azure Template Validation
 on:
-   workflow_dispatch:
+  workflow_dispatch:
 
 permissions:
   contents: read
@@ -15,7 +15,7 @@ jobs:
     steps:
       # Step 1: Checkout the code from your repository
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       # Step 2: Validate the Azure template using microsoft/template-validation-action
       - name: Validate Azure Template
@@ -28,7 +28,6 @@ jobs:
           AZURE_ENV_NAME: ${{ secrets.AZURE_ENV_NAME }}
           AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }}
 
       # Step 3: Print the result of the validation
       - name: Print result

.github/workflows/create-release.yml

@@ -1,64 +1,66 @@
-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@v5
-        with:
-          ref: ${{ github.event.workflow_run.head_sha }}
-
-      - uses: codfish/semantic-release-action@v4
-        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) }}
+name: "Create Release"
+
+on:
+  push:
+    branches: ["main"]
+
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ github.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/docker-build.yml

@@ -0,0 +1,94 @@
+name: Build Docker and Optional Push - Content Generation Solution Accelerator
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+      - demo
+    paths:
+      - 'content-gen/src/backend/**'
+      - 'content-gen/src/app/frontend/**'
+      - 'content-gen/src/app/frontend-server/**'
+      - '.github/workflows/docker-build.yml'
+  pull_request:
+    types:
+      - opened
+      - ready_for_review
+      - reopened
+      - synchronize
+    branches:
+      - main
+      - dev
+      - demo
+    paths:
+      - 'content-gen/src/backend/**'
+      - 'content-gen/src/app/frontend/**'
+      - 'content-gen/src/app/frontend-server/**'
+      - '.github/workflows/docker-build.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  actions: read
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Azure Container Registry
+        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')) }}
+        uses: azure/docker-login@v2 
+        with:
+          login-server: ${{ secrets.ACR_LOGIN_SERVER }}
+          username: ${{ secrets.ACR_USERNAME }}
+          password: ${{ secrets.ACR_PASSWORD }}
+
+      - name: Get current date
+        id: date
+        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+
+      - name: Output ACR Login Server
+        run: |
+          echo "ACR Login Server: ${{ secrets.ACR_LOGIN_SERVER }}"
+
+      - name: Determine Tag Name Based on Branch
+        id: determine_tag
+        run: |
+         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
+         elif [[ "${{ github.ref_name }}" == "dependabotchanges" ]]; then
+          echo "tagname=dependabotchanges" >> $GITHUB_OUTPUT
+         else
+          echo "tagname=default" >> $GITHUB_OUTPUT
+
+         fi      
+      - name: Build and Push Docker Image for Frontend Server
+        uses: docker/build-push-action@v6
+        with:
+          context: ./content-gen/src/app
+          file: ./content-gen/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
+        with:
+          context: ./content-gen/src/backend
+          file: ./content-gen/src/backend/ApiApp.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-api:${{ steps.determine_tag.outputs.tagname }}
+            ${{ secrets.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io' }}/content-gen-api:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}

.gitignore

@@ -1,15 +1,73 @@
+# Virtual environments
 .venv
+venv
+myenv
+scriptsenv/
+scriptenv
 
+# Environment files with secrets
 .env
+.env.local
+.env.*.local
+*.env
+
+# Azure
 .azure/
+
+# Python
 __pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+*.egg-info/
+dist/
+build/
+eggs/
+*.egg
+
+# Jupyter
 .ipynb_checkpoints/
 
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
 
-venv
-myenv
+# Node
+/content-gen/src/app/frontend/node_modules/
+/content-gen/src/app/frontend-server/node_modules/
+/content-gen/src/app/frontend-server/static/
+/content-gen/src/app/frontend-server/*.zip
+node_modules/
 
-scriptsenv/
+# Build output
+/content-gen/src/app/static/
+/content-gen/src/app/frontend/dist/
 
-scriptenv
-pdf
+# Logs
+*.log
+logs/
+
+# Keys and credentials
+*.pem
+*.key
+*.pfx
+*.p12
+*secret*
+*credential*
+
+# OS files
+.DS_Store
+Thumbs.db
+
+# Misc
+pdf
+*.bak
+*.tmp
+*.zip
+
+# RAI evaluation results
+rai_results/
+**/rai_results/