pixelkiln 0.45.0 → 0.46.1

package/dist/cli.js

@@ -676,6 +676,7 @@ function specHash(spec, styleImageHashes, providerOptionIdentity = spec.provider
         textGuidanceScale: spec.character.textGuidanceScale,
         isometric: spec.character.isometric,
         enhancePrompt: spec.character.enhancePrompt,
+        styleTraits: spec.character.styleTraits,
         reference: spec.character.reference ? Object.fromEntries(Object.entries(spec.character.reference).map(([direction, image]) => [direction, image.sha256])) : void 0,
         concept: spec.character.concept?.sha256,
         styleAnchor: spec.character.styleAnchor ? { of: spec.character.styleAnchor.assetId, sha256: spec.character.styleAnchor.sha256 } : void 0
@@ -795,7 +796,7 @@ var MIRRORED_DIRECTION = {
   west: "east",
   "south-west": "south-east"
 };
-var CharacterModeSchema = z.enum(["standard", "v3", "pro"]);
+var CharacterModeSchema = z.enum(["standard", "v3", "pro", "pro-flash"]);
 var CHARACTER_PROPORTION_PRESETS = ["default", "chibi", "cartoon", "stylized", "realistic_male", "realistic_female", "heroic"];
 var CharacterProportionsSchema = z.union([
   z.enum(CHARACTER_PROPORTION_PRESETS),
@@ -991,14 +992,27 @@ var StyleObjectSchema = z.object({
   /**
    * `character` only. `standard` draws from a skeleton template for 1
    * generation; `v3` is the highest quality at 2 to 9 by size; `pro` is a
-   * reference-based engine at 20 to 40 by size. States inherit the
-   * parent's engine; animations choose their own.
+   * reference-based engine at 20 to 40 by size; `pro-flash` draws a
+   * south sprite with PixelLab's newest image model and rotates it with
+   * v3, 6 to 17 by size, or the rotations alone (1 at 64px) from a
+   * `reference`. States inherit the parent's engine; animations choose
+   * their own.
    */
   mode: CharacterModeSchema.optional(),
-  /** `character` only. Rotations per base or state. `v3` and `pro` always draw 8. */
+  /** `character` only. Rotations per base or state. Every engine but `standard` draws 8. */
   directions: z.union([z.literal(4), z.literal(8)]).optional(),
-  /** `character` only. Body template: `mannequin` (default) or a quadruped (`bear`, `cat`, `dog`, `horse`, `lion`). */
+  /** `character` only. Body template: `mannequin` (default), a quadruped (`bear`, `cat`, `dog`, `horse`, `lion`), or `custom` for `pro-flash`. */
   template: z.string().min(1).optional(),
+  /**
+   * `character` only, `pro-flash` bases with a style image: which traits
+   * the style image lends. Each defaults to true.
+   */
+  styleTraits: z.object({
+    palette: z.boolean().optional(),
+    outline: z.boolean().optional(),
+    detail: z.boolean().optional(),
+    shading: z.boolean().optional()
+  }).strict().optional(),
   /** `character` only, `standard` humanoid bases. A preset or multipliers; an asset may override it. */
   proportions: CharacterProportionsSchema.optional(),
   /**
@@ -5442,6 +5456,29 @@ var PixelLabClient = class {
         ...south ? { reference_image: encode(south) } : {},
         ...args.enhancePrompt ? { enhance_prompt: true } : {}
       };
+    } else if (args.mode === "pro-flash") {
+      path45 = "/create-character-pro-flash";
+      const traits = args.styleTraits;
+      body = {
+        description: args.description,
+        template_id: args.template,
+        n_directions: 8,
+        // The author's sprite sets the canvas; a size only applies to text creation.
+        ...south ? { first_frame: encode(south) } : { image_size: imageSize },
+        ...args.view ? { view: args.view } : {},
+        ...args.seed != null ? { seed: args.seed } : {},
+        ...args.styleReference && args.styleReferenceSize ? {
+          style_image: { image: encode(args.styleReference), size: args.styleReferenceSize },
+          ...traits ? {
+            style_options: {
+              ...traits.palette !== void 0 ? { color_palette: traits.palette } : {},
+              ...traits.outline !== void 0 ? { outline: traits.outline } : {},
+              ...traits.detail !== void 0 ? { detail: traits.detail } : {},
+              ...traits.shading !== void 0 ? { shading: traits.shading } : {}
+            }
+          } : {}
+        } : {}
+      };
     } else if (args.mode === "pro") {
       path45 = "/create-character-pro";
       body = {
@@ -5619,12 +5656,24 @@ function characterCost(spec) {
   if (character.kind === "state") return generationCost(spec.width, spec.height, "1dir");
   if (character.mode === "standard") return 1;
   if (character.mode === "v3") return 1 + Math.max(1, Math.ceil(px * 8 / 65536));
+  if (character.mode === "pro-flash") {
+    const south = character.reference?.south;
+    return south ? proFlashCharacterCost(south.width, south.height, true) : proFlashCharacterCost(spec.width, spec.height, false);
+  }
   return generationCost(spec.width, spec.height, "1dir");
 }
+function proFlashCharacterCost(width, height, fromReference) {
+  const side = Math.max(32, Math.ceil(Math.max(width, height) / 4) * 4);
+  const rotations = Math.max(1, Math.ceil(side * side * 8 / 65536));
+  if (fromReference) return rotations;
+  const image = side <= 96 ? 5 : side <= 208 ? 6 : 9;
+  return image + rotations;
+}
 function characterAnimationName(spec) {
   return `pixelkiln:${spec.styleId}/${spec.assetId}`;
 }
 var CHARACTER_TEMPLATES = ["mannequin", "bear", "cat", "dog", "horse", "lion"];
+var PRO_FLASH_TEMPLATES = [...CHARACTER_TEMPLATES, "custom"];
 function encodeAnimationJob(job) {
   return `character-animation:${Buffer.from(JSON.stringify(job)).toString("base64url")}`;
 }
@@ -5783,7 +5832,7 @@ var PixelLabProvider = class _PixelLabProvider {
       if (!character.reference.south) throw new Error(`${label}: a reference needs a south-facing sprite`);
       if (character.mode !== "standard") {
         if (given.length > 1) throw new Error(`${label}: PixelLab ${character.mode} rotates one south-facing reference; drop the other directions`);
-        const limit = character.mode === "v3" ? 256 : 168;
+        const limit = character.mode === "pro" ? 168 : 256;
         const south = character.reference.south;
         if (south.width > limit || south.height > limit) {
           throw new Error(`${label}: reference is ${south.width}x${south.height}; PixelLab ${character.mode} takes up to ${limit}px`);
@@ -5807,26 +5856,39 @@ var PixelLabProvider = class _PixelLabProvider {
       }
     }
     if (styleImages.length) {
-      if (character.mode !== "pro") {
+      if (character.mode !== "pro" && character.mode !== "pro-flash") {
         throw new Error(
-          `PixelLab ${character.mode} characters take no style images; give a base its own sprite with \`reference\`, or use mode pro for a style anchor`
+          `PixelLab ${character.mode} characters take no style images; give a base its own sprite with \`reference\`, or use mode pro or pro-flash for a style anchor`
         );
       }
-      if (styleImages.length > 1) throw new Error("PixelLab pro characters take one style image");
+      if (styleImages.length > 1) throw new Error(`PixelLab ${character.mode} characters take one style image`);
       if (character.kind === "base" && character.reference) {
-        throw new Error(`${label}: a pro base rotating its own reference takes no style image`);
+        throw new Error(`${label}: a ${character.mode} base rotating its own reference takes no style image`);
       }
       const image = styleImages[0];
-      if (image.width > 168 || image.height > 168) {
-        throw new Error(`PixelLab pro character style image is ${image.width}x${image.height}; the limit is 168px`);
+      const limit = character.mode === "pro" ? 168 : 256;
+      if (image.width > limit || image.height > limit) {
+        throw new Error(`PixelLab ${character.mode} character style image is ${image.width}x${image.height}; the limit is ${limit}px`);
+      }
+      if (character.mode === "pro-flash" && (image.width > spec.width || image.height > spec.height)) {
+        throw new Error(
+          `PixelLab pro-flash style image is ${image.width}x${image.height} but the character is ${spec.width}x${spec.height}; crop the image to its subject or raise the style's size`
+        );
       }
     }
-    const maxSize = character.mode === "v3" ? 256 : 128;
+    if (character.styleTraits && character.mode !== "pro-flash") {
+      throw new Error(`${label}: styleTraits choose what a pro-flash style image lends; the ${character.mode} engine does not take them`);
+    }
+    const maxSize = character.mode === "v3" || character.mode === "pro-flash" ? 256 : 128;
     if (spec.width < 16 || spec.height < 16 || spec.width > maxSize || spec.height > maxSize) {
       throw new Error(`PixelLab ${character.mode} characters must be between 16 and ${maxSize} pixels`);
     }
-    if (!CHARACTER_TEMPLATES.includes(character.template)) {
-      throw new Error(`PixelLab character template must be one of: ${CHARACTER_TEMPLATES.join(", ")}`);
+    if (character.mode === "pro-flash" && character.kind === "base" && (spec.width % 4 || spec.height % 4)) {
+      throw new Error(`PixelLab pro-flash characters are sized in multiples of 4 pixels; ${spec.width}x${spec.height} is not`);
+    }
+    const templates = character.mode === "pro-flash" ? PRO_FLASH_TEMPLATES : CHARACTER_TEMPLATES;
+    if (!templates.includes(character.template)) {
+      throw new Error(`PixelLab ${character.mode} character template must be one of: ${templates.join(", ")}`);
     }
     const views = character.mode === "standard" ? ["low top-down", "high top-down", "side", "perspective", "oblique"] : ["low top-down", "high top-down", "side"];
     if (!views.includes(spec.view)) {
@@ -5881,7 +5943,9 @@ var PixelLabProvider = class _PixelLabProvider {
         styleReference: styleImage ? { base64: styleImage.base64, format: styleImage.format } : void 0,
         enhancePrompt: character.enhancePrompt,
         concept: character.concept ? readPose(spec, "concept image", character.concept) : void 0,
-        styleCharacterId: character.styleAnchor ? requireStyleObjectId(spec, context) : void 0
+        styleCharacterId: character.styleAnchor ? requireStyleObjectId(spec, context) : void 0,
+        styleReferenceSize: styleImage ? { width: styleImage.width, height: styleImage.height } : void 0,
+        styleTraits: character.styleTraits
       });
       return { jobId: res2.character_id, metadata: { character: { kind: "base", characterId: res2.character_id, mode: character.mode, directions: character.directions, backgroundJobId: res2.background_job_id } } };
     }
@@ -7789,7 +7853,8 @@ async function resolveCharacterShape(asset, style, kind, files) {
     ...proportions !== void 0 ? { proportions } : {},
     ...style.textGuidanceScale !== void 0 ? { textGuidanceScale: style.textGuidanceScale } : {},
     ...style.isometric !== void 0 ? { isometric: style.isometric } : {},
-    ...style.enhancePrompt !== void 0 ? { enhancePrompt: style.enhancePrompt } : {}
+    ...style.enhancePrompt !== void 0 ? { enhancePrompt: style.enhancePrompt } : {},
+    ...style.styleTraits ? { styleTraits: style.styleTraits } : {}
   };
   if (asset.concept) {
     const image = await files.load(asset.concept, "Concept image");
@@ -8023,8 +8088,9 @@ async function fetchAssets(provider, specs, lock, lockPath, opts = {}) {
               const superseded = (entry.supersededOutputs ?? []).find(
                 (output, oldIndex, all) => currentOutputPath(output, spec, oldIndex, all.length) === target
               );
+              const outgoing = Boolean(superseded && currentHash === superseded.sha256);
               if (!opts.force) {
-                if (superseded && currentHash === superseded.sha256) {
+                if (outgoing) {
                 } else if (recorded || superseded) {
                   throw new Error(
                     `refusing to overwrite modified output ${target}; pass --force to replace it`
@@ -8035,6 +8101,14 @@ async function fetchAssets(provider, specs, lock, lockPath, opts = {}) {
                   );
                 }
               }
+              if (outgoing && cacheDir) {
+                try {
+                  const oldBytes = await readFile7(target);
+                  const oldMediaType = detectMediaType(oldBytes);
+                  if (oldMediaType) await cacheMedia(cacheDir, oldBytes, oldMediaType, currentHash);
+                } catch {
+                }
+              }
               log2(
                 `  replace ${path14.relative(process.cwd(), target)}` + (opts.force ? " (--force)" : " (previous tracked generation)")
               );