@flowselections/floriday-klanten-module 1.0.36 → 1.0.37

package/dist-lib/lib/customer-stickers.functions.js

@@ -20,7 +20,7 @@ export const listCustomerStickers = createServerFn({ method: "POST" })
     const sb = context.supabase;
     const { data: rows, error } = await sb
         .from("customer_product_stickers")
-        .select("trade_item_key, file_path, file_name, mime_type, file_size, updated_at")
+        .select("trade_item_key, file_path, file_name, mime_type, file_size, updated_at, source, width_mm, height_mm")
         .eq("customer_key", data.customerKey);
     if (error)
         throw new Error(error.message);
@@ -34,6 +34,9 @@ export const listCustomerStickers = createServerFn({ method: "POST" })
             file_size: r.file_size ?? null,
             updated_at: r.updated_at,
             url: await signed(sb, r.file_path),
+            source: r.source === "floriday" ? "floriday" : "manual",
+            width_mm: r.width_mm != null ? Number(r.width_mm) : null,
+            height_mm: r.height_mm != null ? Number(r.height_mm) : null,
         });
     }
     const { data: fmt } = await sb
@@ -82,6 +85,9 @@ export const confirmStickerUpload = createServerFn({ method: "POST" })
         mime_type: data.mimeType,
         file_size: data.fileSize ?? null,
         uploaded_by: context.userId ?? null,
+        source: "manual",
+        floriday_sticker_id: null,
+        content_hash: null,
         updated_at: new Date().toISOString(),
     }, { onConflict: "customer_key,trade_item_key" });
     if (error)
@@ -275,102 +281,140 @@ export const suggestStickerMatches = createServerFn({ method: "POST" })
         (p.vbn ? ` | VBN: ${p.vbn}` : "") +
         (p.botanical ? ` | botanisch: ${p.botanical}` : ""))
         .join("\n");
