QuantumHawk42 commited on
Commit
498391f
·
verified ·
1 Parent(s): d2931d4

Update js/app.js

Browse files
Files changed (1) hide show
  1. js/app.js +86 -23
js/app.js CHANGED
@@ -1,4 +1,4 @@
1
- import { Agate, VERSIONS, webgpuStatus, clearCache, hasCachedModel } from "./agate.js";
2
  import { addPngText, readWatermark } from "./marking.js";
3
  import { prepare as preparePrompt, countVector } from "./prompt.js";
4
  import { ThinkerView } from "./thinker.js";
@@ -46,7 +46,8 @@ const ui = {
46
  };
47
  const thinkerView = new ThinkerView($("plan-canvas"), $("pred-canvas"));
48
 
49
- /* Reference image upload and preview */
 
50
  const referenceInput = $("reference-image");
51
  const referencePreview = $("reference-preview");
52
  const referencePreviewWrap = $("reference-preview-wrap");
@@ -54,7 +55,24 @@ const clearReferenceButton = $("clear-reference");
54
  const imageStrength = $("image-strength");
55
  const imageStrengthValue = $("image-strength-v");
56
 
 
57
  let referenceImageUrl = null;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
58
 
59
  referenceInput.addEventListener("change", () => {
60
  const file = referenceInput.files?.[0];
@@ -67,28 +85,12 @@ referenceInput.addEventListener("change", () => {
67
  return;
68
  }
69
 
70
- // Release the previous preview URL, if one exists.
71
- if (referenceImageUrl) {
72
- URL.revokeObjectURL(referenceImageUrl);
73
- }
74
-
75
- referenceImageUrl = URL.createObjectURL(file);
76
- referencePreview.src = referenceImageUrl;
77
- referencePreviewWrap.hidden = false;
78
-
79
  setProgress(0, "Reference image selected", file.name);
80
  });
81
 
82
  clearReferenceButton.addEventListener("click", () => {
83
- referenceInput.value = "";
84
- referencePreview.removeAttribute("src");
85
- referencePreviewWrap.hidden = true;
86
-
87
- if (referenceImageUrl) {
88
- URL.revokeObjectURL(referenceImageUrl);
89
- referenceImageUrl = null;
90
- }
91
-
92
  setProgress(0, agate ? "Ready" : "Idle", "");
93
  });
94
 
@@ -193,6 +195,7 @@ async function load() {
193
  busy = true; ui.go.disabled = true;
194
  window.__agate.state = "loading";
195
  agate = new Agate({ base: BASE, override: MODELS_OVERRIDE, version, ep, variant: VARIANT, optLevel: params.get("opt") || "all" });
 
196
  try {
197
  const t0 = performance.now();
198
  const st = await agate.load(({ phase, file, loaded, total }) => {
@@ -237,16 +240,32 @@ function previewFn() {
237
  };
238
  }
239
 
 
 
 
 
 
 
 
 
 
 
 
 
240
  async function generate(opts = {}) {
241
  busy = true; stop = false;
242
  ui.go.textContent = "Stop"; ui.frame.classList.add("busy");
243
  window.__agate.state = "generating";
244
  const steps = opts.steps ?? Number(ui.steps.value);
 
 
245
  try {
 
246
  setProgress(0, "Encoding prompt", "");
247
  const r = await agate.generate({
248
  prompt: opts.prompt ?? ui.prompt.value.trim(), negative: opts.negative ?? ui.negative.value.trim(),
249
  seed: Number(ui.seed.value) >>> 0, steps, cfg: opts.cfg ?? Number(ui.cfg.value), noise: opts.noise ?? null,
 
250
  watermark: opts.watermark ?? true,
251
  onStep: (i, n) => setProgress(i / n, `Step ${i} / ${n}`, ""),
252
  onPreview: (opts.thinker ?? ui.showThinker.checked) ? previewFn() : null,
@@ -261,8 +280,9 @@ async function generate(opts = {}) {
261
  const T = r.timings;
262
  setProgress(1, "Done", `${(T.totalMs / 1000).toFixed(1)} s`);
263
  showTimings([
 
264
  ["text encode", `${T.textMs.toFixed(0)} ms (bucket ${T.bucket})`],
265
- ["per step", `${T.stepMs.toFixed(0)} ms × ${steps} (first ${T.firstStepMs.toFixed(0)} ms)`],
266
  ["decode + mark", `${T.decodeMs.toFixed(0)} + ${T.markMs.toFixed(0)} ms`],
267
  ["total", `${(T.totalMs / 1000).toFixed(2)} s`],
268
  ]);
@@ -305,7 +325,7 @@ async function parity() {
305
  const refZ = new Float32Array((await bin("parity_latent.bin")).buffer);
306
  const refImg = await bin("parity_image.bin"); // HWC uint8
307
  ui.prompt.value = fx.prompt; ui.steps.value = fx.steps; ui.cfg.value = fx.cfg; ui.negative.value = "";
308
- const r = await generate({ prompt: fx.prompt, negative: "", steps: fx.steps, cfg: fx.cfg, noise, watermark: false });
309
  let dz = 0, dzs = 0, di = 0, dis = 0, se = 0;
310
  for (let k = 0; k < refZ.length; k++) { const d = Math.abs(r.latent[k] - refZ[k]); dz = Math.max(dz, d); dzs += d; }
311
  for (let p = 0; p < refImg.length / 3; p++) for (let c = 0; c < 3; c++) {
@@ -355,6 +375,49 @@ window.__agateSavedPng = async () => {
355
  };
356
  window.agateClearCache = clearCache;
357
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
358
  (async () => {
359
  renderVersion();
360
  if (!FORCE_EP) {
@@ -377,4 +440,4 @@ window.agateClearCache = clearCache;
377
  if (PARITY && agate) await parity();
378
  if (GOLDEN && !PARITY) window.__agate.state = "golden-done";
379
  }
380
- })();
 
1
+ import { Agate, ort, VERSIONS, webgpuStatus, clearCache, hasCachedModel } from "./agate.js";
2
  import { addPngText, readWatermark } from "./marking.js";
3
  import { prepare as preparePrompt, countVector } from "./prompt.js";
4
  import { ThinkerView } from "./thinker.js";
 
46
  };
47
  const thinkerView = new ThinkerView($("plan-canvas"), $("pred-canvas"));
48
 
49
+ /* Reference image (image-to-image): upload, preview, strength. The file is encoded to an SD-VAE latent on the
50
+ first Generate (and again after a resolution change), see generate() below. */
51
  const referenceInput = $("reference-image");
52
  const referencePreview = $("reference-preview");
53
  const referencePreviewWrap = $("reference-preview-wrap");
 
55
  const imageStrength = $("image-strength");
56
  const imageStrengthValue = $("image-strength-v");
57
 
58
+ let referenceFile = null;
59
  let referenceImageUrl = null;
60
+ const referenceLatents = new Map(); // resolution -> encoded latent of the current reference file
61
+
62
+ function setReference(file) {
63
+ if (referenceImageUrl) { URL.revokeObjectURL(referenceImageUrl); referenceImageUrl = null; }
64
+ referenceLatents.clear();
65
+ referenceFile = file || null;
66
+ if (file) {
67
+ referenceImageUrl = URL.createObjectURL(file);
68
+ referencePreview.src = referenceImageUrl;
69
+ } else {
70
+ referencePreview.removeAttribute("src");
71
+ referenceInput.value = "";
72
+ }
73
+ referencePreviewWrap.hidden = !file;
74
+ imageStrength.disabled = !file; // the slider only means something with a reference image
75
+ }
76
 
77
  referenceInput.addEventListener("change", () => {
78
  const file = referenceInput.files?.[0];
 
85
  return;
86
  }
87
 
88
+ setReference(file);
 
 
 
 
 
 
 
 
89
  setProgress(0, "Reference image selected", file.name);
90
  });
91
 
92
  clearReferenceButton.addEventListener("click", () => {
93
+ setReference(null);
 
 
 
 
 
 
 
 
94
  setProgress(0, agate ? "Ready" : "Idle", "");
95
  });
96
 
 
195
  busy = true; ui.go.disabled = true;
196
  window.__agate.state = "loading";
197
  agate = new Agate({ base: BASE, override: MODELS_OVERRIDE, version, ep, variant: VARIANT, optLevel: params.get("opt") || "all" });
198
+ window.__model = agate; // for console diagnostics, e.g. __encoderRoundTrip()
199
  try {
200
  const t0 = performance.now();
201
  const st = await agate.load(({ phase, file, loaded, total }) => {
 
240
  };
241
  }
242
 
243
+ // The reference image as a latent at the model's current resolution, encoded once per image and resolution.
244
+ async function referenceLatentFor(model) {
245
+ const key = String(model.resolution);
246
+ let latent = referenceLatents.get(key);
247
+ if (!latent) {
248
+ setProgress(0, "Encoding reference image", "");
249
+ latent = await model.encodeReferenceImage(referenceFile);
250
+ referenceLatents.set(key, latent);
251
+ }
252
+ return latent;
253
+ }
254
+
255
  async function generate(opts = {}) {
256
  busy = true; stop = false;
257
  ui.go.textContent = "Stop"; ui.frame.classList.add("busy");
258
  window.__agate.state = "generating";
259
  const steps = opts.steps ?? Number(ui.steps.value);
260
+ const useReference = !!referenceFile && opts.reference !== false; // the parity test passes reference: false
261
+ const strength = Number(imageStrength.value);
262
  try {
263
+ const referenceLatent = useReference ? await referenceLatentFor(agate) : null;
264
  setProgress(0, "Encoding prompt", "");
265
  const r = await agate.generate({
266
  prompt: opts.prompt ?? ui.prompt.value.trim(), negative: opts.negative ?? ui.negative.value.trim(),
267
  seed: Number(ui.seed.value) >>> 0, steps, cfg: opts.cfg ?? Number(ui.cfg.value), noise: opts.noise ?? null,
268
+ referenceLatent, denoise: useReference ? strength : 1,
269
  watermark: opts.watermark ?? true,
270
  onStep: (i, n) => setProgress(i / n, `Step ${i} / ${n}`, ""),
271
  onPreview: (opts.thinker ?? ui.showThinker.checked) ? previewFn() : null,
 
280
  const T = r.timings;
281
  setProgress(1, "Done", `${(T.totalMs / 1000).toFixed(1)} s`);
282
  showTimings([
283
+ ...(useReference ? [["image-to-image", `strength ${strength.toFixed(2)} · ${T.steps} of ${steps} steps`]] : []),
284
  ["text encode", `${T.textMs.toFixed(0)} ms (bucket ${T.bucket})`],
285
+ ["per step", `${T.stepMs.toFixed(0)} ms × ${T.steps ?? steps} (first ${T.firstStepMs.toFixed(0)} ms)`],
286
  ["decode + mark", `${T.decodeMs.toFixed(0)} + ${T.markMs.toFixed(0)} ms`],
287
  ["total", `${(T.totalMs / 1000).toFixed(2)} s`],
288
  ]);
 
325
  const refZ = new Float32Array((await bin("parity_latent.bin")).buffer);
326
  const refImg = await bin("parity_image.bin"); // HWC uint8
327
  ui.prompt.value = fx.prompt; ui.steps.value = fx.steps; ui.cfg.value = fx.cfg; ui.negative.value = "";
328
+ const r = await generate({ prompt: fx.prompt, negative: "", steps: fx.steps, cfg: fx.cfg, noise, watermark: false, reference: false });
329
  let dz = 0, dzs = 0, di = 0, dis = 0, se = 0;
330
  for (let k = 0; k < refZ.length; k++) { const d = Math.abs(r.latent[k] - refZ[k]); dz = Math.max(dz, d); dzs += d; }
331
  for (let p = 0; p < refImg.length / 3; p++) for (let c = 0; c < 3; c++) {
 
375
  };
376
  window.agateClearCache = clearCache;
377
 
378
+ // Diagnostic for image-to-image: encode the selected reference image with the SD 1.5 VAE encoder, decode that
379
+ // latent straight away with Agate's own decoder (no generator involved) and show it next to the reference crop.
380
+ // If the two look alike, the encoder, preprocessing and 0.18215 scale agree with the decoder. Run from the
381
+ // console after loading the model and picking an image: await __encoderRoundTrip()
382
+ window.__encoderRoundTrip = async () => {
383
+ if (!agate?.sessions) throw new Error("Load the model first.");
384
+ if (!referenceFile) throw new Error("Select a reference image first.");
385
+ const size = agate.resolution, C = agate.manifest.latent_ch, hw = size / 8;
386
+
387
+ const lat = await agate.encodeReferenceImage(referenceFile);
388
+ let min = Infinity, max = -Infinity, sum = 0;
389
+ for (const v of lat) { if (v < min) min = v; if (v > max) max = v; sum += v; }
390
+ console.log(`latent: ${lat.length} values (expected ${C * hw * hw}), range ${min.toFixed(3)} .. ${max.toFixed(3)}, mean ${(sum / lat.length).toFixed(3)}`);
391
+
392
+ const dec = agate.sessions.vae;
393
+ const result = await dec.run({ [dec.inputNames[0]]: new ort.Tensor("float32", lat, [1, C, hw, hw]) });
394
+ const out = result[dec.outputNames[0]];
395
+ const [, , H, W] = out.dims;
396
+ console.log("decoder output dims:", out.dims.join(" x "));
397
+ const rgba = new Uint8ClampedArray(H * W * 4);
398
+ for (let p = 0; p < H * W; p++) {
399
+ for (let c = 0; c < 3; c++) rgba[p * 4 + c] = Math.round((Math.max(-1, Math.min(1, out.data[c * H * W + p])) + 1) * 127.5);
400
+ rgba[p * 4 + 3] = 255;
401
+ }
402
+
403
+ // the reference, center-cropped exactly as encodeReferenceImage does
404
+ const refCanvas = document.createElement("canvas"); refCanvas.width = size; refCanvas.height = size;
405
+ const bmp = await createImageBitmap(referenceFile);
406
+ const k = Math.max(size / bmp.width, size / bmp.height);
407
+ refCanvas.getContext("2d").drawImage(bmp, (bmp.width - size / k) / 2, (bmp.height - size / k) / 2, size / k, size / k, 0, 0, size, size);
408
+ bmp.close();
409
+ const decCanvas = document.createElement("canvas"); decCanvas.width = W; decCanvas.height = H;
410
+ decCanvas.getContext("2d").putImageData(new ImageData(rgba, W, H), 0, 0);
411
+
412
+ const el = $("parity"); el.hidden = false;
413
+ el.innerHTML = `<span class="label"><i class="sq red"></i>Encoder round trip · reference crop (left) vs decoded latent (right)</span>`;
414
+ const row = document.createElement("div");
415
+ row.style.cssText = "display:flex;gap:12px;margin-top:10px;flex-wrap:wrap";
416
+ for (const c of [refCanvas, decCanvas]) { c.style.cssText = "max-width:48%;height:auto"; row.appendChild(c); }
417
+ el.appendChild(row);
418
+ return { values: lat.length, min, max, mean: sum / lat.length, outputDims: [...out.dims] };
419
+ };
420
+
421
  (async () => {
422
  renderVersion();
423
  if (!FORCE_EP) {
 
440
  if (PARITY && agate) await parity();
441
  if (GOLDEN && !PARITY) window.__agate.state = "golden-done";
442
  }
443
+ })();