add real data to ai

app/home/(user)/(dashboard)/analysis-results/test/test-responses.ts

@@ -1,6 +1,6 @@
 import type { AnalysisResultDetailsMapped } from '@/packages/features/user-analyses/src/types/analysis-results';
 
-export type AnalysisTestResponse = Omit<
+type AnalysisTestResponse = Omit<
   AnalysisResultDetailsMapped,
   'order' | 'orderedAnalysisElementIds' | 'summary' | 'elements'
 >;

app/home/(user)/_components/recommendations.tsx

@@ -4,10 +4,11 @@ import React from 'react';
 
 import { AccountWithParams } from '@/packages/features/accounts/src/types/accounts';
 
-import { analysisResponses } from '../(dashboard)/analysis-results/test/test-responses';
+import { Trans } from '@kit/ui/makerkit/trans';
+
 import { loadAnalyses } from '../_lib/server/load-analyses';
 import { loadRecommendations } from '../_lib/server/load-recommendations';
-import OrderAnalysesCards, { OrderAnalysisCard } from './order-analyses-cards';
+import OrderAnalysesCards from './order-analyses-cards';
 
 export default async function Recommendations({
   account,
@@ -15,25 +16,21 @@ export default async function Recommendations({
   account: AccountWithParams;
 }) {
   const { analyses, countryCode } = await loadAnalyses();
-  const analysisResults = analysisResponses;
-
-  const analysisRecommendations = await loadRecommendations(
-    analysisResults,
-    analyses,
-    account,
-  );
 
+  const analysisRecommendations = await loadRecommendations(analyses, account);
   const orderAnalyses = analyses.filter((analysis) =>
     analysisRecommendations.includes(analysis.title),
   );
-  console.log('analysisRecommendations', analysisRecommendations);
+
   if (orderAnalyses.length < 1) {
     return null;
   }
 
   return (
     <div>
-      <h4>Medreport soovitab teile</h4>
+      <h4>
+        <Trans i18nKey="dashboard:recommendations.title" />
+      </h4>
       <OrderAnalysesCards analyses={orderAnalyses} countryCode={countryCode} />
     </div>
   );

app/home/(user)/_lib/server/load-recommendations.ts

@@ -1,29 +1,26 @@
 import { cache } from 'react';
 
 import { AccountWithParams } from '@/packages/features/accounts/src/types/accounts';
+import { createUserAnalysesApi } from '@/packages/features/user-analyses/src/server/api';
 import { getSupabaseServerClient } from '@/packages/supabase/src/clients/server-client';
-import { createServerClient } from '@supabase/ssr';
+import { Database } from '@/packages/supabase/src/database.types';
 import OpenAI from 'openai';
 
 import PersonalCode from '~/lib/utils';
 
-import { AnalysisTestResponse } from '../../(dashboard)/analysis-results/test/test-responses';
 import { OrderAnalysisCard } from '../../_components/order-analyses-cards';
 
 export const loadRecommendations = cache(recommendationsLoader);
 
-type FormattedAnalysisResponse = {
-  value: string;
-  name: string;
-  responseTime: string;
-};
+type AnalysisResponses =
+  Database['medreport']['Functions']['get_latest_analysis_response_elements_for_current_user']['Returns'];
 
-const getLatestResponseTime = (items: FormattedAnalysisResponse[]) => {
+const getLatestResponseTime = (items: AnalysisResponses) => {
   if (!items?.length) return null;
 
   let latest = null;
   for (const it of items) {
-    const d = new Date(it.responseTime);
+    const d = new Date(it.response_time);
     const t = d.getTime();
     if (!Number.isNaN(t) && (latest === null || t > latest.getTime())) {
       latest = d;
@@ -32,45 +29,10 @@ const getLatestResponseTime = (items: FormattedAnalysisResponse[]) => {
   return latest;
 };
 
-const getLatestUniqueAnalysResponses = (
-  analysisResponses: AnalysisTestResponse[],
-): { name: string; value: string; responseTime: string }[] => {
-  const analysisElements = analysisResponses
-    .map(({ orderedAnalysisElements }) => orderedAnalysisElements)
-    .flat();
-
-  console.log('analysisElements', analysisElements.length);
-
-  const byName = analysisElements.reduce<
-    Record<string, { name: string; value: string; responseTime: string }>
-  >((acc, it) => {
-    const responseTime = it?.results?.responseTime;
-    const responseValue = it?.results?.responseValue;
-    if (!responseTime || !responseValue) return acc;
-
-    const key = it.analysisName;
-    const cur = acc[key];
-    const t = Date.parse(responseTime);
-    const prevT = cur ? Date.parse(cur.responseTime) : -Infinity;
-
-    if (!cur || t > prevT) {
-      acc[key] = {
-        name: key,
-        value: responseValue.toString(),
-        responseTime,
-      };
-    }
-    return acc;
-  }, {});
-
-  return Object.values(byName);
-};
-
 async function recommendationsLoader(
-  analysisResponses: AnalysisTestResponse[],
   analyses: OrderAnalysisCard[],
   account: AccountWithParams | null,
-): Promise<any> {
+): Promise<string[]> {
   if (!process.env.OPENAI_API_KEY) {
     return [];
   }
@@ -78,15 +40,14 @@ async function recommendationsLoader(
     return [];
   }
   const supabaseClient = getSupabaseServerClient();
-
+  const userAnalysesApi = createUserAnalysesApi(supabaseClient);
+  const analysisResponses = await userAnalysesApi.getAllUserAnalysisResponses();
   const analysesRecommendationsPromptId =
     'pmpt_68ca9c8bfa8c8193b27eadc6496c36440df449ece4f5a8dd';
-  const latestUniqueAnalysResponses =
-    getLatestUniqueAnalysResponses(analysisResponses);
-  const latestResponseTime = getLatestResponseTime(latestUniqueAnalysResponses);
+  const latestResponseTime = getLatestResponseTime(analysisResponses);
   const latestISO = latestResponseTime
     ? new Date(latestResponseTime).toISOString()
-    : 'none';
+    : new Date('2025').toISOString();
 
   const previouslyRecommended = await supabaseClient
     .schema('medreport')
@@ -97,16 +58,28 @@ async function recommendationsLoader(
     .eq('latest_data_change', latestISO);
 
   if (previouslyRecommended.data?.[0]?.response) {
-    return previouslyRecommended.data[0].response;
+    return JSON.parse(previouslyRecommended.data[0].response as string)
+      .recommended;
   }
 
   const openAIClient = new OpenAI();
   const { gender, age } = PersonalCode.parsePersonalCode(account.personal_code);
   const weight = account.accountParams?.weight || 'unknown';
-  console.log('analysisResponses', analysisResponses);
-  console.log('analyises', analyses);
-  const formattedAnalysisResponses = latestUniqueAnalysResponses.map(
-    ({ name, value }) => ({ name, value }),
+
+  const formattedAnalysisResponses = analysisResponses.map(
+    ({
+      analysis_name_lab,
+      response_value,
+      norm_upper,
+      norm_lower,
+      norm_status,
+    }) => ({
+      name: analysis_name_lab,
+      value: response_value,
+      normUpper: norm_upper,
+      normLower: norm_lower,
+      normStatus: norm_status,
+    }),
   );
   const formattedAnalyses = analyses.map(({ description, title }) => ({
     description,
@@ -128,23 +101,28 @@ async function recommendationsLoader(
   });
 
   const json = JSON.parse(response.output_text);
-  const updateAiResponse = await supabaseClient
-    .schema('medreport')
-    .from('ai_responses')
-    .insert({
-      account_id: account.id,
-      prompt_name: 'Analysis Recommendations',
-      prompt_id: analysesRecommendationsPromptId,
-      input: JSON.stringify({
-        analyses: formattedAnalyses,
-        results: formattedAnalysisResponses,
-        gender,
-        age,
-        weight,
-      }),
-      latest_data_change: latestISO,
-      response: response.output_text,
-    });
+
+  try {
+    await supabaseClient
+      .schema('medreport')
+      .from('ai_responses')
+      .insert({
+        account_id: account.id,
+        prompt_name: 'Analysis Recommendations',
+        prompt_id: analysesRecommendationsPromptId,
+        input: JSON.stringify({
+          analyses: formattedAnalyses,
+          results: formattedAnalysisResponses,
+          gender,
+          age,
+          weight,
+        }),
+        latest_data_change: latestISO,
+        response: response.output_text,
+      });
+  } catch (error) {
+    console.error('Error saving AI response: ', error);
+  }
 
   return json.recommended;
 }

app/home/[account]/page.tsx

@@ -4,7 +4,6 @@ import { use } from 'react';
 
 import { CompanyGuard } from '@/packages/features/team-accounts/src/components';
 import { createTeamAccountsApi } from '@/packages/features/team-accounts/src/server/api';
-import { createUserAnalysesApi } from '@/packages/features/user-analyses/src/server/api';
 import { getSupabaseServerClient } from '@/packages/supabase/src/clients/server-client';
 
 import { PageBody } from '@kit/ui/page';