Merge remote-tracking branch 'origin/dev' into dependabot-update

Author: AjitPadhi-Microsoft

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.bicep

@@ -780,6 +780,7 @@ module searchServiceUpdate 'br/public:avm/res/search/search-service:0.12.0' = {
   params: {
     // Required parameters
     name: aiSearchName
+    location: location
     enableTelemetry: enableTelemetry
     diagnosticSettings: enableMonitoring ? [
       {

infra/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.41.2.15936",
-      "templateHash": "9287430903779325833"
+      "templateHash": "18133262101573574086"
     }
   },
   "parameters": {
@@ -408,7 +408,7 @@
     "sqlServerResourceName": "[format('sql-{0}', variables('solutionSuffix'))]",
     "sqlDbModuleName": "[format('sqldb-{0}', variables('solutionSuffix'))]",
     "webServerFarmResourceName": "[format('asp-{0}', variables('solutionSuffix'))]",
-    "reactAppLayoutConfig": "{\r\n  \"appConfig\": {\r\n    \"THREE_COLUMN\": {\r\n      \"DASHBOARD\": 50,\r\n      \"CHAT\": 33,\r\n      \"CHATHISTORY\": 17\r\n    },\r\n    \"TWO_COLUMN\": {\r\n      \"DASHBOARD_CHAT\": {\r\n        \"DASHBOARD\": 65,\r\n        \"CHAT\": 35\r\n      },\r\n      \"CHAT_CHATHISTORY\": {\r\n        \"CHAT\": 80,\r\n        \"CHATHISTORY\": 20\r\n      }\r\n    }\r\n  },\r\n  \"charts\": [\r\n    {\r\n      \"id\": \"SATISFIED\",\r\n      \"name\": \"Satisfied\",\r\n      \"type\": \"card\",\r\n      \"layout\": { \"row\": 1, \"column\": 1, \"height\": 11 }\r\n    },\r\n    {\r\n      \"id\": \"TOTAL_CALLS\",\r\n      \"name\": \"Total Calls\",\r\n      \"type\": \"card\",\r\n      \"layout\": { \"row\": 1, \"column\": 2, \"span\": 1 }\r\n    },\r\n    {\r\n      \"id\": \"AVG_HANDLING_TIME\",\r\n      \"name\": \"Average Handling Time\",\r\n      \"type\": \"card\",\r\n      \"layout\": { \"row\": 1, \"column\": 3, \"span\": 1 }\r\n    },\r\n    {\r\n      \"id\": \"SENTIMENT\",\r\n      \"name\": \"Topics Overview\",\r\n      \"type\": \"donutchart\",\r\n      \"layout\": { \"row\": 2, \"column\": 1, \"width\": 40, \"height\": 44.5 }\r\n    },\r\n    {\r\n      \"id\": \"AVG_HANDLING_TIME_BY_TOPIC\",\r\n      \"name\": \"Average Handling Time By Topic\",\r\n      \"type\": \"bar\",\r\n      \"layout\": { \"row\": 2, \"column\": 2, \"row-span\": 2, \"width\": 60 }\r\n    },\r\n    {\r\n      \"id\": \"TOPICS\",\r\n      \"name\": \"Trending Topics\",\r\n      \"type\": \"table\",\r\n      \"layout\": { \"row\": 3, \"column\": 1, \"span\": 2 }\r\n    },\r\n    {\r\n      \"id\": \"KEY_PHRASES\",\r\n      \"name\": \"Key Phrases\",\r\n      \"type\": \"wordcloud\",\r\n      \"layout\": { \"row\": 3, \"column\": 2, \"height\": 44.5 }\r\n    }\r\n  ]\r\n}",
+    "reactAppLayoutConfig": "{\n  \"appConfig\": {\n    \"THREE_COLUMN\": {\n      \"DASHBOARD\": 50,\n      \"CHAT\": 33,\n      \"CHATHISTORY\": 17\n    },\n    \"TWO_COLUMN\": {\n      \"DASHBOARD_CHAT\": {\n        \"DASHBOARD\": 65,\n        \"CHAT\": 35\n      },\n      \"CHAT_CHATHISTORY\": {\n        \"CHAT\": 80,\n        \"CHATHISTORY\": 20\n      }\n    }\n  },\n  \"charts\": [\n    {\n      \"id\": \"SATISFIED\",\n      \"name\": \"Satisfied\",\n      \"type\": \"card\",\n      \"layout\": { \"row\": 1, \"column\": 1, \"height\": 11 }\n    },\n    {\n      \"id\": \"TOTAL_CALLS\",\n      \"name\": \"Total Calls\",\n      \"type\": \"card\",\n      \"layout\": { \"row\": 1, \"column\": 2, \"span\": 1 }\n    },\n    {\n      \"id\": \"AVG_HANDLING_TIME\",\n      \"name\": \"Average Handling Time\",\n      \"type\": \"card\",\n      \"layout\": { \"row\": 1, \"column\": 3, \"span\": 1 }\n    },\n    {\n      \"id\": \"SENTIMENT\",\n      \"name\": \"Topics Overview\",\n      \"type\": \"donutchart\",\n      \"layout\": { \"row\": 2, \"column\": 1, \"width\": 40, \"height\": 44.5 }\n    },\n    {\n      \"id\": \"AVG_HANDLING_TIME_BY_TOPIC\",\n      \"name\": \"Average Handling Time By Topic\",\n      \"type\": \"bar\",\n      \"layout\": { \"row\": 2, \"column\": 2, \"row-span\": 2, \"width\": 60 }\n    },\n    {\n      \"id\": \"TOPICS\",\n      \"name\": \"Trending Topics\",\n      \"type\": \"table\",\n      \"layout\": { \"row\": 3, \"column\": 1, \"span\": 2 }\n    },\n    {\n      \"id\": \"KEY_PHRASES\",\n      \"name\": \"Key Phrases\",\n      \"type\": \"wordcloud\",\n      \"layout\": { \"row\": 3, \"column\": 2, \"height\": 44.5 }\n    }\n  ]\n}",
     "backendWebSiteResourceName": "[format('api-{0}', variables('solutionSuffix'))]",
     "webSiteResourceName": "[format('app-{0}', variables('solutionSuffix'))]"
   },
@@ -31613,6 +31613,9 @@
           "name": {
             "value": "[variables('aiSearchName')]"
           },
+          "location": {
+            "value": "[parameters('location')]"
+          },
           "enableTelemetry": {
             "value": "[parameters('enableTelemetry')]"
           },
@@ -41904,10 +41907,10 @@
         }
       },
       "dependsOn": [
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageDfs)]",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
         "userAssignedIdentity",
         "virtualNetwork"
       ]

