ima2-gen 1.1.21 → 1.1.22

package/lib/cardNewsGenerator.ts

@@ -1,271 +0,0 @@
-import { mkdir, writeFile } from "node:fs/promises";
-import { join } from "node:path";
-import { ulid } from "ulid";
-import { generateViaOAuth } from "./oauthProxy.js";
-import type { OAuthReferenceRef } from "./oauthProxy/references.js";
-import { readTemplateBaseB64 } from "./cardNewsTemplateStore.js";
-import { writeCardNewsManifest, writeCardSidecar } from "./cardNewsManifestStore.js";
-import { invalidateHistoryIndex } from "./historyIndex.js";
-import { requireRuntimeContext, type RouteRuntimeContext } from "./runtimeContext.js";
-
-import { errInfo } from "./errInfo.js";
-
-interface CardTextField {
-  renderMode?: string;
-  text?: string;
-  kind?: string;
-  placement?: string;
-  slotId?: string;
-  [key: string]: unknown;
-}
-
-interface CardInput {
-  id?: string;
-  cardOrder?: number;
-  order?: number;
-  role?: string;
-  headline?: string;
-  body?: string;
-  visualPrompt?: string;
-  textFields?: CardTextField[] | unknown;
-  references?: unknown[];
-  locked?: boolean;
-  [key: string]: unknown;
-}
-
-interface CardTemplate {
-  stylePrompt?: string;
-  negativePrompt?: string;
-  size?: string;
-  [key: string]: unknown;
-}
-
-interface GenerateCardSetInput {
-  setId?: string;
-  cards?: CardInput[];
-  imageTemplateId?: string;
-  quality?: string;
-  size?: string;
-  moderation?: string;
-  model?: string;
-  concurrency?: number | string;
-  requestId?: string;
-  promptMode?: string;
-  sessionId?: string | null;
-  title?: string;
-  roleTemplateId?: string;
-  [key: string]: unknown;
-}
-
-export interface CardSidecar {
-  kind: string;
-  setId: string;
-  sessionId: string | null;
-  requestId: string;
-  cardId: string;
-  cardOrder: number;
-  title: string;
-  role: string;
-  headline: string;
-  body: string;
-  textFields: CardTextField[] | unknown[];
-  imageTemplateId: string;
-  generationStrategy: string;
-  templateBase: string;
-  prompt: string;
-  visualPrompt: string;
-  imageFilename: string | null;
-  sidecarFilename: string;
-  locked: boolean;
-  status: string;
-  error: { code: string; message: string } | null;
-  createdAt: number;
-  generatedAt: number | null;
-  revisedPrompt: string | null;
-  [key: string]: unknown;
-}
-
-export interface CardStart {
-  cardOrder: number;
-  cardId: string;
-  [key: string]: unknown;
-}
-
-interface GenerateCardSetOptions {
-  generateFn?: (
-    prompt: string,
-    quality: string,
-    size: string,
-    moderation?: string,
-    references?: OAuthReferenceRef[],
-    requestId?: string | null,
-    mode?: string,
-    ctx?: RouteRuntimeContext,
-    options?: any,
-  ) => Promise<{ b64: string; revisedPrompt?: string | null; usage?: unknown; webSearchCalls?: number }>;
-  onCardStart?: (card: CardStart) => void | Promise<void>;
-  onCardDone?: (sidecar: CardSidecar) => void | Promise<void>;
-}
-
-function formatRenderedTextInstruction(textFields: CardTextField[] = []) {
-  const visible = (Array.isArray(textFields) ? textFields : [])
-    .filter((field: CardTextField) => field?.renderMode === "in-image" && field.text);
-  if (!visible.length) {
-    return [
-      "Do not render readable text unless explicitly listed.",
-      "If visible text is required, it must be listed explicitly in textFields[].text in the target language/script.",
-      "Do not render role labels, schema keys, placeholder labels, or untranslated summaries.",
-    ].join("\n");
-  }
-  return [
-    "Render only the following readable text items exactly as written:",
-    ...visible.map((field: CardTextField) => {
-      const slot = field.slotId ? ` in slot ${field.slotId}` : "";
-      return `- ${field.kind} at ${field.placement}${slot}: "${field.text}"`;
-    }),
-    "Preserve the language and spelling of every listed text item.",
-    "Do not translate, romanize, summarize, substitute, or add unlisted readable text.",
-    "Do not render role labels, schema keys, placeholder labels, or extra text.",
-  ].join("\n");
-}
-
-export function assemblePrompt(template: CardTemplate, card: CardInput) {
-  return [
-    template.stylePrompt,
-    card.visualPrompt,
-    formatRenderedTextInstruction(Array.isArray(card.textFields) ? card.textFields as CardTextField[] : []),
-    template.negativePrompt ? `Avoid: ${template.negativePrompt}` : "",
-  ].filter(Boolean).join("\n");
-}
-
-async function mapLimit<T, R>(items: T[], limit: number, fn: (item: T, index: number) => Promise<R>): Promise<R[]> {
-  const out: R[] = new Array(items.length);
-  let next = 0;
-  async function worker() {
-    while (next < items.length) {
-      const i = next++;
-      out[i] = await fn(items[i] as T, i);
-    }
-  }
-  await Promise.all(Array.from({ length: Math.min(limit, items.length) }, worker));
-  return out;
-}
-
-export async function generateCardNewsSet(ctxIn: RouteRuntimeContext, input: GenerateCardSetInput, options: GenerateCardSetOptions = {}) {
-  const ctx = requireRuntimeContext(ctxIn);
-  const setId = input.setId || `cs_${ulid()}`;
-  const cards = Array.isArray(input.cards) ? input.cards : [];
-  const cardsToGenerate = cards.filter((card) => !card.locked);
-  if (cardsToGenerate.length === 0) {
-    const err: any = new Error("cards are required");
-    err.status = 400;
-    err.code = "CARD_NEWS_CARDS_REQUIRED";
-    throw err;
-  }
-
-  const imageTemplateId = input.imageTemplateId || "academy-lesson-square";
-  const { template, templateBase, b64: templateB64 } = await readTemplateBaseB64(ctx, imageTemplateId);
-  const dir = join(ctx.config.storage.generatedDir, "cardnews", setId);
-  await mkdir(dir, { recursive: true });
-
-  const quality = input.quality || "medium";
-  const size = input.size || template.size || "2048x2048";
-  const moderation = input.moderation || "low";
-  const model = input.model || ctx.config.imageModels.default;
-  const generateFn = options.generateFn || generateViaOAuth;
-
-  const generatedCards = await mapLimit(cardsToGenerate, Number(input.concurrency) || 2, async (card: CardInput, index: number) => {
-    const cardOrder = Number(card.cardOrder || card.order || index + 1);
-    const baseFilename = `card-${String(cardOrder).padStart(2, "0")}`;
-    const imageFilename = `${baseFilename}.png`;
-    const sidecarFilename = `${baseFilename}.json`;
-    const requestId = input.requestId || `${setId}_${baseFilename}`;
-    const prompt = assemblePrompt(template, card);
-    let result: { b64?: string; revisedPrompt?: string | null } | null = null;
-    let error: { code: string; message: string } | null = null;
-    if (typeof options.onCardStart === "function") {
-      await options.onCardStart({ ...card, cardOrder, cardId: card.id || `card_${cardOrder}` });
-    }
-    try {
-      result = await generateFn(
-        prompt,
-        quality,
-        size,
-        moderation,
-        [templateB64, ...(Array.isArray(card.references) ? (card.references as string[]) : [])],
-        requestId,
-        input.promptMode || "direct",
-        ctx,
-        { model },
-      );
-      if (!result?.b64) {
-        error = { code: "CARD_NEWS_EMPTY_IMAGE", message: "No image data returned" };
-      } else {
-        await writeFile(join(dir, imageFilename), Buffer.from(result.b64, "base64"));
-        invalidateHistoryIndex();
-      }
-    } catch (e) {
-      const err = errInfo(e);
-      error = { code: err.code || "CARD_NEWS_CARD_FAILED", message: err.message || "Card generation failed" };
-    }
-    const sidecar = {
-      kind: "card-news-card",
-      setId,
-      sessionId: input.sessionId || null,
-      requestId,
-      cardId: card.id || `card_${cardOrder}`,
-      cardOrder,
-      title: input.title || "Untitled card news",
-      role: card.role || "card",
-      headline: card.headline || "",
-      body: card.body || "",
-      textFields: Array.isArray(card.textFields) ? card.textFields : [],
-      imageTemplateId,
-      generationStrategy: "parallel-template-i2i",
-      templateBase,
-      prompt,
-      visualPrompt: card.visualPrompt || "",
-      imageFilename: error ? null : imageFilename,
-      sidecarFilename,
-      locked: !!card.locked,
-      status: error ? "error" : "generated",
-      error,
-      createdAt: Date.now(),
-      generatedAt: error ? null : Date.now(),
-      revisedPrompt: result?.revisedPrompt || null,
-    };
-    await writeCardSidecar(dir, sidecarFilename, sidecar);
-    invalidateHistoryIndex();
-    if (typeof options.onCardDone === "function") await options.onCardDone(sidecar);
-    return sidecar;
-  });
-
-  const manifest = {
-    kind: "card-news-set",
-    setId,
-    sessionId: input.sessionId || null,
-    requestId: input.requestId || null,
-    title: input.title || "Untitled card news",
-    imageTemplateId,
-    roleTemplateId: input.roleTemplateId || "mid-5",
-    generationStrategy: "parallel-template-i2i",
-    size,
-    cardCount: generatedCards.length,
-    createdAt: Date.now(),
-    cards: generatedCards,
-  };
-  await writeCardNewsManifest(ctx.config.storage.generatedDir, manifest);
-  invalidateHistoryIndex();
-  return {
-    setId,
-    manifest,
-    cards: generatedCards.map((card) => ({
-      ...card,
-      id: card.cardId,
-      order: card.cardOrder,
-      url: card.imageFilename
-        ? `/generated/cardnews/${encodeURIComponent(setId)}/${encodeURIComponent(card.imageFilename)}`
-        : undefined,
-    })),
-  };
-}

