Merge branch 'main' into dependabot/pip/azure-monitor-opentelemetry-1.6.13

Author: pamelafox

.github/chatmodes/fixer.chatmode.md

@@ -0,0 +1,27 @@
+---
+description: 'Fix and verify issues in app'
+model: GPT-5 (Preview)
+tools: ['extensions', 'codebase', 'usages', 'vscodeAPI', 'problems', 'changes', 'testFailure', 'fetch', 'findTestFiles', 'searchResults', 'githubRepo', 'runTests', 'runCommands', 'runTasks', 'editFiles', 'runNotebooks', 'search', 'new', 'get_issue', 'get_issue_comments', 'get-library-docs', 'playwright', 'pylance mcp server']
+---
+
+# Fixer Mode Instructions
+
+You are in fixer mode. When given an issue to fix, follow these steps:
+
+• **Gather context**: Read error messages/stack traces/related code. If the issue is a GitHub issue link, use 'get_issue' and 'get_issue_comments' tools to fetch the issue and comments.
+• **Make targeted fix**: Make minimal changes to fix the issue. Do not fix any issues that weren't identified. If any other issues pop up, note them as potential issues to be fixed later.
+• **Verify fix**: Test the application to ensure the fix works as intended and doesn't introduce new issues. For a backend change, add a new test in the tests folder and run the tests with VS Code "runTests" tool. RUN all the tests using that tool, not just the tests you added. Try to add tests to existing test files when possible, like test_app.py. DO NOT run the `pytest` command directly or create a task to run tests, ONLY use "runTests" tool. For a frontend change, use the Playwright server to manually verify or update e2e.py tests.
+
+## Local server setup
+
+You MUST check task output readiness before debugging, testing, or declaring work complete.
+
+- Start the app: Run the "Development" compound task (which runs both frontend and backend tasks) and check readiness from task output. Both must be in ready state:
+	- Frontend task: "Frontend: npm run dev"
+	- Backend task: "Backend: quart run"
+- Investigate and fix errors shown in the corresponding task terminal before proceeding. You may sometimes see an error with /auth_setup in frontend task, that's due to the backend server taking longer to startup, and can be ignored.
+- Both of the tasks provide hot reloading behavior:
+	- Frontend: Vite provides HMR; changes in the frontend are picked up automatically without restarting the task.
+	- Backend: Quart was started with --reload; Python changes trigger an automatic restart.
+	- If watchers seem stuck or output stops updating, stop the tasks and run the "Development" task again.
+- To interact with a running application, use the Playwright MCP server

.github/copilot-instructions.md

