pixelkiln 0.47.0 → 0.48.0

package/dist/client/gallery.js

@@ -1050,7 +1050,9 @@ function historySection(item) {
     else thumb.append(el('span', null, g.cached ? '' : 'not cached'));
     const facts = el('div', 'facts');
     const head = el('div');
-    head.append(el('b', null, '#' + g.index), document.createTextNode(' · ' + fmtWhen(g.downloadedAt || g.submittedAt) + ' · ' + fmtCost(g.costUnit, g.cost) +
+    const billedNote = g.billed && (g.billed.unit !== g.costUnit || g.billed.amount !== g.cost)
+      ? ' (billed ' + fmtCost(g.billed.unit, g.billed.amount) + ')' : '';
+    head.append(el('b', null, '#' + g.index), document.createTextNode(' · ' + fmtWhen(g.downloadedAt || g.submittedAt) + ' · ' + fmtCost(g.costUnit, g.cost) + billedNote +
       (g.outputs.length > 1 ? ' · ' + g.outputs.length + ' files' : '')));
     facts.append(head);
     const prompt = el('div', 'prompt' + (g.promptDiffers ? ' differs' : ''), (g.promptDiffers ? 'prompt: ' : 'same prompt: ') + g.prompt);
@@ -1876,6 +1878,9 @@ function renderDrawer() {
     if (item.currentPrompt) row(dl, 'prompt now', el('div', 'prompt state-warn', item.currentPrompt));
     row(dl, 'size', item.width + ' × ' + item.height + ' px');
     if (item.status) row(dl, 'cost', fmtCost(item.costUnit, item.cost));
+    if (item.billed && (item.billed.unit !== item.costUnit || item.billed.amount !== item.cost)) {
+      row(dl, 'billed', fmtCost(item.billed.unit, item.billed.amount));
+    }
     if (item.postprocess && item.postprocess.palette) {
       // What fetch did to the provider's bytes before writing them.
       const p = item.postprocess.palette;

package/dist/index.cjs

@@ -967,6 +967,8 @@ var LockHistoryEntrySchema = import_zod.z.object({
   downloadedAt: import_zod.z.string().nullable().default(null),
   cost: import_zod.z.number().finite().nonnegative().default(0),
   costUnit: import_zod.z.string().min(1).default("generations"),
+  /** What the provider actually billed, read from the completed job; null when never read. */
+  billed: import_zod.z.object({ amount: import_zod.z.number(), unit: import_zod.z.string() }).nullable().default(null),
   provider: import_zod.z.string().default("pixellab"),
   postprocess: PostprocessSchema.optional(),
   /** When the replacement was submitted. */
@@ -1058,6 +1060,14 @@ var LockEntrySchema = import_zod.z.object({
   cost: import_zod.z.number().finite().nonnegative().default(0),
   /** Unit for `cost`. Defaults preserve pre-unit PixelLab lockfiles. */
   costUnit: import_zod.z.string().min(1).default("generations"),
+  /**
+   * What the provider actually billed, read from the completed job rather
+   * than estimated at submit time. Null until a poll reads it, and for a
+   * provider or generator `poll` does not read it from at all; `cost` above
+   * is still what a wave budget spends against, since the real number is
+   * only known after the fact.
+   */
+  billed: import_zod.z.object({ amount: import_zod.z.number(), unit: import_zod.z.string() }).nullable().default(null),
   /** Which provider produced this. Absent on entries written before providers. */
   provider: import_zod.z.string().default("pixellab"),
   /** Generations this entry replaced, newest first; see LockHistoryEntrySchema. */
@@ -1311,7 +1321,13 @@ var CharacterListSchema = import_zod2.z.object({ characters: import_zod2.z.array
 var BackgroundJobSchema = import_zod2.z.object({
   id: import_zod2.z.string(),
   status: import_zod2.z.string(),
-  last_response: import_zod2.z.record(import_zod2.z.unknown()).nullable().optional()
+  last_response: import_zod2.z.record(import_zod2.z.unknown()).nullable().optional(),
+  /**
+   * The billed amount, confirmed live for a `map` object and a standard
+   * character base (docs/ENDPOINTS.md, "Limits and billing"); duplicated at
+   * `last_response.billing_usage` on the jobs observed so far.
+   */
+  usage: UsageSchema
 }).passthrough();
 var DeleteAnimationsSchema = import_zod2.z.object({ success: import_zod2.z.boolean(), deleted_count: import_zod2.z.number().int().default(0), error: import_zod2.z.string().nullable().optional() }).passthrough();
 function validateResponse(schema, raw, operation) {
@@ -2406,6 +2422,14 @@ function pixelLabObjectUrl(generator, objectId) {
   }
   return null;
 }
+function billedFromUsage(usage) {
+  if (!usage) return null;
+  if (usage.type === "usd" || usage.type === void 0 && typeof usage.usd === "number") {
+    return typeof usage.usd === "number" ? { amount: usage.usd, unit: "usd" } : null;
+  }
+  if (typeof usage.generations === "number") return { amount: usage.generations, unit: "generations" };
+  return null;
+}
 function characterCost(spec) {
   const character = spec.character;
   if (!character) return generationCost(spec.width, spec.height, "1dir");
@@ -2776,6 +2800,7 @@ var PixelLabProvider = class _PixelLabProvider {
     if (character.status !== "completed" || !character.rotation_urls) return { status: "processing" };
     const sources = rotationSources(character);
     if (!sources.length) return { status: "failed", error: "character completed with no rotation images" };
+    const backgroundJobId = context?.metadata?.character?.backgroundJobId;
     return {
       status: "ready",
       objectId: character.id,
@@ -2791,7 +2816,8 @@ var PixelLabProvider = class _PixelLabProvider {
           size: character.size,
           updatedAt: character.updated_at ?? null
         }
-      }
+      },
+      billed: await this.billedForJob(backgroundJobId)
     };
   }
   /**
@@ -2803,7 +2829,7 @@ var PixelLabProvider = class _PixelLabProvider {
    */
   async pollCharacterAnimation(job, context) {
     const fps = context?.spec?.character?.animation?.fps ?? 8;
-    const review = (frames, animationId, groupId) => ({
+    const review = (frames, animationId, groupId, billed) => ({
       status: "review-set",
       objectId: `${job.characterId}#${groupId ?? animationId ?? job.name}`,
       frameUrls: frames,
@@ -2819,7 +2845,8 @@ var PixelLabProvider = class _PixelLabProvider {
           animationName: job.name,
           direction: job.direction
         }
-      }
+      },
+      billed
     });
     let cleanedUp = job.jobIds.length === 0;
     for (const id of job.jobIds) {
@@ -2839,13 +2866,13 @@ var PixelLabProvider = class _PixelLabProvider {
       if (Array.isArray(frames) && frames.length && frames.every((f) => typeof f === "string")) {
         const character2 = await this.client.getCharacter(job.characterId);
         const group = findAnimation(character2, job.name, job.direction, animationId);
-        return review(frames, animationId, group?.groupId ?? null);
+        return review(frames, animationId, group?.groupId ?? null, billedFromUsage(status.usage));
       }
     }
     const recorded = context?.metadata?.character?.animationId ?? null;
     const character = await this.client.getCharacter(job.characterId);
     const found = findAnimation(character, job.name, job.direction, recorded);
-    if (found) return review(found.frames, found.animationId, found.groupId);
+    if (found) return review(found.frames, found.animationId, found.groupId, null);
     return cleanedUp ? { status: "failed", error: `animation job is gone upstream and no "${job.name}" ${job.direction} animation exists on the character` } : { status: "processing" };
   }
   async submit(spec, styleImages, context) {
@@ -2878,7 +2905,7 @@ var PixelLabProvider = class _PixelLabProvider {
         // unlike 1dir's {type, base64, format} payload.
         styleImages: styleImages.map(({ base64, width, height }) => ({ base64, width, height }))
       });
-      return { jobId: res2.tile_id };
+      return { jobId: res2.tile_id, metadata: { backgroundJobId: res2.background_job_id } };
     }
     if (spec.generator === "1dir") {
       const res2 = await this.client.create1Direction({
@@ -2887,7 +2914,7 @@ var PixelLabProvider = class _PixelLabProvider {
         view: spec.view === "sidescroller" ? "sidescroller" : "top-down",
         styleImages
       });
-      return { jobId: res2.object_id };
+      return { jobId: res2.object_id, metadata: { backgroundJobId: res2.background_job_id } };
     }
     const res = await this.client.createMapObject({
       description: spec.prompt,
@@ -2899,7 +2926,22 @@ var PixelLabProvider = class _PixelLabProvider {
       detail: spec.detail,
       seed: spec.seed
     });
-    return { jobId: res.object_id };
+    return { jobId: res.object_id, metadata: { backgroundJobId: res.background_job_id } };
+  }
+  /**
+   * What a background job actually billed, once its own record is still
+   * around to ask; see `billedFromUsage`. A stale or already-cleaned-up job
+   * (a map object's record expires in hours; see `pollMap`) means "not
+   * known", not a failure worth surfacing.
+   */
+  async billedForJob(backgroundJobId) {
+    if (!backgroundJobId) return null;
+    try {
+      const job = await this.client.getBackgroundJob(backgroundJobId);
+      return billedFromUsage(job.usage);
+    } catch {
+      return null;
+    }
   }
   async poll(jobId, generator, context) {
     if (generator === "pixflux") {
@@ -2913,16 +2955,17 @@ var PixelLabProvider = class _PixelLabProvider {
         error: "pixflux result is no longer cached locally; re-run submit for this asset"
       };
     }
-    if (generator === "map") return this.pollMap(jobId);
-    if (generator === "tiles") return this.pollTiles(jobId, Boolean(context?.tileFeature));
+    if (generator === "map") return this.pollMap(jobId, context);
+    if (generator === "tiles") return this.pollTiles(jobId, Boolean(context?.tileFeature), context);
     if (generator === "character") return this.pollCharacter(jobId, context);
+    const backgroundJobId = context?.metadata?.backgroundJobId;
     const obj = await this.client.getObject(jobId);
     if (obj.status === "review") {
-      return { status: "review", candidateUrls: obj.frame_urls ?? [] };
+      return { status: "review", candidateUrls: obj.frame_urls ?? [], billed: await this.billedForJob(backgroundJobId) };
     }
     if (obj.status === "completed") {
       const url = firstUrl(obj.rotation_urls) ?? obj.preview_url ?? null;
-      return { status: "ready", objectId: obj.id, sourceUrl: url, sources: url ? [{ url }] : [] };
+      return { status: "ready", objectId: obj.id, sourceUrl: url, sources: url ? [{ url }] : [], billed: await this.billedForJob(backgroundJobId) };
     }
     if (obj.status === "failed") return { status: "failed", error: "generation failed upstream" };
     return {
@@ -2938,7 +2981,8 @@ var PixelLabProvider = class _PixelLabProvider {
    * `/objects` four months on, with `/map-objects` returning 404 for the same
    * id. So a 404 here is not evidence the work is lost.
    */
-  async pollMap(jobId) {
+  async pollMap(jobId, context) {
+    const backgroundJobId = context?.metadata?.backgroundJobId;
     try {
       const obj = await this.client.getMapObject(jobId);
       if (obj.status === "completed" && obj.download_url) {
@@ -2946,7 +2990,8 @@ var PixelLabProvider = class _PixelLabProvider {
           status: "ready",
           objectId: jobId,
           sourceUrl: obj.download_url,
-          sources: [{ url: obj.download_url }]
+          sources: [{ url: obj.download_url }],
+          billed: await this.billedForJob(backgroundJobId)
         };
       }
       if (obj.status === "failed") return { status: "failed", error: "generation failed upstream" };
@@ -2957,7 +3002,7 @@ var PixelLabProvider = class _PixelLabProvider {
       const survivor = await this.client.getObject(jobId).catch(() => null);
       const url = firstUrl(survivor?.rotation_urls) ?? survivor?.preview_url ?? null;
       if (survivor?.status === "completed" && url) {
-        return { status: "ready", objectId: survivor.id, sourceUrl: url, sources: [{ url }] };
+        return { status: "ready", objectId: survivor.id, sourceUrl: url, sources: [{ url }], billed: null };
       }
       return {
         status: "failed",
@@ -2970,12 +3015,14 @@ var PixelLabProvider = class _PixelLabProvider {
    * `storage_urls` once finished. There is no `status` field to read and no
    * progress percentage on offer, so "processing" here carries no ETA.
    */
-  async pollTiles(tileId, connectable) {
+  async pollTiles(tileId, connectable, context) {
     try {
       const set = await this.client.getTilesPro(tileId);
       const tiles = tilesInIndexOrder(set.storage_urls);
       if (!tiles.length) return { status: "failed", error: "tiles job returned no storage urls" };
-      if (!connectable) return { status: "review", candidateUrls: tiles.map((tile) => tile.url) };
+      const backgroundJobId = context?.metadata?.backgroundJobId;
+      const billed = await this.billedForJob(backgroundJobId);
+      if (!connectable) return { status: "review", candidateUrls: tiles.map((tile) => tile.url), billed };
       return {
         status: "ready",
         objectId: tileId,
@@ -2987,7 +3034,8 @@ var PixelLabProvider = class _PixelLabProvider {
         metadata: {
           tileKind: set.kind,
           ...set.tile_rules ? { tileRules: set.tile_rules } : {}
-        }
+        },
+        billed
       };
     } catch (err) {
       if (err instanceof PixelLabError && err.status === 423) return { status: "processing" };
@@ -9228,6 +9276,7 @@ function retireGeneration(entry, retiredAt) {
     downloadedAt: entry.downloadedAt,
     cost: entry.cost,
     costUnit: entry.costUnit,
+    billed: entry.billed,
     provider: entry.provider,
     postprocess: entry.postprocess,
     retiredAt
@@ -9318,6 +9367,7 @@ async function revertGeneration(provider, spec, lock, lockPath, opts) {
     downloadedAt: generation.downloadedAt,
     cost: generation.cost,
     costUnit: generation.costUnit,
+    billed: generation.billed,
     provider: generation.provider,
     postprocess: generation.postprocess,
     history
@@ -9523,15 +9573,27 @@ function packSprites(inputs, options = {}) {
   const sheetH = rows * cellH;
   const rgba = Buffer.alloc(sheetW * sheetH * 4);
   const frames = [];
+  const pivot = options.pivot ?? "top-left";
   sprites.forEach((sprite, i) => {
-    const ox = i % columns * cellW;
-    const oy = Math.floor(i / columns) * cellH;
+    const cellOx = i % columns * cellW;
+    const cellOy = Math.floor(i / columns) * cellH;
+    const offsetX = pivot === "bottom-center" ? Math.floor((cellW - sprite.width) / 2) : 0;
+    const offsetY = pivot === "bottom-center" ? cellH - sprite.height : 0;
+    const ox = cellOx + offsetX;
+    const oy = cellOy + offsetY;
     for (let y = 0; y < sprite.height; y++) {
       const src = y * sprite.width * 4;
       const dst = ((oy + y) * sheetW + ox) * 4;
       sprite.pixels.copy(rgba, dst, src, src + sprite.width * 4);
     }
-    frames.push({ id: sprite.id, x: ox, y: oy, width: sprite.width, height: sprite.height });
+    frames.push({
+      id: sprite.id,
+      x: ox,
+      y: oy,
+      width: sprite.width,
+      height: sprite.height,
+      ...offsetX || offsetY ? { offsetX, offsetY } : {}
+    });
   });
   return {
     png: encodeRgbaPng(sheetW, sheetH, rgba),
@@ -10048,12 +10110,15 @@ function renderAsepriteSheet(atlas, opts) {
   }
   const frames = {};
   for (const frame of atlas.frames) {
+    const offsetX = frame.offsetX ?? 0;
+    const offsetY = frame.offsetY ?? 0;
+    const pivoted = offsetX !== 0 || offsetY !== 0;
     frames[frame.id] = {
       frame: { x: frame.x, y: frame.y, w: frame.width, h: frame.height },
       rotated: false,
-      trimmed: false,
-      spriteSourceSize: { x: 0, y: 0, w: frame.width, h: frame.height },
-      sourceSize: { w: frame.width, h: frame.height },
+      trimmed: pivoted,
+      spriteSourceSize: pivoted ? { x: offsetX, y: offsetY, w: frame.width, h: frame.height } : { x: 0, y: 0, w: frame.width, h: frame.height },
+      sourceSize: pivoted ? { w: atlas.cell.width, h: atlas.cell.height } : { w: frame.width, h: frame.height },
       duration: durations.get(frame.id) ?? ASEPRITE_DEFAULT_DURATION_MS
     };
   }
@@ -10384,7 +10449,8 @@ async function poll(provider, lock, lockPath, opts = {}) {
                 ...entry.providerMetadata[provider.id],
                 ...state.metadata
               }
-            } : entry.providerMetadata
+            } : entry.providerMetadata,
+            billed: state.billed ?? entry.billed
           });
           result.review++;
           log(
@@ -10404,7 +10470,8 @@ async function poll(provider, lock, lockPath, opts = {}) {
                 ...state.metadata
               }
             } : entry.providerMetadata,
-            error: null
+            error: null,
+            billed: state.billed ?? entry.billed
           });
           result.completed++;
           log(`  ready   ${key}`);
@@ -12263,6 +12330,7 @@ function describeHistory(media, entry, cacheDir) {
       height: generation.height,
       cost: generation.cost,
       costUnit: generation.costUnit,
+      billed: generation.billed,
       submittedAt: generation.submittedAt,
       downloadedAt: generation.downloadedAt,
       retiredAt: generation.retiredAt,
@@ -12506,6 +12574,7 @@ async function buildGallerySnapshot(opts) {
       fps: quality?.frameSet?.fps ?? metadataFps(entry) ?? spec.quality?.fps ?? null,
       cost: entry?.cost ?? 0,
       costUnit: entry?.costUnit ?? spec.costUnit,
+      billed: entry?.billed ?? null,
       estimatedCost: spec.cost,
       candidates: spec.candidates,
       submittedAt: entry?.submittedAt ?? null,
@@ -12569,6 +12638,7 @@ async function buildGallerySnapshot(opts) {
       fps: metadataFps(entry),
       cost: entry.cost,
       costUnit: entry.costUnit,
+      billed: entry.billed,
       estimatedCost: null,
       candidates: null,
       submittedAt: entry.submittedAt,