pixelkiln 0.51.0 → 0.53.0

package/dist/cli.js

@@ -707,7 +707,7 @@ import path2 from "path";
 // src/types.ts
 import { z } from "zod";
 var MediaTypeSchema = z.enum(["image/png", "image/gif"]);
-var GeneratorSchema = z.enum(["1dir", "map", "pixflux", "tiles", "animation", "frames", "character", "terrain"]);
+var GeneratorSchema = z.enum(["1dir", "map", "pixflux", "tiles", "animation", "frames", "character", "terrain", "imagePro"]);
 var GridConfidenceSchema = z.enum(["low", "medium", "high"]);
 var RevisionModeSchema = z.enum(["image-to-image", "inpaint", "outpaint"]);
 function tileVariationCount(descriptions) {
@@ -729,6 +729,7 @@ function candidateCount(size) {
 }
 function generationCost(width, height, generator = "map") {
   if (generator === "map" || generator === "pixflux") return 1;
+  if (generator === "imagePro") return 40;
   const px = width * height;
   if (px <= 1024) return 20;
   if (px <= 2048) return 25;
@@ -1227,7 +1228,7 @@ var AssetSchema = z.object({
   prompt: z.string().optional(),
   /** Subdirectory under the style's outDir. Optional. */
   category: z.string().optional(),
-  /** Overrides the style default. `map` generator only. */
+  /** Overrides the style default. `map`, `pixflux`, and `imagePro` only. */
   width: z.number().int().min(16).max(8192).optional(),
   height: z.number().int().min(16).max(8192).optional(),
   /** Overrides the style default. `1dir` generator only. */
@@ -5833,6 +5834,34 @@ var PixelLabClient = class {
       "edit-images-v2"
     );
   }
+  /**
+   * PixelLab's Pro image tier, `/generate-image-v2`: a flat 40 generations
+   * (docs/ENDPOINTS.md, "Single-image generators, measured") for real style
+   * transfer and non-square canvases up to 792x688, where `pixflux` is
+   * limited to 400x400 and no style reference. Like a revision, this hands
+   * back a plain background job with no resource of its own; unlike a
+   * revision, one call returns several candidate images to pick from (the
+   * same 4/16/64-by-size tiering as `1dir`), not a single result, and its
+   * completed shape has not been exercised live yet — `pollImagePro` in
+   * pixellab.ts fails loudly rather than guess if `last_response.images`
+   * turns out not to be the real field name.
+   *
+   * Reference images and a style image (`reference_images`, `style_image` +
+   * `style_options`) exist on this endpoint but are not modeled here yet.
+   */
+  async createImagePro(args) {
+    const body = {
+      description: args.description,
+      image_size: { width: args.width, height: args.height }
+    };
+    if (args.noBackground != null) body.no_background = args.noBackground;
+    if (args.seed != null) body.seed = args.seed;
+    return validateResponse(
+      RevisionJobSubmitSchema,
+      await this.request("/generate-image-v2", { method: "POST", body: JSON.stringify(body) }),
+      "generate-image-v2"
+    );
+  }
   async getBackgroundJob(jobId) {
     const raw = await this.request(`/background-jobs/${encodeURIComponent(jobId)}`);
     return validateResponse(BackgroundJobSchema, raw, "background-jobs/{id}");
@@ -5971,7 +6000,7 @@ var PixelLabProvider = class _PixelLabProvider {
     return new _PixelLabProvider(new PixelLabClient("download-only"));
   }
   supports(generator) {
-    return generator === "1dir" || generator === "map" || generator === "pixflux" || generator === "tiles" || generator === "terrain" || generator === "character";
+    return generator === "1dir" || generator === "map" || generator === "pixflux" || generator === "tiles" || generator === "terrain" || generator === "imagePro" || generator === "character";
   }
   /**
    * `inpaint` (`/inpaint-v3`, a mask) and `image-to-image` (`/edit-images-v2`,
@@ -6016,7 +6045,7 @@ var PixelLabProvider = class _PixelLabProvider {
     return {
       unit: "generations",
       amount: generationCost(spec.width, spec.height, spec.generator),
-      candidates: spec.generator === "1dir" ? candidateCount(spec.size) : 1
+      candidates: spec.generator === "1dir" || spec.generator === "imagePro" ? candidateCount(spec.size) : 1
     };
   }
   validate(spec, styleImages) {
@@ -6032,6 +6061,11 @@ var PixelLabProvider = class _PixelLabProvider {
     if ((spec.generator === "map" || spec.generator === "pixflux") && (spec.width < 16 || spec.height < 16 || spec.width > 400 || spec.height > 400)) {
       throw new Error(`PixelLab ${spec.generator} dimensions must be between 16 and 400 pixels`);
     }
+    if (spec.generator === "imagePro" && (spec.width < 16 || spec.height < 16 || spec.width > 792 || spec.height > 688)) {
+      throw new Error(
+        `PixelLab imagePro is ${spec.width}x${spec.height}; the API takes 16 to 792 wide and 16 to 688 tall (the exact ceiling also depends on aspect ratio)`
+      );
+    }
     if (spec.generator === "map") {
       requirePixelLabOption("view", spec.view, ["low top-down", "high top-down", "side"]);
       requirePixelLabOption("outline", spec.outline, [
@@ -6100,6 +6134,11 @@ var PixelLabProvider = class _PixelLabProvider {
         "PixelLab terrain does not support style images yet; use color_image/reference images directly against /create-tileset if this becomes a real need"
       );
     }
+    if (spec.generator === "imagePro" && styleImages.length) {
+      throw new Error(
+        "PixelLab imagePro does not support style images yet; /generate-image-v2's own reference_images and style_image are not modeled here"
+      );
+    }
     for (const image of styleImages) {
       if (image.width > 256 || image.height > 256) {
         throw new Error(
@@ -6482,6 +6521,16 @@ var PixelLabProvider = class _PixelLabProvider {
       });
       return { jobId: res2.tileset_id, metadata: { backgroundJobId: res2.background_job_id } };
     }
+    if (spec.generator === "imagePro") {
+      const res2 = await this.client.createImagePro({
+        description: spec.prompt,
+        width: spec.width,
+        height: spec.height,
+        noBackground: spec.noBackground,
+        seed: spec.seed
+      });
+      return { jobId: res2.background_job_id };
+    }
     if (spec.generator === "1dir") {
       const res2 = await this.client.create1Direction({
         description: spec.prompt,
@@ -6588,6 +6637,7 @@ var PixelLabProvider = class _PixelLabProvider {
     if (generator === "map") return this.pollMap(jobId, context);
     if (generator === "tiles") return this.pollTiles(jobId, Boolean(context?.tileFeature), context);
     if (generator === "terrain") return this.pollTerrain(jobId, context);
+    if (generator === "imagePro") return this.pollImagePro(jobId);
     if (generator === "character") return this.pollCharacter(jobId, context);
     const backgroundJobId = context?.metadata?.backgroundJobId;
     const obj = await this.client.getObject(jobId);
@@ -6658,6 +6708,40 @@ var PixelLabProvider = class _PixelLabProvider {
       error: `Invalid PixelLab response for revision job ${jobId}: completed with no recognized image field (got: ${Object.keys(done).join(", ") || "no keys"}); update pollRevision in src/providers/pixellab.ts with the real shape`
     };
   }
+  /**
+   * `/generate-image-v2` hands back a plain background job, the same as a
+   * revision, but a completed one carries several candidate images to
+   * review rather than a single result: the Python client's own usage
+   * sample reads `response.images`, and `edit-images-v2` (a sibling Pro
+   * endpoint) confirmed live that its own array lands at
+   * `last_response.images` with each entry `extractBase64`-shaped, so this
+   * assumes the same field name and shape here. That assumption is
+   * UNVERIFIED for this specific endpoint — no live call has been made to
+   * it — so an unrecognized response still fails loudly rather than
+   * guessing, exactly like pollRevision.
+   */
+  async pollImagePro(jobId) {
+    const job = await this.client.getBackgroundJob(jobId);
+    if (job.status === "failed") return { status: "failed", error: "imagePro job failed upstream" };
+    if (job.status !== "completed") return { status: "processing" };
+    const billed = billedFromUsage(job.usage);
+    const done = job.last_response ?? {};
+    if (Array.isArray(done.images) && done.images.length) {
+      const urls = [];
+      for (const [index, candidate] of done.images.entries()) {
+        const base64 = extractBase64(candidate);
+        if (!base64) continue;
+        const file = path12.join(_PixelLabProvider.cacheDir(), `${jobId}-${index}.png`);
+        writeFileSync(file, Buffer.from(base64, "base64"));
+        urls.push(`file://${file}`);
+      }
+      if (urls.length) return { status: "review", candidateUrls: urls, billed };
+    }
+    return {
+      status: "failed",
+      error: `Invalid PixelLab response for imagePro job ${jobId}: completed with no recognized images array (got: ${Object.keys(done).join(", ") || "no keys"}); this endpoint's completed shape has not been exercised live yet -- update pollImagePro in src/providers/pixellab.ts with the real shape`
+    };
+  }
   /**
    * Map objects need their own path because the `/map-objects/{id}` record is
    * deleted upstream roughly 8 hours after creation while the image survives in
@@ -6770,6 +6854,11 @@ var PixelLabProvider = class _PixelLabProvider {
       if (!url) throw new Error(`tiles job ${jobId} has no variation at index ${index}`);
       return { objectId: `${jobId}#${index}`, sourceUrl: url };
     }
+    if (generator === "imagePro") {
+      const file = path12.join(_PixelLabProvider.cacheDir(), `${jobId}-${index}.png`);
+      if (!existsSync7(file)) throw new Error(`imagePro job ${jobId} has no cached candidate at index ${index}`);
+      return { objectId: `${jobId}#${index}`, sourceUrl: `file://${file}` };
+    }
     const promoted = await this.client.selectFrames(jobId, [index], commonTag);
     const objectId = promoted.created_object_ids?.[0];
     if (!objectId) {
@@ -8206,7 +8295,7 @@ async function resolveSpecs(loaded, filter) {
         ...generator === "character" ? { character: await resolveCharacterShape(asset, style, characterKind, { root, load: loadStyleImage }) } : {},
         cost: generator === "tiles" ? tilesCost(tileSize, tileVariations) : generator === "terrain" ? tilesCost(size, terrainTiles) : generationCost(width, height, generator),
         costUnit: "generations",
-        candidates: generator === "tiles" ? tileVariations : generator === "terrain" ? terrainTiles : generator === "1dir" ? candidateCount(size) : 1
+        candidates: generator === "tiles" ? tileVariations : generator === "terrain" ? terrainTiles : generator === "1dir" || generator === "imagePro" ? candidateCount(size) : 1
       };
       const tags = [
         .../* @__PURE__ */ new Set([
@@ -10666,7 +10755,19 @@ var NewAssetSchema = z5.object({
   size: z5.number().int().optional(),
   tags: z5.array(z5.string()).optional(),
   /** Restrict to these styles; empty or omitted means every style. */
-  styles: z5.array(z5.string().min(1)).optional()
+  styles: z5.array(z5.string().min(1)).optional(),
+  /**
+   * A controlled regeneration of another asset in the same manifest,
+   * instead of a fresh generation. `inpaint` needs a mask upload the
+   * gallery does not offer yet, so only `image-to-image` can be created
+   * here; hand-edit the manifest for the other modes.
+   */
+  revision: z5.object({
+    mode: z5.literal("image-to-image"),
+    /** Asset id of the parent this revises; must already exist. */
+    from: z5.string().min(1),
+    strength: z5.number().min(0).max(1).optional()
+  }).strict().optional()
 }).strict();
 var CANDIDATE_OPTION = {
   retrodiffusion: "numImages",
@@ -10832,6 +10933,9 @@ function applyEdit(raw, edit) {
       }
       asset2.styles = styles;
     }
+    if (edit.asset.revision && !Object.hasOwn(raw.assets, edit.asset.revision.from)) {
+      throw new ManifestEditError(`revision parent "${edit.asset.revision.from}" is not declared by the manifest`);
+    }
     raw.assets[edit.assetId] = asset2;
     return;
   }