@@ -0,0 +1,51 @@
+# Adding new data
+
+New files should be added to the `data` folder, and then either run scripts/prepdocs.sh or scripts/prepdocs.ps1 to ingest the data.
+
+# Adding a new azd environment variable
+
+An azd environment variable is stored by the azd CLI for each environment. It is passed to the "azd up" command and can configure both provisioning options and application settings.
+When adding new azd environment variables, update:
+
+1. infra/main.parameters.json : Add the new parameter with a Bicep-friendly variable name and map to the new environment variable
+1. infra/main.bicep: Add the new Bicep parameter at the top, and add it to the `appEnvVariables` object
+1. azure.yaml: Add the new environment variable under pipeline config section
+1. .azdo/pipelines/azure-dev.yml: Add the new environment variable under `env` section
+1. .github/workflows/azure-dev.yml: Add the new environment variable under `env` section
+
+# Adding a new setting to "Developer Settings" in RAG app
+
+When adding a new developer setting, update:
+
+* frontend:
+  * app/frontend/src/api/models.ts : Add to ChatAppRequestOverrides
+  * app/frontend/src/components/Settings.tsx : Add a UI element for the setting
+  * app/frontend/src/locales/*/translations.json: Add a translation for the setting label/tooltip for all languages
+  * app/frontend/src/pages/chat/Chat.tsx: Add the setting to the component, pass it to Settings
+  * app/frontend/src/pages/ask/Ask.tsx: Add the setting to the component, pass it to Settings
+
+* backend:
+  * app/backend/approaches/chatreadretrieveread.py :  Retrieve from overrides parameter
+  * app/backend/approaches/retrievethenread.py : Retrieve from overrides parameter
+  * app/backend/app.py: Some settings may need to be sent down in the /config route.
+
+# When adding tests for a new feature:
+
+All tests are in the `tests` folder and use the pytest framework.
+There are three styles of tests:
+
+* e2e tests: These use playwright to run the app in a browser and test the UI end-to-end. They are in e2e.py and they mock the backend using the snapshots from the app tests.
+* app integration tests: Mostly in test_app.py, these test the app's API endpoints and use mocks for services like Azure OpenAI and Azure Search.
+* unit tests: The rest of the tests are unit tests that test individual functions and methods. They are in test_*.py files.
+
+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.
+
+When you're running tests, make sure you activate the .venv virtual environment first:
+
+```bash
+source .venv/bin/activate
+```

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

@@ -17,7 +17,7 @@ jobs:
       security-events: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Build Bicep for linting
         uses: azure/CLI@v2
@@ -32,7 +32,7 @@ jobs:
       security-events: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Run PSRule analysis
         uses: microsoft/[email protected]

.github/workflows/azure-dev.yml

@@ -118,10 +118,10 @@ jobs:
       USE_AI_PROJECT: ${{ vars.USE_AI_PROJECT }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install azd
-        uses: Azure/setup-azd@v2.1.0
+        uses: Azure/setup-azd@v2.2.0
 
       - name: Install Nodejs
         uses: actions/setup-node@v4

.github/workflows/evaluate.yaml

@@ -125,7 +125,7 @@ jobs:
             })
 
       - name: Checkout pull request
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: refs/pull/${{ github.event.issue.number }}/head
 
@@ -143,7 +143,7 @@ jobs:
           node-version: 18
 
       - name: Install azd
-        uses: Azure/setup-azd@v2.1.0
+        uses: Azure/setup-azd@v2.2.0
 
       - name: Login to Azure with az CLI
         uses: azure/login@v2

.github/workflows/frontend.yaml

@@ -14,7 +14,7 @@ jobs:
     prettier:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v4
+            - uses: actions/checkout@v5
             - name: Run prettier on frontend
               run: |
                 cd ./app/frontend

.github/workflows/lint-markdown.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Run markdownlint
         uses: articulate/actions-markdownlint@v1
         with:

.github/workflows/python-test.yaml

@@ -28,7 +28,7 @@ jobs:
         python_version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         node_version: ["20.14", "22"]
     steps:
-        - uses: actions/checkout@v4
+        - uses: actions/checkout@v5
         - name: Install uv
           uses: astral-sh/setup-uv@v6
           with:

.github/workflows/validate-markdown.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Check broken Paths
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Run Check URLs Country Locale
@@ -54,7 +54,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Run Check Broken URLs

.vscode/tasks.json

@@ -15,6 +15,74 @@
                 "cwd": "${workspaceFolder}/app"
             },
             "problemMatcher": []
+        },
+        {
+            "label": "Development",
+            "dependsOn": [
+                "Frontend: npm run dev",
+                "Backend: quart run"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "Frontend: npm run dev",
+            "type": "npm",
+            "script": "dev",
+            "isBackground": true,
+            "options": {
+                "cwd": "${workspaceFolder}/app/frontend"
+            },
+            "presentation": {
+                "reveal": "always",
+                "group": "buildWatchers",
+                "panel": "dedicated",
+                "clear": false
+            },
+            "problemMatcher": {
+                "pattern": {
+                    "regexp": ""
+                },
+                "background": {
+                    "activeOnStart": true,
+                    "beginsPattern": ".*VITE v.*",
+                    "endsPattern": ".*(?:➜\\s*)?Local:\\s+https?://.*"
+                }
+            }
+        },
+        {
+            "label": "Backend: quart run",
+            "type": "shell",
+            "command": "${workspaceFolder}/.venv/bin/python",
+            "windows": {
+                "command": "${workspaceFolder}\\.venv\\Scripts\\python.exe"
+            },
+            "args": ["-m", "quart", "run", "--reload", "-p", "50505"],
+            "options": {
+                "cwd": "${workspaceFolder}/app/backend",
+                "env": {
+                    "QUART_APP": "main:app",
+                    "QUART_ENV": "development",
+                    "QUART_DEBUG": "0",
+                    "LOADING_MODE_FOR_AZD_ENV_VARS": "override"
+                }
+            },
+            "isBackground": true,
+            "presentation": {
+                "reveal": "always",
+                "group": "buildWatchers",
+                "panel": "dedicated"
+            },
+            "problemMatcher": {
+                "pattern": { "regexp": "" },
+                "background": {
+                    "activeOnStart": true,
+                    "beginsPattern": ".*Serving Quart app.*",
+                    "endsPattern": ".*hypercorn.*Running on http://.*"
+                }
+            }
         }
     ]
 }