Dev

ClientAdvisor/App/WebApp.Dockerfile

@@ -18,11 +18,16 @@ RUN apk add --no-cache --virtual .build-deps \
     libffi-dev \  
     openssl-dev \  
     curl \  
+    unixodbc-dev \ 
     && apk add --no-cache \  
-    libpq 
+    libpq \
+    && curl -O https://download.microsoft.com/download/7/6/d/76de322a-d860-4894-9945-f0cc5d6a45f8/msodbcsql18_18.4.1.1-1_amd64.apk \
+    && apk add --allow-untrusted msodbcsql18_18.4.1.1-1_amd64.apk \
+    && rm msodbcsql18_18.4.1.1-1_amd64.apk 
 
 COPY ./ClientAdvisor/App/requirements.txt /usr/src/app/  
-RUN pip install --upgrade pip setuptools wheel \
+
+RUN pip install --upgrade pip setuptools wheel \  
     && pip install --no-cache-dir -r /usr/src/app/requirements.txt \  
     && rm -rf /root/.cache  
 

ClientAdvisor/App/app.py

@@ -24,6 +24,7 @@
                            format_stream_response, generateFilterString,
                            parse_multi_columns)
 from db import get_connection
+from db import dict_cursor
 
 bp = Blueprint("routes", __name__, static_folder="static", template_folder="static")
 
@@ -1583,7 +1584,8 @@ def get_users():
         ORDER BY NextMeeting ASC;
         """
         cursor.execute(sql_stmt)
-        rows = cursor.fetchall()
+        # Since pyodbc returns query results as a list of tuples, using `dict_cursor` function to convert these tuples into a list of dictionaries
+        rows = dict_cursor(cursor)
 
         if len(rows) <= 6:
             # update ClientMeetings,Assets,Retirement tables sample data to current date
@@ -1618,7 +1620,8 @@ def get_users():
                 FROM DaysDifference
                 """
             cursor.execute(combined_stmt)
