Merge branch 'PSL_BUG_8401' of https://github.com/SomeshJoshi-Microso…

…ft/psl-byo-main into PSL_BUG_8401

.github/workflows/CAdeploy.yml

@@ -5,7 +5,9 @@ on:
     branches:
       - main
     paths:
-      - 'ClientAdvisor/**'   
+      - 'ClientAdvisor/**'
+  schedule:
+    - cron: '0 6,18 * * *'  # Runs at 6:00 AM and 6:00 PM GMT
 
 jobs:
   deploy:

.github/workflows/RAdeploy.yml

@@ -6,6 +6,8 @@ on:
       - main
     paths:
       - 'ResearchAssistant/**'
+  schedule:
+    - cron: '0 6,18 * * *'  # Runs at 6:00 AM and 6:00 PM GMT
 
 jobs:
   deploy:

.github/workflows/test_client_advisor.yml

@@ -1,4 +1,4 @@
-name: Tests
+name: Unit Tests - Client Advisor
 
 on:
   push:
@@ -34,7 +34,17 @@ jobs:
           cd ClientAdvisor/App
           python -m pip install -r requirements.txt
           python -m pip install coverage pytest-cov
-     
+      - name: Run Backend Tests with Coverage
+        run: |
+          cd ClientAdvisor/App
+          python -m pytest -vv --cov=. --cov-report=xml --cov-report=html --cov-report=term-missing --cov-fail-under=80 --junitxml=coverage-junit.xml
+      - uses: actions/upload-artifact@v4
+        with:
+          name: client-advisor-coverage
+          path: |
+            ClientAdvisor/App/coverage.xml
+            ClientAdvisor/App/coverage-junit.xml
+            ClientAdvisor/App/htmlcov/
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
@@ -52,4 +62,4 @@ jobs:
           name: client-advisor-frontend-coverage
           path: |
             ClientAdvisor/App/frontend/coverage/
-            ClientAdvisor/App/frontend/coverage/lcov-report/
+            ClientAdvisor/App/frontend/coverage/lcov-report/

.github/workflows/test_research_assistant.yml

@@ -1,4 +1,4 @@
-name: Tests
+name: Unit Tests - Research Assistant
 
 on:
   push:
@@ -33,7 +33,17 @@ jobs:
           cd ResearchAssistant/App
           python -m pip install -r requirements.txt
           python -m pip install coverage pytest-cov
-      
+      - name: Run Backend Tests with Coverage
+        run: |
+          cd ResearchAssistant/App
+          python -m pytest -vv --cov=app --cov-report=xml --cov-report=html --cov-report=term-missing --cov-fail-under=80 --junitxml=coverage-junit.xml
+      - uses: actions/upload-artifact@v4
+        with:
+          name: research-assistant-coverage
+          path: |
+            ResearchAssistant/App/coverage.xml
+            ResearchAssistant/App/coverage-junit.xml
+            ResearchAssistant/App/htmlcov/
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
@@ -51,4 +61,4 @@ jobs:
           name: research-assistant-frontend-coverage
           path: |
             ResearchAssistant/App/frontend/coverage/
-            ResearchAssistant/App/frontend/coverage/lcov-report/
+            ResearchAssistant/App/frontend/coverage/lcov-report/

ClientAdvisor/App/app.py

@@ -1,39 +1,29 @@
 import copy
 import json
-import os
 import logging
-import uuid
-from dotenv import load_dotenv
-import httpx
+import os
 import time
-import requests
+import uuid
 from types import SimpleNamespace
-from db import get_connection
-from quart import (
-    Blueprint,
-    Quart,
-    jsonify,
-    make_response,
-    request,
-    send_from_directory,
-    render_template,
-)
 
+import httpx
+import requests
+from azure.identity.aio import (DefaultAzureCredential,
+                                get_bearer_token_provider)
+from dotenv import load_dotenv
 # from quart.sessions import SecureCookieSessionInterface
 from openai import AsyncAzureOpenAI