package/lib/cardNewsJobStore.ts

@@ -1,142 +0,0 @@
-import { ulid } from "ulid";
-
-interface CardNewsCard {
-  id: string;
-  order: number;
-  status: string;
-  textFields: unknown[];
-  locked?: boolean;
-  error?: string | { message?: string } | undefined;
-  [key: string]: unknown;
-}
-
-interface CardNewsPlanCard {
-  id: string;
-  order: number;
-  locked?: boolean;
-  textFields?: unknown;
-  [key: string]: unknown;
-}
-
-interface CardNewsPlan {
-  setId: string;
-  cards?: CardNewsPlanCard[];
-  [key: string]: unknown;
-}
-
-interface CardNewsJob {
-  jobId: string;
-  setId: string;
-  status: string;
-  plan: CardNewsPlan;
-  cards: CardNewsCard[];
-  createdAt: number;
-  updatedAt: number;
-  error?: string;
-}
-
-const jobs = new Map<string, CardNewsJob>();
-const TTL_MS = 30 * 60 * 1000;
-
-function summarize(job: CardNewsJob) {
-  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: CardNewsCard[]) {
-  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: CardNewsPlan) {
-  const now = Date.now();
-  const job: CardNewsJob = {
-    jobId: `cj_${ulid()}`,
-    setId: plan.setId,
-    status: "queued",
-    plan,
-    cards: (plan.cards || []).map((card): CardNewsCard => ({
-      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: string) {
-  const job = jobs.get(jobId);
-  if (!job) return null;
-  return summarize(job);
-}
-
-export function updateCardNewsJob(jobId: string, patch: Partial<CardNewsJob>) {
-  const job = jobs.get(jobId);
-  if (!job) return null;
-  Object.assign(job, patch, { updatedAt: Date.now() });
-  return summarize(job);
-}
-
-export function updateCardNewsJobCard(jobId: string, cardId: string, patch: Partial<CardNewsCard>) {
-  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: string) {
-  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: string) {
-  return jobs.get(jobId)?.plan || null;
-}
-
-export function retryCardNewsJob(jobId: string, cardIds: string[] | null | undefined) {
-  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.ts

@@ -1,154 +0,0 @@
-import { mkdir, readFile, readdir, writeFile } from "node:fs/promises";
-import { join } from "node:path";
-import { requireRuntimeContext, type RouteRuntimeContext } from "./runtimeContext.js";
-
-import { errInfo } from "./errInfo.js";
-
-interface CardNewsManifest {
-  setId: string;
-  title?: string;
-  topic?: string;
-  imageTemplateId?: string;
-  roleTemplateId?: string;
-  size?: string;
-  generationStrategy?: string;
-  cardCount?: number;
-  createdAt?: number;
-  sessionId?: string | null;
-  cards?: ManifestCard[];
-  [key: string]: unknown;
-}
-
-interface ManifestCard {
-  cardId?: string;
-  id?: string;
-  cardOrder?: number;
-  order?: number;
-  role?: string;
-  headline?: string;
-  body?: string;
-  visualPrompt?: string;
-  textFields?: unknown;
-  references?: unknown;
-  locked?: boolean;
-  status?: string;
-  error?: string | { message?: string } | null;
-  imageFilename?: string | null;
-  url?: string;
-  [key: string]: unknown;
-}
-
-export async function writeCardNewsManifest(generatedDir: string, manifest: CardNewsManifest) {
-  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: string, filename: string, sidecar: unknown) {
-  await writeFile(join(dir, filename), JSON.stringify(sidecar, null, 2));
-}
-
-function cardUrl(setId: string, imageFilename: string | null | undefined) {
-  if (!imageFilename) return undefined;
-  return `/generated/cardnews/${encodeURIComponent(setId)}/${encodeURIComponent(imageFilename)}`;
-}
-
-function assertSafeSetId(setId: unknown): string {
-  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: CardNewsManifest) {
-  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: (typeof card.error === "object" && card.error && "message" in card.error
-        ? card.error.message
-        : (typeof card.error === "string" ? card.error : undefined)),
-      imageFilename: card.imageFilename || undefined,
-      url: card.url || cardUrl(manifest.setId, card.imageFilename),
-    })),
-  };
-}
-
-export async function readCardNewsSetPlan(ctxIn: RouteRuntimeContext, setId: string) {
-  return manifestToPlan(await readCardNewsManifest(ctxIn, setId));
-}
-
-export async function readCardNewsManifest(ctxIn: RouteRuntimeContext, setId: string): Promise<CardNewsManifest> {
-  const ctx = requireRuntimeContext(ctxIn);
-  const safeSetId = assertSafeSetId(setId);
-  try {
-    const raw = await readFile(
-      join(ctx.config.storage.generatedDir, "cardnews", safeSetId, "manifest.json"),
-      "utf8",
-    );
-    return JSON.parse(raw) as CardNewsManifest;
-  } 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(ctxIn: RouteRuntimeContext) {
-  const ctx = requireRuntimeContext(ctxIn);
-  const root = join(ctx.config.storage.generatedDir, "cardnews");
-  const entries = await readdir(root, { withFileTypes: true }).catch(() => []);
-  const sets: any[] = [];
-  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) as CardNewsManifest;
-      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 (e) {
-      const err = errInfo(e);
-      console.warn("[card-news] set manifest read failed", entry.name, err.message);
-    }
-  }
-  sets.sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0));
-  return sets;
-}