mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-15 23:12:04 +00:00
Merge remote-tracking branch 'origin/main' into feat/v140-fixes
# Conflicts: # docs/api/openapi.yaml
This commit is contained in:
commit
816eabb3c3
59 files changed
+4736
-905
No files matched your search
@@ -0,0 +1,109 @@
|
||||
import { describe, it, expect, vi } from "vitest";
|
||||
import { renderToStaticMarkup } from "react-dom/server";
|
||||
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
||||
|
||||
import { I18nProvider } from "@/lib/i18n/context";
|
||||
import { queryKeys } from "@/lib/query-keys";
|
||||
import type { LabResultDto, LabResultListResponse } from "../types";
|
||||
|
||||
/**
|
||||
* Every row of the compact list is five grid cells from `lg` up. The range
|
||||
* badge renders nothing for a reading without a reference range, so without
|
||||
* its own cell the range bar and the trend slid one column to the left on
|
||||
* exactly those rows.
|
||||
*/
|
||||
|
||||
vi.mock("@/lib/api/api-fetch", () => ({
|
||||
apiGet: () => new Promise(() => {}),
|
||||
apiDelete: vi.fn(),
|
||||
}));
|
||||
|
||||
import { LabList } from "../lab-list";
|
||||
|
||||
function reading(over: Partial<LabResultDto>): LabResultDto {
|
||||
return {
|
||||
id: "r1",
|
||||
biomarkerId: "b1",
|
||||
panel: null,
|
||||
analyte: "Ferritin",
|
||||
value: 80,
|
||||
valueText: null,
|
||||
unit: "ng/mL",
|
||||
referenceLow: 30,
|
||||
referenceHigh: 400,
|
||||
catalogReferenceLow: 30,
|
||||
catalogReferenceHigh: 400,
|
||||
sourceReferenceLow: null,
|
||||
sourceReferenceHigh: null,
|
||||
sourceReferenceText: null,
|
||||
referenceOrigin: "catalog",
|
||||
referenceDivergesFromCatalog: false,
|
||||
takenAt: "2026-09-01T12:00:00.000Z",
|
||||
source: "MANUAL",
|
||||
hasNote: false,
|
||||
rangeStatus: "in_range",
|
||||
createdAt: "2026-09-01T12:00:00.000Z",
|
||||
updatedAt: "2026-09-01T12:00:00.000Z",
|
||||
...over,
|
||||
} as LabResultDto;
|
||||
}
|
||||
|
||||
function renderList(results: LabResultDto[]) {
|
||||
const queryClient = new QueryClient({
|
||||
defaultOptions: { queries: { retry: false, staleTime: Infinity } },
|
||||
});
|
||||
const data: LabResultListResponse = {
|
||||
results,
|
||||
meta: { total: results.length, limit: 500, offset: 0 },
|
||||
};
|
||||
queryClient.setQueryData(
|
||||
queryKeys.labResultsList({
|
||||
biomarkerId: undefined,
|
||||
analyte: undefined,
|
||||
panel: undefined,
|
||||
from: undefined,
|
||||
to: undefined,
|
||||
page: 0,
|
||||
sortDir: "desc",
|
||||
}),
|
||||
data,
|
||||
);
|
||||
return renderToStaticMarkup(
|
||||
<QueryClientProvider client={queryClient}>
|
||||
<I18nProvider initialLocale="en">
|
||||
<LabList />
|
||||
</I18nProvider>
|
||||
</QueryClientProvider>,
|
||||
);
|
||||
}
|
||||
|
||||
function count(html: string, needle: string): number {
|
||||
return html.split(needle).length - 1;
|
||||
}
|
||||
|
||||
describe("<LabList> columns", () => {
|
||||
it("gives the badge its own cell even when a reading has no reference range", () => {
|
||||
const html = renderList([
|
||||
reading({ id: "a", biomarkerId: "b1", analyte: "Ferritin" }),
|
||||
reading({
|
||||
id: "b",
|
||||
biomarkerId: "b2",
|
||||
analyte: "Lipoprotein (a)",
|
||||
referenceLow: null,
|
||||
referenceHigh: null,
|
||||
catalogReferenceLow: null,
|
||||
catalogReferenceHigh: null,
|
||||
rangeStatus: "unknown",
|
||||
}),
|
||||
]);
|
||||
expect(count(html, 'href="/labs/')).toBe(2);
|
||||
// One cell per row, rendered even where the badge itself renders nothing.
|
||||
expect(count(html, 'data-slot="lab-list-badge-cell"')).toBe(2);
|
||||
expect(html).toMatch(/<div data-slot="lab-list-badge-cell"[^>]*><\/div>/);
|
||||
});
|
||||
|
||||
it("hides the chevron from lg up and keeps it on a phone", () => {
|
||||
const html = renderList([reading({})]);
|
||||
expect(html).toMatch(/class="[^"]*lucide-chevron-right[^"]*lg:invisible/);
|
||||
});
|
||||
});
|
||||
@@ -78,6 +78,19 @@ function groupReadings(results: LabResultDto[]): MarkerGroup[] {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* The badge's grid cell. The badge renders nothing for a reading without a
|
||||
* reference range, and a missing cell would pull the range bar and the trend
|
||||
* one column to the left; the wrapper keeps every row at five cells.
|
||||
*/
|
||||
function RangeBadgeCell({ status }: { status: LabResultDto["rangeStatus"] }) {
|
||||
return (
|
||||
<div data-slot="lab-list-badge-cell" className={MOBILE_CELL.badge}>
|
||||
<ReferenceRangeBadge status={status} compact className="lg:w-full" />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function LabRangeBarSlot({ reading }: { reading: LabResultDto }) {
|
||||
return (
|
||||
<div className={cn("w-full lg:w-48", MOBILE_CELL.rangeBar)}>
|
||||
@@ -274,11 +287,7 @@ export function LabList({ onAddFirst }: { onAddFirst?: () => void } = {}) {
|
||||
)}
|
||||
>
|
||||
{inner}
|
||||
<ReferenceRangeBadge
|
||||
status={group.latest.rangeStatus}
|
||||
compact
|
||||
className={cn("lg:w-full", MOBILE_CELL.badge)}
|
||||
/>
|
||||
<RangeBadgeCell status={group.latest.rangeStatus} />
|
||||
<LabRangeBarSlot reading={group.latest} />
|
||||
<div className={cn("w-[72px]", MOBILE_CELL.trend)}>
|
||||
<LabTrendSparkline
|
||||
@@ -287,9 +296,11 @@ export function LabList({ onAddFirst }: { onAddFirst?: () => void } = {}) {
|
||||
referenceHigh={group.latest.referenceHigh}
|
||||
/>
|
||||
</div>
|
||||
{/* With a pointer the row's hover already says it opens; a
|
||||
phone has no hover, so the chevron stays there. */}
|
||||
<ChevronRight
|
||||
className={cn(
|
||||
"text-muted-foreground h-4 w-4 shrink-0",
|
||||
"text-muted-foreground h-4 w-4 shrink-0 lg:invisible",
|
||||
MOBILE_CELL.end,
|
||||
)}
|
||||
/>
|
||||
@@ -300,11 +311,7 @@ export function LabList({ onAddFirst }: { onAddFirst?: () => void } = {}) {
|
||||
// link next to its clickable neighbours.
|
||||
<div key={group.key} className={ROW_CLASS}>
|
||||
{inner}
|
||||
<ReferenceRangeBadge
|
||||
status={group.latest.rangeStatus}
|
||||
compact
|
||||
className={cn("lg:w-full", MOBILE_CELL.badge)}
|
||||
/>
|
||||
<RangeBadgeCell status={group.latest.rangeStatus} />
|
||||
<LabRangeBarSlot reading={group.latest} />
|
||||
<div className={cn("w-[72px]", MOBILE_CELL.trend)}>
|
||||
<LabTrendSparkline
|
||||
|
||||
@@ -102,6 +102,10 @@ export function extractErrorMessage(
|
||||
return t("labs.ocr.consentRequired");
|
||||
case "ai.provider.none":
|
||||
return t("labs.ocr.providerUnsupported");
|
||||
case "aiRuns.workerUnavailable":
|
||||
return t("aiRuns.errorWorkerUnavailable");
|
||||
case "aiRuns.timedOut":
|
||||
return t("aiRuns.errorTimedOut");
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -365,6 +369,17 @@ export function OcrReviewDialog({
|
||||
? t("labs.ocr.readingOnDevice")
|
||||
: t("labs.ocr.extracting")}
|
||||
</span>
|
||||
{extract.runPhase !== "idle" ? (
|
||||
<span
|
||||
role="status"
|
||||
data-slot="ocr-run-phase"
|
||||
className="text-muted-foreground text-xs"
|
||||
>
|
||||
{extract.runPhase === "waitingForWorker"
|
||||
? t("aiRuns.waitingForWorker")
|
||||
: t("aiRuns.backgroundScan")}
|
||||
</span>
|
||||
) : null}
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
|
||||
@@ -6,17 +6,26 @@
|
||||
* - `useOcrCapability()` — the cheap capability probe that decides whether the
|
||||
* "Scan a report" affordance shows.
|
||||
* - `useOcrExtract()` — uploads the photo / PDF and returns the proposed rows.
|
||||
* A vision call is slow, so it opts out of the default 15 s fetch timeout in
|
||||
* favour of a generous 90 s window.
|
||||
* Since v1.40 the route only queues the read (202) and the rows come from
|
||||
* the background run, so no proxy timeout can cut a slow model.
|
||||
* - `useOcrCommit()` — writes the user-confirmed rows and invalidates the
|
||||
* labs + biomarker query keys.
|
||||
*/
|
||||
import type { AiCapabilityState } from "@/lib/ai/capabilities/types";
|
||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import {
|
||||
useMutation,
|
||||
useQuery,
|
||||
useQueryClient,
|
||||
type QueryClient,
|
||||
} from "@tanstack/react-query";
|
||||
|
||||
import { useAiProviderState } from "@/hooks/use-ai-capability";
|
||||
import { clientAbortMs } from "@/lib/ai/effective-timeout";
|
||||
import {
|
||||
resolveAiRun,
|
||||
useAiRunPhase,
|
||||
type WaitForAiRunOptions,
|
||||
} from "@/hooks/use-ai-run";
|
||||
import { apiFetch, apiGet, apiPatch, apiPost } from "@/lib/api/api-fetch";
|
||||
import type { AiRunAccepted } from "@/lib/documents/ai-runs/types";
|
||||
import { ocrImageToText } from "@/lib/labs/local-ocr";
|
||||
import {
|
||||
aiInputDependentKeys,
|
||||
@@ -94,49 +103,60 @@ export function useOcrCapability(enabled: boolean) {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* The most sequential model calls one extract request makes: the read, and one
|
||||
* corrective retry when the reply does not parse.
|
||||
*/
|
||||
const OCR_EXTRACT_MODEL_CALLS = 2;
|
||||
/** How long the queuing request may take: the upload and the enqueue, no model. */
|
||||
const OCR_QUEUE_REQUEST_TIMEOUT_MS = 60_000;
|
||||
|
||||
/**
|
||||
* POST one lab-report extraction. Vision mode uploads the file; text mode posts
|
||||
* only the text the browser OCR'd. Either way a model reads it, so the request
|
||||
* waits as long as the server may: the person's response-timeout setting as
|
||||
* the account payload publishes it (`ai.provider.responseTimeoutMs`), times
|
||||
* the calls one request can make, plus a margin. The 15 s default used to cut
|
||||
* the text path off long before any model answered.
|
||||
* POST one lab-report extraction and follow the background run to its rows.
|
||||
* Vision mode uploads the file; text mode posts only the text the browser
|
||||
* OCR'd. The request itself only queues the read, so it carries a short
|
||||
* ceiling; the run's own deadline (the person's AI response time) ends a slow
|
||||
* read on the server.
|
||||
*/
|
||||
export function postOcrExtract(
|
||||
export async function postOcrExtract(
|
||||
input: { file: File } | { text: string },
|
||||
responseTimeoutMs: number,
|
||||
queryClient: QueryClient,
|
||||
progress: WaitForAiRunOptions & { onQueued?: () => void } = {},
|
||||
): Promise<OcrExtractResponseDto> {
|
||||
const signal = AbortSignal.timeout(
|
||||
clientAbortMs(responseTimeoutMs, OCR_EXTRACT_MODEL_CALLS),
|
||||
);
|
||||
const signal = AbortSignal.timeout(OCR_QUEUE_REQUEST_TIMEOUT_MS);
|
||||
let accepted: OcrExtractResponseDto | AiRunAccepted;
|
||||
if ("text" in input) {
|
||||
return apiPost<OcrExtractResponseDto>(
|
||||
accepted = await apiPost<OcrExtractResponseDto | AiRunAccepted>(
|
||||
"/api/labs/ocr/extract",
|
||||
{ mode: "text", text: input.text },
|
||||
{ signal },
|
||||
);
|
||||
} else {
|
||||
const form = new FormData();
|
||||
form.append("file", input.file);
|
||||
accepted = await apiFetch<OcrExtractResponseDto | AiRunAccepted>(
|
||||
"/api/labs/ocr/extract",
|
||||
{ method: "POST", body: form, signal },
|
||||
);
|
||||
}
|
||||
const form = new FormData();
|
||||
form.append("file", input.file);
|
||||
return apiFetch<OcrExtractResponseDto>("/api/labs/ocr/extract", {
|
||||
method: "POST",
|
||||
body: form,
|
||||
signal,
|
||||
return resolveAiRun<OcrExtractResponseDto>(queryClient, accepted, progress);
|
||||
}
|
||||
|
||||
/**
|
||||
* The extract mutation for one mode, plus the run phase the dialog shows while
|
||||
* the read runs in the background.
|
||||
*/
|
||||
function useOcrExtractMutation(
|
||||
read: (file: File) => Promise<{ file: File } | { text: string }>,
|
||||
) {
|
||||
const queryClient = useQueryClient();
|
||||
const { phase, onQueued, onProgress, reset } = useAiRunPhase();
|
||||
const mutation = useMutation<OcrExtractResponseDto, Error, File>({
|
||||
mutationFn: async (file: File) =>
|
||||
postOcrExtract(await read(file), queryClient, { onQueued, onProgress }),
|
||||
onSettled: reset,
|
||||
});
|
||||
return { ...mutation, runPhase: mutation.isPending ? phase : "idle" };
|
||||
}
|
||||
|
||||
/** Upload + extract (VISION mode). Resolves with the proposed review rows. */
|
||||
export function useOcrExtract() {
|
||||
const { responseTimeoutMs } = useAiProviderState();
|
||||
return useMutation<OcrExtractResponseDto, Error, File>({
|
||||
mutationFn: (file: File) => postOcrExtract({ file }, responseTimeoutMs),
|
||||
});
|
||||
return useOcrExtractMutation(async (file) => ({ file }));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -146,11 +166,9 @@ export function useOcrExtract() {
|
||||
* is shared verbatim.
|
||||
*/
|
||||
export function useOcrTextExtract() {
|
||||
const { responseTimeoutMs } = useAiProviderState();
|
||||
return useMutation<OcrExtractResponseDto, Error, File>({
|
||||
mutationFn: async (file: File) =>
|
||||
postOcrExtract({ text: await ocrImageToText(file) }, responseTimeoutMs),
|
||||
});
|
||||
return useOcrExtractMutation(async (file) => ({
|
||||
text: await ocrImageToText(file),
|
||||
}));
|
||||
}
|
||||
|
||||
/** The local-OCR opt-in preference (read + toggle). */
|
||||
|
||||
Reference in new issue
Block a user