Merge branch 'main' into copilot/fix-2751

Author: pamelafox

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
     "name": "Azure Search OpenAI Demo",
-    "image": "mcr.microsoft.com/devcontainers/python:3.11-bookworm",
+    "image": "mcr.microsoft.com/devcontainers/python:3.13-bookworm",
     "features": {
         "ghcr.io/devcontainers/features/node:1": {
             // This should match the version of Node.js in Github Actions workflows

.github/dependabot.yaml

@@ -16,9 +16,34 @@ updates:
     directory: "/app/frontend"
     schedule:
       interval: "weekly"
+    # Ignore Vite 7.x for now: Vite >=7 requires Node >=20.19.0 while project engines.node is currently >=20.0.0
+    ignore:
+      - dependency-name: "vite"
+        versions:
+          - ">=7.0.0"
 
   # Maintain dependencies for pip
   - package-ecosystem: "pip"
     directory: "/"
     schedule:
       interval: "weekly"
+    groups:
+      telemetry:
+        patterns:
+          - "opentelemetry-*"
+          - "azure-monitor-opentelemetry*"
+      pydantic:
+        patterns:
+          - "pydantic"
+          - "pydantic-*"
+          - "typing-extensions"
+      pallets:
+        patterns:
+          - "flask"
+          - "werkzeug"
+          - "blinker"
+          - "quart"
+          - "jinja2"
+          - "click"
+          - "itsdangerous"
+          - "markupsafe"

.github/workflows/azure-dev-validation.yaml

@@ -50,7 +50,7 @@ jobs:
           PSRULE_CONFIGURATION_AZURE_BICEP_FILE_EXPANSION_TIMEOUT: '30'
 
       - name: Upload results to security tab
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         if: github.repository == 'Azure-Samples/azure-search-openai-demo'
         with:
           sarif_file: reports/ps-rule-results.sarif

.github/workflows/azure-dev.yml

@@ -122,7 +122,7 @@ jobs:
         uses: Azure/[email protected]
 
       - name: Install Nodejs
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: 20
 

.github/workflows/evaluate.yaml

@@ -124,15 +124,15 @@ jobs:
           ref: refs/pull/${{ github.event.issue.number }}/head
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
         with:
           enable-cache: true
-          version: "0.4.20"
+          version: "0.9.5"
           cache-dependency-glob: "requirements**.txt"
           python-version: "3.11"
 
       - name: Setup node
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version: 20
 
@@ -192,19 +192,19 @@ jobs:
 
       - name: Upload eval results as build artifact
         if: ${{ success() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
             name: eval_result
             path: ./evals/results/pr${{ github.event.issue.number }}
 
       - name: Upload server logs as build artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: server_logs
           path: ./app/backend/serverlogs.out
 
       - name: Upload server error logs as build artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: server_error_logs
           path: ./app/backend/serverlogs.err

.github/workflows/python-test.yaml

@@ -25,23 +25,23 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "windows-latest"]
-        python_version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python_version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
         node_version: ["20.14", "22"]
     steps:
         - uses: actions/checkout@v5
           with:
             # Fetch full history so diff-cover can compute a merge base with origin/main
             fetch-depth: 0
         - name: Install uv
-          uses: astral-sh/setup-uv@v6
+          uses: astral-sh/setup-uv@v7
           with:
             enable-cache: true
-            version: "0.4.20"
+            version: "0.9.5"
             cache-dependency-glob: "requirements**.txt"
             python-version: ${{ matrix.python_version }}
             activate-environment: true
         - name: Setup node
-          uses: actions/setup-node@v5
+          uses: actions/setup-node@v6
           with:
             node-version: ${{ matrix.node_version }}
         - name: Build frontend
@@ -82,7 +82,7 @@ jobs:
             pytest tests/e2e.py --tracing=retain-on-failure
         - name: Upload test artifacts
           if: ${{ failure() && steps.e2e.conclusion == 'failure' }}
-          uses: actions/upload-artifact@v4
+          uses: actions/upload-artifact@v5
           with:
             name: playwright-traces${{ matrix.python_version }}
             path: test-results

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.3
+    rev: v0.14.2
     hooks:
     -   id: ruff
 -   repo: https://github.com/psf/black

AGENTS.md

@@ -78,14 +78,49 @@ When adding a new feature, add tests for it in the appropriate file.
 If the feature is a UI element, add an e2e test for it.
 If it is an API endpoint, add an app integration test for it.
 If it is a function or method, add a unit test for it.
-Use mocks from conftest.py to mock external services.
+Use mocks from tests/conftest.py to mock external services. Prefer mocking at the HTTP/requests level when possible.
 
 When you're running tests, make sure you activate the .venv virtual environment first:
 
-```bash
+```shell
 source .venv/bin/activate
 ```
 
+To check for coverage, run the following command:
+
+```shell
+pytest --cov --cov-report=annotate:cov_annotate
+```
+
+Open the cov_annotate directory to view the annotated source code. There will be one file per source file. If a file has 100% source coverage, it means all lines are covered by tests, so you do not need to open the file.
+
+For each file that has less than 100% test coverage, find the matching file in cov_annotate and review the file.
+
+If a line starts with a ! (exclamation mark), it means that the line is not covered by tests. Add tests to cover the missing lines.
+
 ## Sending pull requests
 
 When sending pull requests, make sure to follow the PULL_REQUEST_TEMPLATE.md format.
+
+## Upgrading dependencies
+
+To upgrade a particular package in the backend, use the following command, replacing `<package-name>` with the name of the package you want to upgrade:
+
+```shell
+cd app/backend && uv pip compile requirements.in -o requirements.txt --python-version 3.10 --upgrade-package package-name
+```
+
+## Checking Python type hints
+
+To check Python type hints, use the following command:
+
+```shell
+cd app/backend && mypy . --config-file=../../pyproject.toml
+```
+
+```shell
+cd scripts && mypy . --config-file=../pyproject.toml
+```
+
+Note that we do not currently enforce type hints in the tests folder, as it would require adding a lot of `# type: ignore` comments to the existing tests.
+We only enforce type hints in the main application code and scripts.

README.md

@@ -131,7 +131,7 @@ A related option is VS Code Dev Containers, which will open the project in your
 1. Install the required tools:
 
     - [Azure Developer CLI](https://aka.ms/azure-dev/install)
-    - [Python 3.9, 3.10, or 3.11](https://www.python.org/downloads/)
+    - [Python 3.10, 3.11, 3.12, 3.13, or 3.14](https://www.python.org/downloads/)
       - **Important**: Python and the pip package manager must be in the path in Windows for the setup scripts to work.
       - **Important**: Ensure you can run `python --version` from console. On Ubuntu, you might need to run `sudo apt install python-is-python3` to link `python` to `python3`.
     - [Node.js 20+](https://nodejs.org/download/)

app/backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-bullseye
+FROM python:3.13-bookworm
 
 WORKDIR /app