-            date_diff_rows = cursor.fetchall()
+            # Since pyodbc returns query results as a list of tuples, using `dict_cursor` function to convert these tuples into a list of dictionaries
+            date_diff_rows = dict_cursor(cursor)
 
             client_days = (
                 date_diff_rows[0]["ClientMeetingDaysDifference"]

ClientAdvisor/App/db.py

@@ -1,20 +1,60 @@
 # db.py
 import os
 
-import pymssql
 from dotenv import load_dotenv
+from azure.identity import DefaultAzureCredential
+import pyodbc
+import struct
+import logging
+
 
 load_dotenv()
 
+driver = "{ODBC Driver 18 for SQL Server}"
 server = os.environ.get("SQLDB_SERVER")
 database = os.environ.get("SQLDB_DATABASE")
 username = os.environ.get("SQLDB_USERNAME")
 password = os.environ.get("SQLDB_PASSWORD")
+mid_id = os.environ.get("SQLDB_USER_MID")
+
+
+def dict_cursor(cursor):
+    """
+    Converts rows fetched by the cursor into a list of dictionaries.
+
+    Args:
+        cursor: A database cursor object.
+
+    Returns:
+        A list of dictionaries representing rows.
+    """
+    columns = [column[0] for column in cursor.description]
+    return [dict(zip(columns, row)) for row in cursor.fetchall()]
 
 
 def get_connection():
+    try:
+        credential = DefaultAzureCredential(managed_identity_client_id=mid_id)
+
+        token_bytes = credential.get_token(
+            "https://database.windows.net/.default"
+        ).token.encode("utf-16-LE")
+        token_struct = struct.pack(f"<I{len(token_bytes)}s", len(token_bytes), token_bytes)
+        SQL_COPT_SS_ACCESS_TOKEN = (
+            1256  # This connection option is defined by Microsoft in msodbcsql.h
+        )
 
-    conn = pymssql.connect(
-        server=server, user=username, password=password, database=database, as_dict=True
-    )
-    return conn
+        # Set up the connection
+        connection_string = f"DRIVER={driver};SERVER={server};DATABASE={database};"
+        conn = pyodbc.connect(
+            connection_string, attrs_before={SQL_COPT_SS_ACCESS_TOKEN: token_struct}
+        )
+        return conn
+    except pyodbc.Error as e:
+        logging.error(f"Failed with Default Credential: {str(e)}")
+        conn = pyodbc.connect(
+            f"DRIVER={driver};SERVER={server};DATABASE={database};UID={username};PWD={password}",
+            timeout=5
+        )
+        logging.info("Connected using Username & Password")
+        return conn

ClientAdvisor/App/frontend/src/components/ChatHistory/ChatHistoryListItemCell.test.tsx

@@ -38,8 +38,8 @@ describe('ChatHistoryListItemCell', () => {
   test('renders the chat history item', () => {
     renderWithContext(<ChatHistoryListItemCell item={conversation} onSelect={mockOnSelect} />, mockAppState)
 
-    const titleElement = screen.getByText(/Test Chat/i)
-    expect(titleElement).toBeInTheDocument()
+    const titleElement = screen.getAllByText(/Test Chat/i)
+    expect(titleElement.length).toBeGreaterThan(1)
   })
 
   test('truncates long title', () => {
@@ -50,7 +50,7 @@ describe('ChatHistoryListItemCell', () => {
 
     renderWithContext(<ChatHistoryListItemCell item={longTitleConversation} onSelect={mockOnSelect} />, mockAppState)
 
-    const truncatedTitle = screen.getByText(/A very long title that shoul .../i)
+    const truncatedTitle = screen.getByText(/A very long title that s .../i)
     expect(truncatedTitle).toBeInTheDocument()
   })
 

ClientAdvisor/App/frontend/src/components/ChatHistory/ChatHistoryListItemCell.tsx

@@ -7,14 +7,17 @@ import {
   DialogType,
   IconButton,
   ITextField,
+  ITooltipHostStyles,
   List,
   PrimaryButton,
   Separator,
   Spinner,
   SpinnerSize,
   Stack,
   Text,
-  TextField
+  TextField,
+  TooltipHost,
+  DirectionalHint,
 } from '@fluentui/react'
 import { useBoolean } from '@fluentui/react-hooks'
 
@@ -107,7 +110,7 @@ export const ChatHistoryListItemCell: React.FC<ChatHistoryListItemCellProps> = (
     appStateContext?.dispatch({ type: 'UPDATE_CURRENT_CHAT', payload: item })
   }
 
-  const truncatedTitle = item?.title?.length > 28 ? `${item.title.substring(0, 28)} ...` : item.title
+  const truncatedTitle = item?.title?.length > 24 ? `${item.title.substring(0, 24)} ...` : item.title
 
   const handleSaveEdit = async (e: any) => {
     e.preventDefault()
@@ -236,8 +239,15 @@ export const ChatHistoryListItemCell: React.FC<ChatHistoryListItemCellProps> = (
         </>
       ) : (
         <>
-          <Stack horizontal verticalAlign={'center'} style={{ width: '100%' }}>
-            <div className={styles.chatTitle}>{truncatedTitle}</div>
+          <Stack horizontal verticalAlign={'center'} style={{ width: '100%' }}>            
+            <Stack.Item grow>
+              <TooltipHost
+                content={item.title}
+                directionalHint={DirectionalHint.bottomCenter}
+              >
+                <div className={styles.chatTitle}>{truncatedTitle}</div>
+              </TooltipHost>
+            </Stack.Item>
             {(isSelected || isHovered) && (
               <Stack horizontal horizontalAlign="end">
                 <IconButton

ClientAdvisor/App/requirements.txt

@@ -22,5 +22,7 @@ isort==6.0.0
 
 # Testing tools
 pytest>=8.2,<9  # Compatible version for pytest-asyncio
-pytest-asyncio==0.25.3
-pytest-cov==6.0.0
+pytest-asyncio==0.24.0
+pytest-cov==5.0.0
+
+pyodbc==5.2.0

ClientAdvisor/App/tests/test_app.py

@@ -200,50 +200,60 @@ async def test_ensure_cosmos_generic_exception(mock_init_cosmosdb_client, client
 
 
 @pytest.mark.asyncio
-async def test_get_users_success(client):
+@patch("app.get_connection")
+@patch("app.dict_cursor")
+async def test_get_users_success(mock_dict_cursor, mock_get_connection, client):
+    # Mock database connection and cursor
     mock_conn = MagicMock()
     mock_cursor = MagicMock()
+    mock_get_connection.return_value = mock_conn
     mock_conn.cursor.return_value = mock_cursor
-    mock_cursor.fetchall.return_value = [
-        {
-            "ClientId": 1,
-            "ndays": 10,
-            "ClientMeetingDaysDifference": 1,
-            "AssetMonthsDifference": 1,
-            "StatusMonthsDifference": 1,
-            "DaysDifference": 1,
-            "Client": "Client A",
-            "Email": "clienta@example.com",
-            "AssetValue": "1,000,000",
-            "ClientSummary": "Summary A",
-            "LastMeetingDateFormatted": "Monday January 1, 2023",
-            "LastMeetingStartTime": "10:00 AM",
-            "LastMeetingEndTime": "10:30 AM",
-            "NextMeetingFormatted": "Monday January 8, 2023",
-            "NextMeetingStartTime": "11:00 AM",
-            "NextMeetingEndTime": "11:30 AM",
-        }
-    ]
 
-    with patch("app.get_connection", return_value=mock_conn):
-        response = await client.get("/api/users")
-        assert response.status_code == 200
-        res_text = await response.get_data(as_text=True)
-        assert json.loads(res_text) == [
+    # Mock query results
+    mock_dict_cursor.side_effect = [
+        [  # First call (client data)
             {
                 "ClientId": 1,
-                "ClientName": "Client A",
-                "ClientEmail": "clienta@example.com",
+                "Client": "Client A",
+                "Email": "clienta@example.com",
                 "AssetValue": "1,000,000",
-                "NextMeeting": "Monday January 8, 2023",
-                "NextMeetingTime": "11:00 AM",
-                "NextMeetingEndTime": "11:30 AM",
-                "LastMeeting": "Monday January 1, 2023",
+                "ClientSummary": "Summary A",
+                "LastMeetingDateFormatted": "Monday January 1, 2023",
                 "LastMeetingStartTime": "10:00 AM",
                 "LastMeetingEndTime": "10:30 AM",
-                "ClientSummary": "Summary A",
+                "NextMeetingFormatted": "Monday January 8, 2023",
+                "NextMeetingStartTime": "11:00 AM",
+                "NextMeetingEndTime": "11:30 AM",
+            }
+        ],
+        [  # Second call (date difference query)
+            {
+                "ClientMeetingDaysDifference": 5,
+                "AssetMonthsDifference": 1,
+                "StatusMonthsDifference": 1
             }
         ]
+    ]
+
+    # Call the function
+    response = await client.get("/api/users")
+    assert response.status_code == 200
+    res_text = await response.get_data(as_text=True)
+    assert json.loads(res_text) == [
+        {
+            "ClientId": 1,
+            "ClientName": "Client A",
+            "ClientEmail": "clienta@example.com",
+            "AssetValue": "1,000,000",
+            "NextMeeting": "Monday January 8, 2023",
+            "NextMeetingTime": "11:00 AM",
+            "NextMeetingEndTime": "11:30 AM",
+            "LastMeeting": "Monday January 1, 2023",
+            "LastMeetingStartTime": "10:00 AM",
+            "LastMeetingEndTime": "10:30 AM",
+            "ClientSummary": "Summary A",
+        }
+    ]
 
 
 @pytest.mark.asyncio

ClientAdvisor/App/tests/test_db.py

@@ -1,30 +1,92 @@
+import struct
 from unittest.mock import MagicMock, patch
 
 import db
+import pyodbc
 
+# Mock configuration
 db.server = "mock_server"
 db.username = "mock_user"
 db.password = "mock_password"
 db.database = "mock_database"
+db.driver = "mock_driver"
+db.mid_id = "mock_mid_id"  # Managed identity client ID if needed
 
 
-@patch("db.pymssql.connect")
-def test_get_connection(mock_connect):
+@patch("db.pyodbc.connect")  # Mock pyodbc.connect
+@patch("db.DefaultAzureCredential")  # Mock DefaultAzureCredential
+def test_get_connection(mock_credential_class, mock_connect):
+    # Mock the DefaultAzureCredential and get_token method
+    mock_credential = MagicMock()
+    mock_credential_class.return_value = mock_credential
+    mock_token = MagicMock()
+    mock_token.token = "mock_token"
+    mock_credential.get_token.return_value = mock_token
     # Create a mock connection object
     mock_conn = MagicMock()
     mock_connect.return_value = mock_conn
 
     # Call the function
     conn = db.get_connection()
 
-    # Assert that pymssql.connect was called with the correct parameters
+    # Assert that DefaultAzureCredential and get_token were called correctly
+    mock_credential_class.assert_called_once_with(managed_identity_client_id=db.mid_id)
+    mock_credential.get_token.assert_called_once_with("https://database.windows.net/.default")
+
+    # Assert that pyodbc.connect was called with the correct parameters, including the token
+    expected_attrs_before = {
+        1256: struct.pack(f"<I{len(mock_token.token.encode('utf-16-LE'))}s", len(mock_token.token.encode("utf-16-LE")), mock_token.token.encode("utf-16-LE"))
+    }
     mock_connect.assert_called_once_with(
-        server="mock_server",
-        user="mock_user",
-        password="mock_password",
-        database="mock_database",
-        as_dict=True,
+        f"DRIVER={db.driver};SERVER={db.server};DATABASE={db.database};",
+        attrs_before=expected_attrs_before
+    )
+
+    # Assert that the connection returned is the mock connection
+    assert conn == mock_conn
+
+
+@patch("db.pyodbc.connect")  # Mock pyodbc.connect
+@patch("db.DefaultAzureCredential")  # Mock DefaultAzureCredential
+def test_get_connection_token_failure(mock_credential_class, mock_connect):
+    # Mock the DefaultAzureCredential and get_token method
+    mock_credential = MagicMock()
+    mock_credential_class.return_value = mock_credential
+    mock_token = MagicMock()
+    mock_token.token = "mock_token"
+    mock_credential.get_token.return_value = mock_token
+
+    # Create a mock connection object
+    mock_conn = MagicMock()
+    mock_connect.return_value = mock_conn
+
+    # Simulate a failure in pyodbc.connect by raising pyodbc.Error on the first call
+    mock_connect.side_effect = [pyodbc.Error("pyodbc connection error"), mock_conn]
+
+    # Call the function and ensure fallback is used after the pyodbc error
+    conn = db.get_connection()
+
+    # Assert that pyodbc.connect was called with username and password as fallback
+    mock_connect.assert_any_call(
+        f"DRIVER={db.driver};SERVER={db.server};DATABASE={db.database};UID={db.username};PWD={db.password}",
+        timeout=5
     )
 
     # Assert that the connection returned is the mock connection
     assert conn == mock_conn
+
+
+def test_dict_cursor():
+    # Create a mock cursor
+    mock_cursor = MagicMock()
+
+    # Simulate the cursor.description and cursor.fetchall
+    mock_cursor.description = [("id",), ("name",), ("age",)]
+    mock_cursor.fetchall.return_value = [(1, "Alice", 30), (2, "Bob", 25)]
+
+    # Call the dict_cursor function
+    result = db.dict_cursor(mock_cursor)
+
+    # Verify the result
+    expected_result = [{'id': 1, 'name': 'Alice', 'age': 30}, {'id': 2, 'name': 'Bob', 'age': 25}]
+    assert result == expected_result

ClientAdvisor/AzureFunction/Dockerfile

@@ -2,6 +2,10 @@
 # FROM mcr.microsoft.com/azure-functions/python:4-python3.11-appservice
 FROM mcr.microsoft.com/azure-functions/python:4-python3.11
 
+# Install Microsoft ODBC Driver
+RUN apt-get update && \
+    ACCEPT_EULA=Y apt-get install -y msodbcsql18
+
 ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
     AzureFunctionsJobHost__Logging__Console__IsEnabled=true