ima2-gen 1.1.7 → 1.1.9

package/lib/cardNewsJobStore.ts

@@ -0,0 +1,107 @@
+import { ulid } from "ulid";
+
+const jobs = new Map();
+const TTL_MS = 30 * 60 * 1000;
+
+function summarize(job) {
+  const generated = job.cards.filter((card) => card.status === "generated").length;
+  const errors = job.cards.filter((card) => card.status === "error").length;
+  return {
+    jobId: job.jobId,
+    setId: job.setId,
+    status: job.status,
+    total: job.cards.length,
+    generated,
+    errors,
+    cards: job.cards,
+    updatedAt: job.updatedAt,
+  };
+}
+
+function statusFromCards(cards) {
+  const active = cards.some((card) => card.status === "queued" || card.status === "generating");
+  if (active) return "running";
+  const errors = cards.some((card) => card.status === "error");
+  const generated = cards.some((card) => card.status === "generated");
+  if (errors && generated) return "partial";
+  if (errors) return "error";
+  return "done";
+}
+
+export function createCardNewsJob(plan) {
+  const now = Date.now();
+  const job = {
+    jobId: `cj_${ulid()}`,
+    setId: plan.setId,
+    status: "queued",
+    plan,
+    cards: (plan.cards || []).map((card) => ({
+      id: card.id,
+      order: card.order,
+      status: card.locked ? "skipped" : "queued",
+      textFields: Array.isArray(card.textFields) ? card.textFields : [],
+    })),
+    createdAt: now,
+    updatedAt: now,
+  };
+  jobs.set(job.jobId, job);
+  return summarize(job);
+}
+
+export function getCardNewsJob(jobId) {
+  const job = jobs.get(jobId);
+  if (!job) return null;
+  return summarize(job);
+}
+
+export function updateCardNewsJob(jobId, patch) {
+  const job = jobs.get(jobId);
+  if (!job) return null;
+  Object.assign(job, patch, { updatedAt: Date.now() });
+  return summarize(job);
+}
+
+export function updateCardNewsJobCard(jobId, cardId, patch) {
+  const job = jobs.get(jobId);
+  if (!job) return null;
+  job.cards = job.cards.map((card) => (
+    card.id === cardId ? {
+      ...card,
+      ...patch,
+      textFields: Array.isArray(patch.textFields) ? patch.textFields : card.textFields,
+    } : card
+  ));
+  job.status = statusFromCards(job.cards);
+  job.updatedAt = Date.now();
+  return summarize(job);
+}
+
+export function finishCardNewsJob(jobId) {
+  const job = jobs.get(jobId);
+  if (!job) return null;
+  job.status = statusFromCards(job.cards);
+  job.updatedAt = Date.now();
+  return summarize(job);
+}
+
+export function getCardNewsJobPlan(jobId) {
+  return jobs.get(jobId)?.plan || null;
+}
+
+export function retryCardNewsJob(jobId, cardIds) {
+  const job = jobs.get(jobId);
+  if (!job) return null;
+  const wanted = new Set(cardIds || []);
+  job.cards = job.cards.map((card) => (
+    wanted.has(card.id) && card.status === "error" ? { ...card, status: "queued", error: undefined } : card
+  ));
+  job.status = "queued";
+  job.updatedAt = Date.now();
+  return summarize(job);
+}
+
+export function reapCardNewsJobs(now = Date.now()) {
+  for (const [jobId, job] of jobs.entries()) {
+    if (now - job.updatedAt > TTL_MS) jobs.delete(jobId);
+  }
+}

package/lib/cardNewsManifestStore.js

@@ -1,112 +1,107 @@
 import { mkdir, readFile, readdir, writeFile } from "node:fs/promises";
 import { join } from "node:path";
-
 export async function writeCardNewsManifest(generatedDir, manifest) {
-  const dir = join(generatedDir, "cardnews", manifest.setId);
-  await mkdir(dir, { recursive: true });
-  await writeFile(join(dir, "manifest.json"), JSON.stringify(manifest, null, 2));
-  return { dir, manifestFilename: "manifest.json" };
+    const dir = join(generatedDir, "cardnews", manifest.setId);
+    await mkdir(dir, { recursive: true });
+    await writeFile(join(dir, "manifest.json"), JSON.stringify(manifest, null, 2));
+    return { dir, manifestFilename: "manifest.json" };
 }
