diff --git a/assets/images/wip-azure.png b/assets/images/wip-azure.png index 1aa73c8d..ff9d9ae4 100644 Binary files a/assets/images/wip-azure.png and b/assets/images/wip-azure.png differ diff --git a/services/recommendation-service/dotnet/Plugins/AdvisorPlugin/InvestmentAdvise/skprompt.txt b/services/recommendation-service/dotnet/Plugins/AdvisorPlugin/InvestmentAdvise/skprompt.txt index 74ad1520..f61e74d2 100644 --- a/services/recommendation-service/dotnet/Plugins/AdvisorPlugin/InvestmentAdvise/skprompt.txt +++ b/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}} diff --git a/services/recommendation-service/dotnet/global.json b/services/recommendation-service/dotnet/global.json new file mode 100644 index 00000000..7cd6a1f4 --- /dev/null +++ b/services/recommendation-service/dotnet/global.json @@ -0,0 +1,7 @@ +{ + "sdk": { + "version": "7.0.0", + "rollForward": "latestMajor", + "allowPrerelease": true + } +} \ No newline at end of file diff --git a/ui/typescript/src/components/personalize/personalize-drawer.tsx b/ui/typescript/src/components/personalize/personalize-drawer.tsx index 969f7447..341b0edb 100644 --- a/ui/typescript/src/components/personalize/personalize-drawer.tsx +++ b/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, }; diff --git a/ui/typescript/src/components/personalize/selectors/fin-advisor-list.tsx b/ui/typescript/src/components/personalize/selectors/fin-advisor-list.tsx index 977074c9..536dbe97 100644 --- a/ui/typescript/src/components/personalize/selectors/fin-advisor-list.tsx +++ b/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 (
diff --git a/ui/typescript/src/data/static/personalize.tsx b/ui/typescript/src/data/static/personalize.tsx index dacf3bcd..85b77e1d 100644 --- a/ui/typescript/src/data/static/personalize.tsx +++ b/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'}, ]; \ No newline at end of file