psl main to main

.github/PULL_REQUEST_TEMPLATE.md

@@ -34,4 +34,4 @@ Verify that the following are valid
 * ...
 
 ## Other Information
-<!-- Add any other helpful information that may be needed here.. -->
+<!-- Add any other helpful information that may be needed here.. -->

.github/workflows/test_research_assistant.yml

@@ -0,0 +1,67 @@
+name: Unit Tests - Research Assistant
+
+on:
+  push:
+    branches: main
+    paths:
+      - 'ResearchAssistant/**'
+  pull_request:
+    branches: main
+    types:
+      - opened
+      - ready_for_review
+      - reopened
+      - synchronize
+    paths:
+      - 'ResearchAssistant/**'
+
+jobs:
+  test_research_assistant:
+    name: Research Assistant Tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install Backend Dependencies
+        run: |
+          cd ResearchAssistant/App
+          python -m pip install --upgrade pip
+          python -m pip install -r requirements.txt
+          python -m pip install coverage pytest pytest-cov pytest-asyncio
+
+      - name: Run Backend Tests with Coverage
+        run: |
+          cd ResearchAssistant/App
+          python -m pytest -vv --disable-warnings --cov=. --cov-report=xml --cov-report=html --cov-report=term-missing --junitxml=coverage-junit.xml || true
+
+      - 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:
+      #     node-version: '20'
+      # - name: Install Frontend Dependencies
+      #   run: |
+      #     cd ResearchAssistant/App/frontend
+      #     npm install
+      # - name: Run Frontend Tests with Coverage
+      #   run: |
+      #     cd ResearchAssistant/App/frontend
+      #     npm run test -- --coverage
+      # - uses: actions/upload-artifact@v4
+      #   with:
+      #     name: research-assistant-frontend-coverage
+      #     path: |
+      #       ResearchAssistant/App/frontend/coverage/
+      #       ResearchAssistant/App/frontend/coverage/lcov-report/

.gitignore

@@ -2,7 +2,7 @@
 ## files generated by popular Visual Studio add-ons.
 ##
 ## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
-
+.venv/
 # User-specific files
 *.rsuser
 *.suo

ClientAdvisor/App/.flake8

@@ -1,4 +1,5 @@
 [flake8]
 max-line-length = 88
 extend-ignore = E501, E203
-exclude = .venv, frontend,
+exclude = .venv, frontend
+

ClientAdvisor/App/app.py

@@ -963,6 +963,7 @@ async def stream_chat_request(request_body, request_headers):
         if client_id is None:
             return jsonify({"error": "No client ID provided"}), 400
         query = request_body.get("messages")[-1].get("content")
+        query = query.strip()
 
         async def generate():
             deltaText = ""
@@ -1546,12 +1547,12 @@ def get_users():
             ClientSummary,
             CAST(LastMeeting AS DATE) AS LastMeetingDate,
             FORMAT(CAST(LastMeeting AS DATE), 'dddd MMMM d, yyyy') AS LastMeetingDateFormatted,
-            FORMAT(LastMeeting, 'hh:mm tt') AS LastMeetingStartTime,
-            FORMAT(LastMeetingEnd, 'hh:mm tt') AS LastMeetingEndTime,
+            FORMAT(LastMeeting, 'HH:mm ') AS LastMeetingStartTime,
+            FORMAT(LastMeetingEnd, 'HH:mm') AS LastMeetingEndTime,
             CAST(NextMeeting AS DATE) AS NextMeetingDate,
             FORMAT(CAST(NextMeeting AS DATE), 'dddd MMMM d, yyyy') AS NextMeetingFormatted,