-
 export async function writeCardSidecar(dir, filename, sidecar) {
-  await writeFile(join(dir, filename), JSON.stringify(sidecar, null, 2));
+    await writeFile(join(dir, filename), JSON.stringify(sidecar, null, 2));
 }
-
 function cardUrl(setId, imageFilename) {
-  if (!imageFilename) return undefined;
-  return `/generated/cardnews/${encodeURIComponent(setId)}/${encodeURIComponent(imageFilename)}`;
+    if (!imageFilename)
+        return undefined;
+    return `/generated/cardnews/${encodeURIComponent(setId)}/${encodeURIComponent(imageFilename)}`;
 }
-
 function assertSafeSetId(setId) {
-  if (typeof setId === "string" && /^[a-zA-Z0-9_-]{3,120}$/.test(setId)) return setId;
-  const err = new Error("Card News set not found");
-  err.status = 404;
-  err.code = "CARD_NEWS_SET_NOT_FOUND";
-  throw err;
+    if (typeof setId === "string" && /^[a-zA-Z0-9_-]{3,120}$/.test(setId))
+        return setId;
+    const err = new Error("Card News set not found");
+    err.status = 404;
+    err.code = "CARD_NEWS_SET_NOT_FOUND";
+    throw err;
 }
-
 function manifestToPlan(manifest) {
-  return {
-    setId: manifest.setId,
-    title: manifest.title || "Untitled card news",
-    topic: manifest.topic || manifest.title || "Untitled card news",
-    imageTemplateId: manifest.imageTemplateId || "academy-lesson-square",
-    roleTemplateId: manifest.roleTemplateId || "mid-5",
-    size: manifest.size || "2048x2048",
-    generationStrategy: manifest.generationStrategy || "parallel-template-i2i",
-    cards: (manifest.cards || []).map((card, index) => ({
-      id: card.cardId || card.id || `card_${index + 1}`,
-      order: card.cardOrder || card.order || index + 1,
-      role: card.role || "card",
-      headline: card.headline || "",
-      body: card.body || "",
-      visualPrompt: card.visualPrompt || "",
-      textFields: Array.isArray(card.textFields) ? card.textFields : [],
-      references: card.references || [],
-      locked: !!card.locked,
-      status: card.status || "generated",
-      error: card.error?.message || card.error || undefined,
-      imageFilename: card.imageFilename || undefined,
-      url: card.url || cardUrl(manifest.setId, card.imageFilename),
-    })),
-  };
+    return {
+        setId: manifest.setId,
+        title: manifest.title || "Untitled card news",
+        topic: manifest.topic || manifest.title || "Untitled card news",
+        imageTemplateId: manifest.imageTemplateId || "academy-lesson-square",
+        roleTemplateId: manifest.roleTemplateId || "mid-5",
+        size: manifest.size || "2048x2048",
+        generationStrategy: manifest.generationStrategy || "parallel-template-i2i",
+        cards: (manifest.cards || []).map((card, index) => ({
+            id: card.cardId || card.id || `card_${index + 1}`,
+            order: card.cardOrder || card.order || index + 1,
+            role: card.role || "card",
+            headline: card.headline || "",
+            body: card.body || "",
+            visualPrompt: card.visualPrompt || "",
+            textFields: Array.isArray(card.textFields) ? card.textFields : [],
+            references: card.references || [],
+            locked: !!card.locked,
+            status: card.status || "generated",
+            error: card.error?.message || card.error || undefined,
+            imageFilename: card.imageFilename || undefined,
+            url: card.url || cardUrl(manifest.setId, card.imageFilename),
+        })),
+    };
 }
-
 export async function readCardNewsSetPlan(ctx, setId) {
-  return manifestToPlan(await readCardNewsManifest(ctx, setId));
+    return manifestToPlan(await readCardNewsManifest(ctx, setId));
 }
