Dev

.github/workflows/build-clientadvisor.yml

@@ -36,5 +36,5 @@ jobs:
       password_secret: ${{ matrix.password_secret }}
       app_name: ${{ matrix.app_name }}
       dockerfile: ${{ matrix.dockerfile }}
-      push: ${{ github.event_name == 'push' && github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' }}
-    secrets: inherit
+      push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'dependabotchanges' }} 
+    secrets: inherit

.github/workflows/build-docker.yml

@@ -57,6 +57,8 @@ jobs:
           echo "tagname=dev" >> $GITHUB_OUTPUT
         elif [[ "${{ github.ref_name }}" == "demo" ]]; then
           echo "tagname=demo" >> $GITHUB_OUTPUT
+        elif [[ "${{ github.ref_name }}" == "dependabotchanges" ]]; then
+          echo "tagname=dependabotchanges" >> $GITHUB_OUTPUT
         else
           echo "tagname=default" >> $GITHUB_OUTPUT
 
@@ -72,4 +74,4 @@ jobs:
         cache-from: type=registry,ref=${{ inputs.registry }}/${{ inputs.app_name}}:${{ steps.determine_tag.outputs.tagname }}
         tags: |
           ${{ inputs.registry }}/${{ inputs.app_name}}:${{ steps.determine_tag.outputs.tagname }}
-          ${{ inputs.registry }}/${{ inputs.app_name}}:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}
+          ${{ inputs.registry }}/${{ inputs.app_name}}:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}

.github/workflows/build-researchassistant.yml

@@ -33,5 +33,5 @@ jobs:
       password_secret: ${{ matrix.password_secret }}
       app_name: ${{ matrix.app_name }}
       dockerfile: ${{ matrix.dockerfile }}
-      push: ${{ github.event_name == 'push' && github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' }}
-    secrets: inherit
+      push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'dependabotchanges' }} 
+    secrets: inherit

ClientAdvisor/App/WebApp.Dockerfile

@@ -18,11 +18,17 @@ 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 --no-cache-dir -r /usr/src/app/requirements.txt \  
+
+RUN pip install --upgrade pip setuptools wheel \  
+    && pip install --no-cache-dir -r /usr/src/app/requirements.txt \  
     && rm -rf /root/.cache  
 
 COPY ./ClientAdvisor/App/ /usr/src/app/  

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