Merge remote-tracking branch 'origin/dev' into PSL-US-33784

Author: AjitPadhi-Microsoft

.github/workflows/test.yml

@@ -31,6 +31,7 @@ on:
 permissions:
   contents: read
   actions: read
+  pull-requests: write
 
 jobs:
   #   frontend_tests:
@@ -106,7 +107,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/api
+          pytest --cov=. --cov-report=term-missing --cov-report=xml --junitxml=pytest.xml ./src/tests/api
+
+      - 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'

documents/LocalDevelopmentSetup.md

@@ -293,6 +293,46 @@ Create `.vscode/settings.json` and copy the following JSON:
 
 ---
 
+### Running with Automated Script
+
+For convenience, you can use the provided startup scripts that handle environment setup and start both backend and frontend services automatically. This is the quickest way to get up and running locally.
+
+> **Note**: You must complete **Step 1 (Prerequisites)** and **Step 2 (Development Tools Setup)** before using the automated scripts.
+
+#### Windows (Command Prompt or PowerShell):
+
+```cmd
+cd src
+.\start.cmd
+```
+
+#### macOS/Linux/WSL:
+
+```bash
+cd src
+chmod +x start.sh
+./start.sh
+```
+
+### What the Scripts Do
+
+The startup scripts automatically handle:
+- Environment variable configuration
+- Azure authentication
+- Azure RBAC role assignments (Cosmos DB, SQL Server, AI Foundry, AI Search)
+- Python virtual environment setup
+- Backend dependency installation
+- Frontend dependency installation
+- Starting both backend and frontend servers
+
+> **Note**: The script includes a 30-second wait for the backend to initialize before starting the frontend. If you see connection errors initially, wait a moment and reload the page.
+
+---
+
+## Running Backend and Frontend Manually
+
+If you prefer more control over the setup process, follow the steps below to configure and run each service individually.
+
 ## Step 3: Azure Authentication Setup
 
 Before configuring services, authenticate with Azure:
@@ -385,13 +425,17 @@ az role assignment create \
 ```
 
 #### Cosmos DB Access
-
 ```bash
+# Get your principal ID
+PRINCIPAL_ID=$(az ad signed-in-user show --query id -o tsv)
+
 # Assign Cosmos DB Built-in Data Contributor role
-az role assignment create \
-  --role "Cosmos DB Built-in Data Contributor" \
-  --assignee $PRINCIPAL_ID \
-  --scope "/subscriptions/<subscription-id>/resourceGroups/<resource-group>/providers/Microsoft.DocumentDB/databaseAccounts/<cosmos-account-name>"
+az cosmosdb sql role assignment create \
+  --resource-group <resource-group-name> \
+  --account-name <cosmos-db-account-name> \
+  --role-definition-name "Cosmos DB Built-in Data Contributor" \
+  --principal-id $PRINCIPAL_ID \
+  --scope /subscriptions/<subscription-id>/resourceGroups/<resource-group-name>/providers/Microsoft.DocumentDB/databaseAccounts/<cosmos-db-account-name>
 ```
 
 #### Azure Storage Access

infra/main_custom.bicep

@@ -857,6 +857,9 @@ module searchServiceUpdate 'br/public:avm/res/search/search-service:0.12.0' = {
       ]
     : []
   }
+  dependsOn: [
+    searchService
+  ]
 }
 
 // ========== Search Service to AI Services Role Assignment ========== //

infra/scripts/run_create_agents_scripts.sh

@@ -330,6 +330,8 @@ titleAgentName=""
 while IFS='=' read -r key value; do
   # Skip empty lines or lines without '='
   [ -z "$key" ] && continue
+  # Strip trailing carriage return if present (Windows line endings)
+  value="${value%$'\r'}"
   case "$key" in
     conversationAgentName)
       conversationAgentName="$value"

src/App/package-lock.json

@@ -7,6 +7,7 @@
     "@fluentui/react": "^8.125.4",
     "@azure/msal-react": "^3.0.23",
     "@azure/msal-browser": "^4.24.1",
+    "@reduxjs/toolkit": "^2.6.1",
     "@testing-library/jest-dom": "^6.9.0",
     "@fluentui/react-icons": "^2.0.317",
     "@fluentui/react-components": "^9.72.11",
@@ -27,6 +28,7 @@
     "react-d3-cloud": "^1.0.6",
     "react-dom": "^18.3.1",
     "react-markdown": "^10.1.0",
+    "react-redux": "^9.1.2",
     "react-scripts": "^5.0.1",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.1",

src/App/package.json

@@ -10,7 +10,6 @@
   display: flex;
   flex-direction: row;
   height: calc(100vh - 6vh);
-  /* height: 94vh; */
   gap: var(--gap-base);
   margin-inline: var(--margin-base);
 }
@@ -31,7 +30,6 @@ body {
 .header {
   display: flex;
   align-items: center;
-  /* height: 64px; */
   height: 6vh;
   justify-content: space-between;
   background-color: #fff;
@@ -44,14 +42,8 @@ body {
 }
 
 .header-title {
-  /* font-size: 24px; */
   color: #242424;
-  /* font-size: 18px;
-  font-style: normal;
-  font-weight: 700;
-  font-family: "Segoe UI"; */
   margin-left: 0.5rem;
-  /* font-size: 1.1rem; */
 }
 
 .header-title span {
@@ -77,20 +69,6 @@ body {
   gap: 0.25rem;
 }
 
-/* .header button {
-  height: var(--button-height) !important;
-  font-size: var(--header-btn-font-size) !important;
-} */
-
-/* .header button > span > svg {
-  width: var(--header-btn-icon-size);
-  height: var(--header-btn-icon-size);
-} */
-
-/* .answerDisclaimerContainer {
-  margin-top: 3px;
-} */
-
 .answerDisclaimer {
   font-size: var(--answer-disclaimer-font, 12px);
   color: #a0a0a0;

src/App/src/App.css

@@ -1,9 +1,29 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import App from './App';
+import chatReducer, {
+  appendMessages,
+  setGeneratingResponse,
+} from "./state/slices/chatSlice";
 
-test('renders learn react link', () => {
-  render(<App />);
-  const linkElement = screen.getByText(/learn react/i);
-  expect(linkElement).toBeInTheDocument();
+describe("chatSlice", () => {
+  it("stores chat messages with typed actions", () => {
+    const initialState = chatReducer(undefined, { type: "@@INIT" });
+    const loadingState = chatReducer(
+      initialState,
+      setGeneratingResponse(true)
+    );
+    const nextState = chatReducer(
+      loadingState,
+      appendMessages([
+        {
+          id: "message-1",
+          role: "user",
+          content: "Hello world",
+          date: "2026-04-10T00:00:00.000Z",
+        },
+      ])
+    );
+
+    expect(nextState.generatingResponse).toBe(true);
+    expect(nextState.messages).toHaveLength(1);
+    expect(nextState.messages[0].content).toBe("Hello world");
+  });
 });