-
 export async function readCardNewsManifest(ctx, setId) {
-  const safeSetId = assertSafeSetId(setId);
-  try {
-    const raw = await readFile(
-      join(ctx.config.storage.generatedDir, "cardnews", safeSetId, "manifest.json"),
-      "utf8",
-    );
-    return JSON.parse(raw);
-  } catch (err) {
-    if (err.code === "CARD_NEWS_SET_NOT_FOUND") throw err;
-    const notFound = new Error("Card News set not found");
-    notFound.status = 404;
-    notFound.code = "CARD_NEWS_SET_NOT_FOUND";
-    throw notFound;
-  }
+    const safeSetId = assertSafeSetId(setId);
+    try {
+        const raw = await readFile(join(ctx.config.storage.generatedDir, "cardnews", safeSetId, "manifest.json"), "utf8");
+        return JSON.parse(raw);
+    }
+    catch (err) {
+        if (err.code === "CARD_NEWS_SET_NOT_FOUND")
+            throw err;
+        const notFound = new Error("Card News set not found");
+        notFound.status = 404;
+        notFound.code = "CARD_NEWS_SET_NOT_FOUND";
+        throw notFound;
+    }
 }
-
 export async function listCardNewsSets(ctx) {
-  const root = join(ctx.config.storage.generatedDir, "cardnews");
-  const entries = await readdir(root, { withFileTypes: true }).catch(() => []);
-  const sets = [];
-  for (const entry of entries) {
-    if (!entry.isDirectory()) continue;
-    try {
-      const raw = await readFile(join(root, entry.name, "manifest.json"), "utf8");
-      const manifest = JSON.parse(raw);
-      const first = (manifest.cards || []).find((card) => card.imageFilename);
-      sets.push({
-        setId: manifest.setId || entry.name,
-        title: manifest.title || "Untitled card news",
-        cardCount: manifest.cardCount || manifest.cards?.length || 0,
-        createdAt: manifest.createdAt || 0,
-        sessionId: manifest.sessionId || null,
-        manifestUrl: `/api/cardnews/sets/${encodeURIComponent(manifest.setId || entry.name)}/manifest`,
-        folderLabel: `generated/cardnews/${manifest.setId || entry.name}`,
-        url: cardUrl(manifest.setId || entry.name, first?.imageFilename),
-        cards: (manifest.cards || []).map((card) => ({
-          id: card.cardId,
-          order: card.cardOrder,
-          headline: card.headline,
-          body: card.body,
-          textFields: Array.isArray(card.textFields) ? card.textFields : [],
-          imageFilename: card.imageFilename,
-          status: card.status || "generated",
-          url: cardUrl(manifest.setId || entry.name, card.imageFilename),
-        })),
-      });
-    } catch (err) {
-      console.warn("[card-news] set manifest read failed", entry.name, err.message);
+    const root = join(ctx.config.storage.generatedDir, "cardnews");
+    const entries = await readdir(root, { withFileTypes: true }).catch(() => []);
+    const sets = [];
+    for (const entry of entries) {
+        if (!entry.isDirectory())
+            continue;
+        try {
+            const raw = await readFile(join(root, entry.name, "manifest.json"), "utf8");
+            const manifest = JSON.parse(raw);
+            const first = (manifest.cards || []).find((card) => card.imageFilename);
+            sets.push({
+                setId: manifest.setId || entry.name,
+                title: manifest.title || "Untitled card news",
+                cardCount: manifest.cardCount || manifest.cards?.length || 0,
+                createdAt: manifest.createdAt || 0,
+                sessionId: manifest.sessionId || null,
+                manifestUrl: `/api/cardnews/sets/${encodeURIComponent(manifest.setId || entry.name)}/manifest`,
+                folderLabel: `generated/cardnews/${manifest.setId || entry.name}`,
+                url: cardUrl(manifest.setId || entry.name, first?.imageFilename),
+                cards: (manifest.cards || []).map((card) => ({
+                    id: card.cardId,
+                    order: card.cardOrder,
+                    headline: card.headline,
+                    body: card.body,
+                    textFields: Array.isArray(card.textFields) ? card.textFields : [],
+                    imageFilename: card.imageFilename,
+                    status: card.status || "generated",
+                    url: cardUrl(manifest.setId || entry.name, card.imageFilename),
+                })),
+            });
+        }
+        catch (err) {
+            console.warn("[card-news] set manifest read failed", entry.name, err.message);
+        }
     }
-  }
-  sets.sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0));
-  return sets;
+    sets.sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0));
+    return sets;
 }

package/lib/cardNewsManifestStore.ts

