ima2-gen 1.1.7 → 1.1.9

package/lib/cardNewsPlannerClient.js

@@ -1,114 +1,117 @@
 import { config } from "../config.js";
 import { CARD_NEWS_PLANNER_SCHEMA } from "./cardNewsPlannerSchema.js";
 import { logEvent } from "./logger.js";
-
 function plannerError(message, code, status = 502) {
-  const err = new Error(message);
-  err.code = code;
-  err.status = status;
-  return err;
+    const err = new Error(message);
+    err.code = code;
+    err.status = status;
+    return err;
 }
-
 function extractText(json) {
-  if (typeof json.output_text === "string") return json.output_text;
-  for (const item of json.output || []) {
-    for (const content of item.content || []) {
-      if (typeof content.text === "string") return content.text;
-      if (typeof content.value === "string") return content.value;
+    if (typeof json.output_text === "string")
+        return json.output_text;
+    for (const item of json.output || []) {
+        for (const content of item.content || []) {
+            if (typeof content.text === "string")
+                return content.text;
+            if (typeof content.value === "string")
+                return content.value;
+        }
     }
-  }
-  return "";
+    return "";
 }
-
 async function requestJson({ oauthUrl, model, messages, timeoutMs, structured, reasoningEffort }) {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    const body = {
-      model,
-      input: messages,
-      stream: false,
-      ...(reasoningEffort ? { reasoning: { effort: reasoningEffort } } : {}),
-      ...(structured
-        ? {
-            text: {
-              format: {
-                type: "json_schema",
-                name: "card_news_planner_output",
-                strict: true,
-                schema: CARD_NEWS_PLANNER_SCHEMA,
-              },
-            },
-          }
-        : { text: { format: { type: "json_object" } } }),
-    };
-    const res = await fetch(`${oauthUrl}/v1/responses`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      signal: controller.signal,
-      body: JSON.stringify(body),
-    });
-    logEvent("card-news-planner", "response", { model, status: res.status, structured });
-    if (!res.ok) {
-      const text = await res.text();
-      const err = plannerError("Planner upstream failed", "PLANNER_UPSTREAM_FAILED", 502);
-      err.upstreamStatus = res.status;
-      err.upstreamBodyChars = text.length;
-      throw err;
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
+    try {
+        const body = {
+            model,
+            input: messages,
+            stream: false,
+            ...(reasoningEffort ? { reasoning: { effort: reasoningEffort } } : {}),
+            ...(structured
+                ? {
+                    text: {
+                        format: {
+                            type: "json_schema",
+                            name: "card_news_planner_output",
+                            strict: true,
+                            schema: CARD_NEWS_PLANNER_SCHEMA,
+                        },
+                    },
+                }
+                : { text: { format: { type: "json_object" } } }),
+        };
+        const res = await fetch(`${oauthUrl}/v1/responses`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            signal: controller.signal,
+            body: JSON.stringify(body),
+        });
+        logEvent("card-news-planner", "response", { model, status: res.status, structured });
+        if (!res.ok) {
+            const text = await res.text();
+            const err = plannerError("Planner upstream failed", "PLANNER_UPSTREAM_FAILED", 502);
+            err.upstreamStatus = res.status;
+            err.upstreamBodyChars = text.length;
+            throw err;
+        }
+        const json = await res.json();
+        return extractText(json);
+    }
+    finally {
+        clearTimeout(timer);
     }
-    const json = await res.json();
-    return extractText(json);
-  } finally {
-    clearTimeout(timer);
-  }
 }
-
 async function requestChatJson({ oauthUrl, model, messages, timeoutMs }) {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    const res = await fetch(`${oauthUrl}/v1/chat/completions`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      signal: controller.signal,
-      body: JSON.stringify({
-        model,
-        messages,
-        response_format: { type: "json_object" },
-      }),
-    });
-    logEvent("card-news-planner", "chat_response", { model, status: res.status });
-    if (!res.ok) {
-      const text = await res.text();
-      const err = plannerError("Planner upstream failed", "PLANNER_UPSTREAM_FAILED", 502);
-      err.upstreamStatus = res.status;
-      err.upstreamBodyChars = text.length;
-      throw err;
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
+    try {
+        const res = await fetch(`${oauthUrl}/v1/chat/completions`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            signal: controller.signal,
+            body: JSON.stringify({
+                model,
+                messages,
+                response_format: { type: "json_object" },
+            }),
+        });
+        logEvent("card-news-planner", "chat_response", { model, status: res.status });
+        if (!res.ok) {
+            const text = await res.text();
+            const err = plannerError("Planner upstream failed", "PLANNER_UPSTREAM_FAILED", 502);
+            err.upstreamStatus = res.status;
+            err.upstreamBodyChars = text.length;
+            throw err;
+        }
+        const json = await res.json();
+        return json.choices?.[0]?.message?.content || "";
+    }
+    finally {
+        clearTimeout(timer);
     }
