Merge branch 'main' into ap/docs-and-iaac

services/recommendation-service/dotnet/Plugins/AdvisorPlugin/InvestmentAdvise/skprompt.txt

@@ -11,7 +11,7 @@ This is a chat between systems that respond in valid JSON. You are a financial a
 Provide advice based on the given portfolio allocation and user information such as a age, income, and risk.
 For someone who is {{UserProfilePlugin.GetUserAge $userId}} years old, with {{UserProfilePlugin.GetAnnualHouseholdIncome $userId}} as household income, and with a risk tolerance of {{$risk}}, what recommendation would {{$voice}} give.
 Return well-formed JSON with a "gptRecommendation" property containing {{$voice}}'s' recommendation in a creative and funny tone.
-Example: {"portfolio":[{"symbol":"MSFT","gptRecommendation":"Booyah! Hold on, steady growth! Diversify, though!"},{"symbol":"PEP","gptRecommendation":"Buy, buy, buy! Solid dividends, sweet stability!"}]}
+Example: {"portfolio":[{"symbol":"META","gptRecommendation":"Booyah! Hold on, steady growth! Diversify, though!"},{"symbol":"BRK","gptRecommendation":"Buy, buy, buy! Solid dividends, sweet stability!"}]}
 
 current inflation and mortgage rates: {{$bingResults}}
 

services/recommendation-service/dotnet/global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "7.0.0",
+    "rollForward": "latestMajor",
+    "allowPrerelease": true
+  }
+}

ui/typescript/src/components/chat/chat-message.tsx

@@ -9,38 +9,39 @@ import {ChatProps} from "@/types";
 
 export default function ChatMessage({ chat }: { chat: ChatProps }) {
   const {
-    userName,
+    authorRole,
     content
   } = chat ?? {};
+
   return (
       <div className="chat-content">
         <div className={cn('flex items-end ', {
           'justify-end':
-              userName !== Chats[0].userName,
+              authorRole !== Chats[0].authorRole,
         })}>
           <div className={cn('flex flex-col space-y-2 text-xs max-w-xs mx-2 order-2 ', {
             'items-end':
-                userName !== Chats[0].userName,
+                authorRole !== Chats[0].authorRole,
             'items-start':
-                userName == Chats[0].userName,
+                authorRole === Chats[0].authorRole,
           })}>
             <div><span
                 className={cn('px-4 py-2 rounded-lg inline-block  ', {
                   'rounded-br-none bg-blue-600 text-white':
-                      userName !== Chats[0].userName,
+                      authorRole !== Chats[0].authorRole,
                   'rounded-bl-none bg-gray-300 text-gray-600':
-                      userName == Chats[0].userName,
+                      authorRole === Chats[0].authorRole,
                 })}>{content}</span>
             </div>
           </div>
           <Image
               width={10} height={10}
-              src={(userName == Chats[0].userName) ? miyagilogo : usericon}
+              src={(authorRole == Chats[0].authorRole) ? miyagilogo : usericon}
               alt="Actor" className={cn('w-6 h-6 rounded-full  ', {
             'order-2':
-                userName !== Chats[0].userName,
+                authorRole !== Chats[0].authorRole,
             'order-1':
-                userName == Chats[0].userName,
+                authorRole === Chats[0].authorRole,
           })} />
         </div>
       </div>

ui/typescript/src/components/personalize/personalize-drawer.tsx

@@ -19,7 +19,7 @@ import {
     assetsDataAtom,
     investmentsDataAtom,
     loadingPersonalizeAtom,
-    selectedAdvisorAtom,
+    selectedAdvisorAtom, selectedRiskLevelAtom,
     userInfoAtom
 } from "@/data/personalize/store";
 import {formatRequestData} from "@/data/utils/format-request-data";
@@ -53,18 +53,25 @@ export default function PersonalizeDrawer() {
     const [loadingPersonalize, setLoadingPersonalizeAtom] = useAtom(loadingPersonalizeAtom);
 
     const [userInfo] = useAtom(userInfoAtom);
+    const [currentRiskLevel] = useAtom(selectedRiskLevelAtom);
+    const [currentFavoriteAdvisor] = useAtom(selectedAdvisorAtom);
     const [investmentsInfo, setInvestmentsDataAtom] = useAtom(investmentsDataAtom);
     const [assetsInfo, setAssetsDataAtom] = useAtom(assetsDataAtom);
 
     const handlePersonalize = async () => {
         setLoadingPersonalizeAtom(true);
         try {
-            // Format data from assetsInfo and investmentsInfo
             const { portfolio, stocks } = formatRequestData(assetsInfo, investmentsInfo);
 
-            // Fetch data from atoms
+            const updatedUserInfo = {
+                ...userInfo,
+                riskLevel: currentRiskLevel.name,
+                favoriteAdvisor: currentFavoriteAdvisor.name,
+            };
+
+            // Create the requestData object
             const requestData = {
-                userInfo,
+                userInfo: updatedUserInfo,
                 portfolio,
                 stocks,
             };

ui/typescript/src/components/personalize/selectors/fin-advisor-list.tsx

@@ -16,6 +16,7 @@ export function FinancialAdvisorList({
     className?: string;
 }) {
     const [selectedItem, setSelectedAdvisorAtom] = useAtom(selectedAdvisorAtom);
+
     return (
         <div className="relative w-full lg:w-auto">
             <Listbox value={selectedItem} onChange={setSelectedAdvisorAtom}>

ui/typescript/src/data/static/personalize.tsx

@@ -22,5 +22,5 @@ export const AdvisorsList = [
 export const ReasoningEngineListData = [
     {id: 1, name: 'GPT-35-turbo'},
     {id: 2, name: 'Fine-tuned Llama-2-7B'},
-    {id: 3, name: 'Llama-2-13B'},
+    {id: 3, name: 'GPT-4'},
 ];

ui/typescript/src/data/static/user-info.tsx

@@ -6,6 +6,7 @@ export const UserInfo = {
     "firstName": "Govind",
     "lastName": "Kamtamneni",
     "age": 50,
+    "authorRole": 0,
     "riskLevel": "aggressive",
     "annualHouseholdIncome": 80000,
     "favoriteBook": "intelligent-investor",

ui/typescript/src/layouts/sidebar/chat-blade.tsx

@@ -88,8 +88,7 @@ export default function Sidebar({ className, setSelectedSession, setUserInfoAtom
             body: JSON.stringify({
                 input: userInput,
                 variables: [
-                    { key: 'userId', value: userInfo.userId },
-                    { key: 'userName', value: userInfo.userName },
+                    { key: 'messageType', value: userInfo.authorRole.toString() },
                     { key: 'chatId', value: userInfo.chatId },
                 ],
             }),