@@ -0,0 +1,112 @@
+import { mkdir, readFile, readdir, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+
+export async function writeCardNewsManifest(generatedDir, manifest) {
+  const dir = join(generatedDir, "cardnews", manifest.setId);
+  await mkdir(dir, { recursive: true });
+  await writeFile(join(dir, "manifest.json"), JSON.stringify(manifest, null, 2));
+  return { dir, manifestFilename: "manifest.json" };
+}
+
+export async function writeCardSidecar(dir, filename, sidecar) {
+  await writeFile(join(dir, filename), JSON.stringify(sidecar, null, 2));
+}
+
+function cardUrl(setId, imageFilename) {
+  if (!imageFilename) return undefined;
+  return `/generated/cardnews/${encodeURIComponent(setId)}/${encodeURIComponent(imageFilename)}`;
+}
+
+function assertSafeSetId(setId) {
+  if (typeof setId === "string" && /^[a-zA-Z0-9_-]{3,120}$/.test(setId)) return setId;
+  const err: any = new Error("Card News set not found");
+  err.status = 404;
+  err.code = "CARD_NEWS_SET_NOT_FOUND";
+  throw err;
+}
+
+function manifestToPlan(manifest) {
+  return {
+    setId: manifest.setId,
+    title: manifest.title || "Untitled card news",
+    topic: manifest.topic || manifest.title || "Untitled card news",
+    imageTemplateId: manifest.imageTemplateId || "academy-lesson-square",
+    roleTemplateId: manifest.roleTemplateId || "mid-5",
+    size: manifest.size || "2048x2048",
+    generationStrategy: manifest.generationStrategy || "parallel-template-i2i",
+    cards: (manifest.cards || []).map((card, index) => ({
+      id: card.cardId || card.id || `card_${index + 1}`,
+      order: card.cardOrder || card.order || index + 1,
+      role: card.role || "card",
+      headline: card.headline || "",
+      body: card.body || "",
+      visualPrompt: card.visualPrompt || "",
+      textFields: Array.isArray(card.textFields) ? card.textFields : [],
+      references: card.references || [],
+      locked: !!card.locked,
+      status: card.status || "generated",
+      error: card.error?.message || card.error || undefined,
+      imageFilename: card.imageFilename || undefined,
+      url: card.url || cardUrl(manifest.setId, card.imageFilename),
+    })),
+  };
+}
+
+export async function readCardNewsSetPlan(ctx, setId) {
+  return manifestToPlan(await readCardNewsManifest(ctx, setId));
+}
+
+export async function readCardNewsManifest(ctx, setId) {
+  const safeSetId = assertSafeSetId(setId);
+  try {
+    const raw = await readFile(
+      join(ctx.config.storage.generatedDir, "cardnews", safeSetId, "manifest.json"),
+      "utf8",
+    );
+    return JSON.parse(raw);
+  } catch (err: any) {
+    if (err.code === "CARD_NEWS_SET_NOT_FOUND") throw err;
+    const notFound: any = new Error("Card News set not found");
+    notFound.status = 404;
+    notFound.code = "CARD_NEWS_SET_NOT_FOUND";
+    throw notFound;
+  }
+}
+
+export async function listCardNewsSets(ctx) {
+  const root = join(ctx.config.storage.generatedDir, "cardnews");
+  const entries = await readdir(root, { withFileTypes: true }).catch(() => []);
+  const sets = [];
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    try {
+      const raw = await readFile(join(root, entry.name, "manifest.json"), "utf8");
+      const manifest = JSON.parse(raw);
+      const first = (manifest.cards || []).find((card) => card.imageFilename);
+      sets.push({
+        setId: manifest.setId || entry.name,
+        title: manifest.title || "Untitled card news",
+        cardCount: manifest.cardCount || manifest.cards?.length || 0,
+        createdAt: manifest.createdAt || 0,
+        sessionId: manifest.sessionId || null,
+        manifestUrl: `/api/cardnews/sets/${encodeURIComponent(manifest.setId || entry.name)}/manifest`,
+        folderLabel: `generated/cardnews/${manifest.setId || entry.name}`,
+        url: cardUrl(manifest.setId || entry.name, first?.imageFilename),
+        cards: (manifest.cards || []).map((card) => ({
+          id: card.cardId,
+          order: card.cardOrder,
+          headline: card.headline,
+          body: card.body,
+          textFields: Array.isArray(card.textFields) ? card.textFields : [],
+          imageFilename: card.imageFilename,
+          status: card.status || "generated",
+          url: cardUrl(manifest.setId || entry.name, card.imageFilename),
+        })),
+      });
+    } catch (err) {
+      console.warn("[card-news] set manifest read failed", entry.name, err.message);
+    }
+  }
+  sets.sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0));
+  return sets;
+}