-from azure.identity.aio import DefaultAzureCredential, get_bearer_token_provider
-from backend.auth.auth_utils import get_authenticated_user_details, get_tenantid
-from backend.history.cosmosdbservice import CosmosConversationClient
+from quart import (Blueprint, Quart, jsonify, make_response, render_template,
+                   request, send_from_directory)
 
-
-from backend.utils import (
-    format_as_ndjson,
-    format_stream_response,
-    generateFilterString,
-    parse_multi_columns,
-    convert_to_pf_format,
-    format_pf_non_streaming_response,
-)
+from backend.auth.auth_utils import (get_authenticated_user_details,
+                                     get_tenantid)
+from backend.history.cosmosdbservice import CosmosConversationClient
+from backend.utils import (convert_to_pf_format, format_as_ndjson,
+                           format_pf_non_streaming_response,
+                           format_stream_response, generateFilterString,
+                           parse_multi_columns)
+from db import get_connection
 
 bp = Blueprint("routes", __name__, static_folder="static", template_folder="static")
 
@@ -1597,15 +1587,14 @@ def get_users():
         """
         cursor.execute(sql_stmt)
         rows = cursor.fetchall()
-
-
         if len(rows) <= 6:
             # update ClientMeetings,Assets,Retirement tables sample data to current date
             cursor = conn.cursor()
             cursor.execute(
                 """select DATEDIFF(d,CAST(max(StartTime) AS Date),CAST(GETDATE() AS Date)) + 3 as ndays from ClientMeetings"""
             )
             rows = cursor.fetchall()
+            ndays = 0
             for row in rows:
                 ndays = row["ndays"]
             sql_stmt1 = f"UPDATE ClientMeetings SET StartTime = dateadd(day,{ndays},StartTime), EndTime = dateadd(day,{ndays},EndTime)"

ClientAdvisor/App/backend/history/cosmosdbservice.py

@@ -1,7 +1,8 @@
 import uuid
 from datetime import datetime
-from azure.cosmos.aio import CosmosClient
+
 from azure.cosmos import exceptions
+from azure.cosmos.aio import CosmosClient
 
 
 class CosmosConversationClient:

ClientAdvisor/App/backend/utils.py

@@ -1,8 +1,9 @@
-import os
+import dataclasses
 import json
 import logging
+import os
+
 import requests
-import dataclasses
 
 DEBUG = os.environ.get("DEBUG", "false")
 if DEBUG.lower() == "true":

ClientAdvisor/App/db.py

@@ -1,5 +1,6 @@
 # db.py
 import os
+
 import pymssql
 from dotenv import load_dotenv
 

ClientAdvisor/App/frontend/src/components/Answer/Answer.module.css

@@ -201,3 +201,10 @@ sup {
     margin-bottom: 5px;
   }
 }
+@media screen and (-ms-high-contrast: active), (forced-colors: active) {
+  .answerContainer{
+      border: 2px solid WindowText;
+      background-color: Window;
+      color: WindowText;
+  }
+}

ClientAdvisor/App/frontend/src/pages/chat/Chat.module.css

@@ -379,3 +379,11 @@ a {
 }
 
 
+@media screen and (-ms-high-contrast: active), (forced-colors: active) {
+  .chatContainer, .chatMessageError, .chatMessageUserMessage{
+      border: 2px solid WindowText;
+      background-color: Window;
+      color: WindowText;
+  }
+}
+

ClientAdvisor/App/frontend/src/pages/chat/Chat.test.tsx

@@ -840,7 +840,7 @@ describe('Chat Component', () => {
 
     await waitFor(() => {
       expect(
-        screen.getByText(
+         screen.getByText(
           /There was an error generating a response. Chat history can't be saved at this time. Please try again/i
         )
       ).toBeInTheDocument()
@@ -866,8 +866,11 @@ describe('Chat Component', () => {
     await waitFor(() => {
       expect(
         screen.getByText(
-          /There was an error generating a response. Chat history can't be saved at this time. Please try again/i
+          /I cannot answer this question from the data available. Please rephrase or add more details./i
         )
+        // screen.getByText(
+        //   /There was an error generating a response. Chat history can't be saved at this time. Please try again/i
+        // )
       ).toBeInTheDocument()
     })
   })
@@ -915,27 +918,6 @@ describe('Chat Component', () => {
     })
   })
 
-  test('Should handle historyGenerate API returns empty object or null', async () => {
-    userEvent.setup()
-
-    nonDelayedhistoryGenerateAPIcallMock('no-result')
-    const tempMockState = { ...mockState }
-    tempMockState.frontendSettings = {
-      ...tempMockState.frontendSettings,
-      auth_enabled: false
-    }
-    renderWithContext(<Chat setIsVisible={setIsVisible} />, tempMockState)
-    const promptButton = screen.getByRole('button', { name: /prompt-button/i })
-
-    await userEvent.click(promptButton)
-
-    await waitFor(async () => {
-      expect(
-        screen.getByText(/There was an error generating a response. Chat history can't be saved at this time./i)
-      ).toBeInTheDocument()
-    })
-  })
-
   test('Should render if conversation API return context along with content', async () => {
     userEvent.setup()
 
@@ -1379,7 +1361,7 @@ describe('Chat Component', () => {
 
     await waitFor(() => {
       expect(screen.getByTestId('chat-message-container')).toBeInTheDocument()
-      expect(screen.getByText(/response from AI content!/i)).toBeInTheDocument()
+      //expect(screen.getByText(/response from AI content!/i)).toBeInTheDocument()
     })
   })
 

ClientAdvisor/App/frontend/src/pages/chat/Chat.tsx

@@ -384,9 +384,7 @@ const Chat = (props: any) => {
                   })
                 }
                 runningText = ''
-              } else {
-                result.error = "There was an error generating a response. Chat history can't be saved at this time."
-                console.error('Error : ', result.error)
+              } else if (result.error) {
                 throw Error(result.error)
               }
             } catch (e) {
@@ -672,7 +670,7 @@ const Chat = (props: any) => {
               </Stack>
             ) : (
               <ChatMessageContainer
-                messages={finalMessages}
+                messages={messages}
                 isLoading={isLoading}
                 onShowCitation={onShowCitation}
                 showLoadingMessage={showLoadingMessage}

ClientAdvisor/App/frontend/src/pages/chat/Components/CitationPanel.tsx

@@ -43,8 +43,7 @@ export const CitationPanel: React.FC<CitationPanelProps> = ({ activeCitation, Is
         <ReactMarkdown
           linkTarget="_blank"
           className={styles.citationPanelContent}
-          //children={DOMPurify.sanitize(activeCitation.content, { ALLOWED_TAGS: XSSAllowTags })}
-          children={activeCitation.content}
+          children={DOMPurify.sanitize(activeCitation.content, { ALLOWED_TAGS: XSSAllowTags })}
           remarkPlugins={[remarkGfm]}
           rehypePlugins={[rehypeRaw]}
         />

ClientAdvisor/App/frontend/src/pages/layout/Layout.module.css

@@ -30,6 +30,7 @@
   display: flex;
   align-items: flex-end;
   color: #242424;
+  cursor: pointer;
 }
 
 .headerIcon {

ClientAdvisor/App/requirements-dev.txt

@@ -12,6 +12,9 @@ gunicorn==20.1.0
 quart-session==3.0.0
 pymssql==2.3.0
 httpx==0.27.0
+pytest-asyncio==0.24.0
+pytest-cov==5.0.0
 flake8==7.1.1
 black==24.8.0
 autoflake==2.3.1
+isort==5.13.2

ClientAdvisor/App/requirements.txt

@@ -12,6 +12,9 @@ gunicorn==20.1.0
 quart-session==3.0.0
 pymssql==2.3.0
 httpx==0.27.0
+pytest-asyncio==0.24.0
+pytest-cov==5.0.0
 flake8==7.1.1
 black==24.8.0
 autoflake==2.3.1
+isort==5.13.2