feat(worker): S3 3b härda UPDATE_USER_MEMORY — budget, kostnad, anti-påhitt, GDPR-regression
This commit is contained in:
@@ -3,7 +3,7 @@ import { describe, expect, it, beforeAll, afterAll, vi } from "vitest";
|
|||||||
import { eq, inArray } from "drizzle-orm";
|
import { eq, inArray } from "drizzle-orm";
|
||||||
import { buildServer } from "../src/server.js";
|
import { buildServer } from "../src/server.js";
|
||||||
import { loadConfig } from "../src/config.js";
|
import { loadConfig } from "../src/config.js";
|
||||||
import { createDatabase, closeDatabase, schema } from "@app/database";
|
import { createDatabase, closeDatabase, eraseUser, schema } from "@app/database";
|
||||||
|
|
||||||
describe("DELETE /v1/me — GDPR-radering", () => {
|
describe("DELETE /v1/me — GDPR-radering", () => {
|
||||||
const testDb = createDatabase(process.env.TEST_DATABASE_URL!);
|
const testDb = createDatabase(process.env.TEST_DATABASE_URL!);
|
||||||
@@ -213,4 +213,90 @@ describe("DELETE /v1/me — GDPR-radering", () => {
|
|||||||
deleteSpy.mockRestore();
|
deleteSpy.mockRestore();
|
||||||
await cleanupUser(email);
|
await cleanupUser(email);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("raderar memoryItems och tasteSignals vid DELETE /v1/me", async () => {
|
||||||
|
const email = "gdpr-memory-signals@example.invalid";
|
||||||
|
await cleanupUser(email);
|
||||||
|
const { token, userId } = await registerUser(email);
|
||||||
|
|
||||||
|
await testDb.db.insert(schema.memoryItems).values({
|
||||||
|
userId,
|
||||||
|
kind: "structured_fact",
|
||||||
|
key: "favorite-cuisine-italian",
|
||||||
|
summarySv: "Gillar italienskt",
|
||||||
|
value: { favoriteCuisine: "italian" },
|
||||||
|
origin: "user_stated",
|
||||||
|
confidence: 1,
|
||||||
|
});
|
||||||
|
|
||||||
|
await testDb.db.insert(schema.tasteSignals).values({
|
||||||
|
userId,
|
||||||
|
axis: "spice",
|
||||||
|
direction: 1,
|
||||||
|
strength: 0.8,
|
||||||
|
origin: "user_stated",
|
||||||
|
});
|
||||||
|
|
||||||
|
const res = await app.inject({
|
||||||
|
method: "DELETE",
|
||||||
|
url: "/v1/me",
|
||||||
|
headers: { authorization: `Bearer ${token}` },
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(res.statusCode).toBe(200);
|
||||||
|
|
||||||
|
const remainingMemory = await testDb.db
|
||||||
|
.select({ id: schema.memoryItems.id })
|
||||||
|
.from(schema.memoryItems)
|
||||||
|
.where(eq(schema.memoryItems.userId, userId));
|
||||||
|
expect(remainingMemory).toHaveLength(0);
|
||||||
|
|
||||||
|
const remainingSignals = await testDb.db
|
||||||
|
.select({ id: schema.tasteSignals.id })
|
||||||
|
.from(schema.tasteSignals)
|
||||||
|
.where(eq(schema.tasteSignals.userId, userId));
|
||||||
|
expect(remainingSignals).toHaveLength(0);
|
||||||
|
|
||||||
|
await cleanupUser(email);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("eraseUser raderar memoryItems och tasteSignals (GDPR-regression)", async () => {
|
||||||
|
const email = "gdpr-erase-user-memory@example.invalid";
|
||||||
|
await cleanupUser(email);
|
||||||
|
const { userId } = await registerUser(email);
|
||||||
|
|
||||||
|
await testDb.db.insert(schema.memoryItems).values({
|
||||||
|
userId,
|
||||||
|
kind: "structured_fact",
|
||||||
|
key: "dislikes-broccoli",
|
||||||
|
summarySv: "Ogillar broccoli",
|
||||||
|
value: { dislikedIngredient: "broccoli" },
|
||||||
|
origin: "user_stated",
|
||||||
|
confidence: 1,
|
||||||
|
});
|
||||||
|
|
||||||
|
await testDb.db.insert(schema.tasteSignals).values({
|
||||||
|
userId,
|
||||||
|
axis: "garlic",
|
||||||
|
direction: -1,
|
||||||
|
strength: 0.9,
|
||||||
|
origin: "user_stated",
|
||||||
|
});
|
||||||
|
|
||||||
|
await eraseUser(testDb.db, userId);
|
||||||
|
|
||||||
|
const remainingMemory = await testDb.db
|
||||||
|
.select({ id: schema.memoryItems.id })
|
||||||
|
.from(schema.memoryItems)
|
||||||
|
.where(eq(schema.memoryItems.userId, userId));
|
||||||
|
expect(remainingMemory).toHaveLength(0);
|
||||||
|
|
||||||
|
const remainingSignals = await testDb.db
|
||||||
|
.select({ id: schema.tasteSignals.id })
|
||||||
|
.from(schema.tasteSignals)
|
||||||
|
.where(eq(schema.tasteSignals.userId, userId));
|
||||||
|
expect(remainingSignals).toHaveLength(0);
|
||||||
|
|
||||||
|
await cleanupUser(email);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -214,3 +214,109 @@ describe("memory i18n parity", () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("DELETE /v1/me/memory GDPR-regression", () => {
|
||||||
|
let app: Awaited<ReturnType<typeof buildServer>>;
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
app = await buildServer(config);
|
||||||
|
await app.ready();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async () => {
|
||||||
|
await app.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function cleanup(email: string) {
|
||||||
|
const existing = await testDb.db
|
||||||
|
.select({ id: schema.users.id })
|
||||||
|
.from(schema.users)
|
||||||
|
.where(eq(schema.users.email, email));
|
||||||
|
for (const u of existing) {
|
||||||
|
await testDb.db.delete(schema.memoryItems).where(eq(schema.memoryItems.userId, u.id));
|
||||||
|
await testDb.db.delete(schema.tasteSignals).where(eq(schema.tasteSignals.userId, u.id));
|
||||||
|
await testDb.db.delete(schema.userConsents).where(eq(schema.userConsents.userId, u.id));
|
||||||
|
await testDb.db.delete(schema.userPreferences).where(eq(schema.userPreferences.userId, u.id));
|
||||||
|
await testDb.db.delete(schema.householdMembers).where(eq(schema.householdMembers.userId, u.id));
|
||||||
|
const ownedHouseholds = await testDb.db
|
||||||
|
.select({ id: schema.households.id })
|
||||||
|
.from(schema.households)
|
||||||
|
.innerJoin(
|
||||||
|
schema.householdMembers,
|
||||||
|
eq(schema.householdMembers.householdId, schema.households.id),
|
||||||
|
)
|
||||||
|
.where(
|
||||||
|
and(eq(schema.householdMembers.userId, u.id), eq(schema.householdMembers.role, "owner")),
|
||||||
|
);
|
||||||
|
for (const h of ownedHouseholds) {
|
||||||
|
await testDb.db.delete(schema.storageLocations).where(eq(schema.storageLocations.householdId, h.id));
|
||||||
|
await testDb.db.delete(schema.households).where(eq(schema.households.id, h.id));
|
||||||
|
}
|
||||||
|
await testDb.db.delete(schema.users).where(eq(schema.users.id, u.id));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function registerUser(email: string) {
|
||||||
|
await cleanup(email);
|
||||||
|
const res = await app.inject({
|
||||||
|
method: "POST",
|
||||||
|
url: "/v1/auth/register",
|
||||||
|
payload: { email, password: "Password123!", displayName: "Memory GDPR Test" },
|
||||||
|
});
|
||||||
|
const body = JSON.parse(res.body) as { accessToken: string };
|
||||||
|
const token = body.accessToken;
|
||||||
|
const userId = (JSON.parse(atob(token.split(".")[1]!)) as { sub: string }).sub;
|
||||||
|
await app.inject({
|
||||||
|
method: "POST",
|
||||||
|
url: "/v1/onboarding/quick-start",
|
||||||
|
headers: { authorization: `Bearer ${token}` },
|
||||||
|
payload: { goals: ["cook_more"], precisionMode: "simple" },
|
||||||
|
});
|
||||||
|
return { token, userId };
|
||||||
|
}
|
||||||
|
|
||||||
|
it("tömmer memoryItems och tasteSignals", async () => {
|
||||||
|
const email = "memory-delete-all@example.invalid";
|
||||||
|
const { token, userId } = await registerUser(email);
|
||||||
|
|
||||||
|
await testDb.db.insert(schema.memoryItems).values({
|
||||||
|
userId,
|
||||||
|
kind: "structured_fact",
|
||||||
|
key: "likes-pasta",
|
||||||
|
summarySv: "Gillar pasta",
|
||||||
|
value: { favoriteCuisine: "italian" },
|
||||||
|
origin: "user_stated",
|
||||||
|
confidence: 1,
|
||||||
|
});
|
||||||
|
|
||||||
|
await testDb.db.insert(schema.tasteSignals).values({
|
||||||
|
userId,
|
||||||
|
axis: "spice",
|
||||||
|
direction: 1,
|
||||||
|
strength: 0.8,
|
||||||
|
origin: "user_stated",
|
||||||
|
});
|
||||||
|
|
||||||
|
const res = await app.inject({
|
||||||
|
method: "DELETE",
|
||||||
|
url: "/v1/me/memory",
|
||||||
|
headers: { authorization: `Bearer ${token}` },
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(res.statusCode).toBe(200);
|
||||||
|
|
||||||
|
const remainingMemory = await testDb.db
|
||||||
|
.select({ id: schema.memoryItems.id })
|
||||||
|
.from(schema.memoryItems)
|
||||||
|
.where(eq(schema.memoryItems.userId, userId));
|
||||||
|
expect(remainingMemory).toHaveLength(0);
|
||||||
|
|
||||||
|
const remainingSignals = await testDb.db
|
||||||
|
.select({ id: schema.tasteSignals.id })
|
||||||
|
.from(schema.tasteSignals)
|
||||||
|
.where(eq(schema.tasteSignals.userId, userId));
|
||||||
|
expect(remainingSignals).toHaveLength(0);
|
||||||
|
|
||||||
|
await cleanup(email);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ export interface WorkerContext {
|
|||||||
db: Database;
|
db: Database;
|
||||||
aamos: AamosClient;
|
aamos: AamosClient;
|
||||||
redis?: Redis;
|
redis?: Redis;
|
||||||
|
/** Delad dagsbudget-store så att memory-jobbet kan spegla skanningens budgetkoll. */
|
||||||
|
budgetStore?: BudgetStore;
|
||||||
/** Bygger läs-URL för lagrade bilder (samma signaturlogik som API:ts mock-S3). */
|
/** Bygger läs-URL för lagrade bilder (samma signaturlogik som API:ts mock-S3). */
|
||||||
readUrl: (key: string) => string;
|
readUrl: (key: string) => string;
|
||||||
apiBaseUrl: string;
|
apiBaseUrl: string;
|
||||||
@@ -70,6 +72,7 @@ export function createContext(redis?: Redis): WorkerContext {
|
|||||||
db,
|
db,
|
||||||
aamos,
|
aamos,
|
||||||
redis,
|
redis,
|
||||||
|
budgetStore,
|
||||||
apiBaseUrl,
|
apiBaseUrl,
|
||||||
readUrl: (key: string) => {
|
readUrl: (key: string) => {
|
||||||
const sig = createHmac("sha256", secret).update(key).digest("hex").slice(0, 32);
|
const sig = createHmac("sha256", secret).update(key).digest("hex").slice(0, 32);
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
import { sql } from "drizzle-orm";
|
||||||
|
import { schema, type Database } from "@app/database";
|
||||||
|
|
||||||
|
function currentMonth(): string {
|
||||||
|
const d = new Date();
|
||||||
|
return `${d.getUTCFullYear()}-${String(d.getUTCMonth() + 1).padStart(2, "0")}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bokför AI-användning utan PII i ai_usage_counters.
|
||||||
|
* Används av både scan-processor och UPDATE_USER_MEMORY.
|
||||||
|
*/
|
||||||
|
export async function recordAiUsage(
|
||||||
|
db: Database,
|
||||||
|
userId: string,
|
||||||
|
usage: { costUsd: number; inputTokens: number; outputTokens: number; aiScans?: number },
|
||||||
|
): Promise<void> {
|
||||||
|
const microcents = Math.round(usage.costUsd * 100_000_000);
|
||||||
|
const month = currentMonth();
|
||||||
|
const aiScans = usage.aiScans ?? 0;
|
||||||
|
|
||||||
|
await db
|
||||||
|
.insert(schema.aiUsageCounters)
|
||||||
|
.values({
|
||||||
|
userId,
|
||||||
|
month,
|
||||||
|
aiScans,
|
||||||
|
aiTokensIn: usage.inputTokens,
|
||||||
|
aiTokensOut: usage.outputTokens,
|
||||||
|
aiCostUsdMicrocents: microcents,
|
||||||
|
})
|
||||||
|
.onConflictDoUpdate({
|
||||||
|
target: [schema.aiUsageCounters.userId, schema.aiUsageCounters.month],
|
||||||
|
set: {
|
||||||
|
aiScans: sql`${schema.aiUsageCounters.aiScans} + ${aiScans}`,
|
||||||
|
aiTokensIn: sql`${schema.aiUsageCounters.aiTokensIn} + ${usage.inputTokens}`,
|
||||||
|
aiTokensOut: sql`${schema.aiUsageCounters.aiTokensOut} + ${usage.outputTokens}`,
|
||||||
|
aiCostUsdMicrocents: sql`${schema.aiUsageCounters.aiCostUsdMicrocents} + ${microcents}`,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -5,6 +5,12 @@ import { deriveMemoryUpdates } from "@app/memory-client";
|
|||||||
import { getLocaleContext } from "../locale.js";
|
import { getLocaleContext } from "../locale.js";
|
||||||
import type { WorkerContext } from "../context.js";
|
import type { WorkerContext } from "../context.js";
|
||||||
import { cancelTimedOutCookingSessions } from "@app/database";
|
import { cancelTimedOutCookingSessions } from "@app/database";
|
||||||
|
import { recordAiUsage } from "../lib/ai-usage.js";
|
||||||
|
|
||||||
|
/** Pessimistisk kostnadsuppskattning för UPDATE_USER_MEMORY (text-only). */
|
||||||
|
const COST_ESTIMATE_PER_MEMORY_SYNC_USD = 0.001;
|
||||||
|
/** Maxkonfidens för ai_inferred-minnen (R1: låg startkonfidens). */
|
||||||
|
const AI_INFERRED_MAX_CONFIDENCE = 0.7;
|
||||||
|
|
||||||
export { processProactiveTips } from "./proactive-tips.js";
|
export { processProactiveTips } from "./proactive-tips.js";
|
||||||
|
|
||||||
@@ -237,6 +243,8 @@ export async function processMealBoxReminders(ctx: WorkerContext): Promise<numbe
|
|||||||
* förslag skrivs till memory_items där användaren äger dem.
|
* förslag skrivs till memory_items där användaren äger dem.
|
||||||
*/
|
*/
|
||||||
export async function processMemorySync(ctx: WorkerContext): Promise<number> {
|
export async function processMemorySync(ctx: WorkerContext): Promise<number> {
|
||||||
|
const dailyBudgetUsd = Number(process.env.GEMINI_DAILY_BUDGET_USD ?? 0);
|
||||||
|
|
||||||
const users = await ctx.db
|
const users = await ctx.db
|
||||||
.select({ userId: schema.userConsents.userId })
|
.select({ userId: schema.userConsents.userId })
|
||||||
.from(schema.userConsents)
|
.from(schema.userConsents)
|
||||||
@@ -250,7 +258,12 @@ export async function processMemorySync(ctx: WorkerContext): Promise<number> {
|
|||||||
let updates = 0;
|
let updates = 0;
|
||||||
for (const { userId } of users) {
|
for (const { userId } of users) {
|
||||||
const events = await ctx.db
|
const events = await ctx.db
|
||||||
.select()
|
.select({
|
||||||
|
id: schema.domainEvents.id,
|
||||||
|
type: schema.domainEvents.type,
|
||||||
|
occurredAt: schema.domainEvents.occurredAt,
|
||||||
|
payload: schema.domainEvents.payload,
|
||||||
|
})
|
||||||
.from(schema.domainEvents)
|
.from(schema.domainEvents)
|
||||||
.where(
|
.where(
|
||||||
and(
|
and(
|
||||||
@@ -267,6 +280,16 @@ export async function processMemorySync(ctx: WorkerContext): Promise<number> {
|
|||||||
.limit(100);
|
.limit(100);
|
||||||
if (events.length < 3) continue;
|
if (events.length < 3) continue;
|
||||||
|
|
||||||
|
// BUDGET: spegla skanningen — över budget får inget AAMOS-anrop göras.
|
||||||
|
if (dailyBudgetUsd > 0 && ctx.budgetStore) {
|
||||||
|
const currentSpend = await ctx.budgetStore.getDailySpendUsd();
|
||||||
|
if (currentSpend + COST_ESTIMATE_PER_MEMORY_SYNC_USD > dailyBudgetUsd) {
|
||||||
|
// eslint-disable-next-line no-console
|
||||||
|
console.log(`UPDATE_USER_MEMORY: skippar ${userId}: daglig budget förbrukad.`);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const existing = await ctx.db
|
const existing = await ctx.db
|
||||||
.select({ key: schema.memoryItems.key })
|
.select({ key: schema.memoryItems.key })
|
||||||
.from(schema.memoryItems)
|
.from(schema.memoryItems)
|
||||||
@@ -279,11 +302,12 @@ export async function processMemorySync(ctx: WorkerContext): Promise<number> {
|
|||||||
const has = (kind: string) => consents.find((c) => c.kind === kind)?.status === "granted";
|
const has = (kind: string) => consents.find((c) => c.kind === kind)?.status === "granted";
|
||||||
|
|
||||||
const localeContext = await getLocaleContext(ctx, userId);
|
const localeContext = await getLocaleContext(ctx, userId);
|
||||||
const proposals = await deriveMemoryUpdates(ctx.aamos, {
|
const { proposals, usage } = await deriveMemoryUpdates(ctx.aamos, {
|
||||||
scope: "user",
|
scope: "user",
|
||||||
scopeId: userId,
|
scopeId: userId,
|
||||||
localeContext,
|
localeContext,
|
||||||
events: events.map((e) => ({
|
events: events.map((e) => ({
|
||||||
|
id: e.id,
|
||||||
type: e.type,
|
type: e.type,
|
||||||
occurredAt: e.occurredAt.toISOString(),
|
occurredAt: e.occurredAt.toISOString(),
|
||||||
payload: e.payload,
|
payload: e.payload,
|
||||||
@@ -296,7 +320,35 @@ export async function processMemorySync(ctx: WorkerContext): Promise<number> {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Bokför AI-kostnad/tokens så total dagskostnad inkluderar minnes-AI:n.
|
||||||
|
if (usage) {
|
||||||
|
await recordAiUsage(ctx.db, userId, {
|
||||||
|
costUsd: usage.costUsd,
|
||||||
|
inputTokens: usage.inputTokens,
|
||||||
|
outputTokens: usage.outputTokens,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const eventIdSet = new Set(events.map((e) => e.id));
|
||||||
|
|
||||||
for (const proposal of proposals) {
|
for (const proposal of proposals) {
|
||||||
|
// R1: varje förslag måste vara grundat i faktiska events.
|
||||||
|
const hasEventSupport =
|
||||||
|
proposal.sourceEventIds.length > 0 &&
|
||||||
|
proposal.sourceEventIds.every((id) => eventIdSet.has(id));
|
||||||
|
if (!hasEventSupport) {
|
||||||
|
// eslint-disable-next-line no-console
|
||||||
|
console.log(`UPDATE_USER_MEMORY: avvisar ${proposal.key} för ${userId}: saknar event-stöd.`);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// R1: ai_inferred ska ha låg konfidens.
|
||||||
|
if (proposal.origin === "ai_inferred" && proposal.confidence > AI_INFERRED_MAX_CONFIDENCE) {
|
||||||
|
// eslint-disable-next-line no-console
|
||||||
|
console.log(`UPDATE_USER_MEMORY: avvisar ${proposal.key} för ${userId}: ai_inferred med för hög confidence.`);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// Skriv aldrig över användarverifierade poster (spec §30: user_stated vinner).
|
// Skriv aldrig över användarverifierade poster (spec §30: user_stated vinner).
|
||||||
const [current] = await ctx.db
|
const [current] = await ctx.db
|
||||||
.select()
|
.select()
|
||||||
|
|||||||
@@ -1,14 +1,11 @@
|
|||||||
import { eq, sql } from "drizzle-orm";
|
import { eq } from "drizzle-orm";
|
||||||
import { schema, trackProductAnalytics } from "@app/database";
|
import { schema, trackProductAnalytics } from "@app/database";
|
||||||
import { scanCompleted, scanFailed } from "@app/analytics";
|
import { scanCompleted, scanFailed } from "@app/analytics";
|
||||||
import type { AamosResult, AamosTaskType, DetectedItem } from "@app/ai-contracts";
|
import type { AamosResult, AamosTaskType, DetectedItem } from "@app/ai-contracts";
|
||||||
import type { WorkerContext } from "../context.js";
|
import type { WorkerContext } from "../context.js";
|
||||||
import { getLocaleContext } from "../locale.js";
|
import { getLocaleContext } from "../locale.js";
|
||||||
import type { LocaleContext } from "@app/shared-types";
|
import type { LocaleContext } from "@app/shared-types";
|
||||||
function currentMonth(): string {
|
import { recordAiUsage } from "../lib/ai-usage.js";
|
||||||
const d = new Date();
|
|
||||||
return `${d.getUTCFullYear()}-${String(d.getUTCMonth() + 1).padStart(2, "0")}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Bild-/OCR-jobb (spec §54): hämtar scan_job, anropar AAMOS med kontraktvaliderad
|
* Bild-/OCR-jobb (spec §54): hämtar scan_job, anropar AAMOS med kontraktvaliderad
|
||||||
@@ -84,7 +81,14 @@ export async function processScanJob(ctx: WorkerContext, scanJobId: string): Pro
|
|||||||
await recordScanCompleted(ctx, job, result);
|
await recordScanCompleted(ctx, job, result);
|
||||||
|
|
||||||
// Bokför verklig AI-kostnad/tokens utan PII (spec §45).
|
// Bokför verklig AI-kostnad/tokens utan PII (spec §45).
|
||||||
await recordAiUsage(ctx, job.userId, result);
|
if (result.costUsd != null || result.inputTokens || result.outputTokens) {
|
||||||
|
await recordAiUsage(ctx.db, job.userId, {
|
||||||
|
costUsd: result.costUsd ?? 0,
|
||||||
|
inputTokens: result.inputTokens ?? 0,
|
||||||
|
outputTokens: result.outputTokens ?? 0,
|
||||||
|
aiScans: 1,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// MEAL_PHOTO_ANALYZED-event för tallriksfoton (spec §55)
|
// MEAL_PHOTO_ANALYZED-event för tallriksfoton (spec §55)
|
||||||
if (job.jobType === "ANALYZE_MEAL_IMAGE") {
|
if (job.jobType === "ANALYZE_MEAL_IMAGE") {
|
||||||
@@ -294,41 +298,6 @@ function tokenize(text: string): string[] {
|
|||||||
.filter((t) => t.length > 1);
|
.filter((t) => t.length > 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
// AI-kostnadsbokföring utan PII.
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
async function recordAiUsage(
|
|
||||||
ctx: WorkerContext,
|
|
||||||
userId: string,
|
|
||||||
result: AamosResult<AamosTaskType>,
|
|
||||||
): Promise<void> {
|
|
||||||
const costUsd = result.costUsd ?? 0;
|
|
||||||
const tokensIn = result.inputTokens ?? 0;
|
|
||||||
const tokensOut = result.outputTokens ?? 0;
|
|
||||||
const microcents = Math.round(costUsd * 100_000_000);
|
|
||||||
const month = currentMonth();
|
|
||||||
|
|
||||||
await ctx.db
|
|
||||||
.insert(schema.aiUsageCounters)
|
|
||||||
.values({
|
|
||||||
userId,
|
|
||||||
month,
|
|
||||||
aiScans: 1,
|
|
||||||
aiTokensIn: tokensIn,
|
|
||||||
aiTokensOut: tokensOut,
|
|
||||||
aiCostUsdMicrocents: microcents,
|
|
||||||
})
|
|
||||||
.onConflictDoUpdate({
|
|
||||||
target: [schema.aiUsageCounters.userId, schema.aiUsageCounters.month],
|
|
||||||
set: {
|
|
||||||
aiScans: sql`${schema.aiUsageCounters.aiScans} + 1`,
|
|
||||||
aiTokensIn: sql`${schema.aiUsageCounters.aiTokensIn} + ${tokensIn}`,
|
|
||||||
aiTokensOut: sql`${schema.aiUsageCounters.aiTokensOut} + ${tokensOut}`,
|
|
||||||
aiCostUsdMicrocents: sql`${schema.aiUsageCounters.aiCostUsdMicrocents} + ${microcents}`,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function classifyScanError(error?: string | null): string {
|
function classifyScanError(error?: string | null): string {
|
||||||
if (!error) return "unknown";
|
if (!error) return "unknown";
|
||||||
|
|||||||
@@ -0,0 +1,293 @@
|
|||||||
|
import "./setup-env.js";
|
||||||
|
import { describe, it, expect, beforeAll, afterAll } from "vitest";
|
||||||
|
import { eq } from "drizzle-orm";
|
||||||
|
import { createDatabase, closeDatabase, schema } from "@app/database";
|
||||||
|
import { processMemorySync } from "../src/processors/maintenance.js";
|
||||||
|
import { MemoryBudgetStore } from "@app/ai-contracts";
|
||||||
|
import type { WorkerContext } from "../src/context.js";
|
||||||
|
import type { AamosClient, AamosResult } from "@app/ai-contracts";
|
||||||
|
|
||||||
|
const testDb = createDatabase(process.env.TEST_DATABASE_URL!);
|
||||||
|
const email = "memory-sync-test@example.invalid";
|
||||||
|
|
||||||
|
describe("UPDATE_USER_MEMORY hardening", () => {
|
||||||
|
async function cleanup() {
|
||||||
|
const existing = await testDb.db
|
||||||
|
.select({ id: schema.users.id })
|
||||||
|
.from(schema.users)
|
||||||
|
.where(eq(schema.users.email, email));
|
||||||
|
for (const u of existing) {
|
||||||
|
await testDb.db.delete(schema.memoryItems).where(eq(schema.memoryItems.userId, u.id));
|
||||||
|
await testDb.db.delete(schema.tasteSignals).where(eq(schema.tasteSignals.userId, u.id));
|
||||||
|
await testDb.db.delete(schema.domainEvents).where(eq(schema.domainEvents.userId, u.id));
|
||||||
|
await testDb.db.delete(schema.aiUsageCounters).where(eq(schema.aiUsageCounters.userId, u.id));
|
||||||
|
await testDb.db.delete(schema.userConsents).where(eq(schema.userConsents.userId, u.id));
|
||||||
|
await testDb.db.delete(schema.userPreferences).where(eq(schema.userPreferences.userId, u.id));
|
||||||
|
await testDb.db.delete(schema.userCredentials).where(eq(schema.userCredentials.userId, u.id));
|
||||||
|
await testDb.db.delete(schema.refreshTokens).where(eq(schema.refreshTokens.userId, u.id));
|
||||||
|
await testDb.db.delete(schema.users).where(eq(schema.users.id, u.id));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
await cleanup();
|
||||||
|
});
|
||||||
|
|
||||||
|
afterAll(async () => {
|
||||||
|
await cleanup();
|
||||||
|
await closeDatabase();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function setupUserWithEvents(): Promise<{ userId: string; eventIds: string[] }> {
|
||||||
|
await cleanup();
|
||||||
|
const [user] = await testDb.db
|
||||||
|
.insert(schema.users)
|
||||||
|
.values({
|
||||||
|
email,
|
||||||
|
passwordHash: "not-used",
|
||||||
|
displayName: "Memory Sync Test",
|
||||||
|
})
|
||||||
|
.returning();
|
||||||
|
const userId = user!.id;
|
||||||
|
|
||||||
|
await testDb.db.insert(schema.userConsents).values([
|
||||||
|
{ userId, kind: "personalization", status: "granted" },
|
||||||
|
{ userId, kind: "anonymized_improvement", status: "granted" },
|
||||||
|
{ userId, kind: "image_training", status: "granted" },
|
||||||
|
]);
|
||||||
|
|
||||||
|
const events = await testDb.db
|
||||||
|
.insert(schema.domainEvents)
|
||||||
|
.values([
|
||||||
|
{
|
||||||
|
type: "RECIPE_COOKED",
|
||||||
|
userId,
|
||||||
|
payload: { recipeId: "r1", recipeTitleSv: "Kycklingpasta" },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: "RECIPE_RATED",
|
||||||
|
userId,
|
||||||
|
payload: { recipeId: "r1", stars: 5 },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: "MEAL_LOGGED",
|
||||||
|
userId,
|
||||||
|
payload: { mealType: "dinner" },
|
||||||
|
},
|
||||||
|
])
|
||||||
|
.returning();
|
||||||
|
|
||||||
|
return { userId, eventIds: events.map((e) => e.id) };
|
||||||
|
}
|
||||||
|
|
||||||
|
function makeContext(aamos: AamosClient, budgetStore?: MemoryBudgetStore): WorkerContext {
|
||||||
|
return {
|
||||||
|
db: testDb.db,
|
||||||
|
aamos,
|
||||||
|
budgetStore,
|
||||||
|
apiBaseUrl: "http://localhost:4000",
|
||||||
|
readUrl: (key: string) => `http://localhost:4000/mock-s3/${key}`,
|
||||||
|
close: async () => {},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
it("skriver grundade förslag från events", async () => {
|
||||||
|
const { userId, eventIds } = await setupUserWithEvents();
|
||||||
|
|
||||||
|
const aamos = {
|
||||||
|
async runTask() {
|
||||||
|
return {
|
||||||
|
status: "ok",
|
||||||
|
output: {
|
||||||
|
memoryUpdates: eventIds.map((id) => ({
|
||||||
|
key: `likes_${id}`,
|
||||||
|
kind: "structured_fact",
|
||||||
|
summarySv: "Gillar kycklingpasta",
|
||||||
|
value: { recipeId: "r1" },
|
||||||
|
origin: "observed",
|
||||||
|
confidence: 0.75,
|
||||||
|
expiresAt: null,
|
||||||
|
sourceEventIds: [id],
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
costUsd: 0.001,
|
||||||
|
inputTokens: 100,
|
||||||
|
outputTokens: 50,
|
||||||
|
} as AamosResult<"UPDATE_USER_MEMORY">;
|
||||||
|
},
|
||||||
|
async healthCheck() {
|
||||||
|
return { ok: true };
|
||||||
|
},
|
||||||
|
} as AamosClient;
|
||||||
|
|
||||||
|
const updates = await processMemorySync(makeContext(aamos));
|
||||||
|
expect(updates).toBe(eventIds.length);
|
||||||
|
|
||||||
|
const items = await testDb.db
|
||||||
|
.select()
|
||||||
|
.from(schema.memoryItems)
|
||||||
|
.where(eq(schema.memoryItems.userId, userId));
|
||||||
|
expect(items.length).toBe(eventIds.length);
|
||||||
|
|
||||||
|
const usage = await testDb.db
|
||||||
|
.select()
|
||||||
|
.from(schema.aiUsageCounters)
|
||||||
|
.where(eq(schema.aiUsageCounters.userId, userId));
|
||||||
|
expect(usage).toHaveLength(1);
|
||||||
|
expect(usage[0]!.aiCostUsdMicrocents).toBe(100_000); // 0.001 USD
|
||||||
|
expect(usage[0]!.aiTokensIn).toBe(100);
|
||||||
|
expect(usage[0]!.aiTokensOut).toBe(50);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("avvisar fabricerade förslag utan event-stöd", async () => {
|
||||||
|
const { userId, eventIds } = await setupUserWithEvents();
|
||||||
|
|
||||||
|
const aamos = {
|
||||||
|
async runTask() {
|
||||||
|
return {
|
||||||
|
status: "ok",
|
||||||
|
output: {
|
||||||
|
memoryUpdates: [
|
||||||
|
{
|
||||||
|
key: "fabricated_likes_sushi",
|
||||||
|
kind: "structured_fact",
|
||||||
|
summarySv: "Gillar sushi",
|
||||||
|
value: { favoriteCuisine: "japanese" },
|
||||||
|
origin: "ai_inferred",
|
||||||
|
confidence: 0.5,
|
||||||
|
expiresAt: null,
|
||||||
|
sourceEventIds: ["non-existent-event-id"],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: "grounded_likes_pasta",
|
||||||
|
kind: "structured_fact",
|
||||||
|
summarySv: "Gillar pasta",
|
||||||
|
value: { recipeId: "r1" },
|
||||||
|
origin: "observed",
|
||||||
|
confidence: 0.8,
|
||||||
|
expiresAt: null,
|
||||||
|
sourceEventIds: [eventIds[0]!],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
costUsd: 0,
|
||||||
|
inputTokens: 0,
|
||||||
|
outputTokens: 0,
|
||||||
|
} as AamosResult<"UPDATE_USER_MEMORY">;
|
||||||
|
},
|
||||||
|
async healthCheck() {
|
||||||
|
return { ok: true };
|
||||||
|
},
|
||||||
|
} as AamosClient;
|
||||||
|
|
||||||
|
const updates = await processMemorySync(makeContext(aamos));
|
||||||
|
expect(updates).toBe(1);
|
||||||
|
|
||||||
|
const items = await testDb.db
|
||||||
|
.select()
|
||||||
|
.from(schema.memoryItems)
|
||||||
|
.where(eq(schema.memoryItems.userId, userId));
|
||||||
|
expect(items.map((i) => i.key)).toEqual(["grounded_likes_pasta"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("avvisar ai_inferred med för hög confidence", async () => {
|
||||||
|
const { userId, eventIds } = await setupUserWithEvents();
|
||||||
|
|
||||||
|
const aamos = {
|
||||||
|
async runTask() {
|
||||||
|
return {
|
||||||
|
status: "ok",
|
||||||
|
output: {
|
||||||
|
memoryUpdates: [
|
||||||
|
{
|
||||||
|
key: "overconfident",
|
||||||
|
kind: "structured_fact",
|
||||||
|
summarySv: "Gillar pasta",
|
||||||
|
value: { recipeId: "r1" },
|
||||||
|
origin: "ai_inferred",
|
||||||
|
confidence: 0.95,
|
||||||
|
expiresAt: null,
|
||||||
|
sourceEventIds: [eventIds[0]!],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
costUsd: 0,
|
||||||
|
inputTokens: 0,
|
||||||
|
outputTokens: 0,
|
||||||
|
} as AamosResult<"UPDATE_USER_MEMORY">;
|
||||||
|
},
|
||||||
|
async healthCheck() {
|
||||||
|
return { ok: true };
|
||||||
|
},
|
||||||
|
} as AamosClient;
|
||||||
|
|
||||||
|
const updates = await processMemorySync(makeContext(aamos));
|
||||||
|
expect(updates).toBe(0);
|
||||||
|
|
||||||
|
const items = await testDb.db
|
||||||
|
.select()
|
||||||
|
.from(schema.memoryItems)
|
||||||
|
.where(eq(schema.memoryItems.userId, userId));
|
||||||
|
expect(items).toHaveLength(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("hoppas över anropet och skriver inget när daglig budget är förbrukad", async () => {
|
||||||
|
const { userId } = await setupUserWithEvents();
|
||||||
|
const previousBudget = process.env.GEMINI_DAILY_BUDGET_USD;
|
||||||
|
process.env.GEMINI_DAILY_BUDGET_USD = "0.0005";
|
||||||
|
|
||||||
|
const budgetStore = new MemoryBudgetStore();
|
||||||
|
await budgetStore.incrementDailySpendUsd(0.0004); // redan nära taket
|
||||||
|
|
||||||
|
let called = false;
|
||||||
|
const aamos = {
|
||||||
|
async runTask() {
|
||||||
|
called = true;
|
||||||
|
return { status: "ok", output: { memoryUpdates: [] }, costUsd: 0, inputTokens: 0, outputTokens: 0 } as AamosResult<"UPDATE_USER_MEMORY">;
|
||||||
|
},
|
||||||
|
async healthCheck() {
|
||||||
|
return { ok: true };
|
||||||
|
},
|
||||||
|
} as AamosClient;
|
||||||
|
|
||||||
|
const updates = await processMemorySync(makeContext(aamos, budgetStore));
|
||||||
|
expect(updates).toBe(0);
|
||||||
|
expect(called).toBe(false);
|
||||||
|
|
||||||
|
const items = await testDb.db
|
||||||
|
.select()
|
||||||
|
.from(schema.memoryItems)
|
||||||
|
.where(eq(schema.memoryItems.userId, userId));
|
||||||
|
expect(items).toHaveLength(0);
|
||||||
|
|
||||||
|
process.env.GEMINI_DAILY_BUDGET_USD = previousBudget;
|
||||||
|
});
|
||||||
|
|
||||||
|
it("förkastar trasigt AAMOS-svar helt utan delskrivning", async () => {
|
||||||
|
const { userId } = await setupUserWithEvents();
|
||||||
|
|
||||||
|
const aamos = {
|
||||||
|
async runTask() {
|
||||||
|
return {
|
||||||
|
status: "ok",
|
||||||
|
output: { memoryUpdates: [{ broken: true }] },
|
||||||
|
costUsd: 0,
|
||||||
|
inputTokens: 0,
|
||||||
|
outputTokens: 0,
|
||||||
|
} as unknown as AamosResult<"UPDATE_USER_MEMORY">;
|
||||||
|
},
|
||||||
|
async healthCheck() {
|
||||||
|
return { ok: true };
|
||||||
|
},
|
||||||
|
} as AamosClient;
|
||||||
|
|
||||||
|
const updates = await processMemorySync(makeContext(aamos));
|
||||||
|
expect(updates).toBe(0);
|
||||||
|
|
||||||
|
const items = await testDb.db
|
||||||
|
.select()
|
||||||
|
.from(schema.memoryItems)
|
||||||
|
.where(eq(schema.memoryItems.userId, userId));
|
||||||
|
expect(items).toHaveLength(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -22,6 +22,8 @@ export interface AamosCallOptions {
|
|||||||
anonymizedImprovement: boolean;
|
anonymizedImprovement: boolean;
|
||||||
imageTraining: boolean;
|
imageTraining: boolean;
|
||||||
};
|
};
|
||||||
|
/** Systeminstruktion som skickas med till AAMOS (t.ex. anti-påhitt-regler). */
|
||||||
|
systemInstruction?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface AamosResult<T extends AamosTaskType> {
|
export interface AamosResult<T extends AamosTaskType> {
|
||||||
@@ -118,6 +120,9 @@ export class HttpAamosClient implements AamosClient {
|
|||||||
anonymizedImprovement: false,
|
anonymizedImprovement: false,
|
||||||
imageTraining: false,
|
imageTraining: false,
|
||||||
},
|
},
|
||||||
|
...(options.systemInstruction
|
||||||
|
? { systemInstruction: options.systemInstruction }
|
||||||
|
: {}),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -219,6 +224,7 @@ export class MockAamosClient implements AamosClient {
|
|||||||
async runTask<T extends AamosTaskType>(
|
async runTask<T extends AamosTaskType>(
|
||||||
taskType: T,
|
taskType: T,
|
||||||
input: TaskInput<T>,
|
input: TaskInput<T>,
|
||||||
|
_options?: AamosCallOptions,
|
||||||
): Promise<AamosResult<T>> {
|
): Promise<AamosResult<T>> {
|
||||||
const contract = TASK_CONTRACTS[taskType];
|
const contract = TASK_CONTRACTS[taskType];
|
||||||
const parsedInput = contract.input.safeParse(input);
|
const parsedInput = contract.input.safeParse(input);
|
||||||
|
|||||||
@@ -289,8 +289,27 @@ export function mockOutputFor(taskType: AamosTaskType, input: unknown): unknown
|
|||||||
case "PARSE_CRAVING":
|
case "PARSE_CRAVING":
|
||||||
return { tags: ["creamy"], cuisine: null, maxKcal: null, confidence: 0.6 };
|
return { tags: ["creamy"], cuisine: null, maxKcal: null, confidence: 0.6 };
|
||||||
|
|
||||||
case "UPDATE_USER_MEMORY":
|
case "UPDATE_USER_MEMORY": {
|
||||||
return { memoryUpdates: [] };
|
const events =
|
||||||
|
typeof input === "object" && input !== null
|
||||||
|
? ((input as { events?: Array<{ id?: string; type?: string }> }).events ?? [])
|
||||||
|
: [];
|
||||||
|
const eventIds = events.map((e) => e.id).filter((id): id is string => id != null);
|
||||||
|
if (eventIds.length === 0) return { memoryUpdates: [] };
|
||||||
|
// Mock: ett grundat förslag per faktiskt event (utan att hitta på nya).
|
||||||
|
return {
|
||||||
|
memoryUpdates: eventIds.map((id) => ({
|
||||||
|
key: `event_${id}`,
|
||||||
|
kind: "event" as const,
|
||||||
|
summarySv: "Observerad från event",
|
||||||
|
value: { eventId: id },
|
||||||
|
origin: "observed" as const,
|
||||||
|
confidence: 0.75,
|
||||||
|
expiresAt: null,
|
||||||
|
sourceEventIds: [id],
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
case "GENERATE_WEEK_PLAN":
|
case "GENERATE_WEEK_PLAN":
|
||||||
return { entries: [], confidence: 0.5 };
|
return { entries: [], confidence: 0.5 };
|
||||||
|
|||||||
@@ -377,6 +377,7 @@ export const updateUserMemoryInput = z.object({
|
|||||||
scopeId: z.string(),
|
scopeId: z.string(),
|
||||||
events: z.array(
|
events: z.array(
|
||||||
z.object({
|
z.object({
|
||||||
|
id: z.string(),
|
||||||
type: z.string(),
|
type: z.string(),
|
||||||
occurredAt: z.string(),
|
occurredAt: z.string(),
|
||||||
payload: z.unknown(),
|
payload: z.unknown(),
|
||||||
@@ -394,6 +395,8 @@ export const updateUserMemoryOutput = z.object({
|
|||||||
origin: z.enum(["observed", "ai_inferred"]),
|
origin: z.enum(["observed", "ai_inferred"]),
|
||||||
confidence,
|
confidence,
|
||||||
expiresAt: z.string().nullable().default(null),
|
expiresAt: z.string().nullable().default(null),
|
||||||
|
/** Händelse-ID:n som stödjer förslaget – obligatoriskt för grundningskoll (R1). */
|
||||||
|
sourceEventIds: z.array(z.string()).min(1),
|
||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
});
|
});
|
||||||
@@ -585,6 +588,8 @@ export const aamosRequestEnvelopeSchema = z.object({
|
|||||||
anonymizedImprovement: z.boolean(),
|
anonymizedImprovement: z.boolean(),
|
||||||
imageTraining: z.boolean(),
|
imageTraining: z.boolean(),
|
||||||
}),
|
}),
|
||||||
|
/** Extra systeminstruktion som AAMOS ska lägga till i prompten. */
|
||||||
|
systemInstruction: z.string().optional(),
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
export type AamosRequestEnvelope = z.infer<typeof aamosRequestEnvelopeSchema>;
|
export type AamosRequestEnvelope = z.infer<typeof aamosRequestEnvelopeSchema>;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { AamosClient } from "@app/ai-contracts";
|
import { TASK_CONTRACTS, type AamosClient } from "@app/ai-contracts";
|
||||||
import type { MemoryItem, MemoryKind, SignalOrigin } from "@app/shared-types";
|
import type { MemoryItem, MemoryKind, SignalOrigin } from "@app/shared-types";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -21,12 +21,14 @@ export interface MemoryUpdateProposal {
|
|||||||
origin: Exclude<SignalOrigin, "user_stated">;
|
origin: Exclude<SignalOrigin, "user_stated">;
|
||||||
confidence: number;
|
confidence: number;
|
||||||
expiresAt?: string | null;
|
expiresAt?: string | null;
|
||||||
|
/** Händelse-ID:n som stödjer förslaget (R1: grundat, aldrig påhittat). */
|
||||||
|
sourceEventIds: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface MemorySyncInput {
|
export interface MemorySyncInput {
|
||||||
scope: "user" | "household";
|
scope: "user" | "household";
|
||||||
scopeId: string;
|
scopeId: string;
|
||||||
events: Array<{ type: string; occurredAt: string; payload: unknown }>;
|
events: Array<{ id: string; type: string; occurredAt: string; payload: unknown }>;
|
||||||
existingMemoryKeys: string[];
|
existingMemoryKeys: string[];
|
||||||
consentFlags: {
|
consentFlags: {
|
||||||
personalization: boolean;
|
personalization: boolean;
|
||||||
@@ -38,15 +40,23 @@ export interface MemorySyncInput {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Kör minnesuppdatering via AAMOS. Returnerar förslag – anroparen (workern)
|
* Kör minnesuppdatering via AAMOS. Returnerar granskade förslag + faktisk
|
||||||
* persisterar dem i memory_items och publicerar MEMORY_UPDATED-event.
|
* token/kostnadsanvändning så att workern kan bokföra i ai_usage_counters.
|
||||||
* Utan personaliseringssamtycke körs ingenting.
|
* Utan personaliseringssamtycke körs ingenting.
|
||||||
|
*
|
||||||
|
* R1 (grundat, aldrig påhittat): AAMOS får explicit instruktion om att aldrig
|
||||||
|
* fabricera minnen; svaret valideras mot Zod-kontraktet.
|
||||||
*/
|
*/
|
||||||
export async function deriveMemoryUpdates(
|
export async function deriveMemoryUpdates(
|
||||||
aamos: AamosClient,
|
aamos: AamosClient,
|
||||||
input: MemorySyncInput,
|
input: MemorySyncInput,
|
||||||
): Promise<MemoryUpdateProposal[]> {
|
): Promise<{
|
||||||
if (!input.consentFlags.personalization) return [];
|
proposals: MemoryUpdateProposal[];
|
||||||
|
usage: { costUsd: number; inputTokens: number; outputTokens: number } | null;
|
||||||
|
}> {
|
||||||
|
if (!input.consentFlags.personalization) {
|
||||||
|
return { proposals: [], usage: null };
|
||||||
|
}
|
||||||
|
|
||||||
const result = await aamos.runTask(
|
const result = await aamos.runTask(
|
||||||
"UPDATE_USER_MEMORY",
|
"UPDATE_USER_MEMORY",
|
||||||
@@ -59,13 +69,36 @@ export async function deriveMemoryUpdates(
|
|||||||
{
|
{
|
||||||
subjectRef: pseudonymize(input.scopeId),
|
subjectRef: pseudonymize(input.scopeId),
|
||||||
consentFlags: input.consentFlags,
|
consentFlags: input.consentFlags,
|
||||||
|
systemInstruction:
|
||||||
|
"Du får ENDAST sammanfatta faktiska events. Hitta ALDRIG på minnen, preferenser eller mönster som inte har explicit stöd i events. Varje förslag måste referera till ett eller flera events via sourceEventIds. ai_inferred-förslag ska ha låg konfidens.",
|
||||||
...(input.localeContext ? { localeContext: input.localeContext } : {}),
|
...(input.localeContext ? { localeContext: input.localeContext } : {}),
|
||||||
...(input.correlationId ? { correlationId: input.correlationId } : {}),
|
...(input.correlationId ? { correlationId: input.correlationId } : {}),
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
if (result.status !== "ok" || !result.output) return [];
|
const usage =
|
||||||
return result.output.memoryUpdates.map((u) => ({
|
result.status === "ok" && result.output
|
||||||
|
? {
|
||||||
|
costUsd: result.costUsd ?? 0,
|
||||||
|
inputTokens: result.inputTokens ?? 0,
|
||||||
|
outputTokens: result.outputTokens ?? 0,
|
||||||
|
}
|
||||||
|
: null;
|
||||||
|
|
||||||
|
if (result.status !== "ok" || !result.output) {
|
||||||
|
return { proposals: [], usage };
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extra Zod-validering: ett brutet kontrakt ska aldrig nå användardata.
|
||||||
|
const parsed = TASK_CONTRACTS["UPDATE_USER_MEMORY"].output.safeParse(result.output);
|
||||||
|
if (!parsed.success) {
|
||||||
|
// eslint-disable-next-line no-console
|
||||||
|
console.error("UPDATE_USER_MEMORY output bröt mot kontraktet:", parsed.error.message);
|
||||||
|
return { proposals: [], usage };
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
proposals: parsed.data.memoryUpdates.map((u) => ({
|
||||||
key: u.key,
|
key: u.key,
|
||||||
kind: u.kind,
|
kind: u.kind,
|
||||||
summarySv: u.summarySv,
|
summarySv: u.summarySv,
|
||||||
@@ -73,7 +106,10 @@ export async function deriveMemoryUpdates(
|
|||||||
origin: u.origin,
|
origin: u.origin,
|
||||||
confidence: u.confidence,
|
confidence: u.confidence,
|
||||||
expiresAt: u.expiresAt,
|
expiresAt: u.expiresAt,
|
||||||
}));
|
sourceEventIds: u.sourceEventIds,
|
||||||
|
})),
|
||||||
|
usage,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface MemoryOverviewItem extends MemoryItem {
|
export interface MemoryOverviewItem extends MemoryItem {
|
||||||
|
|||||||
Reference in New Issue
Block a user