-    const json = await res.json();
-    return json.choices?.[0]?.message?.content || "";
-  } finally {
-    clearTimeout(timer);
-  }
 }
-
 export async function requestCardNewsPlannerJson(input, options = {}) {
-  const oauthUrl = options.oauthUrl || `http://127.0.0.1:${config.oauth.proxyPort}`;
-  const model = options.model || config.cardNewsPlanner.model;
-  const timeoutMs = options.timeoutMs || config.cardNewsPlanner.timeoutMs;
-  const reasoningEffort = options.reasoningEffort || config.imageModels?.reasoningEffort || "medium";
-  let text = "";
-  let mode = "structured-output";
-  try {
-    text = await requestJson({ oauthUrl, model, messages: input.messages, timeoutMs, structured: true, reasoningEffort });
-  } catch (err) {
-    if (err.code !== "PLANNER_UPSTREAM_FAILED") throw err;
-    mode = "json-mode";
-    text = await requestChatJson({ oauthUrl, model, messages: input.messages, timeoutMs });
-  }
-  try {
-    return { output: JSON.parse(text), mode, model };
-  } catch {
-    throw plannerError("Planner returned invalid JSON", "PLANNER_INVALID_JSON", 502);
-  }
+    const oauthUrl = options.oauthUrl || `http://127.0.0.1:${config.oauth.proxyPort}`;
+    const model = options.model || config.cardNewsPlanner.model;
+    const timeoutMs = options.timeoutMs || config.cardNewsPlanner.timeoutMs;
+    const reasoningEffort = options.reasoningEffort || config.imageModels?.reasoningEffort || "medium";
+    let text = "";
+    let mode = "structured-output";
+    try {
+        text = await requestJson({ oauthUrl, model, messages: input.messages, timeoutMs, structured: true, reasoningEffort });
+    }
+    catch (err) {
+        if (err.code !== "PLANNER_UPSTREAM_FAILED")
+            throw err;
+        mode = "json-mode";
+        text = await requestChatJson({ oauthUrl, model, messages: input.messages, timeoutMs });
+    }
+    try {
+        return { output: JSON.parse(text), mode, model };
+    }
+    catch {
+        throw plannerError("Planner returned invalid JSON", "PLANNER_INVALID_JSON", 502);
+    }
 }

package/lib/cardNewsPlannerClient.ts

@@ -0,0 +1,114 @@
+import { config } from "../config.js";
+import { CARD_NEWS_PLANNER_SCHEMA } from "./cardNewsPlannerSchema.js";
+import { logEvent } from "./logger.js";
+
+function plannerError(message, code, status = 502) {
+  const err: any = new Error(message);
+  err.code = code;
+  err.status = status;
+  return err;
+}
+
+function extractText(json) {
+  if (typeof json.output_text === "string") return json.output_text;
+  for (const item of json.output || []) {
+    for (const content of item.content || []) {
+      if (typeof content.text === "string") return content.text;
+      if (typeof content.value === "string") return content.value;
+    }
+  }
+  return "";
+}
+
+async function requestJson({ oauthUrl, model, messages, timeoutMs, structured, reasoningEffort }) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const body = {
+      model,
+      input: messages,
+      stream: false,
+      ...(reasoningEffort ? { reasoning: { effort: reasoningEffort } } : {}),
+      ...(structured
+        ? {
+            text: {
+              format: {
+                type: "json_schema",
+                name: "card_news_planner_output",
+                strict: true,
+                schema: CARD_NEWS_PLANNER_SCHEMA,
+              },
+            },
+          }
+        : { text: { format: { type: "json_object" } } }),
+    };
+    const res = await fetch(`${oauthUrl}/v1/responses`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      signal: controller.signal,
+      body: JSON.stringify(body),
+    });
+    logEvent("card-news-planner", "response", { model, status: res.status, structured });
+    if (!res.ok) {
+      const text = await res.text();
+      const err: any = plannerError("Planner upstream failed", "PLANNER_UPSTREAM_FAILED", 502);
+      err.upstreamStatus = res.status;
+      err.upstreamBodyChars = text.length;
+      throw err;
+    }
+    const json = await res.json();
+    return extractText(json);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+async function requestChatJson({ oauthUrl, model, messages, timeoutMs }) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const res = await fetch(`${oauthUrl}/v1/chat/completions`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      signal: controller.signal,
+      body: JSON.stringify({
+        model,
+        messages,
+        response_format: { type: "json_object" },
+      }),
+    });
+    logEvent("card-news-planner", "chat_response", { model, status: res.status });
+    if (!res.ok) {
+      const text = await res.text();
+      const err: any = plannerError("Planner upstream failed", "PLANNER_UPSTREAM_FAILED", 502);
+      err.upstreamStatus = res.status;
+      err.upstreamBodyChars = text.length;
+      throw err;
+    }
+    const json: any = await res.json();
+    return json.choices?.[0]?.message?.content || "";
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+export async function requestCardNewsPlannerJson(input, options: any = {}) {
+  const oauthUrl = options.oauthUrl || `http://127.0.0.1:${config.oauth.proxyPort}`;
+  const model = options.model || config.cardNewsPlanner.model;
+  const timeoutMs = options.timeoutMs || config.cardNewsPlanner.timeoutMs;
+  const reasoningEffort = options.reasoningEffort || config.imageModels?.reasoningEffort || "medium";
+  let text = "";
+  let mode = "structured-output";
+  try {
+    text = await requestJson({ oauthUrl, model, messages: input.messages, timeoutMs, structured: true, reasoningEffort });
+  } catch (err: any) {
+    if (err.code !== "PLANNER_UPSTREAM_FAILED") throw err;
+    mode = "json-mode";
+    text = await requestChatJson({ oauthUrl, model, messages: input.messages, timeoutMs });
+  }
+  try {
+    return { output: JSON.parse(text), mode, model };
+  } catch {
+    throw plannerError("Planner returned invalid JSON", "PLANNER_INVALID_JSON", 502);
+  }
+}

