@zalify/cli 0.5.0 → 0.6.1

package/dist/cli.js

@@ -11849,29 +11849,112 @@ async function workspaceSet(slugOrId) {
 
 // src/images.ts
 import { createHash as createHash2 } from "node:crypto";
-import { readFileSync as readFileSync3, writeFileSync as writeFileSync4, existsSync as existsSync3 } from "node:fs";
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync4, existsSync as existsSync3, rmSync as rmSync2 } from "node:fs";
 import { join as join3, resolve as resolve2 } from "node:path";
-var BATCH2 = 20;
-async function imagesGenerate(storeDir) {
-  const auth = requireActive();
-  const imagesDir = join3(resolve2(storeDir), "images");
-  const manifestPath = join3(imagesDir, "manifest.json");
-  if (!existsSync3(manifestPath)) {
-    throw new Error(`No images/manifest.json in ${storeDir}`);
+var MAX_JOBS_PER_REQUEST = 40;
+var POLL_INTERVAL_MS = 5000;
+var POLL_TIMEOUT_MS = 30 * 60 * 1000;
+var STREAM_BATCH = 20;
+function buildPrompt(manifest, entry) {
+  const style = entry.type === "model" ? manifest.modelStyle ?? manifest.style : manifest.style;
+  return `${style}
+
+${entry.prompt}`;
+}
+function apiError(auth, label, status, json) {
+  if (json.code === "UPGRADE_REQUIRED") {
+    return new Error(`${json.error ?? "Paid plan required."}
+  Upgrade: ${auth.appUrl}/store/${auth.workspaceSlug}/settings/billing`);
   }
-  const manifest = JSON.parse(readFileSync3(manifestPath, "utf8"));
-  const indexPath = join3(imagesDir, "assets.json");
-  const index = existsSync3(indexPath) ? JSON.parse(readFileSync3(indexPath, "utf8")) : {};
-  const missing = manifest.images.filter((e) => !existsSync3(join3(imagesDir, e.file)));
-  if (missing.length === 0) {
-    console.log("All manifest images already exist locally.");
-    return;
+  return new Error(`${label} ${status}: ${JSON.stringify(json)}`);
+}
+function sleep(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}
+async function saveProduced(imagesDir, indexPath, index, file2, asset) {
+  const img = await fetch(asset.url);
+  if (!img.ok) {
+    console.error(`  ✗ ${file2}: download ${img.status}`);
+    return false;
   }
-  console.log(`Generating ${missing.length} image(s) on Zalify (workspace "${auth.workspaceName}")…`);
-  let produced = 0;
-  let failed = 0;
-  for (let i = 0;i < missing.length; i += BATCH2) {
-    const batch = missing.slice(i, i + BATCH2);
+  const bytes = Buffer.from(await img.arrayBuffer());
+  writeFileSync4(join3(imagesDir, file2), bytes);
+  index[file2] = {
+    assetId: asset.id,
+    url: asset.url,
+    checksum: createHash2("sha256").update(bytes).digest("hex")
+  };
+  writeFileSync4(indexPath, JSON.stringify(index, null, 2) + `
+`);
+  return true;
+}
+async function submitJob(auth, manifest, entries) {
+  const res = await fetch(`${auth.appUrl}/api/images/jobs`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${auth.key}`
+    },
+    body: JSON.stringify({
+      workspaceId: auth.workspaceId,
+      jobs: entries.map((e) => ({
+        prompt: buildPrompt(manifest, e),
+        size: "1024x1024",
+        count: 1
+      }))
+    })
+  });
+  if (res.status === 404)
+    return null;
+  const json = await res.json().catch(() => ({}));
+  if (!res.ok)
+    throw apiError(auth, "images/jobs", res.status, json);
+  if (!json.jobId)
+    throw new Error(`images/jobs: no jobId in response`);
+  return json.jobId;
+}
+async function pollJob(auth, jobId, files, imagesDir, indexPath, index, counters) {
+  const handled = new Set;
+  const reported = new Set;
+  const deadline = Date.now() + POLL_TIMEOUT_MS;
+  while (true) {
+    const res = await fetch(`${auth.appUrl}/api/images/jobs/${jobId}?workspaceId=${encodeURIComponent(auth.workspaceId)}`, { headers: { Authorization: `Bearer ${auth.key}` } });
+    const json = await res.json().catch(() => ({}));
+    if (!res.ok)
+      throw apiError(auth, `images/jobs/${jobId}`, res.status, json);
+    const total = json.total || files.length;
+    for (const item of json.produced ?? []) {
+      if (handled.has(item.jobIndex))
+        continue;
+      handled.add(item.jobIndex);
+      const file2 = files[item.jobIndex];
+      if (!file2)
+        continue;
+      if (await saveProduced(imagesDir, indexPath, index, file2, item.asset)) {
+        counters.produced++;
+        console.log(`  ✓ ${file2} (${handled.size + reported.size}/${total})`);
+      } else {
+        counters.failed++;
+      }
+    }
+    for (const f of json.failed ?? []) {
+      if (reported.has(f.jobIndex))
+        continue;
+      reported.add(f.jobIndex);
+      counters.failed++;
+      console.error(`  ✗ ${files[f.jobIndex] ?? `job ${f.jobIndex}`}: ${f.message}`);
+    }
+    if (json.status === "done")
+      return;
+    if (Date.now() >= deadline) {
+      throw new Error(`Timed out after 30 minutes waiting for job ${jobId}. ` + `The job keeps running server-side — re-run \`zalify images generate\` to resume.`);
+    }
+    await sleep(POLL_INTERVAL_MS);
+  }
+}
+async function streamingGenerate(auth, manifest, missing, imagesDir, indexPath, index, counters) {
+  for (let i = 0;i < missing.length; i += STREAM_BATCH) {
+    const batch = missing.slice(i, i + STREAM_BATCH);
     const res = await fetch(`${auth.appUrl}/api/assets/generate`, {
       method: "POST",
       headers: {
@@ -11881,9 +11964,7 @@ async function imagesGenerate(storeDir) {
       body: JSON.stringify({
         workspaceId: auth.workspaceId,
         jobs: batch.map((e) => ({
-          prompt: `${e.type === "model" ? manifest.modelStyle ?? manifest.style : manifest.style}
-
-${e.prompt}`,
+          prompt: buildPrompt(manifest, e),
           count: 1,
           size: "1024x1024"
         }))
@@ -11891,11 +11972,7 @@ ${e.prompt}`,
     });
     if (!res.ok || !res.body) {
       const json = await res.json().catch(() => ({}));
-      if (json.code === "UPGRADE_REQUIRED") {
-        throw new Error(`${json.error ?? "Paid plan required."}
-  Upgrade: ${auth.appUrl}/store/${auth.workspaceSlug}/settings/billing`);
-      }
-      throw new Error(`generate ${res.status}: ${JSON.stringify(json)}`);
+      throw apiError(auth, "generate", res.status, json);
     }
     const reader = res.body.getReader();
     const decoder = new TextDecoder;
@@ -11921,32 +11998,62 @@ ${e.prompt}`,
           const entry = batch[event.jobIndex];
           if (!entry)
             continue;
-          const img = await fetch(event.asset.url);
-          if (!img.ok) {
-            console.error(`  ✗ ${entry.file}: download ${img.status}`);
-            failed++;
-            continue;
+          if (await saveProduced(imagesDir, indexPath, index, entry.file, event.asset)) {
+            counters.produced++;
+            console.log(`  ✓ ${entry.file} (${counters.produced + counters.failed}/${missing.length})`);
+          } else {
+            counters.failed++;
           }
-          const bytes = Buffer.from(await img.arrayBuffer());
-          writeFileSync4(join3(imagesDir, entry.file), bytes);
-          index[entry.file] = {
-            assetId: event.asset.id,
-            url: event.asset.url,
-            checksum: createHash2("sha256").update(bytes).digest("hex")
-          };
-          writeFileSync4(indexPath, JSON.stringify(index, null, 2) + `
-`);
-          produced++;
-          console.log(`  ✓ ${entry.file} (${produced + failed}/${missing.length})`);
         } else if (event.type === "error") {
           const entry = batch[event.jobIndex];
-          failed++;
+          counters.failed++;
           console.error(`  ✗ ${entry?.file ?? `job ${event.jobIndex}`}: ${event.message}`);
         }
       }
     }
   }
-  console.log(`Done: ${produced} generated (already in the asset library), ${failed} failed${failed ? " — re-run to retry" : ""}.`);
+}
+async function imagesGenerate(storeDir) {
+  const auth = requireActive();
+  const imagesDir = join3(resolve2(storeDir), "images");
+  const manifestPath = join3(imagesDir, "manifest.json");
+  if (!existsSync3(manifestPath)) {
+    throw new Error(`No images/manifest.json in ${storeDir}`);
+  }
+  const manifest = JSON.parse(readFileSync3(manifestPath, "utf8"));
+  const indexPath = join3(imagesDir, "assets.json");
+  const index = existsSync3(indexPath) ? JSON.parse(readFileSync3(indexPath, "utf8")) : {};
+  const jobStatePath = join3(imagesDir, ".imagegen-job.json");
+  const counters = { produced: 0, failed: 0 };
+  if (existsSync3(jobStatePath)) {
+    const state = JSON.parse(readFileSync3(jobStatePath, "utf8"));
+    console.log(`Resuming job ${state.jobId}`);
+    await pollJob(auth, state.jobId, state.files, imagesDir, indexPath, index, counters);
+    rmSync2(jobStatePath, { force: true });
+    console.log(`Done: ${counters.produced} generated (already in the asset library), ${counters.failed} failed${counters.failed ? " — re-run to retry" : ""}.`);
+    return;
+  }
+  const missing = manifest.images.filter((e) => !existsSync3(join3(imagesDir, e.file)));
+  if (missing.length === 0) {
+    console.log("All manifest images already exist locally.");
+    return;
+  }
+  console.log(`Generating ${missing.length} image(s) on Zalify (workspace "${auth.workspaceName}")…`);
+  for (let i = 0;i < missing.length; i += MAX_JOBS_PER_REQUEST) {
+    const chunk = missing.slice(i, i + MAX_JOBS_PER_REQUEST);
+    const jobId = await submitJob(auth, manifest, chunk);
+    if (jobId === null) {
+      console.log("job API unavailable — using streaming mode");
+      await streamingGenerate(auth, manifest, missing.slice(i), imagesDir, indexPath, index, counters);
+      break;
+    }
+    const state = { jobId, files: chunk.map((e) => e.file) };
+    writeFileSync4(jobStatePath, JSON.stringify(state, null, 2) + `
+`);
+    await pollJob(auth, jobId, state.files, imagesDir, indexPath, index, counters);
+    rmSync2(jobStatePath, { force: true });
+  }
+  console.log(`Done: ${counters.produced} generated (already in the asset library), ${counters.failed} failed${counters.failed ? " — re-run to retry" : ""}.`);
 }
 
 // src/cli.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zalify/cli",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "Zalify CLI - command-line interface for Zalify",
   "type": "module",
   "main": "dist/cli.js",