infra/main_custom.bicep

@@ -781,6 +781,7 @@ module searchServiceUpdate 'br/public:avm/res/search/search-service:0.12.0' = {
   params: {
     // Required parameters
     name: aiSearchName
+    location: location
     enableTelemetry: enableTelemetry
     diagnosticSettings: enableMonitoring ? [
       {
@@ -856,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/agent_scripts/requirements.txt

@@ -1,3 +1,3 @@
-aiohttp==3.13.3
+aiohttp==3.13.4
 azure-identity==1.25.2
 azure-ai-projects==2.0.0b3

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

@@ -70,6 +70,7 @@
     "d3-color": "$d3-color",
     "nth-check": "$nth-check",
     "flatted": "^3.4.2",
+    "lodash": "4.18.1",
     "node-forge": "^1.4.0",
     "react-scripts": {
       "picomatch": "^4.0.4"

src/App/package.json

@@ -7,9 +7,9 @@ pydantic[email]==2.11.10
 
 # Azure SDK Core
 azure-core==1.38.0
-requests==2.32.5
-types-requests==2.32.4.20260107
-aiohttp==3.13.3
+requests==2.33.0
+types-requests==2.33.0.20260408
+aiohttp==3.13.4
 
 # Azure Services
 azure-identity==1.25.2
@@ -35,6 +35,6 @@ opentelemetry-instrumentation==0.60b0
 azure-monitor-opentelemetry==1.8.3
 
 # Development tools
-pytest==9.0.2
+pytest==9.0.3
 pytest-cov==7.0.0
 pytest-asyncio==1.3.0

src/api/requirements.txt

@@ -107,7 +107,7 @@ if exist "%API_ENV_FILE%" (
     echo   2. Manually create %API_ENV_FILE% with required environment variables
     echo   3. Copy an existing .env file to %API_ENV_FILE%
     echo.
-    echo For more information, see: documents/LocalDebuggingSetup.md
+    echo For more information, see: documents/LocalDevelopmentSetup.md
     exit /b 1
 )
 
@@ -131,7 +131,7 @@ set APP_ENV_FILE=%ROOT_DIR%\src\App\.env
 (
     echo REACT_APP_API_BASE_URL=http://127.0.0.1:8000
 ) > "%APP_ENV_FILE%"
-echo Updated src/App/.env with APP_API_BASE_URL
+echo Updated src/App/.env with REACT_APP_API_BASE_URL
 
 REM Add or update APP_ENV="dev" in API .env file
 echo Checking for existing APP_ENV in src/api/.env...
@@ -284,6 +284,18 @@ if errorlevel 1 (
 )
 cd %ROOT_DIR%
 
+REM Close any processes using ports 8000 and 3000
+echo Checking for processes using ports 8000 and 3000...
+REM Kill any existing processes on ports 8000 and 3000 before starting
+for %%P in (8000 3000) do (
+    for /f "tokens=5" %%A in ('netstat -ano ^| findstr "LISTENING" ^| findstr ":%%P "') do (
+        if "%%A" neq "0" (
+            echo Port %%P is already in use by PID %%A. Stopping it...
+            taskkill /F /PID %%A /T >nul 2>&1
+        )
+    )
+)
+
 REM Start backend and frontend
 echo Starting backend server...
 cd %ROOT_DIR%
@@ -297,10 +309,27 @@ timeout /t 30 /nobreak >nul
 
 echo Starting frontend server...
 cd %ROOT_DIR%\src\App
-call npm start
 
-echo Both servers have been started.
-echo Backend running at http://127.0.0.1:8000
-echo Frontend running at http://localhost:3000
+REM Show server information before starting
+echo.
+echo ========================================
+echo Both servers are now running:
+echo   Backend:  http://127.0.0.1:8000
+echo   Frontend: http://localhost:3000
+echo ========================================
+echo Press Ctrl+C to stop all servers
+echo.
+
+REM Start npm with PowerShell wrapper for automatic cleanup on Ctrl+C (single line for reliability)
+powershell -NoProfile -ExecutionPolicy Bypass -Command "try { npm start } finally { Write-Host ''; Write-Host 'Stopping all processes...'; Start-Sleep -Milliseconds 500; @(8000, 3000) | ForEach-Object { $port = $_; Get-NetTCPConnection -LocalPort $port -State Listen -ErrorAction SilentlyContinue | ForEach-Object { $pid_ = $_.OwningProcess; if ($pid_ -and $pid_ -ne 0) { taskkill /F /PID $pid_ /T 2>$null } } }; Write-Host 'Cleanup complete.'; Write-Host ''; Write-Host 'All servers stopped.' -ForegroundColor Yellow }"
+
+REM Fallback cleanup in case PowerShell finally block was interrupted
+for %%P in (8000 3000) do (
+    for /f "tokens=5" %%A in ('netstat -ano ^| findstr "LISTENING" ^| findstr ":%%P "') do (
+        if "%%A" neq "0" (
+            taskkill /F /PID %%A /T >nul 2>&1
+        )
+    )
+)
 
 endlocal