package/lib/cardNewsPlannerPrompt.js

@@ -1,60 +1,60 @@
 export function buildCardNewsPlannerMessages(input = {}) {
-  const roleTemplate = input.roleTemplate || {};
-  const imageTemplate = input.imageTemplate || {};
-  return [
-    {
-      role: "developer",
-      content: [
-        "You are a Card News planning assistant.",
-        "Return JSON only. Do not call image tools. Do not generate images.",
-        "Keep the selected card count and role order exactly.",
-        "Preserve the user's original language for headline, body, textFields, and visualPrompt.",
-        "Do not translate to English unless explicitly requested.",
-        "If the user mixes languages, preserve the mix.",
-        "If the user provides exact text, preserve it exactly.",
-        "Role names such as cover/problem/cta are structural labels, not visible design text.",
-        "Keep headline and body as UI/manifest text.",
-        "Only textFields[].text with renderMode=\"in-image\" is intended to appear inside the image.",
-        "Create textFields only for text that should be readable inside the image.",
-        "Prefer template slot ids and placements when assigning textFields.",
-        "Use headline textFields for hook/cover cards, body or caption textFields for explanation cards, and cta textFields only for action cards.",
-        "Never put structural role labels such as CTA, cover, problem, insight, or example into textFields unless the user explicitly requested that exact visible wording.",
-        "Placement examples: top-right badge, top-center headline, center-left supporting caption, bottom-center CTA.",
-        "Make visualPrompt describe scene, layout, style, spatial composition, and text-box placement only.",
-        "Do not duplicate visible text in visualPrompt except to reference a text box position.",
-        "visualPrompt may mention a text box location, but the exact readable copy must live only in textFields[].text.",
-      ].join("\n"),
-    },
-    {
-      role: "user",
-      content: JSON.stringify({
-        topic: input.topic || "",
-        audience: input.audience || "",
-        goal: input.goal || "",
-        contentBrief: input.contentBrief || "",
-        size: input.size || "2048x2048",
-        imageTemplate: {
-          id: imageTemplate.id,
-          name: imageTemplate.name,
-          stylePrompt: imageTemplate.stylePrompt,
-          recommendedOutputSizes: imageTemplate.recommendedOutputSizes || [],
-          slots: imageTemplate.slots || [],
-          palette: imageTemplate.palette || [],
+    const roleTemplate = input.roleTemplate || {};
+    const imageTemplate = input.imageTemplate || {};
+    return [
+        {
+            role: "developer",
+            content: [
+                "You are a Card News planning assistant.",
+                "Return JSON only. Do not call image tools. Do not generate images.",
+                "Keep the selected card count and role order exactly.",
+                "Preserve the user's original language for headline, body, textFields, and visualPrompt.",
+                "Do not translate to English unless explicitly requested.",
+                "If the user mixes languages, preserve the mix.",
+                "If the user provides exact text, preserve it exactly.",
+                "Role names such as cover/problem/cta are structural labels, not visible design text.",
+                "Keep headline and body as UI/manifest text.",
+                "Only textFields[].text with renderMode=\"in-image\" is intended to appear inside the image.",
+                "Create textFields only for text that should be readable inside the image.",
+                "Prefer template slot ids and placements when assigning textFields.",
+                "Use headline textFields for hook/cover cards, body or caption textFields for explanation cards, and cta textFields only for action cards.",
+                "Never put structural role labels such as CTA, cover, problem, insight, or example into textFields unless the user explicitly requested that exact visible wording.",
+                "Placement examples: top-right badge, top-center headline, center-left supporting caption, bottom-center CTA.",
+                "Make visualPrompt describe scene, layout, style, spatial composition, and text-box placement only.",
+                "Do not duplicate visible text in visualPrompt except to reference a text box position.",
+                "visualPrompt may mention a text box location, but the exact readable copy must live only in textFields[].text.",
+            ].join("\n"),
         },
-        roleTemplate: {
-          id: roleTemplate.id,
-          roles: (roleTemplate.roles || []).map((role) => ({
-            role: role.role,
-            promptHint: role.promptHint,
-            preferredSlots: role.preferredSlots || [],
-          })),
+        {
+            role: "user",
+            content: JSON.stringify({
+                topic: input.topic || "",
+                audience: input.audience || "",
+                goal: input.goal || "",
+                contentBrief: input.contentBrief || "",
+                size: input.size || "2048x2048",
+                imageTemplate: {
+                    id: imageTemplate.id,
+                    name: imageTemplate.name,
+                    stylePrompt: imageTemplate.stylePrompt,
+                    recommendedOutputSizes: imageTemplate.recommendedOutputSizes || [],
+                    slots: imageTemplate.slots || [],
+                    palette: imageTemplate.palette || [],
+                },
+                roleTemplate: {
+                    id: roleTemplate.id,
+                    roles: (roleTemplate.roles || []).map((role) => ({
+                        role: role.role,
+                        promptHint: role.promptHint,
+                        preferredSlots: role.preferredSlots || [],
+                    })),
+                },
+                textFieldPolicy: {
+                    visibleTextSource: "textFields[].text",
+                    renderableMode: "in-image",
+                    structuralRoleLabelsAreNotVisibleText: true,
+                },
+            }),
         },
-        textFieldPolicy: {
-          visibleTextSource: "textFields[].text",
-          renderableMode: "in-image",
-          structuralRoleLabelsAreNotVisibleText: true,
-        },
-      }),
-    },
-  ];
+    ];
 }

package/lib/cardNewsPlannerPrompt.ts

@@ -0,0 +1,60 @@
+export function buildCardNewsPlannerMessages(input: any = {}) {
+  const roleTemplate: any = input.roleTemplate || {};
+  const imageTemplate: any = input.imageTemplate || {};
+  return [
+    {
+      role: "developer",
+      content: [
+        "You are a Card News planning assistant.",
+        "Return JSON only. Do not call image tools. Do not generate images.",
+        "Keep the selected card count and role order exactly.",
+        "Preserve the user's original language for headline, body, textFields, and visualPrompt.",
+        "Do not translate to English unless explicitly requested.",
+        "If the user mixes languages, preserve the mix.",
+        "If the user provides exact text, preserve it exactly.",
+        "Role names such as cover/problem/cta are structural labels, not visible design text.",
+        "Keep headline and body as UI/manifest text.",
+        "Only textFields[].text with renderMode=\"in-image\" is intended to appear inside the image.",
+        "Create textFields only for text that should be readable inside the image.",
+        "Prefer template slot ids and placements when assigning textFields.",
+        "Use headline textFields for hook/cover cards, body or caption textFields for explanation cards, and cta textFields only for action cards.",
+        "Never put structural role labels such as CTA, cover, problem, insight, or example into textFields unless the user explicitly requested that exact visible wording.",
+        "Placement examples: top-right badge, top-center headline, center-left supporting caption, bottom-center CTA.",
+        "Make visualPrompt describe scene, layout, style, spatial composition, and text-box placement only.",
+        "Do not duplicate visible text in visualPrompt except to reference a text box position.",
+        "visualPrompt may mention a text box location, but the exact readable copy must live only in textFields[].text.",
+      ].join("\n"),
+    },
+    {
+      role: "user",
+      content: JSON.stringify({
+        topic: input.topic || "",
+        audience: input.audience || "",
+        goal: input.goal || "",
+        contentBrief: input.contentBrief || "",
+        size: input.size || "2048x2048",
+        imageTemplate: {
+          id: imageTemplate.id,
+          name: imageTemplate.name,
+          stylePrompt: imageTemplate.stylePrompt,
+          recommendedOutputSizes: imageTemplate.recommendedOutputSizes || [],
+          slots: imageTemplate.slots || [],
+          palette: imageTemplate.palette || [],
+        },
+        roleTemplate: {
+          id: roleTemplate.id,
+          roles: (roleTemplate.roles || []).map((role: any) => ({
+            role: role.role,
+            promptHint: role.promptHint,
+            preferredSlots: role.preferredSlots || [],
+          })),
+        },
+        textFieldPolicy: {
+          visibleTextSource: "textFields[].text",
+          renderableMode: "in-image",
+          structuralRoleLabelsAreNotVisibleText: true,
+        },
+      }),
+    },
+  ];
+}