-    for (let i = 0; i < remaining.length; i += 8) {
-        const batch = remaining.slice(i, i + 8);
-        const started = Date.now();
-        try {
-            const parts = [
-                {
-                    text: "Je koppelt stickerbestanden aan producten uit het assortiment van een bloemenhandel.\n" +
-                        "Producten:\n" +
-                        productList +
-                        "\n\nHieronder volgen stickers. Voor elke sticker krijg je eerst de bestandsnaam en daarna (indien beschikbaar) een afbeelding van de sticker.\n" +
-                        "Geef per sticker het best passende product terug. Kies alleen een product als je het redelijk zeker weet; anders tradeItemKey = null.\n" +
-                        'Antwoord uitsluitend als JSON-array: [{"fileId":"...","tradeItemKey":"..."|null,"confidence":0.0-1.0,"reason":"korte uitleg in het Nederlands"}]',
-                },
-            ];
-            for (const f of batch) {
-                parts.push({ text: `Sticker fileId=${f.fileId} bestandsnaam="${f.fileName}"` });
-                const t = f.thumbnail ?? "";
-                const m = /^data:([^;,]+);base64,(.+)$/.exec(t);
-                if (m)
-                    parts.push({ inline_data: { mime_type: m[1], data: m[2] } });
-            }
-            const url = model.providerSlug === "gemini"
-                ? `${model.baseUrl}/v1beta/models/${model.modelSlug}:generateContent`
-                : null;
-            if (!url) {
-                throw new Error(`AI-aanbieder "${model.providerSlug}" wordt hier nog niet ondersteund. Kies een Gemini-model bij AI-authenticatie.`);
+    let aiError = null;
+    for (let i = 0; i < remaining.length; i += 4) {
+        const batch = remaining.slice(i, i + 4);
+        const parts = [
+            {
+                text: "Je koppelt stickerbestanden aan producten uit het assortiment van een bloemenhandel.\n" +
+                    "Producten:\n" +
+                    productList +
+                    "\n\nHieronder volgen stickers. Voor elke sticker krijg je eerst de bestandsnaam en daarna (indien beschikbaar) een afbeelding van de sticker.\n" +
+                    "Geef per sticker het best passende product terug. Kies alleen een product als je het redelijk zeker weet; anders tradeItemKey = null.\n" +
+                    'Antwoord uitsluitend als JSON-array: [{"fileId":"...","tradeItemKey":"..."|null,"confidence":0.0-1.0,"reason":"korte uitleg in het Nederlands"}]',
+            },
+        ];
+        for (const f of batch) {
+            parts.push({ text: `Sticker fileId=${f.fileId} bestandsnaam="${f.fileName}"` });
+            const t = f.thumbnail ?? "";
+            const m = /^data:([^;,]+);base64,(.+)$/.exec(t);
+            if (m)
+                parts.push({ inline_data: { mime_type: m[1], data: m[2] } });
+        }
+        const url = model.providerSlug === "gemini"
+            ? `${model.baseUrl}/v1beta/models/${model.modelSlug}:generateContent`
+            : null;
+        if (!url) {
+            throw new Error(`AI-aanbieder "${model.providerSlug}" wordt hier nog niet ondersteund. Kies een Gemini-model bij AI-authenticatie.`);
+        }
+        let json = null;
+        let lastMessage = "AI-herkenning mislukt.";
+        for (let attempt = 0; attempt < 4; attempt++) {
+            const started = Date.now();
+            let res;
+            try {
+                res = await fetch(url, {
+                    method: "POST",
+                    headers: { "Content-Type": "application/json", "x-goog-api-key": model.apiKey },
+                    body: JSON.stringify({
+                        contents: [{ role: "user", parts }],
+                        generationConfig: { responseMimeType: "application/json", temperature: 0 },
+                    }),
+                });
             }
-            const res = await fetch(url, {
-                method: "POST",
-                headers: { "Content-Type": "application/json", "x-goog-api-key": model.apiKey },
-                body: JSON.stringify({
-                    contents: [{ role: "user", parts }],
-                    generationConfig: { responseMimeType: "application/json", temperature: 0 },
-                }),
-            });
-            if (!res.ok) {
-                const body = await res.text();
+            catch (e) {
+                lastMessage = "De AI-dienst is niet bereikbaar. Probeer het zo nog eens.";
                 await logAiCall({
                     moduleKey: AI_MODULE_KEY,
                     providerSlug: model.providerSlug,
                     modelSlug: model.modelSlug,
                     status: "error",
                     durationMs: Date.now() - started,
-                    errorCode: String(res.status),
-                    errorMessage: body.slice(0, 500),
+                    errorCode: "network",
+                    errorMessage: e instanceof Error ? e.message.slice(0, 500) : null,
                     createdBy: context.userId ?? null,
                 });
-                if (res.status === 401 || res.status === 403) {
-                    throw new Error("De AI-sleutel wordt geweigerd. Controleer de sleutel bij AI-authenticatie.");
-                }
-                if (res.status === 429) {
-                    throw new Error("De AI-dienst is tijdelijk overbelast. Probeer het zo nog eens.");
-                }
-                throw new Error(`De AI-dienst gaf een fout (${res.status}).`);
-            }
-            const json = await res.json();
-            const text = json?.candidates?.[0]?.content?.parts?.map((p) => p?.text ?? "").join("") ?? "";
-            const cleaned = text.trim().replace(/^```(?:json)?/i, "").replace(/```$/, "");
-            let parsed = [];
-            try {
-                parsed = JSON.parse(cleaned);
-            }
-            catch {
-                parsed = [];
+                await new Promise((r) => setTimeout(r, 1500 * 2 ** attempt));
+                continue;
             }
-            const validKeys = new Set(products.map((p) => p.key));
-            for (const row of Array.isArray(parsed) ? parsed : []) {
-                const fileId = String(row?.fileId ?? "");
-                if (!batch.some((b) => b.fileId === fileId))
-                    continue;
-                const key = row?.tradeItemKey ? String(row.tradeItemKey) : null;
-                suggestions.push({
-                    fileId,
-                    tradeItemKey: key && validKeys.has(key) ? key : null,
-                    confidence: Number.isFinite(Number(row?.confidence)) ? Number(row.confidence) : 0,
-                    reason: row?.reason ? String(row.reason).slice(0, 200) : null,
+            if (res.ok) {
+                json = await res.json();
+                await logAiCall({
+                    moduleKey: AI_MODULE_KEY,
+                    providerSlug: model.providerSlug,
+                    modelSlug: model.modelSlug,
+                    status: "success",
+                    durationMs: Date.now() - started,
+                    createdBy: context.userId ?? null,
                 });
+                break;
             }
-            for (const b of batch) {
-                if (!suggestions.some((s) => s.fileId === b.fileId)) {
-                    suggestions.push({ fileId: b.fileId, tradeItemKey: null, confidence: 0, reason: null });
-                }
-            }
+            const body = await res.text();
             await logAiCall({
                 moduleKey: AI_MODULE_KEY,
                 providerSlug: model.providerSlug,
                 modelSlug: model.modelSlug,
-                status: "success",
+                status: "error",
                 durationMs: Date.now() - started,
+                errorCode: String(res.status),
+                errorMessage: body.slice(0, 500),
                 createdBy: context.userId ?? null,
             });
+            if (res.status === 401 || res.status === 403) {
+                throw new Error("De AI-sleutel wordt geweigerd. Controleer de sleutel bij AI-authenticatie.");
+            }
+            if (res.status === 400 || res.status === 404) {
+                throw new Error(`Het ingestelde AI-model werd geweigerd (${res.status}). Controleer het model bij AI-authenticatie.`);
+            }
+            if (res.status === 429 || res.status >= 500) {
+                lastMessage =
+                    "De AI-dienst is tijdelijk overbelast. De stickers zijn geüpload; koppel ze handmatig of probeer de herkenning zo nog eens.";
+                const retryAfter = Number(res.headers.get("retry-after"));
+                const waitMs = Number.isFinite(retryAfter) && retryAfter > 0
+                    ? retryAfter * 1000
+                    : 1500 * 2 ** attempt;
+                if (attempt < 3)
+                    await new Promise((r) => setTimeout(r, waitMs));
+                continue;
+            }
+            throw new Error(`De AI-dienst gaf een fout (${res.status}).`);
         }
-        catch (e) {
-            throw e instanceof Error ? e : new Error("AI-herkenning mislukt.");
+        if (!json) {
+            aiError = lastMessage;
+            for (const b of batch) {
+                suggestions.push({ fileId: b.fileId, tradeItemKey: null, confidence: 0, reason: null });
+            }
+            continue;
+        }
+        const text = json?.candidates?.[0]?.content?.parts?.map((p) => p?.text ?? "").join("") ?? "";
+        const cleaned = text.trim().replace(/^```(?:json)?/i, "").replace(/```$/, "");
+        let parsed = [];
+        try {
+            parsed = JSON.parse(cleaned);
+        }
+        catch {
+            parsed = [];
+        }
+        const validKeys = new Set(products.map((p) => p.key));
+        for (const row of Array.isArray(parsed) ? parsed : []) {
+            const fileId = String(row?.fileId ?? "");
+            if (!batch.some((b) => b.fileId === fileId))
+                continue;
+            const key = row?.tradeItemKey ? String(row.tradeItemKey) : null;
+            suggestions.push({
+                fileId,
+                tradeItemKey: key && validKeys.has(key) ? key : null,
+                confidence: Number.isFinite(Number(row?.confidence)) ? Number(row.confidence) : 0,
+                reason: row?.reason ? String(row.reason).slice(0, 200) : null,
+            });
+        }
+        for (const b of batch) {
+            if (!suggestions.some((s) => s.fileId === b.fileId)) {
+                suggestions.push({ fileId: b.fileId, tradeItemKey: null, confidence: 0, reason: null });
+            }
         }
     }
+    return { suggestions, aiError };
     return { suggestions };
 });
 export const commitStickerBatch = createServerFn({ method: "POST" })
@@ -430,6 +474,9 @@ export const commitStickerBatch = createServerFn({ method: "POST" })
                 mime_type: it.mimeType,
                 file_size: it.fileSize ?? null,
                 uploaded_by: context.userId ?? null,
+                source: "manual",
+                floriday_sticker_id: null,
+                content_hash: null,
                 updated_at: new Date().toISOString(),
             }, { onConflict: "customer_key,trade_item_key" });
             if (upErr)