-            FORMAT(NextMeeting, 'hh:mm tt') AS NextMeetingStartTime,
-            FORMAT(NextMeetingEnd, 'hh:mm tt') AS NextMeetingEndTime
+            FORMAT(NextMeeting, 'HH:mm') AS NextMeetingStartTime,
+            FORMAT(NextMeetingEnd, 'HH:mm') AS NextMeetingEndTime
         FROM (
             SELECT ca.ClientId, Client, Email, AssetValue, ClientSummary, LastMeeting, LastMeetingEnd, NextMeeting, NextMeetingEnd
             FROM (
@@ -1584,7 +1585,6 @@ 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()

ClientAdvisor/AzureFunction/function_app.py

@@ -22,6 +22,7 @@
 # Azure Function App
 app = func.FunctionApp(http_auth_level=func.AuthLevel.ANONYMOUS)
 
+
 endpoint = os.environ.get("AZURE_OPEN_AI_ENDPOINT")
 api_key = os.environ.get("AZURE_OPEN_AI_API_KEY")
 api_version = os.environ.get("OPENAI_API_VERSION")
@@ -100,6 +101,16 @@ def get_SQL_Response(
         Do not include assets values unless asked for.
         Always use ClientId = {clientid} in the query filter.
         Always return client name in the query.
+        If a question involves date and time, always use FORMAT(YourDateTimeColumn, 'yyyy-MM-dd HH:mm:ss') in the query.
+        If asked, provide information about client meetings according to the requested timeframe: give details about upcoming meetings if asked for "next" or "upcoming" meetings, and provide details about past meetings if asked for "previous" or "last" meetings including the scheduled time and don't filter with "LIMIT 1"  in the query.
+        If asked about the number of past meetings with this client, provide the count of records where the ConversationId is neither null nor an empty string and the EndTime is before the current date in the query.
+        If asked, provide information on the client's portfolio performance in the query.
+        If asked, provide information about the client's top-performing investments in the query.
+        If asked, provide information about any recent changes in the client's investment allocations in the query.
+        If asked about the client's portfolio performance over the last quarter, calculate the total investment by summing the investment amounts where AssetDate is greater than or equal to the date from one quarter ago using DATEADD(QUARTER, -1, GETDATE()) in the query.
+        If asked about upcoming important dates or deadlines for the client, always ensure that StartTime is greater than the current date. Do not convert the formats of StartTime and EndTime and consistently provide the upcoming dates along with the scheduled times in the query.
+        To determine the asset value, sum the investment values for the most recent available date.  If asked for the asset types in the portfolio and the present of each, provide a list of each asset type with its most recent investment value.
+        If the user inquires about asset on a specific date ,sum the investment values for the specific date avoid summing values from all dates prior to the requested date.If asked for the asset types in the portfolio and the value of each for specific date , provide a list of each asset type with specific date investment value avoid summing values from all dates prior to the requested date.
         Only return the generated sql query. do not return anything else''' 
         try:
 
@@ -157,8 +168,11 @@ def get_answers_from_calltranscripts(
 
         query = question
         system_message = '''You are an assistant who provides wealth advisors with helpful information to prepare for client meetings. 
-        You have access to the client’s meeting call transcripts. 
-        You can use this information to answer questions about the clients'''
+        You have access to the client’s meeting call transcripts.
+        If requested for call transcript(s), the response for each transcript should be summarized separately and Ensure all transcripts for the specified client are retrieved and format **must** follow as First Call Summary,Second Call Summary etc.
+        if asked related to count of call transcripts,**Always** respond the total number of sourceurid involved for the {ClientId} consistently, Do never change if question is reframed or contains "so far" or if the case is altered or having first name or full name of the client present with so far or case altered with first name of the client or case altered with first name of client and so far.
+        You can use this information to answer questions about the clients
+        '''
 
         completion = client.chat.completions.create(
             model = deployment,
@@ -182,7 +196,6 @@ def get_answers_from_calltranscripts(
                         "parameters": {
                             "endpoint": search_endpoint,
                             "index_name": index_name,
-                            "semantic_configuration": "default",
                             "query_type": "vector_simple_hybrid", #"vector_semantic_hybrid"
                             "fields_mapping": {
                                 "content_fields_separator": "\n",
@@ -259,20 +272,25 @@ async def stream_openai_text(req: Request) -> StreamingResponse:
     settings.max_tokens = 800
     settings.temperature = 0
 
-    system_message = '''you are a helpful assistant to a wealth advisor. 
+    # Read the HTML file
+    with open("table.html", "r") as file:
+        html_content = file.read()
+
+    system_message = '''you are a helpful assistant to a wealth advisor.
     Do not answer any questions not related to wealth advisors queries.
-    If the client name and client id do not match, only return - Please only ask questions about the selected client or select another client to inquire about their details. do not return any other information.
-    Only use the client name returned from database in the response.
+    Always consider to give selected client full name only in response and do not use other example names also consider my client means currently selected client.
     If you cannot answer the question, always return - I cannot answer this question from the data available. Please rephrase or add more details.
     ** Remove any client identifiers or ids or numbers or ClientId in the final response.
+    Client name **must be** same  as retrieved from database.
+    Always return time in "HH:mm" format for the client in response.
     '''
-
-    user_query = query.replace('?',' ')
+    system_message += html_content
+
+    user_query = query.replace('?','')
 
     user_query_prompt = f'''{user_query}. Always send clientId as {user_query.split(':::')[-1]} '''
     query_prompt = f'''<message role="system">{system_message}</message><message role="user">{user_query_prompt}</message>'''
-
-
+
     sk_response = kernel.invoke_prompt_stream(
         function_name="prompt_test",
         plugin_name="weather_test",

ClientAdvisor/AzureFunction/table.html

@@ -0,0 +1,11 @@
+ <!-- Include the table here -->
+    <table style="border: 1px solid #C8C6C4; width: 100%; border-collapse: collapse; margin: 20px 0; font-size: 1em; font-family: Segoe UI">
+        <tr>
+            <th style="background-color: #F3F2F1; padding: 12px 15px; border: 1px solid #ddd; text-align: left;">Header 1</th>
+            <th style="background-color: #F3F2F1; padding: 12px 15px; border: 1px solid #ddd; text-align: left;">Header 2</th>
+        </tr>
+        <tr>
+            <td style="padding: 12px 15px; border: 1px solid #ddd; text-align: left; color:#797775;">Data 1</td>
+            <td style="padding: 12px 15px; border: 1px solid #ddd; text-align: left; color:#797775;">Data 2</td>
+        </tr>
+    </table>

ClientAdvisor/Deployment/bicep/deploy_azure_function.bicep

@@ -0,0 +1,149 @@
+@description('Specifies the location for resources.')
+param solutionName string 
+param solutionLocation string
+@secure()
+param azureOpenAIApiKey string
+param azureOpenAIApiVersion string
+param azureOpenAIEndpoint string
+@secure()
+param azureSearchAdminKey string
+param azureSearchServiceEndpoint string
+param azureSearchIndex string
+param sqlServerName string
+param sqlDbName string
+param sqlDbUser string
+@secure()
+param sqlDbPwd string
+param functionAppVersion string
+
+var functionAppName = '${solutionName}fn'
+var azureOpenAIDeploymentModel = 'gpt-4'
+var azureOpenAIEmbeddingDeployment = 'text-embedding-ada-002'
+var valueOne = '1'
+
+resource storageAccount 'Microsoft.Storage/storageAccounts@2021-04-01' = {
+  name: '${solutionName}fnstorage'
+  location: solutionLocation
+  sku: {
+    name: 'Standard_LRS'
+  }
+  kind: 'StorageV2'
+  properties: {
+    allowSharedKeyAccess: false
+  }
+}
+
+resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = {
+  name: 'workspace-${solutionName}'
+  location: solutionLocation
+}
+
+resource ApplicationInsights 'Microsoft.Insights/components@2020-02-02' = {
+  name: functionAppName
+  location: solutionLocation
+  kind: 'web'
+  properties: {
+    Application_Type: 'web'
+    publicNetworkAccessForIngestion: 'Enabled'
+    publicNetworkAccessForQuery: 'Enabled'
+    WorkspaceResourceId: logAnalyticsWorkspace.id
+  }
+}
+
+resource containerAppEnv 'Microsoft.App/managedEnvironments@2022-06-01-preview' = {
+  name: '${solutionName}env'
+  location: solutionLocation
+  sku: {
+    name: 'Consumption'
+  }
+  properties: {
+    appLogsConfiguration: {
+      destination: 'log-analytics'
+      logAnalyticsConfiguration: {
+        customerId: logAnalyticsWorkspace.properties.customerId
+        sharedKey: logAnalyticsWorkspace.listKeys().primarySharedKey
+      }
+    }
+  }
+}
+
+resource functionApp 'Microsoft.Web/sites@2024-04-01' = {
+  name: functionAppName
+  location: solutionLocation
+  kind: 'functionapp'
+  identity: {
+    type: 'SystemAssigned'
+  }
+  properties: {
+    managedEnvironmentId: containerAppEnv.id
+    siteConfig: {
+      linuxFxVersion: 'DOCKER|bycwacontainerreg.azurecr.io/byc-wa-fn:${functionAppVersion}'
+      appSettings: [
+        {
+          name: 'APPINSIGHTS_INSTRUMENTATIONKEY'
+          value: reference(ApplicationInsights.id, '2015-05-01').InstrumentationKey
+        }
+        {
+          name: 'AZURE_OPEN_AI_API_KEY'
+          value: azureOpenAIApiKey
+        }
+        {
+          name: 'AZURE_OPEN_AI_DEPLOYMENT_MODEL'
+          value: azureOpenAIDeploymentModel
+        }
+        {
+          name: 'AZURE_OPEN_AI_ENDPOINT'
+          value: azureOpenAIEndpoint
+        }
+        {
+          name: 'AZURE_OPENAI_EMBEDDING_DEPLOYMENT'
+          value: azureOpenAIEmbeddingDeployment
+        }
+        {
+          name: 'OPENAI_API_VERSION'
+          value: azureOpenAIApiVersion
+        }
+        {
+          name: 'AZURE_AI_SEARCH_API_KEY'
+          value: azureSearchAdminKey
+        }
+        {
+          name: 'AZURE_AI_SEARCH_ENDPOINT'
+          value: azureSearchServiceEndpoint
+        }
+        {
+          name: 'AZURE_SEARCH_INDEX'
+          value: azureSearchIndex
+        }
+        {
+          name: 'PYTHON_ENABLE_INIT_INDEXING'
+          value: valueOne
+        }
+        {
+          name: 'PYTHON_ISOLATE_WORKER_DEPENDENCIES'
+          value: valueOne
+        }
+        {
+          name: 'SQLDB_CONNECTION_STRING'
+          value: 'TBD'
+        }
+        {
+          name: 'SQLDB_SERVER'
+          value: sqlServerName
+        }
+        {
+          name: 'SQLDB_DATABASE'
+          value: sqlDbName
+        }
+        {
+          name: 'SQLDB_USERNAME'
+          value: sqlDbUser
+        }
+        {
+          name: 'SQLDB_PASSWORD'
+          value: sqlDbPwd
+        }
+      ]
+    }
+  }
+}