Merge remote-tracking branch 'origin/dev' into dependabotchanges

Author: VishalS-Microsoft

.devcontainer/Dockerfile

@@ -0,0 +1,4 @@
+FROM mcr.microsoft.com/devcontainers/python:3.11-bullseye
+
+# Remove Yarn repository to avoid GPG key expiration issue
+RUN rm -f /etc/apt/sources.list.d/yarn.list

.devcontainer/devcontainer.json

@@ -1,7 +1,9 @@
 {
     "name": "azd-template",
-    "image": "mcr.microsoft.com/devcontainers/python:3.11-bullseye",
-    "forwardPorts": [50505],
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+    "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

.flake8

@@ -1,5 +1,5 @@
 [flake8]
 max-line-length = 88
 extend-ignore = E501
-exclude = venv, frontend
-ignore = E203, W503
+exclude = .venv, frontend
+ignore = E203, W503, G004, G200

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,26 +7,39 @@ assignees: ''
 
 ---
 
-**Describe the bug**
+# Describe the bug
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+# Expected behavior
+A clear and concise description of what you expected to happen.
+
+# How does this bug make you feel?
+_Share a gif from [giphy](https://giphy.com/) to tells us how you'd feel_
+
+---
+
+# Debugging information
+
+## Steps to reproduce
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
+## Screenshots
 If applicable, add screenshots to help explain your problem.
 
-**Configuration: Please provide the following**
- - Azure OpenAI model name and version (e.g. 'gpt-35-turbo-16k, version 0613')
- - Is chat history enabled?
- - Are you using data? If so, what data source? (e.g. Azure AI Search, Azure CosmosDB Mongo vCore, etc)
+## Logs
+
+If applicable, add logs to help the engineer debug the problem.
+
+---
+
+# Tasks
+
+_To be filled in by the engineer picking up the issue_
 
-**Additional context**
-Add any other context about the problem here.
+- [ ] Task 1
+- [ ] Task 2
+- [ ] ...

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,20 +7,26 @@ assignees: ''
 
 ---
 
-**Is your feature request related to this sample app, or to an Azure service, such as Azure OpenAI or Azure AI Search?**
-Describe the scope of your request. This forum is focused on features relating to this sample app and its functionality, not the functionality of underlying Azure services.
+# Motivation
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+A clear and concise description of why this feature would be useful and the value it would bring.
+Explain any alternatives considered and why they are not sufficient.
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+# How would you feel if this feature request was implemented?
 
-**Is this feature specific to your use case or your organization, or would it apply broadly across other uses of this app?**
-Describe how you and others might leverage this feature.
+_Share a gif from [giphy](https://giphy.com/) to tells us how you'd feel. Format: ![alt_text](https://media.giphy.com/media/xxx/giphy.gif)_
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+# Requirements
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+A list of requirements to consider this feature delivered
+- Requirement 1
+- Requirement 2
+- ...
+
+# Tasks
+
+_To be filled in by the engineer picking up the issue_
+
+- [ ] Task 1
+- [ ] Task 2
+- [ ] ...

.github/ISSUE_TEMPLATE/subtask.md

@@ -19,4 +19,4 @@ _To be filled in by the engineer picking up the subtask
 
 - [ ] Task 1
 - [ ] Task 2
-- [ ] ...
+- [ ] ...

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,38 @@
+## Purpose
+<!-- Describe the intention of the changes being proposed. What problem does it solve or functionality does it add? -->
+* ...
+
+## Does this introduce a breaking change?
+<!-- Mark one with an "x". -->
+
+- [ ] Yes
+- [ ] No
+
+<!-- Please prefix your PR title with one of the following:
+  * `feat`: A new feature
+  * `fix`: A bug fix
+  * `docs`: Documentation only changes
+  * `style`: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
+  * `refactor`: A code change that neither fixes a bug nor adds a feature
+  * `perf`: A code change that improves performance
+  * `test`: Adding missing tests or correcting existing tests
+  * `build`: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
+  * `ci`: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
+  * `chore`: Other changes that don't modify src or test files
+  * `revert`: Reverts a previous commit
+  * !: A breaking change is indicated with a `!` after the listed prefixes above, e.g. `feat!`, `fix!`, `refactor!`, etc.
+-->
+
+## Golden Path Validation
+- [ ] I have tested the primary workflows (the "golden path") to ensure they function correctly without errors.
+
+## Deployment Validation
+- [ ] I have validated the deployment process successfully and all services are running as expected with this change.
+
+## What to Check
+Verify that the following are valid
+* ...
+
+## Other Information
+
+<!-- Add any other helpful information that may be needed here. -->

.github/dependabot.yml

@@ -1,52 +1,49 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
 version: 2
- 
+
 updates:
-# 1) All frontend (npm) deps in ONE PR
-  - package-ecosystem: "npm"
-    directory: "/src/frontend"
+  # GitHub Actions - grouped
+  - package-ecosystem: "github-actions"
+    directory: "/"
     schedule:
-      interval: "monthly"               
+      interval: "monthly"
     target-branch: "dependabotchanges"
-    open-pull-requests-limit: 10        
     commit-message:
-      prefix: "build(deps)"
-    
+      prefix: "build"
+    open-pull-requests-limit: 10
     groups:
-      all-frontend-deps:
+      github-actions:
         patterns:
-          - "*"                         
-    
- 
-# 2) All backend (pip) deps in ONE PR  
+          - "*"
+
+  # Python (pip) dependencies - grouped
   - package-ecosystem: "pip"
-    directory: "/src"
+    directories:
+      - "/content-gen/src/backend"
+      - "/content-gen/infra/vscode_web"
+      - "/content-gen/scripts"
     schedule:
       interval: "monthly"
     target-branch: "dependabotchanges"
-    open-pull-requests-limit: 10
     commit-message:
-      prefix: "build(deps)"
+      prefix: "build"
+    open-pull-requests-limit: 10
     groups:
-      all-backend-deps:
+      python-deps:
         patterns:
-          - "*"                         
- 
-# 3) All GitHub Actions in ONE PR  
-  - package-ecosystem: "github-actions"
-    directory: "/"
+          - "*"
+
+  # npm dependencies - grouped
+  - package-ecosystem: "npm"
+    directories:
+      - "/content-gen/src/app/frontend"
+      - "/content-gen/src/app/frontend-server"
     schedule:
       interval: "monthly"
     target-branch: "dependabotchanges"
-    open-pull-requests-limit: 10
     commit-message:
-      prefix: "build(deps)"
+      prefix: "build"
+    open-pull-requests-limit: 10
     groups:
-      all-actions:
+      npm-deps:
         patterns:
-          - "*"                         
-
+          - "*"

.github/workflows/azure-dev.yml

@@ -1,6 +1,6 @@
 name: Azure Template Validation
 on:
-   workflow_dispatch:
+  workflow_dispatch:
 
 permissions:
   contents: read
@@ -15,20 +15,21 @@ jobs:
     steps:
       # Step 1: Checkout the code from your repository
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       # Step 2: Validate the Azure template using microsoft/template-validation-action
       - name: Validate Azure Template
-        uses: microsoft/template-validation-action@v0.4.4
+        uses: microsoft/template-validation-action@v0.4.3
         id: validation
+        with:
+          workingDirectory: ./content-gen
         env:
           AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
           AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
           AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
           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