pixelkiln 0.73.0 → 0.75.0

package/dist/cli.js

@@ -14225,6 +14225,7 @@ async function priceManifestEdit(manifestPath, edit) {
           styleId: spec.styleId,
           assetId: spec.assetId,
           change: was === void 0 ? "new" : "changed",
+          provider: spec.provider,
           cost: spec.cost,
           costUnit: spec.costUnit,
           candidates: spec.candidates
@@ -15749,6 +15750,7 @@ ${css}</style>
       <option value="none">Group: none</option>
     </select>
     <span id="editing" class="editing" hidden title="This gallery can write the manifest. It never contacts a provider.">editing</span>
+    <button id="studio" type="button" hidden title="Draft a new character: its style, base, loops, and portrait, priced as you go">+ New character</button>
     <button id="refresh" type="button" title="Re-read the manifest, lockfile, and disk">Refresh</button>
     <label class="chip" title="Refresh every 5 seconds while this tab is visible"><input id="auto" type="checkbox"> auto</label>
   </div>
@@ -17332,6 +17334,70 @@ function createGenerateHandlers(opts) {
     job.phase = "done";
     job.finishedAt = now().toISOString();
   }
+  async function submitGroups(job, ctx, groups) {
+    job.phase = "submitting";
+    for (const group of groups) {
+      const provider = opts.providerFor(job.project ?? void 0, group.provider);
+      const ceiling = remainingFor(group, groups.length, opts.budget, spent);
+      if (provider.balance) {
+        const balance = await provider.balance();
+        say(job, `balance: ${formatCost(balance.unit, balance.remaining)} remaining (${group.provider})`);
+        if (balance.unit !== group.costUnit) {
+          throw new Error(
+            `Provider ${group.provider} estimate unit ${group.costUnit} does not match balance unit ${balance.unit}.`
+          );
+        }
+        if (balance.unit !== "free" && group.cost > balance.remaining) {
+          throw new Error(
+            `${group.provider} needs ${formatCost(balance.unit, group.cost)} but only ${formatCost(balance.unit, balance.remaining)} remain.`
+          );
+        }
+      }
+      const res = await submit(provider, ctx.loaded, group.actionable, ctx.lock, ctx.lockPath, {
+        budget: ceiling,
+        onProgress: (line) => say(job, line),
+        spacingMs: opts.submitSpacingMs
+      });
+      spent[group.provider] = (spent[group.provider] ?? 0) + res.spent;
+      units[group.provider] = res.unit;
+      job.spent[group.provider] = (job.spent[group.provider] ?? 0) + res.spent;
+      job.counts.submitted += res.submitted;
+      job.counts.failed += res.failed;
+      say(job, `${group.provider}: submitted ${res.submitted}, failed ${res.failed}, estimated ${formatCost(res.unit, res.spent)}`);
+    }
+  }
+  async function generateInWaves(job, ctx, specs, groups) {
+    for (let wave = 1; ; wave++) {
+      const submittedBefore = job.counts.submitted;
+      await submitGroups(job, ctx, groups);
+      await settle(job, ctx, specs);
+      if (job.phase !== "done" || job.counts.submitted === submittedBefore) return;
+      const finishedAt = job.finishedAt;
+      const finish = () => {
+        job.phase = "done";
+        job.finishedAt = finishedAt;
+      };
+      job.phase = "queued";
+      job.finishedAt = null;
+      const next = await opts.loadProject(job.project ?? void 0);
+      const byKey = new Map(next.specs.map((spec) => [lockKey(spec.styleId, spec.assetId), spec]));
+      const nextSpecs = job.keys.map((key) => byKey.get(key)).filter((spec) => Boolean(spec));
+      const plan = await buildPlan(nextSpecs, next.lock);
+      if (!plan.actionable.length) return finish();
+      for (const group of plan.groups) {
+        const remaining = remainingFor(group, plan.groups.length, opts.budget, spent);
+        if (group.cost > remaining) {
+          say(job, `wave ${wave + 1} would spend ${formatCost(group.costUnit, group.cost)} on ${group.provider} but only ${formatCost(group.costUnit, remaining)} of this session's budget remain; stopping here`);
+          return finish();
+        }
+      }
+      say(job, `wave ${wave + 1}: ${plan.actionable.length} asset(s) whose parents are now on disk: ` + plan.groups.map((g) => `${g.provider} ${formatCost(g.costUnit, g.cost)}`).join("; "));
+      contexts.set(job.id, next);
+      ctx = next;
+      specs = nextSpecs;
+      groups = plan.groups;
+    }
+  }
   async function run(job, ctx, specs, groups) {
     try {
       if (job.mode === "refresh") {
@@ -17359,36 +17425,8 @@ function createGenerateHandlers(opts) {
         return;
       }
       if (job.mode === "generate") {
-        job.phase = "submitting";
-        for (const group of groups) {
-          const provider = opts.providerFor(job.project ?? void 0, group.provider);
-          const ceiling = remainingFor(group, groups.length, opts.budget, spent);
-          if (provider.balance) {
-            const balance = await provider.balance();
-            say(job, `balance: ${formatCost(balance.unit, balance.remaining)} remaining (${group.provider})`);
-            if (balance.unit !== group.costUnit) {
-              throw new Error(
-                `Provider ${group.provider} estimate unit ${group.costUnit} does not match balance unit ${balance.unit}.`
-              );
-            }
-            if (balance.unit !== "free" && group.cost > balance.remaining) {
-              throw new Error(
-                `${group.provider} needs ${formatCost(balance.unit, group.cost)} but only ${formatCost(balance.unit, balance.remaining)} remain.`
-              );
-            }
-          }
-          const res = await submit(provider, ctx.loaded, group.actionable, ctx.lock, ctx.lockPath, {
-            budget: ceiling,
-            onProgress: (line) => say(job, line),
-            spacingMs: opts.submitSpacingMs
-          });
-          spent[group.provider] = (spent[group.provider] ?? 0) + res.spent;
-          units[group.provider] = res.unit;
-          job.spent[group.provider] = (job.spent[group.provider] ?? 0) + res.spent;
-          job.counts.submitted += res.submitted;
-          job.counts.failed += res.failed;
-          say(job, `${group.provider}: submitted ${res.submitted}, failed ${res.failed}, estimated ${formatCost(res.unit, res.spent)}`);
-        }
+        await generateInWaves(job, ctx, specs, groups);
+        return;
       }
       await settle(job, ctx, specs);
     } catch (error) {