Compare commits

..
54 Commits
Author SHA1 Message Date
ausboss 39a7599fd9 Merge pull request #339 from ausboss/release/2.25.0
Release 2.25.0
2026-11-12 12:14:52 -06:00
ausboss c4e519565b Release 2.25.0 2026-11-12 12:07:14 -06:00
ausboss f18b8f6ca3 Merge pull request #327 from ausboss/feat/load-image
Load Image: a loader that also sets the size
2026-11-12 11:54:26 -06:00
ausboss 64ab3e9761 Load Image: crop from a side, crop without resizing, and a picture preview
- Keep (crop_from) picks the part of the picture a crop keeps: the
  center, a side or a corner. Crop to fill used to cut from the middle
  only.
- Two more Size choices that only cut and never resize: crop takes a
  width x height piece, and crop to ratio takes the largest piece of a
  shape such as 16:9. Ratio lists 13 shapes, or takes the shape from
  the width and height boxes. Round to rounds these down so the piece
  stays inside the picture.
- Two small pictures on the node show the file going in, with the kept
  part lit and the cut part dark, and the picture coming out, both on
  one scale. Between them the node names the shape and what happens
  ("3:4 -> 1:1", "77% size", "cuts 449 px of height"). A click on the
  first picture picks the part to keep.

The browser repeats the new arithmetic, and the shared table of cases
(now 469) holds it to the backend's answers.
2026-11-12 11:33:12 -06:00
ausboss 065f2cb14c Merge main: Load Image stays in Unreleased above the 2.24.0 section 2026-11-12 10:37:50 -06:00
ausboss 3d99ddd35a Merge pull request #338 from ausboss/fix/preview-slow-link
Save Image: a small picture on the node, a Save row, and no stale picture on a slow link
2026-11-12 10:37:38 -06:00
ausboss 224b4af1da Merge remote-tracking branch 'origin/main' into fix/preview-slow-link
# Conflicts:
#	CHANGELOG.md
2026-11-12 10:36:36 -06:00
ausboss 0a7177b151 Merge pull request #337 from ausboss/feat/callout-info-card
Callout: Info card style with a title, rows and small print
2026-11-12 10:34:40 -06:00
ausboss b31561d1a0 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	CHANGELOG.md
2026-11-12 10:33:54 -06:00
ausboss ba4ab486c3 Merge pull request #336 from ausboss/feat/clear-vram-menu
Clear VRAM on the canvas right-click menu
2026-11-12 10:33:34 -06:00
ausboss 4603256ebf Save Image: a row over held pictures with a solid Save button
With Auto save off the only way to save was a small SAVE label in the
corner of the preview bar, easy to miss.

A row between the bar and the picture now says "Not saved yet" and holds
a solid button: Save picture, Save all 4, Save this one, Save the rest.
After a save it says what is saved, with the file's name for one picture.
The row shows only while the node holds pictures, takes its own room so
the picture keeps its floor, and stays with the preview off.

The button is primaryAction in the shared panel controls; the wording is
keepWords, with a test.
2026-11-12 10:24:27 -06:00
ausboss 52b23691dc Save Image shows a small copy of each picture on its face
The node's face loaded the whole saved file: 31 MB for a 9232 x 4608
sheet, where the panel draws a few hundred pixels of it. On a 2.8 MB/s
link that took half a minute.

Save Image now writes a WebP copy of each picture, at most 2048 pixels on
the long side, into the temp folder (ausboss_preview) and names them in
its result. The panel shows that copy and goes back to the file itself
when the copy is gone, as after a restart. The queue still lists the
saved file, and preview off writes no copy.

Same link, same picture: the new picture shows 0.3 s after the run
(0.2 MB), where it took 32.6 s.
2026-11-12 10:13:23 -06:00
ausboss df773658da Save Image shows the new picture when it loads slowly
The frontend loads a node's result into node.imgs with a time limit: two
tries of about 8 seconds. A picture that takes longer is dropped and
node.imgs keeps the run before. The preview panel preferred node.imgs, so
a 31 MB sheet over a 2.8 MB/s link never showed; the panel stayed on the
older picture.

The panel now notes which output record node.imgs was loaded for and uses
the stored output when that is not the current one. While a new picture
loads, the one before dims after a moment.
2026-11-12 10:01:38 -06:00
ausboss d4636bb5e3 Callout: Info card style with a title, rows and small print
Right-click a Callout and pick Info card for a small card: the first line
is its title (a clock, info, warning, bulb or tick emoji at its start is
drawn as a line icon), a line with a | is a row with the label on the left
and the value on the right, a row in bold is drawn in teal, and small
print is a grey line. An empty note starts with sample text.

The card look is a node property and the text is the note's own text, so
an Info card saves as a plain Callout: an older pack shows the same text
as a note with its rows written out. A plain callout never reads | as a
row, so no note written before changes.
2026-11-12 08:21:31 -06:00
ausboss 83f59cac93 Clear VRAM on the canvas right-click menu, with a setting to hide it
Right-clicking the empty canvas offers Clear VRAM, which sends ComfyUI's
own free request (unload models and free memory) and shows a toast with
the result. The setting AusBoss.Memory.ClearVramMenu (on by default)
hides the entry, and so does ComfyUI's Comfy.Memory.AllowManualUnload.
2026-11-12 07:19:25 -06:00
ausboss 431941fc9d Merge pull request #335 from ausboss/release/2.24.0
Release 2.24.0
2026-11-12 00:59:02 -06:00
ausboss f5eab116c0 Release 2.24.0 2026-11-12 00:58:15 -06:00
ausboss 6008d31653 Merge pull request #334 from ausboss/fix/save-image-one-row
Save Image: Auto save shares the Embed workflow row
2026-11-12 00:29:19 -06:00
ausboss 434817bc76 Test: Save Image's settings card keeps its height 2026-11-12 00:28:26 -06:00
ausboss cdd98b13a3 Save Image: Auto save shares the Embed workflow row, so the node is no taller than before 2026-11-12 00:09:16 -06:00
ausboss f9683347be Merge pull request #331 from ausboss/fix/note-popup-outside-click
Workflow Note popup closes on a click outside it
2026-11-11 23:17:25 -06:00
ausboss a2853a0ae1 Merge pull request #332 from ausboss/feat/prompt-variations
New node: Prompt Variations
2026-11-11 23:17:06 -06:00
ausboss b2eb11996b Merge main: FlashVSR Upscale and Prompt Variations share the zh locale file 2026-11-11 23:11:35 -06:00
ausboss 36fcf9db4f Merge pull request #333 from ausboss/feat/flashvsr
Add FlashVSR Upscale: a video upscale node with one model file
2026-11-11 23:08:46 -06:00
ausboss cb21a14424 Add FlashVSR Upscale: a video upscale node with one model file
Makes a video larger and sharper with the FlashVSR v1.1 model, from 1x to
4x. The model, the loop and the tiling are the pack's own code in plain
PyTorch, so the node needs one model file and no other pack. A long clip
needs no more graphics memory than a short one, and a result too large for
the free memory is made in tiles.

Comes with a help page, the example workflow FlashVSR Video Upscale, and
tests for the helpers.
2026-11-11 22:49:17 -06:00
ausboss f9ca96f648 Prompt Variations node: pick one choice from each {a|b|c} set by seed
A prompt box that changes on every run. Choices in curly brackets are
picked on the server from the wired seed, so the same seed gives the same
prompt again and a randomized seed with a run count of 50 gives 50 mixes.
Brackets without a | are left alone, so JSON prompts pass through.
2026-11-11 22:17:53 -06:00
ausboss 2d7dd74fe2 Workflow Note popup closes on a click outside it
The info tile's popup is a modal dialog that only Close or Escape put
away. A press and release both on the dark area around the card now close
it; a click, text selection or drag that starts on the card keeps it open.
The Edit form already asks before an outside click drops a change.
2026-11-11 21:45:20 -06:00
ausboss 8a379940bd Merge pull request #330 from ausboss/feat/save-image-hold
Save Image: show every picture of a run, and save on a click
2026-11-11 21:03:46 -06:00
ausboss a87ffb84b7 Merge main: Text Lines and the Save Image entries share one changelog section 2026-11-11 19:56:28 -06:00
ausboss 89bda6ba11 Merge pull request #329 from ausboss/feat/text-lines-node
Text Lines: run what comes after once for each line of text
2026-11-11 19:56:16 -06:00
ausboss e191f0fc40 Save Image: SAVE ALL keeps every picture of a list run
A list run saves once for each item, so one result holds several held
runs. The button used only the first, and kept one picture of six.
2026-11-11 19:52:41 -06:00
ausboss 090dcdad62 Save Image can wait for a click before it saves
Auto save off: a run shows its pictures on the node and saves nothing.
SAVE ALL keeps every picture, SAVE keeps the one the arrows picked.
Held pictures wait in the temp folder and are copied to the output
folder under the names the node would have given them.
2026-11-11 19:44:19 -06:00
ausboss 47d1c4f739 Text Lines: run what comes after once for each line of text
A new node. Type a list of prompts, one on each line, or wire in a list
another node wrote. Empty lines are skipped, a number or bullet at the
start of a line can be taken off, and a limit stops a list that ran long.
2026-11-11 19:41:41 -06:00
ausboss a92017cff4 Save Image shows every picture of a run at once
A run that saved several pictures showed one, with arrows to step
through them. They now show side by side, as the core Save Image does.
The arrows go on to each picture by itself and round again to all of
them. The other preview nodes show a batch the same way.
2026-11-11 19:41:27 -06:00
ausboss cfbc42799a Merge main so Load Image and Edit Lock share one changelog section 2026-11-11 17:08:23 -06:00
ausboss 799d731ab5 Merge pull request #328 from ausboss/feat/edit-lock
New nodes: Edit Lock and Edit Lock Restore
2026-11-11 17:04:37 -06:00
ausboss 5fc8cffc9f Edit Lock help: rain together with a clear local change 2026-11-11 16:09:23 -06:00
ausboss 4dffaf3991 Edit Lock: rain, snow and haze come through whole
The node locked from the first step, where rain or snow over the whole
picture reads as a small local edit, so the effect was held back.

It now watches the first steps, undoing only the model's zoom and shift,
and decides once the picture has formed. When no place has changed
clearly, or the lock would free a wide part of the picture that holds no
clear change, it puts nothing back and only keeps the picture in place.
Local edits lock from that step on and end on the original as before.
2026-11-11 16:00:12 -06:00
ausboss bc474f1532 Edit Lock docs: when always is the wrong pick
An edit that also changes the light on the face (a new hair color on a
close-up) looks better plain: always keeps the old light on everything it
keeps. The README's chain numbers are from a rerun on a seed where the
model makes all five edits.
2026-11-11 14:15:08 -06:00
ausboss c206d9e9da Edit Lock: an edit leaves the rest of the picture where it was
Two new nodes. Edit Lock sits between the model and the sampler, reads
what the edit changes from the model's own prediction at every step, and
puts the original back everywhere else. Edit Lock Restore swaps the
original's pixels in for those parts after the decode.

The zoom and shift a model adds to the whole picture are measured and
discounted before anything is compared, and an even tint is taken out.
An edit of the whole picture is left alone.

On MiniMax-H3-Image at 4 megapixels, 18 local edits at two seeds each
moved by up to 14.5 px plain and by 0.12 px or less locked.
2026-11-11 00:59:25 -06:00
ausboss b4657e2b58 Load Image: a loader that also sets the size
A new node, Load Image. It loads a picture and sets its size in the
same node, so a workflow needs no resize node and no size node after
its loader.

- Size: off, megapixels, longest side, scale, fit inside, or crop to
  fill. Each choice shows only the numbers it uses. Round to rounds
  the result to a multiple. Under More: the resize method, and Enlarge,
  which when off only ever makes a picture smaller.
- Arrows under the file picker step through the input folder, with
  the picture's place in the list beside them.
- The node shows the size going in and the size coming out before a
  run. The browser repeats the backend's arithmetic, and a table of
  252 cases holds the two to the same answers.
- Outputs: image, mask, width, height, filename, original_width,
  original_height. The mask is the picture's transparency, as the
  stock loader gives it, at the new size.
- The picture on the node is ComfyUI's own preview, so the mask editor
  and clipspace work as they do on the stock loader.
- With Size off the pixels are the file's own.

Mask by Touch and the run check know the new loader as a source.
2026-11-10 17:42:00 -06:00
ausboss eba880cdee Merge pull request #326 from ausboss/feat/touch-feedback 2026-11-10 14:50:45 -06:00
ausboss b6a67a4c34 Mask by Touch: take away by name, big pictures, a quiet queue
Four things people ran into while picking a mask:

- Ctrl-click on a part of a picked thing could take the whole thing
  away. With only a sweater picked, a Ctrl-click on the face offered
  the person, which holds the sweater, and the pick was gone. From a
  spot that is not picked, a piece that holds a whole pick is no longer
  offered; the picture says nothing is picked there.
- A name could only be taken away while Erase was chosen. The name
  field now has a + / - button, and a name typed with a minus in front
  ("-face") is taken away whichever tool is chosen.
- SAM 3 answers at the size of the picture it is given, so a look at a
  3840 px picture took 53 s and an 8192 px one ran a 32 GB card out of
  memory. A picture with a long side over 2048 px is now asked about on
  a smaller copy, and the answer comes back at the picture's own size:
  31 s and 33 s. Pictures up to 2048 px are asked about as before.
- Each change on the loader in front of the node sent one more look and
  left the earlier ones waiting. The node's own waiting looks are now
  taken out of the queue before a new one is sent.

The button that pauses the look now says Pause or Look on, and an out
of memory stop says so in plain words.
2026-11-10 14:49:34 -06:00
ausboss 27525ffdd8 Merge pull request #325 from ausboss/fix/explain-known-errors
Say what to do for two run errors that come from outside the workflow
2026-11-09 16:21:15 -06:00
ausboss eb668c448c Merge pull request #324 from ausboss/fix/two-copies
Start ComfyUI when the pack is installed twice, an older copy included
2026-11-09 16:21:05 -06:00
ausboss 9b3cd7c769 Merge the two-copies fix so both changes share one changelog section 2026-11-09 16:19:53 -06:00
ausboss 13c303178b Known run errors: shorter messages 2026-11-09 16:03:33 -06:00
ausboss f945feabb6 Say what to do for two run errors that come from outside the workflow
A MiniMax H3 run that keeps a clip's sound stops with KeyError: 'latent'
when the Muse MiniMax Director pack is installed, and an older ComfyUI
stops on a w6a8 model file. Neither message tells a person what to do,
so the run check now shows one toast for each with the cause and the fix.
2026-11-09 16:00:23 -06:00
ausboss 24ce4ffb06 README: install the pack one way, not both 2026-11-09 15:51:11 -06:00
ausboss 980ed5db8b One-copy check: only look in ComfyUI's custom_nodes folders 2026-11-09 15:27:28 -06:00
ausboss bf59887643 One-copy check: look beside the folder ComfyUI loaded, not its link target 2026-11-09 15:23:12 -06:00
ausboss 60be0ee865 Start ComfyUI when the pack is installed twice
A Manager install (custom_nodes/ausboss-nodes) beside a git clone
(custom_nodes/ComfyUI-AusBoss) added every route twice and ComfyUI
stopped while starting. Each copy now looks for the others, one loads
and the rest step aside and name the folder to delete.
2026-11-09 15:22:28 -06:00
ausboss 146e3cfa8b Merge pull request #322 from ausboss/ci/publish-downloader-note
Publish Model Downloader: take the release note as an input
2026-11-09 00:35:55 -06:00
ausboss e22ddb90d5 Publish Model Downloader: take the release note as an input
The job carried the 0.1.0 note as a fixed string, so every later
version would have shown "Initial release" on the Registry. The note is
now a required input of the manual run, and the publish step refuses a
blank one.
2026-11-09 00:34:40 -06:00
79 changed files with 8818 additions and 181 deletions
@@ -7,6 +7,10 @@ on:
description: Full commit SHA from ComfyUI-AusBoss-Model-Downloader main
required: true
type: string
changelog:
description: Release note for this version, shown in the Registry's Updates section
required: true
type: string
# The existing AusBoss publisher credential stays in this repository. This
# manual job publishes only the separately maintained Model Downloader addon.
@@ -62,12 +66,16 @@ jobs:
id: publish
env:
REGISTRY_ACCESS_TOKEN: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
COMFY_NODE_CHANGELOG: 'Initial release: model downloads from Civitai and Hugging Face, installed-file checks, saved model lists, and AusBoss Workflow Note integration.'
COMFY_NODE_CHANGELOG: ${{ inputs.changelog }}
run: |
if [ -z "$REGISTRY_ACCESS_TOKEN" ]; then
echo '::error::REGISTRY_ACCESS_TOKEN is not configured.'
exit 1
fi
if [ -z "${COMFY_NODE_CHANGELOG// /}" ]; then
echo '::error::The changelog input is empty; the Registry shows it as the release note.'
exit 1
fi
comfy --skip-prompt --no-enable-telemetry node publish --token "$REGISTRY_ACCESS_TOKEN"
- name: Report Registry review status
if: always() && steps.publish.outcome != 'skipped'
+138
View File
@@ -2,6 +2,144 @@
All notable changes to ComfyUI-AusBoss are documented here.
## 2.25.0 - 2026-11-12
- **New node: Load Image.** Loads a picture and sets its size in the same
node, so a workflow needs no resize node after its loader. Size can be a
megapixel count, a longest side, a scale, a box the picture fits inside, or
a box it fills by cropping, rounded to a multiple you choose. It can also
cut a piece or a shape such as 16:9 out of the picture without resizing,
and you pick which part is kept: the center, a side or a corner. Arrows
step through the pictures in the input folder. Two small pictures on the
node show what goes in and what comes out, with both sizes and what is
cut off, before you run. It also gives the file's name and its original
size. With Size off the picture comes out exactly as the file has it.
- **Clear VRAM from the right-click menu.** Right-click the empty canvas
and pick **Clear VRAM 🆎** to unload every model and free memory on the
ComfyUI server, the same as ComfyUI's own "Unload Models and Execution
Cache". A short message says when it is done. Turn the entry off in
Settings, 🆎 AusBoss, Memory.
- **Callout 🆎: Info card.** Right-click a Callout and pick **Info card**
for a small card with a title, a list of labels and values, and small
print, such as a table of run times. Write a row as `label | value`; a
row in **bold** is drawn in teal so the one to pick stands out. The first
line is the title, and a ⏱️ ℹ️ ⚠️ 💡 or ✅ at its start becomes a small
icon. An older pack shows the card as a plain note with its rows written
out.
- **Save Image shows big pictures at once.** The node now shows a small
copy of each picture, a few hundred kilobytes, where it used to load the
whole file. A 30 MB sheet on a ComfyUI opened from another computer took
half a minute to show, or never did; it now shows as the run ends. The
saved file is the same full-size file as before.
- **Save Image: the Save button is hard to miss.** With **Auto save** off,
a row over the picture now says **Not saved yet** and holds a solid
**Save picture** button. Before, it was a small SAVE label in the corner.
With several pictures the button reads **Save all 4**, or **Save this
one** when the arrows are on one picture. After a save the row says the
name the picture was saved under.
- **A picture that loads slowly no longer leaves the old one up.** When a
result took more than about 16 seconds to reach the browser, the node
kept the picture from the run before. Now the new picture always shows,
and the old one dims while the new one loads. This fixes Select Frame,
Mask Refine, Mask by Name and LaMa Inpaint as well as Save Image.
## 2.24.0 - 2026-11-12
- **New node: Edit Lock.** Keeps every part of your picture that an edit
did not change exactly where it was, with the colors it had. Edit models
redraw the whole picture, so untouched parts often come back a little
zoomed, shifted or tinted. Put Edit Lock between the model and the
sampler and give it the picture you are editing. It needs no mask. It
steps aside when the edit changes the whole picture, and lets rain,
snow and haze through while holding the picture in place. Tested on
MiniMax-H3-Image.
- **New node: Edit Lock Restore.** Puts your picture's own pixels back in
every part the edit did not change. Add it after the VAE Decode with
Edit Lock's `edit_lock` output. It also gives a mask of what the edit
changed and a one-line report.
- **New node: Text Lines.** It runs what comes after once for each line of
your text. Type five prompts, one on each line, and one run makes five
pictures. It also takes a list a text model wrote: empty lines are
skipped, a leading number or bullet comes off, and **Limit** stops a list
that ran long.
- **Save Image shows every picture of a run at once.** When a run saves
several pictures, they now show side by side in the node, the way the
core Save Image does. The arrows still go to each picture by itself, and
round again to all of them. Select Frame, Mask Refine, Mask by Name and
LaMa Inpaint show a batch the same way.
- **Save Image can wait for a click before it saves.** Switch **Auto save**
off and a run only shows its pictures on the node. **SAVE ALL** over them
keeps every one; step to one picture with the arrows and **SAVE** keeps
just that one. Good for making a batch and keeping the best. Auto save is
on unless you switch it off, so nothing changes for workflows you have.
- **New node: Prompt Variations.** A prompt box that picks one choice from
each set in curly brackets, such as `a {red|blue|green} {sweater|jacket}`,
on every run. The seed decides the picks, so the same seed gives the same
prompt again. Queue 50 runs with a random seed and get 50 different
prompts, with no wildcard pack.
- **Mask by Touch: type a name to take it out of the mask.** The name field
under the picture now has a sign in front. Click it to switch between **+**
(add by name) and **−** (take away by name), then type "face" or "hair" and
press Enter. Typing "-face" takes it away whatever the sign says. Before,
a typed name was only taken away while Erase was chosen, which nothing on
the node said.
- **Mask by Touch: Ctrl-click only takes away what you point at.** With a
sweater picked, a Ctrl-click on the face offered the whole person, and the
sweater went with it. Now a spot where nothing is picked says so and
changes nothing.
- **Mask by Touch works on big pictures.** A look at a 3840 pixel picture took
twice as long as at 2048, and at 8192 pixels it ran a 32 GB graphics card
out of memory. The node now asks SAM 3 about a copy of at most 2048 pixels
and brings the answer back to full size. Pictures up to 2048 pixels come
out exactly as before. On bigger ones a mask's edge can sit a pixel or two
differently.
- **Mask by Touch no longer fills the queue.** With Image Crop + Rotate + Pad
or Load Image + Pad wired in, every change to the loader (each step of its
megapixels, for one) queued one more look at a picture that was already
replaced. Now only the newest look waits. The button that pauses the
looking also says **Pause** and **Look on**.
- **New node: FlashVSR Upscale 🆎.** Makes a video larger and sharper with
the FlashVSR v1.1 model, from 1x to 4x. It needs one model file and no
other pack: the help page has the download link. A long clip needs no more
graphics memory than a short one, and a result too large for the free
memory is made in tiles.
The new example `FlashVSR Video Upscale (AusBoss)` shows it between Load
Video and Save Video.
- **Two errors from outside a workflow now say what to do.** When a MiniMax H3
run stops with `KeyError: 'latent'` because the Muse MiniMax Director pack is
installed, a message names that pack and says to turn it off. When an older
ComfyUI cannot read a `w6a8` model file, a message says to update ComfyUI.
ComfyUI's own error report stays as it is.
- **ComfyUI starts when the pack is installed twice.** A Manager install
(`custom_nodes/ausboss-nodes`) beside a git clone
(`custom_nodes/ComfyUI-AusBoss`) stopped ComfyUI while it started. Now one
copy loads and the other steps aside, and the console says which folder to
delete. A copy from 2.23.0 or older is the one that loads when it sits
beside a newer one, so delete the older folder.
- **A Workflow Note popup closes when you click outside it.** Opening an
info tile (a Tips note, say) showed the full note, and only its Close
button or Escape put it away. A click on the dark area around it now
closes it too. Selecting text in the note, or a drag that starts on it,
keeps it open, and the Edit form still asks before it drops a change.
## 2.23.0 - 2026-11-09
- **Mask by Touch keeps your picks when the picture changes.** Your clicks
+37 -1
View File
@@ -20,6 +20,7 @@ Most of them are for image and video work. ComfyUI's core nodes already cover th
- **[Mask by Touch](#mask-by-touch):** click a thing on the picture and get its mask. Hover shows what a click would take, and **Fine edges** follows hair and fur.
- **[Mask by Name](#mask-by-name):** type "the red jacket" and get its mask and a cut-out.
- **[Image Crop + Rotate + Pad](#image-crop--rotate--pad):** turn, crop and pad a picture by dragging handles on the node, for outpainting.
- **[Edit Lock](#edit-lock):** an edit changes what you asked for, and the rest of the picture stays exactly where it was. No mask needed.
- **[Stitch Inpaint](#stitch-inpaint):** after an inpaint or outpaint, everything you didn't ask to change is your original pixels again.
- **[Video Crop + Rotate + Pad → Clip](#video-crop--rotate--pad--clip):** trim a clip on a timeline, and pad or crop it to a new shape.
- **[Tiled Upscale](#tiled-upscale):** upscale a picture in tiles to the megapixels you set.
@@ -42,6 +43,8 @@ git clone https://github.com/ausboss/ComfyUI-AusBoss.git
Restart ComfyUI and search the node library for **AusBoss**.
Install it one way, not both. Manager puts the pack in `custom_nodes/ausboss-nodes` and a clone in `custom_nodes/ComfyUI-AusBoss`. They are the same pack, so if both folders are there, delete one. The console says which copy it skipped.
After an update, through Manager or `git pull`, restart ComfyUI and hard-refresh the browser with **Ctrl+Shift+R**. Otherwise the browser keeps the old JavaScript, and the pack warns you about it. Manager can install a version or two behind while the Comfy Registry reviews a new release. To get the newest one, pick it in Manager's version list, or update by hand: delete the pack's folder in `ComfyUI/custom_nodes` and clone the repository as shown above.
The pack uses the Pillow, NumPy, Torch and PyAV that come with ComfyUI. Each example lists the models it needs on its Workflow Note. LaMa Inpaint also needs [`big-lama.pt`](https://github.com/Sanster/models/releases/download/add_big_lama/big-lama.pt) in `ComfyUI/models/lama/`. The pack never downloads weights by itself.
@@ -77,6 +80,12 @@ It returns the `image`, a `mask` of everything the model paints (padding, see-th
Krea 2 Rotate + Outpaint turns a photo, pads it and paints the new area in one pass. [Try the Krea 2 Rotate + Outpaint example →](example_workflows/Krea%202%20Rotate%20%2B%20Outpaint%20%28AusBoss%29.json)
### Load Image
Loads a picture and sets its size in one node. Pick a file, upload one, or step through the input folder with the arrows. **Size** can stay off, or bring the picture to a megapixel count, a longest side, a scale, a box it must fit inside, or a box it fills by cropping. It can also cut a piece or a shape such as 16:9 out of the picture without resizing, and **Keep** picks which part stays: the center, a side or a corner. **Round to** keeps the result on a multiple of 8, 16 or whatever the model wants. The node shows the picture going in and coming out, with both sizes, before you run, such as `912 × 1632 → 1144 × 2048`.
It returns the `image`, a `mask` of its see-through parts, the new `width` and `height`, the `filename` for a save prefix, and the file's `original_width` and `original_height`.
### Load Image + Pad
Makes a canvas for outpainting: drag the edges out to add room around a picture. The Source list shows the picture under the pointer. The new area can be a solid color, the average color of the nearest edge, the edge pixels smeared outward, a blurred copy of the picture, or a mirror of it. The card also has a seam feather, a canvas multiple and a megapixel budget, and **Exact padding** opens one control per side. A budget of 0 keeps the picture's size, and anything higher resizes the picture before padding. A picture wired into `source_image` is padded instead of the chosen file.
@@ -137,6 +146,18 @@ The same watercolor edit without and with Realign to Source: 61 px off before, 0
Qwen drew this watercolor 5.6% taller, and Realign to Source lined it back up with the original.
### Edit Lock
Keeps every part of your picture that an edit did not change exactly where it was, with the colors it had. An edit model redraws the whole picture, so the parts you did not ask about often come back a little zoomed in, shifted or tinted, and the picture jumps when you flip between before and after. Put Edit Lock between the model and the sampler and give it the picture you are editing. It needs no mask: it sees what the edit changes while the picture is being made, and holds on to everything else.
When the edit changes the whole picture (a new style, new light), there is nothing to keep, so the node steps aside and the edit runs as usual. A soft effect over the whole picture, such as rain or falling snow, is let through as well: the node then only holds the picture in place. **Lock** (`lock`) set to `off` does nothing at all, `always` locks even a whole-picture edit, and an optional `mask` says where the edit may happen. **Tolerance** (`tolerance`) sets how big a change must be to count as part of the edit.
On MiniMax-H3-Image, 4 megapixel edits moved the picture by up to 14 px without the lock (measured at 1 megapixel) and by 0.2 px or less with it (0.08 px or less on 35 of the 36 locked runs), on 19 local edits at two seeds each. After five edits in a row on one picture the plain chain had drifted 1.65 px and turned visibly pink; the locked chain sat at 0.04 px with no tint.
### Edit Lock Restore
Puts your picture's own pixels back in every part the edit did not change. Edit Lock keeps those parts in place, but they still pass through the VAE, which softens fine detail a little. Add this right after the VAE Decode and wire in Edit Lock's `edit_lock` output. **Feather** (`feather`) sets how softly the original fades into the edit. It also returns `edit_mask`, white where the edit changed the picture, and a one-line `report` of how much was kept.
### Image Compare A/B
Compares two pictures with a slider, or flips between them whole. Nothing covers the picture, and its size shows underneath. The panel grows with the node, and images A and B pass through, so you can put it anywhere on an image wire. **Erase** mixes the two by hand: rub parts of one picture away with a brush so the other shows through, then save the mix as a PNG under a name you type, with a layered PSD for Photoshop or GIMP if you want it.
@@ -197,6 +218,12 @@ Changes a clip's frame rate by making in-between frames. You set the source and
It returns the new frames and their fps. It doesn't touch audio, so carry the source audio to Save Video separately. The [help page](js/docs/AUSBOSS_NODES_FrameInterpolate.md) covers the weights and timing.
### FlashVSR Upscale
Makes a video larger and sharper with the FlashVSR model. Set **Scale** from 1 to 4 and it returns every frame at the new size, with fine detail drawn back in. It reads the clip a few frames at a time, so a long clip needs no more graphics memory than a short one, and a result too large for the free memory is made in tiles.
It needs one model file in `ComfyUI/models/diffusion_models` and no other pack. The [help page](js/docs/AUSBOSS_NODES_FlashVSRUpscale.md) has the download link, the memory it needs and the speed. [Try the FlashVSR Video Upscale example →](example_workflows/FlashVSR%20Video%20Upscale%20%28AusBoss%29.json)
### Save Video
Saves a frame batch or a core `VIDEO` as MP4 (H.264 or H.265), WebM (VP9 or AV1), ProRes MOV, lossless FFV1 MKV, GIF or WebP. Which encoders you get depends on your FFmpeg and PyAV build, and H.264 and H.265 come in CPU and NVENC versions. The videos carry color tags, and optionally audio and the workflow.
@@ -342,6 +369,14 @@ Puts batch `b` after `a`. When the sizes match, nothing is resized. When they di
A text box that grows with the node and sends its text, unchanged, down a `STRING` wire. Use it for a prompt, caption, path or other text that several nodes share. Spaces and line breaks are kept. Ctrl + Up and Ctrl + Down change the weight of the selected words, as in ComfyUI's own prompt boxes.
### Text Lines
Runs what comes after once for each line of your text. Type five prompts, one on each line, and one run makes five pictures. It also takes a list another node wrote, skips empty lines, and can take a leading `1.` or `-` off each line. `number` counts the lines from 1, to give each its own seed.
### Prompt Variations
A prompt box that changes on every run. Write choices in curly brackets, split by `|`, such as `a {red|blue|green} {sweater|jacket}`, and the node picks one from each set. Wire in the seed your sampler uses: a new seed gives a new mix, and the same seed gives the same prompt again. Set the seed to randomize and queue 50 runs to get 50 different prompts. Text without brackets comes out exactly as typed, so a JSON prompt is safe.
### H3 Prompt Writer
Type what happens, one line for each moment, and leave a blank line to cut to a new place. Connect up to four pictures and give each one a job: a person, a place, an outfit, a thing or a style. Copy the moves from a video, keep a clip going, or add a voice or a song. A timeline on the node shows when each moment plays before you run it. It needs no extra model and you never see H3's prompt format. Connect a small text model and it fills in a one-line idea.
@@ -394,7 +429,7 @@ Turns parts of a workflow off and on from one small card. Select the nodes of on
## Example workflows
These are the workflows where the nodes do something core ComfyUI doesn't do by itself: outpainting and inpainting that put your original picture back, lining an edit back up with its source, upscaling a picture in tiles, masking a thing by its name or with a click, and removing a watermark from a clip. Open a JSON file from [`example_workflows/`](example_workflows), or find them under this pack in ComfyUI's template browser. Each one has a thumbnail, numbered groups and a Workflow Note with the setup steps and model downloads.
These are the workflows where the nodes do something core ComfyUI doesn't do by itself: outpainting and inpainting that put your original picture back, lining an edit back up with its source, upscaling a picture in tiles, masking a thing by its name or with a click, removing a watermark from a clip, and making a clip larger and sharper. Open a JSON file from [`example_workflows/`](example_workflows), or find them under this pack in ComfyUI's template browser. Each one has a thumbnail, numbered groups and a Workflow Note with the setup steps and model downloads.
![The Krea 2 Rotate + Outpaint workflow: a setup note on the left, then groups for your input, the two boxes and the model loaders, and the result with a before-and-after slider and Save Image.](assets/readme/workflow-layout.webp)
@@ -415,6 +450,7 @@ The workflows open with their image and video loaders empty, so you load your ow
| [Mask by Name](example_workflows/Mask%20by%20Name%20%28AusBoss%29.json) | Type what to find in a picture, and get its mask and a cut-out with a see-through background | ComfyUI's own SAM 3.1 (ComfyUI 0.20 or newer) |
| [Mask by Touch](example_workflows/Mask%20by%20Touch%20%28AusBoss%29.json) | Click a thing in a picture, or its whole subject, and get its mask and a cut-out with hair-fine edges | ComfyUI's own SAM 3.1 and its background-removal model (ComfyUI 0.21 or newer) |
| [Simple Video Watermark Remover](example_workflows/Simple%20Video%20Watermark%20Remover%20%28AusBoss%29.json) | Find an overlay in a clip and remove it, with a one-frame comparison branch | ComfyUI's own SAM 3.1 (ComfyUI 0.20 or newer), plus `big-lama.pt` |
| [FlashVSR Video Upscale](example_workflows/FlashVSR%20Video%20Upscale%20%28AusBoss%29.json) | Make a clip larger and sharper with one node | `flashvsr_v1.1_fp16.safetensors` |
Every example uses only core nodes and this pack. Speed and memory use depend on the models, the sizes, the frame count and whatever else is using the GPU.
+39 -7
View File
@@ -22,6 +22,8 @@ NODE_MODULES = [
"node_callout",
"node_color_match",
"node_compare",
"node_edit_lock",
"node_flashvsr_upscale",
"node_frame_interpolate",
"node_free_memory",
"node_h3_prompt_writer",
@@ -35,6 +37,7 @@ NODE_MODULES = [
"node_lama_inpaint",
"node_layout_boxes",
"node_literals",
"node_load_image",
"node_load_image_pad",
"node_load_audio",
"node_load_video",
@@ -42,6 +45,7 @@ NODE_MODULES = [
"node_mask_by_name",
"node_mask_by_touch",
"node_math",
"node_prompt_variations",
"node_realign_to_source",
"node_refine_mask",
"node_resolution",
@@ -52,6 +56,7 @@ NODE_MODULES = [
"node_select_frame",
"node_show_text",
"node_step_preview",
"node_text_lines",
"node_tiled_upscale",
"node_video_crop_rotate_pad",
"node_video_crop_rotate_pad_clip",
@@ -63,7 +68,19 @@ NODE_CLASS_MAPPINGS = {}
NODE_DISPLAY_NAME_MAPPINGS = {}
_failed_modules = []
# Two copies of the pack (a Manager install beside a git clone) add every
# route twice and ComfyUI stops while starting. Only one copy loads.
_other_copy = None
try:
from .nodes._single_copy import other_copy_that_loads
_other_copy = other_copy_that_loads(os.path.dirname(__file__))
except Exception:
traceback.print_exc()
for _module_name in NODE_MODULES:
if _other_copy:
break
try:
_module = importlib.import_module(f".nodes.{_module_name}", __name__)
NODE_CLASS_MAPPINGS.update(getattr(_module, "NODE_CLASS_MAPPINGS", {}))
@@ -76,7 +93,7 @@ for _module_name in NODE_MODULES:
# Folder ComfyUI serves to the browser; every .js file in it is loaded as a
# frontend extension. Shared modules use .mjs so they are import-only.
WEB_DIRECTORY = "./js"
WEB_DIRECTORY = None if _other_copy else "./js"
__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS", "WEB_DIRECTORY"]
@@ -112,11 +129,26 @@ def _print_banner():
print(bar)
try:
from .nodes._frontend_cache import register_frontend_cache_guard
def _print_second_copy():
# ASCII only, as in the banner.
red = "\033[0;31m"
reset = "\033[0m"
own = os.path.basename(os.path.dirname(os.path.realpath(__file__)))
other = os.path.basename(_other_copy["folder"])
print(f"{red}AusBoss: this pack is installed twice.{reset}")
print(f" Using: custom_nodes/{other} (v{_other_copy['version']})")
print(f" Skipping: custom_nodes/{own} (v{_read_version()})")
print(" Delete one of the two folders, then restart ComfyUI.")
register_frontend_cache_guard()
except Exception:
traceback.print_exc()
_print_banner()
if _other_copy:
_print_second_copy()
else:
try:
from .nodes._frontend_cache import register_frontend_cache_guard
register_frontend_cache_guard()
except Exception:
traceback.print_exc()
_print_banner()
+3 -3
View File
@@ -1,9 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" width="105" height="20" role="img" aria-label="release: v2.23.0">
<title>release: v2.23.0</title>
<svg xmlns="http://www.w3.org/2000/svg" width="105" height="20" role="img" aria-label="release: v2.25.0">
<title>release: v2.25.0</title>
<path fill="#555" d="M0 0h48v20H0z"/>
<path fill="#00b4aa" d="M48 0h57v20H48z"/>
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" font-size="11">
<text x="24" y="14">release</text>
<text x="76.5" y="14">v2.23.0</text>
<text x="76.5" y="14">v2.25.0</text>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 425 B

After

Width:  |  Height:  |  Size: 425 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB

@@ -0,0 +1,526 @@
{
"id": "0b455c1f-6b0c-4f69-8a7e-86f8de61df5c",
"revision": 0,
"last_node_id": 5,
"last_link_id": 4,
"nodes": [
{
"id": 1,
"type": "AUSBOSS_NODES_WorkflowNote",
"pos": [
0,
30
],
"size": [
440,
640
],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [
{
"name": "note",
"type": "STRING",
"link": null,
"widget": {
"name": "note"
}
}
],
"outputs": [],
"title": "🆎 AusBoss",
"properties": {
"cnr_id": "ausboss-nodes",
"ver": "2.24.0",
"Node name for S&R": "AUSBOSS_NODES_WorkflowNote"
},
"widgets_values": [
"{\"v\": 1, \"title\": \"FlashVSR Video Upscale\", \"subtitle\": \"Make a video larger and sharper with one node and one model file.\", \"author\": \"AusBoss\", \"layout\": \"card\", \"accent\": \"\", \"body\": \"[▶ AusBoss on YouTube](https://www.youtube.com/@ausbossdev) · videos on these nodes and workflows\\n\\n---\\n\\n1. Load your video.\\n2. Set **Scale**: how many times larger each side gets. At 1 the video keeps its size and is only sharpened.\\n3. Press **Run**, then play the result in **Save Video**.\\n\\nTo try a short piece first, drag the right end of the bar under the player in Load Video.\\n\\nA long video needs no more graphics memory than a short one. A large result is made in tiles, so it fits the memory you have and takes longer.\\n\\nNeeds AusBoss nodes 2.24.0 or newer. No other pack is needed.\", \"models\": [{\"name\": \"flashvsr_v1.1_fp16.safetensors\", \"dir\": \"diffusion_models\", \"size\": \"3.5 GB\", \"url\": \"https://huggingface.co/ausboss/FlashVSR-v1.1-ComfyUI/resolve/main/flashvsr_v1.1_fp16.safetensors\", \"note\": \"FlashVSR v1.1 by Junhao Zhuang and the OpenImagingLab team, in one file\"}], \"packs\": [{\"name\": \"ComfyUI-AusBoss\", \"url\": \"https://github.com/ausboss/ComfyUI-AusBoss\", \"node\": \"AUSBOSS_NODES_FlashVSRUpscale\"}], \"links\": [{\"label\": \"YouTube · ausbossdev\", \"url\": \"https://www.youtube.com/@ausbossdev\"}, {\"label\": \"GitHub · ausboss\", \"url\": \"https://github.com/ausboss\"}, {\"label\": \"Civitai · AusBoss\", \"url\": \"https://civitai.com/user/AusBoss\"}, {\"label\": \"X · Zanzibased\", \"url\": \"https://x.com/Zanzibased\"}]}",
""
],
"widgets_values_named": {
"note": "{\"v\": 1, \"title\": \"FlashVSR Video Upscale\", \"subtitle\": \"Make a video larger and sharper with one node and one model file.\", \"author\": \"AusBoss\", \"layout\": \"card\", \"accent\": \"\", \"body\": \"[▶ AusBoss on YouTube](https://www.youtube.com/@ausbossdev) · videos on these nodes and workflows\\n\\n---\\n\\n1. Load your video.\\n2. Set **Scale**: how many times larger each side gets. At 1 the video keeps its size and is only sharpened.\\n3. Press **Run**, then play the result in **Save Video**.\\n\\nTo try a short piece first, drag the right end of the bar under the player in Load Video.\\n\\nA long video needs no more graphics memory than a short one. A large result is made in tiles, so it fits the memory you have and takes longer.\\n\\nNeeds AusBoss nodes 2.24.0 or newer. No other pack is needed.\", \"models\": [{\"name\": \"flashvsr_v1.1_fp16.safetensors\", \"dir\": \"diffusion_models\", \"size\": \"3.5 GB\", \"url\": \"https://huggingface.co/ausboss/FlashVSR-v1.1-ComfyUI/resolve/main/flashvsr_v1.1_fp16.safetensors\", \"note\": \"FlashVSR v1.1 by Junhao Zhuang and the OpenImagingLab team, in one file\"}], \"packs\": [{\"name\": \"ComfyUI-AusBoss\", \"url\": \"https://github.com/ausboss/ComfyUI-AusBoss\", \"node\": \"AUSBOSS_NODES_FlashVSRUpscale\"}], \"links\": [{\"label\": \"YouTube · ausbossdev\", \"url\": \"https://www.youtube.com/@ausbossdev\"}, {\"label\": \"GitHub · ausboss\", \"url\": \"https://github.com/ausboss\"}, {\"label\": \"Civitai · AusBoss\", \"url\": \"https://civitai.com/user/AusBoss\"}, {\"label\": \"X · Zanzibased\", \"url\": \"https://x.com/Zanzibased\"}]}",
"ausboss_workflow_note_panel": ""
},
"color": "#14424d",
"bgcolor": "#161f21"
},
{
"id": 2,
"type": "AUSBOSS_NODES_LoadVideo",
"pos": [
500,
80
],
"size": [
420,
760
],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [
{
"name": "video",
"type": "COMBO",
"link": null,
"widget": {
"name": "video"
}
},
{
"name": "start_seconds",
"type": "FLOAT",
"link": null,
"widget": {
"name": "start_seconds"
}
},
{
"name": "end_seconds",
"type": "FLOAT",
"link": null,
"widget": {
"name": "end_seconds"
}
},
{
"name": "custom_width",
"type": "INT",
"link": null,
"widget": {
"name": "custom_width"
}
},
{
"name": "custom_height",
"type": "INT",
"link": null,
"widget": {
"name": "custom_height"
}
},
{
"name": "every_nth",
"type": "INT",
"link": null,
"widget": {
"name": "every_nth"
}
},
{
"name": "max_frames",
"type": "INT",
"link": null,
"widget": {
"name": "max_frames"
}
},
{
"name": "single_frame",
"type": "BOOLEAN",
"link": null,
"widget": {
"name": "single_frame"
}
},
{
"name": "upload",
"type": "IMAGEUPLOAD",
"link": null,
"widget": {
"name": "upload"
}
}
],
"outputs": [
{
"name": "frames",
"type": "IMAGE",
"links": [
1
]
},
{
"name": "audio",
"type": "AUDIO",
"links": [
3
]
},
{
"name": "frame_count",
"type": "INT",
"links": []
},
{
"name": "fps",
"type": "FLOAT",
"links": [
4
]
},
{
"name": "width",
"type": "INT",
"links": []
},
{
"name": "height",
"type": "INT",
"links": []
},
{
"name": "duration",
"type": "FLOAT",
"links": []
},
{
"name": "video",
"type": "VIDEO",
"links": []
}
],
"title": "Load Video - Your video",
"properties": {
"cnr_id": "ausboss-nodes",
"ver": "2.24.0",
"Node name for S&R": "AUSBOSS_NODES_LoadVideo",
"ausboss_load_video_loop": true
},
"widgets_values": {
"video": "",
"start_seconds": 0,
"end_seconds": 0,
"custom_width": 0,
"custom_height": 0,
"every_nth": 1,
"max_frames": 0,
"single_frame": false
},
"widgets_values_named": {
"video": "",
"start_seconds": 0,
"end_seconds": 0,
"custom_width": 0,
"custom_height": 0,
"every_nth": 1,
"max_frames": 0,
"single_frame": false,
"upload": "image",
"ausboss_widget_card": "",
"ausboss_load_video_viewer": ""
},
"color": "#14424d",
"bgcolor": "#161f21"
},
{
"id": 3,
"type": "AUSBOSS_NODES_FlashVSRUpscale",
"pos": [
980,
80
],
"size": [
360,
190
],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [
{
"name": "frames",
"type": "IMAGE",
"link": 1
},
{
"name": "vae",
"type": "VAE",
"shape": 7,
"link": null
},
{
"name": "model",
"type": "COMBO",
"link": null,
"widget": {
"name": "model"
}
},
{
"name": "scale",
"type": "FLOAT",
"link": null,
"widget": {
"name": "scale"
}
},
{
"name": "color_match",
"type": "BOOLEAN",
"link": null,
"widget": {
"name": "color_match"
}
}
],
"outputs": [
{
"name": "frames",
"type": "IMAGE",
"links": [
2
]
}
],
"title": "FlashVSR Upscale",
"properties": {
"cnr_id": "ausboss-nodes",
"ver": "2.24.0",
"Node name for S&R": "AUSBOSS_NODES_FlashVSRUpscale",
"models": [
{
"name": "flashvsr_v1.1_fp16.safetensors",
"url": "https://huggingface.co/ausboss/FlashVSR-v1.1-ComfyUI/resolve/main/flashvsr_v1.1_fp16.safetensors",
"directory": "diffusion_models"
}
]
},
"widgets_values": [
"flashvsr_v1.1_fp16.safetensors",
2,
true,
""
],
"widgets_values_named": {
"model": "flashvsr_v1.1_fp16.safetensors",
"scale": 2,
"color_match": true,
"ausboss_widget_card": ""
},
"color": "#14424d",
"bgcolor": "#161f21"
},
{
"id": 4,
"type": "AUSBOSS_NODES_SaveVideo",
"pos": [
1400,
80
],
"size": [
440,
640
],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [
{
"name": "frames",
"type": "IMAGE",
"link": 2
},
{
"name": "audio",
"type": "AUDIO",
"link": 3
},
{
"name": "video",
"type": "VIDEO",
"link": null
},
{
"name": "fps",
"type": "FLOAT",
"link": 4
},
{
"name": "filename_prefix",
"type": "STRING",
"link": null,
"widget": {
"name": "filename_prefix"
}
},
{
"name": "crf",
"type": "INT",
"link": null
},
{
"name": "format",
"type": "COMBO",
"link": null,
"widget": {
"name": "format"
}
},
{
"name": "pingpong",
"type": "BOOLEAN",
"link": null,
"widget": {
"name": "pingpong"
}
},
{
"name": "save_metadata",
"type": "BOOLEAN",
"link": null,
"widget": {
"name": "save_metadata"
}
}
],
"outputs": [
{
"name": "file_path",
"type": "STRING",
"links": []
}
],
"title": "Save Video",
"properties": {
"cnr_id": "ausboss-nodes",
"ver": "2.24.0",
"Node name for S&R": "AUSBOSS_NODES_SaveVideo",
"ausboss_save_video_loop": true
},
"widgets_values": {
"fps": 24,
"filename_prefix": "flashvsr_upscaled",
"crf": 19,
"format": "mp4 h264",
"pingpong": false,
"save_metadata": true
},
"widgets_values_named": {
"fps": 24,
"filename_prefix": "flashvsr_upscaled",
"crf": 19,
"format": "mp4 h264",
"pingpong": false,
"save_metadata": true,
"ausboss_widget_card": "",
"ausboss_save_video_viewer": ""
},
"color": "#14424d",
"bgcolor": "#161f21"
},
{
"id": 5,
"type": "AUSBOSS_NODES_RunTimer",
"pos": [
1515,
770
],
"size": [
210,
67
],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [],
"outputs": [],
"title": "Run Timer",
"properties": {
"cnr_id": "ausboss-nodes",
"ver": "2.24.0",
"Node name for S&R": "AUSBOSS_NODES_RunTimer"
},
"color": "#14424d",
"bgcolor": "#161f21"
}
],
"links": [
[
1,
2,
0,
3,
0,
"IMAGE"
],
[
2,
3,
0,
4,
0,
"IMAGE"
],
[
3,
2,
1,
4,
1,
"AUDIO"
],
[
4,
2,
3,
4,
3,
"FLOAT"
]
],
"groups": [
{
"id": 1,
"title": "1 · Your video",
"bounding": [
480,
0,
460,
880
],
"color": "#1d5560",
"flags": {}
},
{
"id": 2,
"title": "2 · Make it larger",
"bounding": [
960,
0,
400,
880
],
"color": "#1d5560",
"flags": {}
},
{
"id": 3,
"title": "3 · Result",
"bounding": [
1380,
0,
480,
880
],
"color": "#1d5560",
"flags": {}
}
],
"definitions": {
"subgraphs": []
},
"config": {},
"extra": {
"ds": {
"scale": 0.73,
"offset": [
137,
20
]
}
},
"version": 0.4
}
+115 -22
View File
@@ -13,10 +13,12 @@ import { BRAND, chainCallback, keepDomWidgetWidthAuto } from "../shared/index.mj
import {
ARROW_ANGLE,
ARROW_CHOICES,
CARD_TEMPLATE,
DOUBLE_ARROWS,
arrowText,
fitFontSize,
parseBlocks,
parseCard,
pastedLink,
repointLinks,
targetId,
@@ -45,6 +47,10 @@ const LINK_TILES = {
youtube: { label: "Watch Me on YouTube", url: "https://www.youtube.com/@ausbossdev" },
discord: { label: "Join for Help or More Workflows", url: "https://discord.gg/RwVxY9Fuaj" },
};
// A new Info card opens at this size, which shows its starter text whole.
const CARD_SIZE = [300, 230];
// The card's text grows with the node like a note's, but a card stays a card.
const CARD_FONT_MAX = 20;
const FRAME_FILL = 0.8; // the share of the view a node brought into view takes, as in Workflow Switches
const FONT = '"IBM Plex Sans", "Inter", "Segoe UI", system-ui, -apple-system, sans-serif';
@@ -81,6 +87,20 @@ ${TILE_FACE_CSS}
.ausboss-callout-card[data-tile] .ausboss-callout-url svg{width:36px;height:28px;flex:none}
.ausboss-callout-card[data-tile] .ausboss-callout-out{margin-left:auto}
.ausboss-callout-card[data-tile] .ausboss-callout-tools{right:27px;}
.ausboss-callout-card[data-card]{background:#111818;border:1px solid #2e3c3b;}
.ausboss-callout-card[data-card] .ausboss-callout-inner{padding:.8em 1em;color:#d9e4e3;font-weight:400;line-height:1.45;}
.ausboss-callout-card[data-card] b{color:#f2f7f6;font-weight:650;}
.ausboss-card-block{margin:0 0 .85em;}
.ausboss-card-block:last-child{margin-bottom:0;}
.ausboss-card-block>*+*{margin-top:.3em;}
.ausboss-card-title{display:flex;align-items:center;gap:.4em;color:#f2f7f6;font-size:1.08em;font-weight:650;}
.ausboss-card-icon{flex:none;width:1em;height:1em;color:#c9d6d4;}
.ausboss-card-icon svg{display:block;width:100%;height:100%;}
.ausboss-card-row{display:flex;justify-content:space-between;align-items:baseline;gap:1em;}
.ausboss-card-row>span:last-child{flex:none;text-align:right;white-space:nowrap;}
.ausboss-card-row.is-mark,.ausboss-card-row.is-mark b{color:#6fe0d6;font-weight:500;}
.ausboss-card-small,.ausboss-card-small b{color:#93a6a4;}
.ausboss-card-small{font-size:.92em;}
.ausboss-callout-empty{color:#6f8987;font-size:14px;font-weight:400;}
.ausboss-callout-arrow{display:inline-block;width:1.2em;height:1.2em;margin:0 .1em;vertical-align:-.26em;filter:drop-shadow(0 0 .3em rgba(0,180,170,.55));}
.ausboss-callout-arrow svg{display:block;width:100%;height:100%;overflow:visible;}
@@ -154,6 +174,25 @@ function arrowIcon(kind) {
return root;
}
// The small line icons an Info card's title can start with.
const CARD_ICON_PATHS = {
clock: ["M12 7v5l3.2 2"],
info: ["M12 11v6", "M12 7.6v.01"],
warning: ["M12 3.5 2.8 19.5h18.4Z", "M12 10v4", "M12 16.9v.01"],
tip: ["M9.5 18h5", "M10.5 21h3", "M12 3a6 6 0 0 0-3.6 10.8c.7.6 1.1 1.3 1.1 2.2h5c0-.9.4-1.6 1.1-2.2A6 6 0 0 0 12 3Z"],
check: ["M8 12.4l2.8 2.8 5.2-5.6"],
};
const CARD_ICON_RING = new Set(["clock", "info", "check"]);
function cardIcon(kind) {
const span = el("span", "ausboss-card-icon");
const root = svg("svg", { viewBox: "0 0 24 24", "aria-hidden": "true", fill: "none", stroke: "currentColor", "stroke-width": "2", "stroke-linecap": "round", "stroke-linejoin": "round" });
if (CARD_ICON_RING.has(kind)) root.append(svg("circle", { cx: 12, cy: 12, r: 9 }));
for (const d of CARD_ICON_PATHS[kind] ?? []) root.append(svg("path", { d }));
span.append(root);
return span;
}
// The node a link names, looked up in the graph the note sits in.
function linkedNode(state, id) {
const graph = state.node.graph ?? app.graph;
@@ -262,17 +301,79 @@ function bringIntoView(target) {
}
}
// One line's pieces into an element. The pieces of one link sit in one
// element; a link that leaves ComfyUI ends with a small ↗.
function appendPieces(state, into, line) {
let run = null;
let wrap = null;
const close = () => {
if (wrap?.classList.contains("ausboss-callout-url")) wrap.append(el("span", "ausboss-callout-out", "↗"));
};
for (const piece of line) {
if (piece.run !== run) {
close();
run = piece.run;
wrap = run === undefined ? null : linkRun(state, piece);
if (wrap) into.append(wrap);
}
const target = wrap ?? into;
if (piece.arrow) target.append(arrowSpan(state, piece.arrow, piece));
else target.append(piece.bold ? el("b", "", piece.text) : document.createTextNode(piece.text));
}
close();
}
// An Info card: a title, rows of label and value, and small print.
function renderCard(state, blocks) {
for (const lines of blocks) {
const block = el("div", "ausboss-card-block");
for (const line of lines) {
let row;
if (line.kind === "title") {
row = el("div", "ausboss-card-title");
if (line.icon) row.append(cardIcon(line.icon));
const words = el("span");
appendPieces(state, words, line.pieces);
row.append(words);
} else if (line.kind === "row") {
row = el("div", `ausboss-card-row${line.highlight ? " is-mark" : ""}`);
for (const cell of line.cells) {
const side = el("span");
appendPieces(state, side, cell);
row.append(side);
}
} else {
row = el("div", "ausboss-card-text");
appendPieces(state, row, line.pieces);
}
if (line.small) row.classList.add("ausboss-card-small");
block.append(row);
}
state.inner.append(block);
}
}
function renderText(state) {
const style = state.node.properties?.ausbossCalloutTile;
if (["youtube","discord","title"].includes(style)) state.card.dataset.tile = style;
else delete state.card.dataset.tile;
setTileFace(state.node, state.root, Boolean(state.card.dataset.tile), () => startEdit(state));
const blocks = parseBlocks(state.valueWidget.value);
// An Info card has no title bar, like a tile, but keeps the full editor
// and saves as a plain Callout: an older pack shows its text as a note.
if (style === "card") state.card.dataset.card = "";
else delete state.card.dataset.card;
const isCard = style === "card";
setTileFace(state.node, state.root, Boolean(state.card.dataset.tile) || isCard, () => startEdit(state));
const blocks = isCard ? parseCard(state.valueWidget.value) : parseBlocks(state.valueWidget.value);
state.inner.replaceChildren();
state.empty = blocks.length === 0;
if (state.empty) {
state.inner.append(el("div", "ausboss-callout-empty", "Double-click to write a note"));
}
if (isCard) {
renderCard(state, blocks);
fit(state);
return;
}
for (const lines of blocks) {
const point = el("div", "ausboss-callout-point");
lines.forEach((line, index) => {
@@ -280,21 +381,7 @@ function renderText(state) {
// lines are told apart by a break, as before; a block needs none.
const into = line.small ? el("div", "ausboss-callout-small") : point;
if (index && !line.small && !lines[index - 1].small) point.append(document.createElement("br"));
let run = null;
let wrap = null;
for (const piece of line) {
// The pieces of one link sit in one element.
if (piece.run !== run) {
if (wrap?.classList.contains("ausboss-callout-url")) wrap.append(el("span", "ausboss-callout-out", "↗"));
run = piece.run;
wrap = run === undefined ? null : linkRun(state, piece);
if (wrap) into.append(wrap);
}
const target = wrap ?? into;
if (piece.arrow) target.append(arrowSpan(state, piece.arrow, piece));
else target.append(piece.bold ? el("b", "", piece.text) : document.createTextNode(piece.text));
}
if (wrap?.classList.contains("ausboss-callout-url")) wrap.append(el("span", "ausboss-callout-out", "↗"));
appendPieces(state, into, line);
if (line.small) point.append(into);
});
state.inner.append(point);
@@ -364,7 +451,7 @@ function fit(state) {
inner.style.fontSize = `${px}px`;
return inner.offsetHeight <= height && inner.scrollWidth <= width + 1;
};
const size = fitFontSize(fits);
const size = fitFontSize(fits, undefined, card.dataset.card === undefined ? undefined : CARD_FONT_MAX);
const social = card.dataset.tile === "youtube" || card.dataset.tile === "discord";
inner.style.fontSize = `${social ? Math.min(size, 16) : size}px`;
}
@@ -453,7 +540,9 @@ function startEdit(state) {
const wrap = el("div", "ausboss-callout-editor");
const area = el("textarea", "ausboss-callout-edit");
area.value = state.valueWidget.value ?? "";
area.placeholder = "One idea per paragraph. **Bold** a word to stress it. The buttons below add an arrow, make a line small or make words a link.";
area.placeholder = state.card.dataset.card === undefined
? "One idea per paragraph. **Bold** a word to stress it. The buttons below add an arrow, make a line small or make words a link."
: "The first line is the title. Write label | value for a row. **Bold** a whole row to make it teal. Small makes a line small print.";
area.spellcheck = true;
const bar = el("div", "ausboss-callout-arrowbar");
bar.append(el("span", "", "Arrow"));
@@ -687,7 +776,7 @@ app.registerExtension({
const state = buildPanel(this);
if (!state) return;
renderText(state);
if (state.card.dataset.tile && Number.isFinite(saved?.size?.[1])) {
if ((state.card.dataset.tile || state.card.dataset.card !== undefined) && Number.isFinite(saved?.size?.[1])) {
this.setSize?.([this.size[0], saved.size[1]]);
}
});
@@ -699,14 +788,18 @@ app.registerExtension({
chainCallback(nodeType.prototype, "getExtraMenuOptions", function (_canvas, options) {
const state = this.__ausbossCallout;
if (!state || !Array.isArray(options)) return;
for (const [style, label] of [["plain","Plain callout"],["title","Title tile"],["youtube","Set YouTube link tile"],["discord","Set Discord link tile"]]) {
for (const [style, label] of [["plain","Plain callout"],["card","Info card"],["title","Title tile"],["youtube","Set YouTube link tile"],["discord","Set Discord link tile"]]) {
options.unshift({ content: label, callback: () => {
this.properties ??= {};
this.properties.ausbossCalloutTile = style;
const preset = LINK_TILES[style];
if (preset) commitWidgetValue(this, state.valueWidget, `[${preset.label}](${preset.url})`, app.canvas);
// An empty card starts with text that shows how one is written.
const starter = style === "card" && !String(state.valueWidget.value ?? "").trim();
if (starter) commitWidgetValue(this, state.valueWidget, CARD_TEMPLATE, app.canvas);
renderText(state);
if (style !== "plain") this.setSize?.([this.size[0], style === "title" ? 86 : 78]);
if (starter) this.setSize?.([Math.max(this.size[0], CARD_SIZE[0]), CARD_SIZE[1]]);
else if (style !== "plain" && style !== "card") this.setSize?.([this.size[0], style === "title" ? 86 : 78]);
markChanged();
}});
}
+53
View File
@@ -0,0 +1,53 @@
// Clear VRAM 🆎 — a right-click entry on the empty canvas that unloads every
// model and frees memory on the ComfyUI server this page is connected to.
//
// It sends the same request as ComfyUI's own "Unload Models and Execution
// Cache" command (top menu, Edit): POST /free with unload_models and
// free_memory. That command is not on the right-click menu, so this entry
// puts it one click away. A setting hides the entry; a ComfyUI that turns
// manual unloading off (Comfy.Memory.AllowManualUnload) hides it too.
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { showToast } from "../shared/index.mjs";
const SETTING_ID = "AusBoss.Memory.ClearVramMenu";
const MENU_LABEL = "Clear VRAM 🆎";
function setting(id) {
return app.ui?.settings?.getSettingValue?.(id);
}
async function clearVram() {
try {
const response = await api.fetchApi("/free", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ unload_models: true, free_memory: true }),
});
if (!response.ok) throw new Error(`the server answered ${response.status}`);
showToast({ severity: "success", summary: MENU_LABEL, detail: "Models unloaded and memory freed.", life: 3000 });
} catch (error) {
showToast({ severity: "error", summary: MENU_LABEL, detail: `Could not clear VRAM: ${error?.message ?? error}` });
}
}
app.registerExtension({
name: "ausboss.clear.vram",
settings: [
{
id: SETTING_ID,
name: "Clear VRAM on the right-click menu",
type: "boolean",
defaultValue: true,
category: ["🆎 AusBoss", "Memory", "Clear VRAM menu"],
tooltip:
"Right-click the empty canvas for Clear VRAM: it unloads every model and frees "
+ "memory on the ComfyUI server. Off hides the entry.",
},
],
getCanvasMenuItems() {
if (setting(SETTING_ID) === false) return [];
if (setting("Comfy.Memory.AllowManualUnload") === false) return [];
return [{ content: MENU_LABEL, callback: clearVram }];
},
});
+40 -1
View File
@@ -15,7 +15,38 @@ Right-click the Callout and choose **Title tile** to give your existing text a b
- Double-click a title to edit it. **Save** or `Ctrl+Enter` keeps the change; **Cancel** or `Esc` leaves the original text.
- Drag the visible bottom-right grip to resize. You can also focus the grip and use arrow keys; hold **Shift** for smaller changes. Resizing keeps the tile in place and supports Undo.
## Writing
## Info card
A small card for facts people look up: run times, settings, what each choice
does. Right-click the Callout and choose **Info card**. An empty note starts
with sample text that shows each part.
Write it like this:
```text
⏱️ Too slow?
###### Redraw time on an RTX 5090. Smaller cards take longer.
2x, 18 steps | ~4 min
2x, 10 steps | ~3 min
1.5x, 18 steps | ~2.5 min
**1.5x, 10 steps (default) | ~2 min**
###### 1.5x is a 4608-wide sheet, 2x is 6144.
```
- The first line is the card's title. Start it with ⏱️ ℹ️ ⚠️ 💡 or ✅ and
that emoji is drawn as a small icon.
- A line with a `|` in it is a row: the words before the `|` on the left,
the rest on the right.
- Put the whole row in two stars, `**like this | value**`, and it is drawn
in teal. Use it for the default or the one to pick.
- Small print (the **Small** button) is a grey line, for a subtitle or a note
at the bottom.
- A blank line leaves a gap. Arrows and links work as in any callout.
- Double-click the card to edit it. Choose **Plain callout** to turn it back
into a note; the text stays.
- On a plain callout, double-click the note, or press **Edit**, to type. Click outside the box to
keep the text. **Esc** drops what you typed.
@@ -90,5 +121,13 @@ In the text a link is written `[the words](https://example.com)`, or
it to read the address before you click.
- An older version of the pack shows a link as typed, brackets and address
included, so the address can still be read and copied there.
- An Info card is saved as an ordinary Callout with the text you typed.
The card look is a setting on the node, so an older version of the pack
shows the same text as a plain note, rows written out as `label | value`.
A plain callout never reads `|` as a row, so notes written before look
the same.
- A row splits at its first `|` that is not inside a link. A row pasted
from a Markdown table loses its outer pipes, and the table's `---` line
is skipped. An Info card's text grows with the card, up to 20 px.
- The font is IBM Plex Sans when the computer has it, otherwise the system
font. The node loads no fonts and makes no network requests.
+142
View File
@@ -0,0 +1,142 @@
# Edit Lock
Keeps every part of your picture that an edit did not change exactly where
it was, with the colors it had.
An edit model redraws the whole picture, also the parts you did not ask it
to change. Those parts often come back a little zoomed in, shifted or
tinted. Flip between the original and the edit and the whole picture
jumps. Edit Lock stops that: only the edit is new.
It needs no mask. It sees what the edit changes while the picture is being
made, and holds on to everything else.
## Quick start
1. Put **Edit Lock 🆎** between the model and the sampler: the model (after
any LoRA loader) goes in, and its `model` output goes to the sampler or
guider.
2. Wire the VAE into `vae` and the picture you are editing into `image`.
Use the same picture the edit model gets, at the size of the result.
3. After the VAE Decode, add **Edit Lock Restore 🆎**. Wire the decoded
picture into `image` and Edit Lock's `edit_lock` output into
`edit_lock`. This puts your own pixels back in the untouched parts.
4. Wire Restore's `report` into **Show Text 🆎** to read how much was kept.
Run your edit as usual. Prompt, steps and seed stay as they were.
## What it does with each kind of edit
- **A local edit** (add glasses, repaint the car, change the sign): the
edit happens, and the rest of the picture stays put.
- **An edit of the whole picture** (a new style, new light, fog):
there is nothing to keep, so Edit Lock steps aside and the edit runs as
if the node were not there. The report says so.
- **A soft effect over the whole picture** (rain, falling snow, haze):
it touches everything a little, so there is no untouched part to put
back. Edit Lock lets the effect through and only holds the picture in
place, so it does not come back zoomed or shifted. The report says so.
- **A soft effect and a clear change in one edit** (rain and an umbrella):
the node may lock on the umbrella and hold the rain back everywhere
else. If the effect is missing outside the changed part, set **Lock** to
`off`.
- **Something in between** (a new hair color on a close-up, a new
background behind a person): it may lock or step aside. The report says
which. These edits often change the light on the face too. `auto` steps
aside for most of them, so the new light comes with the new hair.
`always` keeps the old light on everything it keeps, which can look
wrong on a face. A mask settles it: paint the hair and the face, and
the rest is locked.
- **The model ignores your picture and draws a new one:** that reads as a
whole-picture edit, so `auto` steps aside. `always` holds the model to
your picture.
## Controls
- **model**: the edit model. Patch last, after any LoRAs.
- **vae**: the same VAE the workflow decodes with.
- **image**: the picture you are editing, at the size of the result. If
the sizes differ by more than a few percent the lock does nothing, and
the report says so.
- **Lock** (`lock`): `auto` (the default) locks the untouched parts and
steps aside when the whole picture changes. `always` locks even then.
`off` does nothing, which makes a quick before and after.
- **Tolerance** (`tolerance`): how big a change must be to count as part of
the edit. 1 is the default. Raise it if small unwanted changes get
through. Lower it if the lock holds back part of your edit.
- **mask** (optional): white marks where the edit may happen; everything
else is locked. With a mask the node does not look for the change
itself. A mask from **Mask by Touch 🆎** or **Mask by Name 🆎** works.
## Outputs
- **model**: the model with the lock on.
- **edit_lock**: what the lock kept, for Edit Lock Restore 🆎.
## Good to know
- The lock belongs to one picture. For an edit with two pictures, give it
the one the result should line up with.
- It works on single pictures, not video.
- The node watches the first steps of a run and locks for the rest, so
the model finishes the edit on top of your real picture. Shadows and
reflections the edit adds next to the changed part still come through.
- If your edit is missing and the report says nearly all of the picture
was kept, set **Lock** to `off`.
- Tested on MiniMax-H3-Image. The lock itself is not tied to one model, but
the line between "local edit" and "whole picture" was measured there.
## Technical details
At every step an edit model predicts the finished picture. Edit Lock
compares that prediction with your picture in latent space.
**Watching.** The first prediction of a run is a blur, and rain, snow or
the light a new hair color throws on a face only show a few steps in. So
the node watches until the noise is down to 0.8 of where it began: step 4
of a 6-step MiniMax-H3-Image run. A run that never gets that low decides
at its last step. While it watches, the model draws its own picture and
only one thing is corrected. The model often draws the whole picture about
one percent larger, or a little shifted. The node measures that zoom and
shift at every step, on the calmer half of the picture, and moves the
prediction back so it sits where your picture does.
**Deciding.** Change is measured against the quiet part of the picture:
the tenth where the prediction differs least. An even tint over the whole
picture is taken out first, so a color cast is not read as a change. A
spot counts as changed when it differs by 3 times the quiet level, or by 2
times while it touches a spot that does. So a faint change beside a clear
one belongs to the edit, and a faint change alone is redraw noise.
**Tolerance** multiplies both numbers.
**Locking.** From the decision on, wherever the picture did not change,
the original latent is put back before the sampler takes its next step. A
part once read as changed stays changed for the rest of the run. The last
step ends on the original there, so what was kept is the original itself,
not a redrawn copy.
**Stepping aside.** `auto` does not lock in three cases:
- At the first step the whole picture is already changing (a new style,
new light). The node reads the calmest fifth of a smoothed copy, where a
slightly larger redraw nearly vanishes and a new style does not. On
MiniMax-H3-Image, local edits at 1, 4 and 16 megapixels read 0.22 or
less there and whole-picture edits 0.27 or more; the line sits at 0.243.
The model then runs untouched.
- At the decision no place has changed clearly: the strongest spot of the
picture is under 4 times the quiet level. That is light rain or fog.
Local edits read 4.7 or more there, glasses and makeup included.
- At the decision the lock would hand a tenth of the picture or more to
the edit, yet the strongest hundredth of the picture is under 4 times
the quiet level. That is heavier rain or snow, and a lock would let it
through in patches. Local edits that wide read 4.4 or more; rain and
snow read 3.6 or less.
In the last two cases the node keeps undoing the zoom and shift to the end
of the run, and puts nothing back. An edit close to one of these lines (a
hair color change on a close-up, a new background, smoke) can fall on
either side. The report says which, and **Lock** overrides it.
This is the target the TailSteer paper trains a model toward (the source
where nothing changed, the model's own edit elsewhere), applied while
sampling. It needs no LoRA and no training.
+48
View File
@@ -0,0 +1,48 @@
# Edit Lock Restore
Puts your picture's own pixels back in every part the edit did not change.
**Edit Lock 🆎** keeps the untouched parts in place while the picture is
made. They still pass through the VAE, which softens fine detail a little.
This node swaps your original pixels in for those parts, so they match
your picture pixel for pixel. Only the edit is new.
## Quick start
1. Add it right after the VAE Decode, before any upscaler.
2. Wire the decoded picture into `image`.
3. Wire the `edit_lock` output of Edit Lock 🆎 into `edit_lock`.
4. Wire `report` into **Show Text 🆎** to read what was kept.
## Controls
- **image**: the edited picture, straight from the VAE Decode.
- **edit_lock**: from Edit Lock 🆎. It carries your original picture and
the map of what the edit changed, so there is nothing else to wire.
- **Feather** (`feather`): how softly your original fades into the edit,
in pixels. 16 is the default. The fade lies outside the edit, so the
edit itself is never mixed with the old picture.
## Outputs
- **image**: the edit, with your original pixels in the untouched parts.
- **edit_mask**: white where the edit changed the picture. Use it to see
what the lock decided, or for a later step that should only touch the
edit.
- **report**: one line, such as "Edit Lock kept 82% of your picture as it
was and left 18% to the edit".
## When nothing was locked
The picture passes through unchanged, the mask is all white, and the
report says why: the edit changed the whole picture, the lock was off, or
the picture and the result were different sizes.
## Technical details
The map of what changed is made while sampling, on the latent grid. Here
it is enlarged to the picture's size, widened by the feather and blurred
by the same amount, and used to blend the decoded picture with your
original. If the decoded picture is not the size of your original (after
an upscale), the original is resized to fit first, which costs it some
sharpness. That is why this node goes before an upscaler.
+69
View File
@@ -0,0 +1,69 @@
# FlashVSR Upscale
Makes a video larger and sharper. Give it the frames of a clip, set how much
larger, and it returns the same clip with more detail. Use it as the last
step before Save Video, for a generated clip or one you loaded.
It needs one model file and no other pack.
## The model file
Download `flashvsr_v1.1_fp16.safetensors` (3.5 GB) from
[ausboss/FlashVSR-v1.1-ComfyUI](https://huggingface.co/ausboss/FlashVSR-v1.1-ComfyUI)
and put it in `ComfyUI/models/diffusion_models`. Then refresh the page, or
press `R`, and pick it under **Model**.
The file holds the official FlashVSR v1.1 weights in one piece. Another
FlashVSR file will not load here: the node stops and says which part is
missing.
## Controls
- **frames**: The clip, as a batch of frames. Load Video's frames output
goes here.
- **Model** (`model`): The model file above. The list shows the files in
`diffusion_models` that have FlashVSR in their name.
- **Scale** (`scale`, starts at `2`): How many times larger each side gets,
from 1 to 4. At `1` the clip keeps its size and is only sharpened.
- **Keep colors** (`color_match`, starts on): Brings each frame's colours
back to those of your clip. Leave it on unless you want the model's own
colours.
- **vae** (optional): Connect the Wan 2.1 VAE for a slower, finer finish.
With nothing connected, the fast decoder inside the model file makes the
picture.
## Outputs
- **frames**: The larger frames, as many as went in, in the same order.
The frame rate and the sound are not touched, so wire those from Load
Video to Save Video as before.
## What to expect
FlashVSR redraws fine detail: skin, hair, cloth and edges come back
sharper than the clip had them. It keeps the scene, the motion and the
timing.
A long clip needs no more graphics memory than a short one. The node reads
the clip a few frames at a time and keeps only the last few in memory.
## Technical details
- **Size.** The result is exactly your size times **Scale**, rounded to
even numbers. Inside, the model works at a multiple of 128 pixels each
way; the node pads the picture for that and cuts the padding off again,
so nothing of your picture is cropped.
- **Graphics memory.** About 10 GB for a 576 x 1024 result. A result too
large for the free memory is made in overlapping tiles and blended, and
the tile size is chosen from the memory that is free when the node runs.
1152 x 2048 ran in two tiles at about 16 GB. On an 8 GB card (RTX 3070
Laptop) the same result ran in smaller tiles at about 6.5 GB, at about 3
seconds a frame.
- **Speed.** On an RTX 5090: about 7 frames a second for a 576 x 1024
result and about 2 frames a second for 1152 x 2048.
- **One step.** The model runs once per group of frames. There are no
steps, sampler, prompt or seed to set.
- **The model.** FlashVSR v1.1 by Junhao Zhuang and the OpenImagingLab
team, released under Apache-2.0. It is built on the Wan 2.1 1.3B video
model. This node is the pack's own code in plain PyTorch.
- The node makes no network requests and writes no files.
+108
View File
@@ -0,0 +1,108 @@
# Load Image
Loads a picture and sets its size in the same node, so a workflow does not
need a resize node and a size node after its loader.
Pick a file in **Source**, press **Load** to upload one, or use the arrows
under it to step through the pictures in ComfyUI's input folder. The line
beside the arrows shows the size of the file and, when the size changes, the
size that comes out:
`912 × 1632 → 1144 × 2048`
That is the real output size, worked out before you run.
Under that line are two small pictures: the file as it goes in, and the
picture as it comes out. On the first one the part that is kept is lit and
the part that is cut off is dark. Between them the node says the shape
(`3:4 → 1:1`) and what happens (`77% size`, `cuts 449 px of height`).
## Size
**Size** (`size`) picks how the picture is resized. Each choice shows only
the numbers it uses.
| Choice | What it does | Its number |
|---|---|---|
| **off** | The picture comes out exactly as the file has it. | none |
| **megapixels** | Brings the whole picture to a total size and keeps its shape. | **Megapixels** (`megapixels`): 1.0 is about 1024 × 1024 |
| **longest side** | Sets the longer edge; the other edge follows. | **Longest side** (`longest_side`), in pixels |
| **scale** | Multiplies both edges. | **Scale** (`scale`): 0.5 is half, 2 is double |
| **fit inside** | Makes the picture as big as it can be inside a box, with nothing cut off. | **Width** and **Height** (`width`, `height`) |
| **crop to fill** | Covers the box completely and cuts off what sticks out. | **Width** and **Height** |
| **crop** | Cuts a piece of that size out of the picture. Nothing is resized. | **Width** and **Height** |
| **crop to ratio** | Cuts the largest piece of a shape, such as 16:9, out of the picture. Nothing is resized. | **Ratio** (`ratio`) |
**Round to** (`multiple`) rounds the new width and height to a multiple of
that number. Most models want 8 or 16. Set it to 1 to keep the numbers as
they are. It does nothing while Size is off.
## Which part is kept
The three crop choices show **Keep** (`crop_from`). It picks the part of the
picture that stays: `center` cuts evenly from both sides, `top` keeps the top
and cuts from the bottom, `bottom left` keeps that corner, and so on.
You can also click the first small picture: click its top to keep the top,
a corner to keep that corner. The lit part moves so you see what you get.
In **Ratio**, `width : height` takes the shape from the Width and Height
boxes, for a shape that is not in the list (1600 and 900 give 16:9).
## More
- **Method** (`method`): how pixels are resampled. `lanczos` is the sharpest
for photos. `nearest` keeps pixel art crisp.
- **Enlarge** (`enlarge`): on, a small picture is made bigger to reach the
size you asked for. Off, a picture is only ever made smaller: one that is
already below the target comes out at its own size, and crop to fill cuts
the box's shape out of it without growing it.
## The picture on the node
The picture under the settings is ComfyUI's own preview, the same one the
stock Load Image shows. Drop a file on the node or paste one to upload it,
and right-click the node for the mask editor and for copy and paste.
## Outputs
- `image`: the picture at its new size.
- `mask`: white where the picture is see-through and black where it is
solid, as the stock loader gives it. A picture with no transparency gives
an all black mask. It is always the same size as `image`.
- `width`, `height`: the size that comes out.
- `filename`: the file's name without its folder or its ending
(`shots/hero.png` gives `hero`), ready for a save node's prefix.
- `original_width`, `original_height`: the size of the file before any
resize. Use them to bring a result back to the size you started from.
## Which loader to use
- **Load Image** (this node): load a picture and set its size.
- **Load Image + Pad**: add empty space around a picture for outpainting.
- **Image Crop + Rotate + Pad**: turn, crop and pad a picture by hand.
## Technical details
- Every frame of an animated file comes through as a batch, all at the same
new size. A phone photo is turned the way its EXIF data says.
- With Size off the pixels are the file's own, bit for bit, and Round to is
not applied.
- Rounding moves each edge to the nearest multiple, so the shape can change
by up to half a step. Fit inside rounds down instead, so the result never
leaves its box.
- Crop to fill resizes the picture until it covers the box, then cuts the
box out at the side Keep names. The mask goes through the same resize and
the same cut.
- Crop and crop to ratio only cut. A box larger than the picture is cut down
to the picture, and Round to rounds down so the piece stays inside it.
Enlarge does not apply to them.
- The small pictures are drawn on one scale, so a picture made half as large
is drawn half as large.
- With Enlarge off, a rounded size is rounded down so it never passes the
file's own size.
- The size line on the node uses the same arithmetic as the run. The pack's
tests hold the two to the same answers over a table of cases.
- Files are read only from ComfyUI's input, output and temp folders. A name
such as `photo.png [output]` loads a picture ComfyUI made.
- The node runs again when the file changes on disk or a setting changes.
+24 -5
View File
@@ -19,8 +19,8 @@ What is lit in teal is what the mask will be. When it is right, press Run
for the whole workflow.
The first time the pointer rests on a picture, the node looks at it. A
small button under the picture shows how far along it is, **❚❚ 40/104**,
filling up as it goes. The first things light up after a few seconds, and
button under the picture shows how far along it is, **❚❚ Pause · looking
40/104**, filling up as it goes. The first things light up after a few seconds, and
it has seen the whole picture after about 20.
You do not have to wait for that. Whatever is lit under the pointer can be
@@ -28,7 +28,7 @@ picked: a click takes it at once, also while the node is still looking.
Click that button to pause the looking when what you need is already lit:
what is lit stays, and you go on picking and painting. It turns into
**▶**; click it to look on from where it stopped. A click on a spot where
**▶ Look on**; click it to look on from where it stopped. A click on a spot where
nothing is lit yet looks on as well.
A click on a spot where nothing is lit yet is not lost: a dot marks it, the
@@ -50,6 +50,9 @@ at that spot.
A stroke across two things, like both shoes, takes both.
- Did the thing not light up at all? Type its name into the field under the
picture, like "screen" or "earring", and press Enter.
- Is something in the mask that should not be, like the face or the hair of
a person you picked? Click the **+** in front of that field so it shows
**−**, type "face" and press Enter. Or hold Ctrl and click the face.
- When nothing fits, switch to **Paint** and paint the area yourself.
## The whole subject, or the background
@@ -59,6 +62,10 @@ click: the person, the animal, the product. **Background** picks everything
else. They are picks like any other: click more things to add them, or
Ctrl-click a thing to take it away again.
Ctrl-click takes away the thing under the pointer, where it is in the mask.
On a spot where nothing is picked it changes nothing, and the picture says
so.
Both need ComfyUI's background-removal model, see "The model for Fine
edges" below.
@@ -115,8 +122,11 @@ or an area you painted.
it.
- **all 3** on a chip takes every thing of that name instead of the one you
clicked: all five birds, both shoes.
- The field at the end, **+ type a name**, picks every thing of the name
you type. With Erase chosen it takes them away.
- The field at the end picks every thing of the name you type. The sign in
front of it says what happens to the name: **+** adds it, **−** takes it
away. Click the sign to change it. A name typed with a minus in front,
like "-face", is taken away whatever the sign shows. With Erase chosen the
sign starts on **−**.
## The tools on the node
@@ -273,6 +283,15 @@ then.
### How SAM 3 is asked
- A picture whose long side is over 2048 pixels is asked about on a copy
with its long side at 2048. SAM 3 reads every picture at 1008 pixels
anyway, and returns each answer at the size it was given, on the graphics
card: at 8192 pixels one word with many matches needed over 27 GB. The
answer is brought back to the picture's own size, so the mask, the cut-out
and your touches stay in pixels of the picture. Paint is never scaled.
Measured on a 3840 pixel picture, five words: the new masks share 95 to
99.6 % of their area with the old ones, the edge sits a median 0 to 2
pixels differently, and a look takes 31 seconds in place of 53.
- The search is ComfyUI's own SAM 3: SAM3 Detect, asked about points, or
about a word that CLIP Text Encode has read. Both use ComfyUI's own
settings (threshold 0.5, two edge passes). The node needs ComfyUI 0.20 or
+54
View File
@@ -0,0 +1,54 @@
# Prompt Variations
A prompt box that changes on every run. Write choices in curly brackets and
the node picks one from each set:
```text
A woman in a {plain|striped|patterned} {tank top|sweater|button-up shirt}
and {jeans|a pleated skirt|cargo shorts}, {standing|sitting on a stool|leaning on the wall}.
```
One run might give "A woman in a striped sweater and jeans, sitting on a
stool." The next gives another mix.
Use it to make many different pictures in one go. Wire in the seed, set the
Seed node to **randomize**, and set the number of runs next to the Run
button to 50. Each run gets a new seed, so each picture gets new choices.
## Controls
- The text box (`text`): your prompt. Put each set of choices in curly
brackets and split the choices with `|`. Write as many sets as you like,
each with as many choices as you like.
- `seed` (a socket): the seed your sampler uses. A new seed picks new
choices. The same seed picks the same ones again, so a picture you like
can be made again from its seed.
## Output
- **prompt**: your text with one choice picked from each set. Wire it to
Show Text to see what was picked.
## Tips
- An empty choice lets a part come and go: `a {|striped} shirt` gives "a
shirt" or "a striped shirt".
- Sets can go inside sets: `{a {red|blue} hat|a scarf}`.
- Text without curly brackets comes out exactly as typed.
- To make one choice come up more often, write it more than once:
`{jeans|jeans|skirt}`.
## Technical details
Only brackets that hold a `|` are choices. Brackets without one are left as
they are, so a JSON prompt such as `{"light": "soft"}` passes through
unchanged. A `|` inside JSON brackets still counts as a choice.
The innermost sets are picked first, from left to right, with Python's
`random.Random(seed)`. The same text and seed always give the same prompt,
on any machine. Spaces around each choice are trimmed, and an empty pick
also drops the one space in front of it.
The picks happen when the prompt runs, on the server, not in the browser.
ComfyUI's own `{a|b}` choices in some text boxes are picked by the browser
when you queue, with no seed; this node does not use them.
+16 -2
View File
@@ -50,8 +50,22 @@ file's name. A caption on the `caption_text` input writes the paired `.txt`.
shorter; on again, the node returns to its height with the last saved
image. It is display only: the file is saved either way and the queue
still lists it. When a run saves more than one image (a batch, or a list
such as a folder of images), arrows beside the switch (‹ 2 / 5 ›) step
through them.
such as a folder of images), they all show side by side. The arrows
beside the switch (‹ all 5 ›) go on to each one by itself (‹ 2 / 5 ›) and
back round to all of them. A run of more than 48 shows one at a time.
The node shows a small copy of each picture (up to 2048 pixels on the
long side), so a big file shows at once on a slow connection too. The
saved file is always full size. The copies are in ComfyUI's temp folder.
- **Auto save** (`autosave`, on by default): on, every run saves its
pictures. Off, a run only shows them here and saves nothing. A row over
the picture then says **Not saved yet**, with a **Save picture** button.
With several pictures it reads **Save all 4**, and with the arrows on one
picture, **Save this one**. After a save the row says what is saved.
Use it to make a batch, look, and keep only the good ones. The pictures
are saved under the name and folder set above, in the format picked,
with the workflow inside if **Embed workflow** is on. They wait in
ComfyUI's temp folder, which is emptied when ComfyUI restarts, so save
what you want before that.
- **Preview steps** (`step_preview`, off by default): the switch left of
**preview** shows the picture while it is being made, one step at a time,
where the saved image goes, with a **STOP** button on the bar. Stop a run
+60
View File
@@ -0,0 +1,60 @@
# Text Lines
Runs what comes after once for each line of your text. Type five prompts,
one on each line, press Run once, and you get five pictures.
Use it for a list of prompts you typed, or for a list another node wrote,
such as a text model asked for "five different poses".
## How to use it
1. Type your lines in the box, or wire text into **text**.
2. Wire **line** to where one prompt would go, such as a text encoder's
prompt.
3. Run. Every node after it runs once for each line, and a Save Image at the
end saves one picture for each.
Empty lines are skipped. Models and pictures that do not depend on the line
are loaded once, not once for each line.
## Controls
- The text box (`text`): One line for each run.
- **Split at** (`split`): **each line** makes every line its own run.
**blank line** keeps lines together and starts the next run at an empty
line. Pick it when one prompt is several lines long.
- **Numbering** (`remove_numbering`): **remove** takes a number or bullet
off the start of each line, such as `1.`, `2)`, `-` or `[prompt 3]`.
Lists a text model writes usually have them. **keep** leaves every line
as written.
- **Limit** (`limit`): The most lines to run. 0 runs them all. Set it when
a text model might write more lines than you asked for.
## Outputs
- **line**: Each line, one at a time.
- **number**: The line's place in the list, starting at 1. Add it to a seed
with Math Expression (`a + b`) to give each line its own seed.
- **count**: How many lines run.
## Notes
- With no lines at all, the run stops at this node and says so.
- Every run uses the same seed unless you add **number** to it. Different
prompts still give different pictures.
- A line such as "2 women on a beach" or "1.5x zoom" keeps its number: only
a number followed by a period, bracket or colon counts as numbering.
## Technical details
**line** and **number** are ComfyUI lists (`OUTPUT_IS_LIST`), the same way
Image Folder hands out pictures. ComfyUI runs each later node once for each
item and keeps the results in order. A node that takes a whole list at once,
such as core Rebatch Images, gets all of them together.
Numbering that is removed: a number in square, round or CJK brackets with an
optional word before it (`[prompt 1]`, `(2)`), a word and a number followed by
a colon, period, bracket or dash (`Shot 3:`), a bare number followed by a
period, bracket or colon that has no digit right after it, and the bullets
`-`, `*` and `•` followed by a space. Only one marker is removed from each
line.
+5
View File
@@ -17,6 +17,7 @@ help panel.
| Pick a picture size by shape and megapixels, in place of Empty Latent | Latent Size (`AUSBOSS_NODES_Resolution`) |
| Resize a picture, or snap its size to a multiple | Image Resize (`AUSBOSS_NODES_ImageResize`), Align Image (`AUSBOSS_NODES_AlignImage`) |
| Read a picture's width and height | Image Size (`AUSBOSS_NODES_ImageSize`) |
| Load a picture and set its size or crop it (megapixels, longest side, a box, a ratio) in one node | Load Image (`AUSBOSS_NODES_LoadImage`) |
| Outpaint: load a picture and add empty space around it | Load Image + Pad (`AUSBOSS_NODES_LoadImagePad`) |
| Turn, crop and pad a picture in one node | Image Crop + Rotate + Pad (`AUSBOSS_NODES_ImageCropRotatePad`) |
| Inpaint only the masked part, then put it back | Crop For Inpaint (`AUSBOSS_NODES_CropForInpaint`) then Stitch Inpaint (`AUSBOSS_NODES_StitchInpaint`) |
@@ -24,6 +25,7 @@ help panel.
| Get a mask by typing what to find | Mask by Name (`AUSBOSS_NODES_MaskByName`) |
| Get a mask by clicking the thing | Mask by Touch (`AUSBOSS_NODES_MaskByTouch`) |
| Grow, shrink, fill or smooth a mask | Mask Refine (`AUSBOSS_NODES_RefineMask`) |
| Keep the untouched parts of a picture exactly as they were while an edit model edits it | Edit Lock (`AUSBOSS_NODES_EditLock`) then Edit Lock Restore (`AUSBOSS_NODES_EditLockRestore`) |
| Line an edited picture back up with the original | Realign to Source (`AUSBOSS_NODES_RealignToSource`, experimental) |
| Match one picture's colors to another | Color Match (`AUSBOSS_NODES_ColorMatch`) |
| Upscale big pictures in tiles | Tiled Upscale (`AUSBOSS_NODES_TiledUpscale`) then Tiled Upscale Stitch (`AUSBOSS_NODES_TiledUpscaleStitch`) |
@@ -37,8 +39,11 @@ help panel.
| Load a sound file and keep only part of it, up to a set length | Load Audio (`AUSBOSS_NODES_LoadAudio`) |
| Turn, crop and pad a video: one frame, or the whole clip | Video Crop + Rotate + Pad → Frame (`AUSBOSS_NODES_VideoCropRotatePad`), → Clip (`AUSBOSS_NODES_VideoCropRotatePadClip`) |
| Change a clip's frame rate | Frame Interpolate (`AUSBOSS_NODES_FrameInterpolate`) |
| Make a clip larger and sharper | FlashVSR Upscale (`AUSBOSS_NODES_FlashVSRUpscale`) |
| Work with frame batches | Select Frame, Select Every Nth, Split Batch, Merge Batches (`AUSBOSS_NODES_SelectFrame`, `_SelectEveryNth`, `_SplitBatch`, `_MergeBatches`) |
| Run a workflow once for each line of text, such as a list of prompts | Text Lines (`AUSBOSS_NODES_TextLines`) |
| One shared seed, number or text | Seed, Integer, Float, Text (`AUSBOSS_NODES_Seed`, `_Integer`, `_Float`, `_Text`) |
| A prompt that picks from `{a\|b\|c}` choices on each run, by seed | Prompt Variations (`AUSBOSS_NODES_PromptVariations`) |
| Do maths on numbers | Math Expression (`AUSBOSS_NODES_MathExpression`) |
| Show text on the node, or the picture while it is made | Show Text (`AUSBOSS_NODES_ShowText`), Step Preview (`AUSBOSS_NODES_StepPreview`) |
| Free graphics memory between steps | Free Memory (`AUSBOSS_NODES_FreeMemory`) |
+306 -20
View File
@@ -14,7 +14,7 @@
// switch lays each sampling step over the stage, with a Stop button on the
// bar (shared/step_preview.mjs).
import { panelSwitch } from "../shared/panel_controls.mjs";
import { panelSwitch, primaryAction } from "../shared/panel_controls.mjs";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { isForeignRun } from "../shared/prompt_scope.mjs";
@@ -26,14 +26,16 @@ import { suppressCoreImagePreview } from "../shared/core_preview.mjs";
import { autoMaskValues } from "../shared/mask_auto.mjs";
import { hideInputsInDef, hideWidget, setWidgetVisible } from "../shared/widget_visibility.mjs";
import { makePictureStepper } from "../shared/picture_stepper.mjs";
import { keepIndex, stepIndex } from "../shared/picture_steps.mjs";
import { ALL, allLabel, gridShape, heldPlaces, keepIndex, keepWords, stepIndex, stepWithAll } from "../shared/picture_steps.mjs";
import { addStepConsumer, mountStepOverlay, showsStepsOn, stepRun, stopStepRun, watchSteps } from "../shared/step_preview.mjs";
import {
describeNodePreview,
describeSourcePreview,
lightPreviewQuery,
outputLocatorId,
outputRecordCount,
outputRecordQuery,
ownResultIsCurrent,
placeholderText,
staleText,
sourceFileWidget,
@@ -54,7 +56,15 @@ const BAR_GAP = 6;
const BAR_PADDING = 2;
const PANEL_HEIGHT = STAGE_HEIGHT + BAR_HEIGHT + 4 + 16;
const OFF_HEIGHT = BAR_HEIGHT + 16;
// The row over pictures that wait for a Save, and the gap under it.
const KEEP_HEIGHT = 30;
const KEEP_SPACE = KEEP_HEIGHT + 4;
const INPUT_SIDE = 1; // LiteGraph.INPUT
// A run that left this many pictures or fewer opens with all of them side
// by side. More than that and each would be a speck, so the arrows go
// through them one at a time, as before.
const GRID_MAX = 48;
const GRID_GAP = 4;
// The node's height from before its preview was switched off, so switching
// it back on returns the node to it (saved with the workflow).
const HEIGHT_PROPERTY = "ausboss_preview_height";
@@ -114,7 +124,17 @@ const NODE_CONFIG = {
},
AUSBOSS_NODES_SelectFrame: { inputName: "frames", noun: "frames" },
// Its result is the file it just saved; the card sits above the panel.
AUSBOSS_NODES_SaveImage: { inputName: "images", noun: "an image", switchTitle: "Show the saved image here. The file is saved either way.", steps: true },
// SAVE shows only for a run made with Auto save off, which holds its
// pictures until this button keeps them.
AUSBOSS_NODES_SaveImage: {
inputName: "images",
noun: "an image",
switchTitle: "Show the saved image here. The file is saved either way.",
steps: true,
// Auto save off: a row over the picture says it is not saved yet and
// holds the button that saves it.
keep: "Save what is showing: every picture, or the one the arrows picked.",
},
};
// The picture sits out of flow, centred in the stage, so it can never set
@@ -137,11 +157,22 @@ function ensureCss() {
.ausboss-input-preview.preview-off .ausboss-stepper{display:none;}
.ausboss-input-preview-stage img,.ausboss-input-preview-stage video{display:none;position:absolute;inset:0;margin:auto;max-width:100%;max-height:100%;object-fit:contain;}
.ausboss-input-preview-stage.show-image img{display:block;}
.ausboss-input-preview-stage.loading-image img{opacity:.4;transition:opacity .3s ease 1.2s;}
.ausboss-input-preview-stage.show-video video{display:block;}
.ausboss-input-preview-grid{display:none;position:absolute;inset:0;box-sizing:border-box;gap:${GRID_GAP}px;padding:${GRID_GAP}px;justify-content:center;align-content:center;}
.ausboss-input-preview-stage.show-grid .ausboss-input-preview-grid{display:grid;}
.ausboss-input-preview-stage .ausboss-input-preview-grid img{display:block;position:static;margin:0;width:100%;height:100%;min-width:0;min-height:0;max-width:none;max-height:none;object-fit:contain;}
.ausboss-input-preview-hint{display:none;max-width:86%;color:${T.faint};font:11px/1.35 ${FONT_UI};text-align:center;}
.ausboss-input-preview-stage:not(.show-image):not(.show-video) .ausboss-input-preview-hint{display:block;}
.ausboss-input-preview-stage:not(.show-image):not(.show-video):not(.show-grid) .ausboss-input-preview-hint{display:block;}
.ausboss-input-preview-keep{box-sizing:border-box;flex:none;display:flex;align-items:center;justify-content:space-between;gap:10px;height:${KEEP_HEIGHT}px;padding:0 4px 0 10px;border-radius:${RADIUS_CONTROL}px;background:${T.brandSoft};pointer-events:none;}
.ausboss-input-preview-keep[hidden]{display:none;}
.ausboss-input-preview-keep span{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:${T.brandInk};font:600 11px/1.2 ${FONT_UI};}
.ausboss-input-preview-keep.done{background:${T.fill};}
.ausboss-input-preview-keep.done span{color:${T.label};}
.ausboss-input-preview-tools{display:flex;gap:4px;pointer-events:auto;}
.ausboss-input-preview-tool{box-sizing:border-box;height:${BAR_HEIGHT}px;min-width:24px;padding:0 6px;border:1px solid transparent;border-radius:${RADIUS_XS}px;background:${T.fill};color:${T.label};font:600 9.5px/18px ${FONT_UI};letter-spacing:.02em;cursor:pointer;}
.ausboss-input-preview-tool[hidden]{display:none;}
.ausboss-input-preview-stage .ausboss-input-preview-grid img.kept{outline:2px solid ${T.brand};outline-offset:-2px;}
.ausboss-input-preview-tool:hover{color:${T.ink};background:${T.fillHover};}
.ausboss-input-preview-tool.active{color:${T.brandInk};background:${T.brandSoft};}
.ausboss-input-preview-tool:focus-visible{outline:2px solid ${T.brand};outline-offset:1px;}
@@ -451,7 +482,7 @@ function syncPreviewMode(state, resize) {
if (resize) {
const node = state.node;
node.properties ??= {};
const floor = node.computeSize?.()[1] ?? (enabled ? PANEL_HEIGHT : OFF_HEIGHT);
const floor = node.computeSize?.()[1] ?? panelFloor(state);
if (!enabled) {
// Off: remember the height, then shrink to what is left.
const height = Number(node.size?.[1]);
@@ -494,7 +525,7 @@ function buildTools(state, tools, signal) {
}
function showHint(state, text) {
state.stage.classList.remove("show-image", "show-video");
state.stage.classList.remove("show-image", "show-video", "show-grid");
state.hint.textContent = text;
state.placeholder = null;
releaseSteps(state);
@@ -509,14 +540,64 @@ function showPlaceholder(state, connected) {
function showMedia(state, kind) {
state.stage.classList.toggle("show-image", kind === "image");
state.stage.classList.toggle("show-video", kind === "video");
state.stage.classList.toggle("show-grid", kind === "grid");
state.placeholder = null;
releaseSteps(state);
}
function clearMedia(state) {
state.img.removeAttribute("src");
state.stage.classList.remove("loading-image");
state.video.pause?.();
state.video.removeAttribute("src");
clearGrid(state);
}
function clearGrid(state) {
if (!state.gridKey) return;
state.gridKey = "";
state.grid?.replaceChildren();
}
// Every picture of the run at once, each as big as the stage allows.
function layoutGrid(state) {
const cells = [...(state.grid?.children ?? [])];
if (!cells.length) return;
const loaded = cells.find((cell) => cell.naturalWidth > 0 && cell.naturalHeight > 0);
const aspect = loaded ? loaded.naturalWidth / loaded.naturalHeight : 1;
const { columns, rows } = gridShape(cells.length, state.stage.clientWidth, state.stage.clientHeight, aspect);
// Tracks the size of one picture, so the pictures sit together in the
// middle of the stage with no bands between the rows.
const wide = (state.stage.clientWidth - GRID_GAP * (columns + 1)) / columns;
const tall = (state.stage.clientHeight - GRID_GAP * (rows + 1)) / rows;
if (!(wide > 0) || !(tall > 0)) return;
const width = Math.floor(Math.min(wide, tall * aspect));
const height = Math.floor(width / aspect);
state.grid.style.gridTemplateColumns = `repeat(${columns}, ${width}px)`;
state.grid.style.gridTemplateRows = `repeat(${rows}, ${height}px)`;
}
function showGrid(state, count) {
const urls = Array.from({ length: count }, (_, index) => storedResultUrl(state.node, index) ?? "");
const key = urls.join("\n");
if (state.gridKey !== key) {
state.gridKey = key;
state.grid.replaceChildren(...urls.map((url, index) => {
const cell = document.createElement("img");
cell.alt = `Picture ${index + 1} of ${count}`;
cell.decoding = "async";
// The first picture to load tells the grid the shape to lay out for.
cell.addEventListener("load", () => layoutGrid(state), { once: true });
cell.addEventListener("error", () => dropLightPreview(state), { once: true });
cell.src = url;
return cell;
}));
}
state.img.removeAttribute("src");
state.video.pause?.();
state.video.removeAttribute("src");
layoutGrid(state);
showMedia(state, "grid");
}
// Each source has one hook, with subscribers that can leave in any order.
@@ -560,17 +641,36 @@ function rewatchSource(state, source) {
// record: an overwritten file reloads after the next run, and a plain refresh
// never reloads the picture.
const storedRand = new WeakMap();
const outputRecord = (node) => app.nodeOutputs?.[outputLocatorId(node)];
// Save Image also writes a small copy of each picture for its face, and the
// panel shows that one: a few hundred kilobytes where the file can be tens
// of megabytes. The copies are in the temp folder, which ComfyUI empties
// when it starts; a record whose copy is gone goes back to the file itself.
const lightGone = new WeakSet();
function lightQuery(record, index = null) {
return record && !lightGone.has(record) ? lightPreviewQuery(record, index) : null;
}
function storedResultUrl(node, index = null) {
const record = app.nodeOutputs?.[outputLocatorId(node)];
const query = outputRecordQuery(record, index);
const record = outputRecord(node);
const light = lightQuery(record, index);
const query = light ?? outputRecordQuery(record, index);
if (!query) return null;
if (!storedRand.has(record)) storedRand.set(record, app.getRandParam?.() ?? "");
return api.apiURL(`/view?${query}${app.getPreviewFormatParam?.() ?? ""}${storedRand.get(record)}`);
return api.apiURL(`/view?${query}${light ? "" : app.getPreviewFormatParam?.() ?? ""}${storedRand.get(record)}`);
}
// A small copy that would not load: show the file itself from now on.
function dropLightPreview(state) {
const record = outputRecord(state.node);
if (!lightQuery(record)) return false;
lightGone.add(record);
scheduleRefresh(state);
return true;
}
// Several pictures from one run (a list, or a batch Save Image saved one by
// one): the arrows in the bar pick which one shows. One picture keeps the
// panel as it was, with no arrows.
// one): they all show side by side, and the arrows in the bar go on to each
// one by itself and back round to all of them. One picture keeps the panel
// as it was, with no arrows.
function resultCount(state) {
if (state.stale || state.resultGone) return 0;
return outputRecordCount(app.nodeOutputs?.[outputLocatorId(state.node)]);
@@ -586,10 +686,156 @@ function previewMinWidth(state) {
return Math.max(PANEL_MIN_WIDTH, Math.ceil(state.node.size[0] - state.bar.clientWidth + needed));
}
// --- pictures held until Save (Save Image with Auto save off) ---------------
// The pictures this node is holding, in the order it shows them. Empty when
// the last run saved its pictures itself.
function heldPictures(state) {
if (state.stale || state.resultGone) return [];
return heldPlaces(app.nodeOutputs?.[outputLocatorId(state.node)]);
}
// Which of the shown pictures are kept, by their place on the node.
function keptOf(state, held) {
const key = held.map((picture) => `${picture.token}_${picture.index}`).join(" ");
if (state.kept?.key !== key) state.kept = { key, indexes: new Set() };
return state.kept.indexes;
}
// A click keeps every picture, or only the one the arrows picked. With the
// preview off there is no picture to pick, so it keeps them all.
function keepsAll(state, count) {
return count < 2 || showsAll(state, count) || !previewEnabled(state);
}
// The row shows while the node holds pictures. It says what is saved, and
// its button what a click will do (keepWords).
function syncHeld(state, count = resultCount(state)) {
const row = state.keepRow;
if (!row) return;
const held = heldPictures(state);
const hidden = !held.length || count < 1;
if (row.hidden !== hidden) {
row.hidden = hidden;
fitKeepRow(state);
}
if (hidden) return;
const kept = keptOf(state, held);
const all = keepsAll(state, count);
const done = all ? kept.size >= held.length : kept.has(state.index);
const words = keepWords({
held: held.length, kept: kept.size, all, done, saving: Boolean(state.keeping), name: state.kept?.name ?? "",
});
state.keepNote.textContent = words.note;
state.keepNote.title = state.kept?.path ? `ComfyUI/output/${state.kept.path}` : "";
state.keepButton.textContent = words.button;
state.keepButton.classList.toggle("quiet", words.quiet);
state.keepButton.disabled = Boolean(state.keeping);
row.classList.toggle("done", words.quiet && kept.size >= held.length);
[...(state.grid?.children ?? [])].forEach((cell, index) => cell.classList.toggle("kept", kept.has(index)));
}
// The row takes room of its own, so the picture keeps its floor: the node
// grows to hold it, and a node with the preview off gives the room back.
function fitKeepRow(state) {
const node = state.node;
if (previewEnabled(state)) {
ensureNodeMinHeight(node);
} else {
const floor = Number(node.computeSize?.()?.[1]);
if (Number.isFinite(floor)) node.setSize?.([node.size?.[0] ?? PANEL_MIN_WIDTH, floor]);
}
node.setDirtyCanvas?.(true, true);
}
function buildKeepRow(state, title, signal) {
const row = document.createElement("div");
row.className = "ausboss-input-preview-keep";
row.hidden = true;
const note = document.createElement("span");
const button = primaryAction("Save picture", title);
// Stop the graph from seeing the click as a canvas drag on the node.
button.addEventListener("pointerdown", (event) => event.stopPropagation(), { signal });
button.addEventListener("click", (event) => {
event.preventDefault();
event.stopPropagation();
keepHeld(state);
}, { signal });
row.append(note, button);
state.keepRow = row;
state.keepNote = note;
state.keepButton = button;
return row;
}
async function keepHeld(state) {
const held = heldPictures(state);
if (!held.length || state.keeping) return;
const count = resultCount(state);
const wanted = keepsAll(state, count) ? held.map((_, place) => place) : [state.index];
// One request for each run, in the order the pictures show.
const runs = new Map();
for (const place of wanted) {
const picture = held[place];
if (!picture) continue;
if (!runs.has(picture.token)) runs.set(picture.token, []);
runs.get(picture.token).push(picture.index);
}
state.keeping = true;
syncHeld(state);
const kept = keptOf(state, held);
const saved = [];
let skipped = 0;
try {
for (const [token, picks] of runs) {
const response = await api.fetchApi("/ausboss/save_image/keep", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ token, picks }),
});
const answer = await response.json().catch(() => ({}));
if (!response.ok) throw new Error(answer.error || "Could not save.");
if (!state.alive) return;
const done = new Set(answer.kept ?? []);
held.forEach((picture, place) => {
if (picture.token === token && done.has(picture.index)) kept.add(place);
});
saved.push(...(answer.saved ?? []));
// One picture: the row says the name it was saved under.
const path = held.length === 1 ? answer.saved?.[0]?.path : null;
if (typeof path === "string" && path && state.kept) {
state.kept.path = path;
state.kept.name = path.slice(path.lastIndexOf("/") + 1);
}
skipped += answer.skipped?.length ?? 0;
}
toast(state, saved.length === 1
? `Saved ${saved[0].path}`
: saved.length
? `Saved ${saved.length} pictures`
: skipped ? "Not saved: the file already exists" : "Already saved");
} catch (error) {
if (state.alive) toast(state, error?.message || "Could not save.");
} finally {
state.keeping = false;
if (state.alive) syncHeld(state);
}
}
function showsAll(state, count) {
return count > 1 && count <= GRID_MAX && state.all !== false;
}
function stepPicture(state, step) {
const count = resultCount(state);
if (count < 2) return;
state.index = stepIndex(state.index, count, step);
if (count > GRID_MAX) {
state.index = stepIndex(state.index, count, step);
} else {
const at = stepWithAll(showsAll(state, count) ? ALL : state.index, count, step);
state.all = at === ALL;
if (!state.all) state.index = at;
}
refresh(state);
}
@@ -597,6 +843,7 @@ function refresh(state) {
if (!state.alive) return;
if (!previewEnabled(state)) {
clearMedia(state);
syncHeld(state);
return;
}
const source = upstreamNode(state.node, state.inputName);
@@ -604,7 +851,9 @@ function refresh(state) {
const count = resultCount(state);
const hidden = state.stepper.root.hidden;
state.index = keepIndex(state.index, count);
state.stepper.set(state.index, count);
const all = showsAll(state, count);
state.stepper.set(state.index, count, all ? allLabel(count) : undefined);
syncHeld(state, count);
if (state.stepper.root.hidden !== hidden) growToNodeFloor(state.widget);
if (state.stale) {
// The node ran while its preview was off, so the picture it still has
@@ -616,11 +865,20 @@ function refresh(state) {
// A node that just stopped the run has no result for this picture: the
// one it still holds is from an earlier run (Mask by Name's last find,
// tinted), so show what feeds it instead.
if (all) {
showGrid(state, count);
// The grid's cells are new: mark the ones already kept.
syncHeld(state, count);
return;
}
clearGrid(state);
const described = state.resultGone
? describeSourcePreview(source)
: count > 1
? { kind: "url", url: storedResultUrl(state.node, state.index) }
: describeNodePreview(state.node, state.inputName, storedResultUrl(state.node));
: describeNodePreview(state.node, state.inputName, storedResultUrl(state.node),
// The small copy goes first: node.imgs is the full file.
!lightQuery(outputRecord(state.node)) && ownResultIsCurrent(state.node, outputRecord(state.node), state.imgsFor));
if (!described) {
clearMedia(state);
showPlaceholder(state, !!source);
@@ -642,6 +900,9 @@ function refresh(state) {
state.video.removeAttribute("src");
if (state.img.getAttribute("src") !== url) {
state.img.src = url;
// The picture before stays up while this one loads. A slow load
// dims it, so an old picture is never taken for the new one.
state.stage.classList.toggle("loading-image", true);
} else if (state.img.complete && state.img.naturalWidth > 0) {
showMedia(state, "image");
}
@@ -664,8 +925,19 @@ function scheduleRefresh(state) {
// Watching the property rather than an api event catches both routes that set
// it - the progress frames streamed during a run and the ui payload delivered
// when the node finishes - without this file having to know either event name.
// The panel's floor: the bar and the picture, the bar alone with the
// preview off, and the Save row on top while it shows.
function panelFloor(state, enabled = state ? previewEnabled(state) : true) {
const keep = state?.keepRow && !state.keepRow.hidden ? KEEP_SPACE : 0;
return (enabled ? PANEL_HEIGHT : OFF_HEIGHT) + keep;
}
function watchOwnResult(node, state) {
let images = node.imgs;
// Which output the pictures in node.imgs were loaded for. The frontend
// gives up on a picture that loads slowly and keeps the run before, so
// the panel checks this before it trusts node.imgs (ownResultIsCurrent).
state.imgsFor = outputRecord(node);
try {
Object.defineProperty(node, "imgs", {
configurable: true,
@@ -673,6 +945,7 @@ function watchOwnResult(node, state) {
get: () => images,
set: (value) => {
images = value;
state.imgsFor = outputRecord(node);
if (state.alive) scheduleRefresh(state);
},
});
@@ -701,7 +974,9 @@ function buildPanel(node, config) {
const toastEl = document.createElement("div");
toastEl.className = "ausboss-input-preview-toast";
toastEl.style.display = "none";
stage.append(img, video, hint, toastEl);
const grid = document.createElement("div");
grid.className = "ausboss-input-preview-grid";
stage.append(img, video, grid, hint, toastEl);
const bar = document.createElement("div");
bar.className = "ausboss-input-preview-bar";
root.append(bar, stage);
@@ -711,7 +986,7 @@ function buildPanel(node, config) {
const widget = node.addDOMWidget(WIDGET_NAME, "ausboss_input_preview", root, {
serialize: false,
hideOnZoom: false,
getMinHeight: () => (enabled() ? PANEL_HEIGHT : OFF_HEIGHT),
getMinHeight: () => panelFloor(node.__ausbossInputPreview, enabled()),
});
keepDomWidgetWidthAuto(widget);
// Not saved with the workflow either: options.serialize only keeps it out
@@ -723,7 +998,7 @@ function buildPanel(node, config) {
// dragged taller. With the preview off the floor is the bar alone.
fillNodeHeight(widget, {
minWidth: () => previewMinWidth(node.__ausbossInputPreview),
minHeight: () => (enabled() ? PANEL_HEIGHT : OFF_HEIGHT),
minHeight: () => panelFloor(node.__ausbossInputPreview, enabled()),
minNodeSize: [PANEL_MIN_WIDTH, 90],
exactMinWidth: true,
});
@@ -735,7 +1010,10 @@ function buildPanel(node, config) {
noun: config.noun,
switchTitle: config.switchTitle,
advanced: config.advanced,
root, bar, stage, img, video, hint, widget, abort,
root, bar, stage, img, video, grid, hint, widget, abort,
// Several pictures open side by side; the arrows pick one (false).
all: true,
gridKey: "",
toast: toastEl,
toastTimer: 0,
toolButtons: null,
@@ -751,6 +1029,7 @@ function buildPanel(node, config) {
};
livePanels.add(state);
if (config.tools?.length) bar.append(buildTools(state, config.tools, abort.signal));
if (config.keep) bar.after(buildKeepRow(state, config.keep, abort.signal));
if (config.readout) {
state.readout = document.createElement("span");
state.readout.className = "ausboss-input-preview-readout";
@@ -769,9 +1048,16 @@ function buildPanel(node, config) {
installPreviewSwitch(state, abort.signal);
if (config.steps) installStepsSwitch(state, abort.signal);
img.addEventListener("load", () => showMedia(state, "image"));
// The grid is laid out for the stage's shape, so a resized node lays it out again.
if (typeof ResizeObserver === "function") {
const watcher = new ResizeObserver(() => { if (state.alive && state.gridKey) layoutGrid(state); });
watcher.observe(stage);
abort.signal.addEventListener("abort", () => watcher.disconnect(), { once: true });
}
img.addEventListener("load", () => { stage.classList.remove("loading-image"); showMedia(state, "image"); });
img.addEventListener("error", () => {
if (img.getAttribute("src")) showPlaceholder(state, true);
stage.classList.remove("loading-image");
if (img.getAttribute("src") && !dropLightPreview(state)) showPlaceholder(state, true);
});
video.addEventListener("loadeddata", () => showMedia(state, "video"));
video.addEventListener("error", () => {
+19
View File
@@ -47,6 +47,24 @@ async function stopLook(node) {
return Boolean(running || waiting.length);
}
// Take this node's own runs that still wait out of the queue: the looks and
// touches its picture asked for (they carry an `ask`), never a run of the
// workflow. Says how many went. The one that is running is left alone.
async function dropWaiting(node) {
const id = executionIdOf(app.rootGraph ?? app.graph, node);
if (!id) return 0;
const queue = await (await api.fetchApi("/queue")).json();
const ours = (entry) => {
const step = entry?.[2]?.[id];
return step?.class_type === NODE_CLASS && String(step.inputs?.ask ?? "") !== "";
};
const waiting = (queue?.queue_pending ?? []).filter(ours).map((entry) => entry[1]);
if (waiting.length) {
await api.fetchApi("/queue", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ delete: waiting }) });
}
return waiting.length;
}
// The picture goes above the settings: the stage widget sits ahead of the
// node's card, whichever of the two was built first.
function stageFirst(node) {
@@ -92,6 +110,7 @@ function build(node) {
const face = mountTouchStage(node, {
lookOnButton: () => lookOnButton,
stopLook: () => stopLook(node).catch(() => false),
dropWaiting: () => dropWaiting(node).catch(() => 0),
// A workflow is being opened: nothing is run on the person's behalf.
loading: () => Boolean(app.configuringGraph),
// Bypassed or muted, or inside a box that is: nothing is run for it.
+11
View File
@@ -26,6 +26,7 @@ import { nodeByExecutionId } from "../shared/graph_ids.mjs";
import {
collapseRepeatedErrors,
emptySourceMessage,
explainRunError,
findEmptySources,
nodeLacksSource,
} from "../shared/run_check.mjs";
@@ -174,10 +175,20 @@ function collapseAnswers() {
api.queuePrompt = collapsing;
}
// A run that stops on an error the pack knows the cause of gets one toast
// that says what to do. ComfyUI's own error report is left as it is.
function explainKnownErrors() {
api.addEventListener("execution_error", ({ detail }) => {
const known = explainRunError(detail);
if (known) showToast({ severity: "warn", summary: known.summary, detail: known.detail, life: 30000 });
});
}
app.registerExtension({
name: "ausboss.run_check",
setup() {
guardRuns();
collapseAnswers();
explainKnownErrors();
},
});
+31 -3
View File
@@ -33,7 +33,7 @@ const CARD_HEIGHT = 288;
const WRAPPER_INSET = 16;
const HIDDEN = [
"filename_prefix", "format", "save_metadata", "exact_name", "on_existing",
"output_dir", "caption", "name_counter", "name_date", "name_time", "name_size", "name_batch",
"output_dir", "caption", "name_counter", "name_date", "name_time", "name_size", "name_batch", "autosave",
];
const FONT = `-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif`;
const MONO = `ui-monospace,SFMono-Regular,Menlo,Consolas,monospace`;
@@ -60,7 +60,10 @@ function ensureCss() {
.ausboss-save-chip:hover{color:#fff;border-color:${BRAND}}
.ausboss-save-chip.on{background:${BRAND};border-color:${BRAND};color:#04201d}
.ausboss-save-chips.off .ausboss-save-chip{opacity:.4;pointer-events:none}
.ausboss-save-embed-label{flex:0 0 30%;color:#8ba3a1;font-size:11px;user-select:none}
.ausboss-save-embed-label{flex:none;color:#8ba3a1;font-size:11px;white-space:nowrap;user-select:none}
.ausboss-save-half{display:flex;align-items:center;gap:6px;flex:1 1 auto;min-width:0}
.ausboss-save-half .ausboss-card-seg{flex:1 1 0;min-width:0}
.ausboss-save-switches{gap:12px}
.ausboss-save-browse{position:fixed;z-index:10000;width:260px;max-height:320px;overflow:auto;padding:4px;border:1px solid #3a4047;border-radius:7px;background:#1c1f23;box-shadow:0 8px 28px rgba(0,0,0,.5);font:12px/1.3 ${FONT};color:#d8ecea}
.ausboss-save-browse-head{padding:5px 8px 6px;border-bottom:1px solid #2c3238;color:#78908e;font:10px/1 ${FONT};letter-spacing:.08em;text-transform:uppercase;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
.ausboss-save-browse button{display:block;width:100%;padding:6px 8px;border:none;border-radius:5px;background:transparent;color:inherit;font:inherit;text-align:left;cursor:pointer}
@@ -282,9 +285,29 @@ function buildCard(node) {
button.addEventListener("click", () => { if (setValue(node, "save_metadata", on)) notifyAusbossChange(); state.refresh(); });
embedSeg.append(button); embedButtons.set(on, button);
}
embedRow.append(el("span", "ausboss-save-embed-label", PANEL_LABELS.embed), embedSeg);
const embedHalf = el("div", "ausboss-save-half");
embedHalf.append(el("span", "ausboss-save-embed-label", PANEL_LABELS.embed), embedSeg);
embedRow.classList.add("ausboss-save-switches");
embedRow.append(embedHalf);
root.append(embedRow);
// Auto save: off shows the pictures without saving them; the Save button
// over the picture (js/input_preview) then keeps the ones that are wanted.
// It shares the Embed workflow row, so the card is no taller than before.
const autoHalf = el("div", "ausboss-save-half");
const autoSeg = el("div", "ausboss-card-seg ausboss-card-bool");
autoSeg.setAttribute("role", "radiogroup");
const autoButtons = new Map();
const autoTitle = "On: every run saves its pictures. Off: the pictures only show here, and the Save button over them keeps the ones you want.";
for (const [on, text] of [[false, PANEL_LABELS.off], [true, PANEL_LABELS.on]]) {
const button = el("button", "", text);
button.type = "button"; button.title = autoTitle;
button.addEventListener("click", () => { if (setValue(node, "autosave", on)) { state.savedPath = null; notifyAusbossChange(); } state.refresh(); });
autoSeg.append(button); autoButtons.set(on, button);
}
autoHalf.append(el("span", "ausboss-save-embed-label", "Auto save"), autoSeg);
embedRow.append(autoHalf);
root.addEventListener("pointerdown", (event) => {
if (event.target.closest("button,input,select")) event.stopPropagation();
});
@@ -330,6 +353,11 @@ function buildCard(node) {
button.classList.toggle("on", on === embed);
button.setAttribute("aria-checked", String(on === embed));
}
const auto = values.autosave !== false;
for (const [on, button] of autoButtons) {
button.classList.toggle("on", on === auto);
button.setAttribute("aria-checked", String(on === auto));
}
};
const domWidget = node.addDOMWidget(WIDGET_NAME, WIDGET_NAME, root, {
+83
View File
@@ -289,3 +289,86 @@ export function repointLinks(text, nodes, groups) {
.replace(ARROW_RE, (all, _arrow, id) => (id === undefined ? all : `${all.slice(0, -id.length - 1)}${follow(`#${id}`)}`));
return changed ? next : null;
}
// Info card: a small card with a title, rows and small print, chosen from the
// note's menu. Its text is the note's ordinary text with one addition: a line
// with a | in it is a row, the words before it on the left and the rest on
// the right. A row in **bold** is the one to notice and is drawn in teal. The
// first line is the card's title; a clock, info, warning, bulb or tick emoji
// at its start is drawn as a small icon. A plain callout reads none of this,
// so every note written before looks as it did, and a release before this
// one shows the card as a plain note with its rows written out.
const CARD_ICONS = new Map([
["⏱", "clock"], ["⏲", "clock"], ["⏰", "clock"], ["\u{1F552}", "clock"], ["⌛", "clock"], ["⏳", "clock"],
["ℹ", "info"], ["⚠", "warning"], ["\u{1F4A1}", "tip"], ["✅", "check"], ["✔", "check"],
]);
const CARD_ICON_RE = new RegExp(`^(${[...CARD_ICONS.keys()].join("|")})${VS16}?\\s*`, "u");
export const CARD_TEMPLATE = [
"ℹ️ Title",
`${SMALL_MARK}A line of small print under the title.`,
"",
"Label | value",
"**The one to notice | value**",
"",
`${SMALL_MARK}A note at the bottom.`,
].join("\n");
// Where a row splits: the first | that is not inside a link, or -1.
function cellSplit(line) {
const masked = line.replace(WORDS_LINK_RE, (all) => " ".repeat(all.length));
return masked.indexOf("|");
}
// A row's two sides, or null when the line is not a row. The outer pipes of
// a pasted Markdown table row are dropped.
export function cardCells(line) {
const bare = String(line ?? "").trim().replace(/^\|/, "").replace(/\|$/, "");
const at = cellSplit(bare);
if (at < 0) return null;
let label = bare.slice(0, at).trim();
let value = bare.slice(at + 1).trim();
if (!label || !value) return null;
// **label | value** marks the whole row.
if (label.startsWith("**") && !label.slice(2).includes("**") && value.endsWith("**") && !value.slice(0, -2).includes("**")) {
label = `${label}**`;
value = `**${value}`;
}
return [label, value];
}
// Text -> blocks of lines. A line is { kind: "title", icon, pieces },
// { kind: "row", cells: [pieces, pieces], highlight } or { kind: "text",
// pieces }; small print carries `small: true`. A Markdown table's ---|---
// line is dropped.
export function parseCard(text) {
const blocks = [];
let lines = [];
let first = true;
const flush = () => {
if (lines.length) blocks.push(lines);
lines = [];
};
for (const raw of String(text ?? "").replace(/\r\n?/g, "\n").split("\n")) {
const line = raw.replace(HEADING_RE, "").trim();
if (!line) { flush(); continue; }
if (/^\|?[\s:|-]*-[\s:|-]*\|?$/.test(line) && line.includes("|")) continue;
const small = SMALL_RE.test(raw);
const cells = cardCells(line);
let item;
if (first && !small && !cells) {
const icon = CARD_ICON_RE.exec(line);
item = { kind: "title", icon: icon ? CARD_ICONS.get(icon[1]) : null, pieces: pieces(icon ? line.slice(icon[0].length) : line) };
} else if (cells) {
const sides = cells.map((cell) => pieces(cell));
const shown = sides.flat().filter((piece) => piece.arrow || piece.text?.trim());
item = { kind: "row", cells: sides, highlight: shown.length > 0 && shown.every((piece) => piece.bold) };
} else {
item = { kind: "text", pieces: pieces(line) };
}
first = false;
if (small) item.small = true;
lines.push(item);
}
flush();
return blocks;
}
+24
View File
@@ -0,0 +1,24 @@
// A click on the dark area around a modal <dialog> closes it, the way people
// expect any popup to work. The browser reports a click on a dialog's
// backdrop as a click on the dialog element itself, so a click counts as
// outside when it lands on the dialog element beyond its own box. Both the
// press and the release must be outside: a text selection or a drag that
// starts on the card and ends on the backdrop keeps the popup open.
export function pointOutside(rect, x, y) {
return x < rect.left || x > rect.right || y < rect.top || y > rect.bottom;
}
export function closeOnBackdropClick(dialog, close = () => dialog.close()) {
const outside = (event) => event.target === dialog
&& pointOutside(dialog.getBoundingClientRect(), event.clientX, event.clientY);
let pressedOutside = false;
dialog.addEventListener("pointerdown", (event) => {
pressedOutside = outside(event);
});
dialog.addEventListener("click", (event) => {
const started = pressedOutside;
pressedOutside = false;
if (started && outside(event)) close();
});
}
+1 -1
View File
@@ -9,7 +9,7 @@ import { app } from "../../../scripts/app.js";
// Must match `version` in pyproject.toml — scripts/release_preflight.py
// enforces it. The backend serves its copy at /ausboss/pack_version; a
// mismatch means the browser cached JavaScript from an older install.
export const AUSBOSS_JS_VERSION = "2.23.0";
export const AUSBOSS_JS_VERSION = "2.25.0";
export const BRAND = "#00b4aa"; // AusBoss teal — keep node accents consistent.
export const BRAND_DARK = "#007f78";
+46 -3
View File
@@ -107,16 +107,59 @@ export function outputRecordQuery(record, index = null) {
}).toString();
}
// The /view query of the small copy Save Image writes for its face
// ({ ausboss_preview: ["ausboss_preview/<name>.webp"] }, one for each entry
// of images, in the temp folder). Null when the record has none: an older
// run, another node, or the preview switched off.
export function lightPreviewQuery(record, index = null) {
const places = record?.ausboss_preview;
const count = outputRecordCount(record);
if (!count || !Array.isArray(places) || places.length !== count) return null;
const at = Number.isInteger(index) && index >= 0 && index < count ? index : count - 1;
const place = places[at];
if (typeof place !== "string" || !place) return null;
const slash = place.lastIndexOf("/");
return new URLSearchParams({
filename: place.slice(slash + 1),
subfolder: slash >= 0 ? place.slice(0, slash) : "",
type: "temp",
}).toString();
}
// How many pictures the node's last run left in its output record.
export function outputRecordCount(record) {
return Array.isArray(record?.images) ? record.images.length : 0;
}
// Is node.imgs the picture of this output record?
//
// The frontend loads a result into node.imgs with a time limit (two tries of
// about 8 seconds). A picture that takes longer, a big one over a slow link,
// is dropped without a word and node.imgs keeps the run before. `loadedFor`
// is the record that was current when node.imgs was last set; the file name
// is compared as well, for a newer run that arrived while a picture loaded.
export function ownResultIsCurrent(node, record, loadedFor) {
const images = node?.imgs;
const src = Array.isArray(images) && images.length ? images[images.length - 1]?.src : null;
if (typeof src !== "string" || !src) return false;
const wanted = outputRecordQuery(record);
// No stored picture to compare with, or a frame streamed during the run.
if (!wanted || !/[?&]filename=/.test(src)) return true;
if (loadedFor !== record) return false;
const have = new URLSearchParams(src.slice(src.indexOf("?") + 1));
const want = new URLSearchParams(wanted);
return ["filename", "subfolder", "type"].every((key) => (have.get(key) ?? "") === (want.get(key) ?? ""));
}
// What the panel shows, best first: this node's result (node.imgs, then the
// URL of its stored output), then whatever feeds it, then nothing.
export function describeNodePreview(node, inputName, storedUrl = null) {
return describeOwnResult(node)
?? (storedUrl ? { kind: "url", url: storedUrl } : null)
// `ownIsCurrent` false: node.imgs is an older run's (ownResultIsCurrent), so
// the stored output goes first.
export function describeNodePreview(node, inputName, storedUrl = null, ownIsCurrent = true) {
const stored = storedUrl ? { kind: "url", url: storedUrl } : null;
return (ownIsCurrent ? null : stored)
?? describeOwnResult(node)
?? stored
?? describeSourcePreview(upstreamNode(node, inputName));
}
+211
View File
@@ -0,0 +1,211 @@
// The row under the file picker on Load Image: arrows that step through the
// input folder, where the file is in the list ("14 / 212"), and the size the
// picture goes in at and comes out at ("912 × 1632 → 1144 × 2048"). The
// widgets underneath stay the source of truth: an arrow only changes the
// image widget's value, the way picking from the list does.
//
// Under it, the preview: the picture as it goes in with the part that is
// kept lit, and the picture as it comes out, both on one scale, with what
// the size choice does in words. While the choice cuts something, a click
// on the first picture picks the part to keep.
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { CROP_MODES, changeText, cropSideAt, keptPart, placeText, planLoadSize, shapeText, sizeText, stepFile, thumbSizes } from "./load_size.mjs";
import { mediaViewQuery } from "./media_list.mjs";
import { FONT_UI, RADIUS_CONTROL, THEME as T } from "./theme.mjs";
import { commitWidgetValue, comboValues } from "./widget_card_math.mjs";
const CSS_ID = "ausboss-load-strip-css";
// Sizes already read, by file: stepping back to a picture shows its size at once.
const SIZES_KEPT = 200;
const sizes = new Map();
function ensureCss() {
if (document.getElementById(CSS_ID)) return;
const style = document.createElement("style");
style.id = CSS_ID;
style.textContent = `
.ausboss-load-strip{display:flex;align-items:center;gap:6px;height:100%;min-width:0;font:500 11px/1 ${FONT_UI};color:${T.label}}
.ausboss-load-step{flex:none;width:26px;height:100%;padding:0;border:1px solid transparent;border-radius:${RADIUS_CONTROL}px;background:${T.fill};color:${T.inkSoft};font:600 11px/1 ${FONT_UI};cursor:pointer}
.ausboss-load-step:hover{background:${T.fillHover};color:${T.inkHover}}
.ausboss-load-step:focus-visible{outline:2px solid ${T.brand};outline-offset:1px}
.ausboss-load-step:disabled{opacity:.4;cursor:default}
.ausboss-load-place{flex:none;color:${T.faint};font-variant-numeric:tabular-nums;white-space:nowrap;user-select:none}
.ausboss-load-size{flex:1 1 0;min-width:0;overflow:hidden;text-align:right;white-space:nowrap;text-overflow:ellipsis;color:${T.inkSoft};font-weight:600;font-variant-numeric:tabular-nums}
.ausboss-load-size b{color:${T.brandInk};font-weight:700}
.ausboss-load-size i{color:${T.faint};font-style:normal;margin:0 5px}
.ausboss-load-view{display:flex;align-items:center;justify-content:center;gap:10px;height:100%;min-width:0;font:500 10px/1.25 ${FONT_UI};color:${T.faint}}
.ausboss-load-thumb{position:relative;flex:none;overflow:hidden;border-radius:2px;background-color:${T.fill};background-repeat:no-repeat}
.ausboss-load-thumb.in{background-size:100% 100%}
.ausboss-load-thumb.in.pick{cursor:pointer}
.ausboss-load-thumb.out{outline:1px solid ${T.brand};outline-offset:0}
.ausboss-load-kept{position:absolute;box-sizing:border-box;border:1px solid ${T.brand};box-shadow:0 0 0 400px rgba(8,10,11,.68);pointer-events:none}
.ausboss-load-note{flex:0 1 auto;min-width:0;display:flex;flex-direction:column;align-items:center;gap:2px;text-align:center;user-select:none}
.ausboss-load-note b{color:${T.inkSoft};font-weight:600;font-variant-numeric:tabular-nums;white-space:nowrap}
.ausboss-load-note span{white-space:nowrap}
`;
document.head.append(style);
}
const viewUrl = (value) => api.apiURL(`/view?${mediaViewQuery(value)}`);
// The picture's own size, read from the file the way the browser shows it.
function readSize(file, done) {
const known = sizes.get(file);
if (known) return known;
const picture = new Image();
picture.onload = () => {
if (sizes.size >= SIZES_KEPT) sizes.delete(sizes.keys().next().value);
sizes.set(file, { width: picture.naturalWidth, height: picture.naturalHeight });
done();
};
picture.src = viewUrl(file);
return null;
}
// The widest and tallest a preview picture is drawn.
const THUMB_WIDTH = 76;
const THUMB_HEIGHT = 68;
export function loadImagePreview(node) {
ensureCss();
const root = document.createElement("div");
root.className = "ausboss-load-view";
const input = document.createElement("div");
input.className = "ausboss-load-thumb in";
const kept = document.createElement("div");
kept.className = "ausboss-load-kept";
input.append(kept);
const note = document.createElement("div");
note.className = "ausboss-load-note";
const output = document.createElement("div");
output.className = "ausboss-load-thumb out";
root.append(input, note, output);
let last = {};
const side = () => node.widgets?.find((item) => item.name === "crop_from") ?? null;
const sideLinked = () => node.inputs?.find((slot) => slot?.widget?.name === "crop_from")?.link != null;
input.addEventListener("click", (event) => {
const widget = side();
if (!widget || !input.classList.contains("pick")) return;
const box = input.getBoundingClientRect();
if (!(box.width > 0 && box.height > 0)) return;
const next = cropSideAt((event.clientX - box.left) / box.width, (event.clientY - box.top) / box.height);
if (next === widget.value) return;
commitWidgetValue(node, widget, next, app.canvas);
node.setDirtyCanvas?.(true, true);
});
const line = (tag, text) => {
const item = document.createElement(tag);
item.textContent = text;
return item;
};
const sync = (values = last) => {
last = values;
const file = String(values.image ?? "");
const source = file ? readSize(file, () => { if (String(last.image ?? "") === file) sync(); }) : null;
const plan = source ? planLoadSize(source.width, source.height, values) : null;
root.style.visibility = plan ? "" : "hidden";
if (!plan) return;
const picture = `url(${JSON.stringify(viewUrl(file))})`;
const sizes = thumbSizes(source.width, source.height, plan, THUMB_WIDTH, THUMB_HEIGHT);
const part = keptPart(plan);
Object.assign(input.style, { width: `${sizes.input[0]}px`, height: `${sizes.input[1]}px`, backgroundImage: picture });
Object.assign(kept.style, {
left: `${part.x * 100}%`, top: `${part.y * 100}%`,
width: `${part.width * 100}%`, height: `${part.height * 100}%`,
});
const spareWide = plan.resizeWidth - plan.width;
const spareHigh = plan.resizeHeight - plan.height;
Object.assign(output.style, {
width: `${sizes.output[0]}px`, height: `${sizes.output[1]}px`, backgroundImage: picture,
backgroundSize: `${(plan.resizeWidth / plan.width) * 100}% ${(plan.resizeHeight / plan.height) * 100}%`,
backgroundPosition: `${spareWide > 0 ? (plan.cropX / spareWide) * 100 : 0}% ${spareHigh > 0 ? (plan.cropY / spareHigh) * 100 : 0}%`,
});
const picks = CROP_MODES.includes(values.size) && !sideLinked();
input.classList.toggle("pick", picks);
input.title = picks
? "The picture going in. The lit part is kept. Click the part you want to keep."
: "The picture going in. The lit part is kept.";
output.title = "The picture coming out.";
const from = shapeText(source.width, source.height);
const to = shapeText(plan.width, plan.height);
const change = changeText(source.width, source.height, plan);
note.replaceChildren(
line("b", from === to ? from : `${from} → ${to}`),
...(change ? change.split(" · ").map((text) => line("span", text)) : [line("span", "no change")]),
);
};
return { element: root, sync };
}
export function loadImageStrip(node) {
ensureCss();
const root = document.createElement("div");
root.className = "ausboss-load-strip";
const widget = () => node.widgets?.find((item) => item.name === "image") ?? null;
const linked = () => {
const slot = node.inputs?.find((input) => input?.widget?.name === "image" || input?.name === "image");
return slot?.link != null;
};
let last = {};
const step = (delta, label, title) => {
const button = document.createElement("button");
button.type = "button";
button.className = "ausboss-load-step";
button.textContent = label;
button.title = title;
button.addEventListener("click", () => {
const image = widget();
if (!image) return;
const next = stepFile(comboValues(image), image.value, delta);
if (next === null || next === image.value) return;
commitWidgetValue(node, image, next, app.canvas);
node.setDirtyCanvas?.(true, true);
});
root.append(button);
return button;
};
const back = step(-1, "◀", "The picture before this one in the input folder");
const on = step(1, "▶", "The next picture in the input folder");
const place = document.createElement("span");
place.className = "ausboss-load-place";
place.title = "Where this picture is in the input folder's list";
const size = document.createElement("span");
size.className = "ausboss-load-size";
root.append(place, size);
const sync = (values = last) => {
last = values;
const image = widget();
const files = comboValues(image);
const file = String(values.image ?? "");
place.textContent = placeText(files, file);
const stuck = linked() || stepFile(files, file, 1) === null;
back.disabled = stuck;
on.disabled = stuck;
const source = file ? readSize(file, () => { if (String(last.image ?? "") === file) sync(); }) : null;
size.replaceChildren();
if (!source) {
size.title = "";
return;
}
const plan = planLoadSize(source.width, source.height, values);
const text = sizeText(source.width, source.height, plan);
const [from, to] = text.split(" → ");
size.append(from);
if (to) {
const arrow = document.createElement("i");
arrow.textContent = "→";
const out = document.createElement("b");
out.textContent = to;
size.append(arrow, out);
}
size.title = to
? `The file is ${from}. The picture comes out at ${to}.`
: `The picture comes out at its own size, ${from}.`;
};
return { element: root, sync };
}
+206
View File
@@ -0,0 +1,206 @@
// Load Image: the size a picture comes out at, worked out in the browser so
// the node can show it before a run. This repeats plan_load_size in
// nodes/_load_image_helpers.py; tests/fixtures/load_size_cases.json holds
// both to the same answers. No DOM in here.
export const SIZE_MODES = Object.freeze(["off", "megapixels", "longest side", "scale", "fit inside", "crop to fill", "crop", "crop to ratio"]);
// Which part of the picture a crop keeps, as a 3 x 3 grid read row by row.
export const CROP_GRID = Object.freeze(["top left", "top", "top right", "left", "center", "right", "bottom left", "bottom", "bottom right"]);
// The choices that cut something off, so the kept part matters.
export const CROP_MODES = Object.freeze(["crop to fill", "crop", "crop to ratio"]);
const roundHalfUp = (value) => Math.floor(value + 0.5);
const whole = (value, fallback) => (Number.isFinite(Number(value)) ? Math.trunc(Number(value)) : fallback);
// Nearest multiple, never below one step.
const nearest = (value, step) => Math.max(step, roundHalfUp(value / step) * step);
// The largest multiple that is not above the value, never below one step.
const below = (value, step) => Math.max(step, Math.floor(value / step) * step);
// Rounded down to a multiple, or left alone when smaller than one step.
const inside = (value, step) => (value >= step ? Math.floor(value / step) * step : value);
// Where a cut starts along one edge with `spare` pixels to lose.
const cropStart = (spare, side, low, high) => (side.includes(low) ? 0 : side.includes(high) ? spare : Math.floor(spare / 2));
function ratioTerms(ratio, width, height) {
if (ratio === "width : height") return [Math.max(1, width), Math.max(1, height)];
const [across, down] = String(ratio ?? "1:1").split(":").map((term) => Math.trunc(Number(term)));
return [Math.max(1, across || 1), Math.max(1, down || 1)];
}
function target(sourceW, sourceH, size, { megapixels, longest_side: longestSide, scale, width, height }) {
const scaled = (factor) => [Math.max(1, roundHalfUp(sourceW * factor)), Math.max(1, roundHalfUp(sourceH * factor))];
if (size === "megapixels") {
const amount = Number(megapixels);
return amount > 0 ? scaled(Math.sqrt((amount * 1e6) / (sourceW * sourceH))) : [sourceW, sourceH];
}
if (size === "longest side") {
const edge = whole(longestSide, 0);
if (edge <= 0) return [sourceW, sourceH];
const [w, h] = scaled(edge / Math.max(sourceW, sourceH));
return sourceW >= sourceH ? [edge, h] : [w, edge];
}
if (size === "scale") {
const factor = Number(scale);
return factor > 0 ? scaled(factor) : [sourceW, sourceH];
}
const fit = Math.min(Math.max(1, whole(width, 1)) / sourceW, Math.max(1, whole(height, 1)) / sourceH);
return scaled(fit);
}
// { resizeWidth, resizeHeight, cropX, cropY, width, height } for a picture of
// sourceWidth x sourceHeight and the node's values, or null when the picture
// has no size yet or the choice is not one the node knows.
export function planLoadSize(sourceWidth, sourceHeight, values = {}) {
const sourceW = whole(sourceWidth, 0);
const sourceH = whole(sourceHeight, 0);
const size = values.size ?? "off";
if (sourceW <= 0 || sourceH <= 0 || !SIZE_MODES.includes(size)) return null;
const same = { resizeWidth: sourceW, resizeHeight: sourceH, cropX: 0, cropY: 0, width: sourceW, height: sourceH };
if (size === "off") return same;
const step = Math.max(1, whole(values.multiple, 1));
const enlarge = values.enlarge !== false;
const boxW = Math.max(1, whole(values.width, 1024));
const boxH = Math.max(1, whole(values.height, 1024));
const side = CROP_GRID.includes(values.crop_from) ? values.crop_from : "center";
const cut = (resizeWidth, resizeHeight, width, height) => ({
resizeWidth, resizeHeight,
cropX: cropStart(resizeWidth - width, side, "left", "right"),
cropY: cropStart(resizeHeight - height, side, "top", "bottom"),
width, height,
});
if (size === "crop") {
return cut(sourceW, sourceH, inside(Math.min(boxW, sourceW), step), inside(Math.min(boxH, sourceH), step));
}
if (size === "crop to ratio") {
const [across, down] = ratioTerms(values.ratio, boxW, boxH);
let width = sourceW;
let height = sourceH;
if (sourceW * down >= sourceH * across) width = Math.min(sourceW, Math.max(1, roundHalfUp((sourceH * across) / down)));
else height = Math.min(sourceH, Math.max(1, roundHalfUp((sourceW * down) / across)));
return cut(sourceW, sourceH, inside(width, step), inside(height, step));
}
if (size === "crop to fill") {
let width = boxW;
let height = boxH;
if (enlarge) {
width = nearest(width, step);
height = nearest(height, step);
} else {
const grow = Math.max(width / sourceW, height / sourceH);
if (grow > 1) {
width = Math.max(1, Math.floor(width / grow + 1e-6));
height = Math.max(1, Math.floor(height / grow + 1e-6));
}
width = Math.min(below(width, step), Math.max(step, sourceW));
height = Math.min(below(height, step), Math.max(step, sourceH));
}
const cover = Math.max(width / sourceW, height / sourceH);
const resizeWidth = Math.max(width, Math.ceil(sourceW * cover - 1e-6));
const resizeHeight = Math.max(height, Math.ceil(sourceH * cover - 1e-6));
return cut(resizeWidth, resizeHeight, width, height);
}
let [targetW, targetH] = target(sourceW, sourceH, size, { ...values, width: boxW, height: boxH });
if (!enlarge && (targetW > sourceW || targetH > sourceH)) [targetW, targetH] = [sourceW, sourceH];
const rounded = (wanted, source, box) => {
let value = nearest(wanted, step);
if (size === "fit inside" && value > box) value = below(box, step);
if (!enlarge && value > source) value = below(source, step);
return value;
};
const width = rounded(targetW, sourceW, boxW);
const height = rounded(targetH, sourceH, boxH);
return { resizeWidth: width, resizeHeight: height, cropX: 0, cropY: 0, width, height };
}
// "912 × 1632" for a picture that comes out as it went in, "912 × 1632 →
// 1144 × 2048" when its size changes, "" while the picture's size is unknown.
export function sizeText(sourceWidth, sourceHeight, plan) {
if (!(sourceWidth > 0 && sourceHeight > 0)) return "";
const from = `${sourceWidth} × ${sourceHeight}`;
if (!plan || (plan.width === sourceWidth && plan.height === sourceHeight)) return from;
return `${from} → ${plan.width} × ${plan.height}`;
}
// What a plan does to the picture, in a few words for the node: how much it
// is resized and how much is cut off, in the file's own pixels. "" when the
// picture comes out as it went in.
export function changeText(sourceWidth, sourceHeight, plan) {
if (!plan || !(sourceWidth > 0 && sourceHeight > 0)) return "";
const parts = [];
const percent = Math.round((plan.resizeWidth / sourceWidth) * 100);
if (plan.resizeWidth !== sourceWidth || plan.resizeHeight !== sourceHeight) parts.push(`${percent}% size`);
const cutWide = Math.round(((plan.resizeWidth - plan.width) * sourceWidth) / plan.resizeWidth);
const cutHigh = Math.round(((plan.resizeHeight - plan.height) * sourceHeight) / plan.resizeHeight);
if (cutWide > 0 && cutHigh > 0) parts.push(`cuts ${cutWide} × ${cutHigh} px`);
else if (cutWide > 0) parts.push(`cuts ${cutWide} px of width`);
else if (cutHigh > 0) parts.push(`cuts ${cutHigh} px of height`);
return parts.join(" · ");
}
const SHAPES = [[1, 1], [5, 4], [4, 3], [3, 2], [16, 10], [16, 9], [2, 1], [21, 9]];
// A picture's shape in words people use: "3:4", "16:9". A size within one
// percent of a common shape gets that name (rounding to a multiple moves a
// 16:9 picture a few pixels off it); any other gets "~1.34:1" or "~1:1.34".
export function shapeText(width, height) {
if (!(width > 0 && height > 0)) return "";
const wide = width >= height;
const value = wide ? width / height : height / width;
const near = SHAPES.find(([across, down]) => Math.abs(value - across / down) <= (across / down) * 0.01);
if (near) return wide ? `${near[0]}:${near[1]}` : `${near[1]}:${near[0]}`;
const rounded = Math.round(value * 100) / 100;
return wide ? `~${rounded}:1` : `~1:${rounded}`;
}
// The part of the file a plan keeps, as fractions of the file's width and
// height: { x, y, width, height }, all 0 to 1.
export function keptPart(plan) {
if (!plan) return { x: 0, y: 0, width: 1, height: 1 };
return {
x: plan.cropX / plan.resizeWidth,
y: plan.cropY / plan.resizeHeight,
width: Math.min(1, plan.width / plan.resizeWidth),
height: Math.min(1, plan.height / plan.resizeHeight),
};
}
// The sizes two small pictures are drawn at so their difference shows: both
// on one scale, the larger filling a box of maxWidth x maxHeight, and neither
// edge under `least` pixels.
export function thumbSizes(sourceWidth, sourceHeight, plan, maxWidth, maxHeight, least = 10) {
const outW = plan?.width ?? sourceWidth;
const outH = plan?.height ?? sourceHeight;
const scale = Math.min(maxWidth / Math.max(sourceWidth, outW), maxHeight / Math.max(sourceHeight, outH));
const at = (value) => Math.max(least, Math.round(value * scale));
return { input: [at(sourceWidth), at(sourceHeight)], output: [at(outW), at(outH)] };
}
// The crop side under a click at (x, y), each 0 to 1 across the picture.
export function cropSideAt(x, y) {
const third = (value) => (value < 1 / 3 ? 0 : value < 2 / 3 ? 1 : 2);
return CROP_GRID[third(y) * 3 + third(x)];
}
// The file one step before or after the current one in the list, going
// round at the ends. A file that is not in the list steps to the first or
// the last. null when the list has nothing to step to.
export function stepFile(files, current, delta) {
const list = (Array.isArray(files) ? files : []).filter((name) => name !== "" && name != null);
if (!list.length) return null;
const at = list.indexOf(current);
if (at < 0) return delta < 0 ? list[list.length - 1] : list[0];
if (list.length === 1) return null;
return list[(at + (delta < 0 ? -1 : 1) + list.length) % list.length];
}
// "14 / 212": where the current file is in the list. "" for an empty list,
// "– / 212" for a file that is not in it.
export function placeText(files, current) {
const list = (Array.isArray(files) ? files : []).filter((name) => name !== "" && name != null);
if (!list.length) return "";
const at = list.indexOf(current);
return `${at < 0 ? "–" : at + 1} / ${list.length}`;
}
+18 -1
View File
@@ -25,7 +25,11 @@ export function ensurePanelControls() {
.ausboss-panel-switch i::after{content:"";position:absolute;top:2px;left:2px;width:9px;height:9px;border-radius:50%;background:${T.inkSoft}}
.ausboss-panel-switch[aria-checked=true] i{background:${T.brand}}
.ausboss-panel-switch[aria-checked=true] i::after{left:13px;background:${T.inkHover}}
.ausboss-compact-action:focus-visible,.ausboss-panel-switch:focus-visible{outline:2px solid ${T.brand};outline-offset:1px}
.ausboss-primary-action{box-sizing:border-box;flex:none;height:22px;min-width:24px;padding:0 14px;border:0;border-radius:${RADIUS_XS}px;background:${T.brand};color:${T.onBrand};font:700 11px/1 ${controlFont};white-space:nowrap;cursor:pointer;pointer-events:auto}
.ausboss-primary-action:hover:enabled{filter:brightness(1.12)}
.ausboss-primary-action.quiet{background:${T.fill};color:${T.inkSoft}}
.ausboss-primary-action:disabled{opacity:.6;cursor:default}
.ausboss-compact-action:focus-visible,.ausboss-primary-action:focus-visible,.ausboss-panel-switch:focus-visible{outline:2px solid ${T.brand};outline-offset:1px}
`;
document.head.append(style);
}
@@ -40,6 +44,19 @@ export function compactAction(label, title = "") {
return button;
}
// The one thing a panel wants done next, as a solid button: Save Image's
// "Save picture" over a picture that is not saved yet. `quiet` (a class the
// panel sets) is the same button once it has nothing left to do.
export function primaryAction(label, title = "") {
ensurePanelControls();
const button = document.createElement("button");
button.type = "button";
button.className = "ausboss-primary-action";
button.textContent = label;
button.title = title;
return button;
}
export function panelSwitch(label, title) {
ensurePanelControls();
const button = document.createElement("button");
+3 -2
View File
@@ -52,9 +52,10 @@ export function makePictureStepper({ noun = "picture", height = 24, onStep, sign
root.append(arrow("‹", -1, `Previous ${noun}`), label, arrow("›", 1, `Next ${noun}`));
return {
root,
set(index, count) {
// `text` replaces the "2 / 5" for a stop that is not one picture.
set(index, count, text) {
root.hidden = !(count > 1);
label.textContent = stepperLabel(index, count);
label.textContent = text ?? stepperLabel(index, count);
},
};
}
+72
View File
@@ -19,3 +19,75 @@ export function stepIndex(index, count, step) {
export function stepperLabel(index, count) {
return count > 1 ? `${keepIndex(index, count) + 1} / ${count}` : "";
}
// The preview panel has one more stop, before picture 1: every picture at
// once. ALL stands for it where an index would be.
export const ALL = -1;
// One step back or on through "all, 1, 2 ... count", round at both ends.
export function stepWithAll(index, count, step) {
if (!(count > 0)) return ALL;
const stops = count + 1;
const at = index === ALL ? 0 : keepIndex(index, count) + 1;
const next = (((at + Math.sign(Number(step) || 0)) % stops) + stops) % stops;
return next === 0 ? ALL : next - 1;
}
export function allLabel(count) {
return count > 1 ? `all ${count}` : "";
}
// How to lay `count` pictures out in a box so each one draws as big as it
// can: the columns and rows that leave a picture of this shape (`aspect`,
// width over height) the most room.
export function gridShape(count, width, height, aspect = 1) {
const total = Math.max(1, Math.trunc(Number(count) || 0));
const shape = Number.isFinite(aspect) && aspect > 0 ? aspect : 1;
if (!(width > 0) || !(height > 0)) {
const columns = Math.ceil(Math.sqrt(total));
return { columns, rows: Math.ceil(total / columns) };
}
let best = { columns: 1, rows: total, size: 0 };
for (let columns = 1; columns <= total; columns += 1) {
const rows = Math.ceil(total / columns);
const size = Math.min(width / columns, (height / rows) * shape);
if (size > best.size) best = { columns, rows, size };
}
return { columns: best.columns, rows: best.rows };
}
// The held pictures in a Save Image result, in the order they show: each
// one's run token and its place in that run. A list run saves once for each
// item, so one result can hold several tokens. Empty when the result holds
// none, or when a picture in it is not one of the held ones.
export function heldPlaces(record) {
const tokens = new Set(Array.isArray(record?.ausboss_held) ? record.ausboss_held : []);
if (!tokens.size) return [];
const held = (Array.isArray(record.images) ? record.images : []).map((image) => {
const match = /^([0-9a-f]{16})_(\d{3})\./.exec(String(image?.filename ?? ""));
return match && tokens.has(match[1]) ? { token: match[1], index: Number(match[2]) } : null;
});
return held.length && held.every(Boolean) ? held : [];
}
// What the row over held pictures says, and what its button does.
// held how many pictures the node holds
// kept how many of them are saved already
// all a click keeps every picture (one picture, the grid, preview off)
// done nothing is left to keep where the click would act
// saving a save is on its way
// name the file a single picture was saved as, when known
// `quiet` is the button once it has nothing left to do.
export function keepWords({ held = 0, kept = 0, all = true, done = false, saving = false, name = "" } = {}) {
const note = !kept
? "Not saved yet"
: held < 2
? (name ? `Saved as ${name}` : "Saved")
: kept >= held ? `All ${held} saved` : `${kept} of ${held} saved`;
if (saving) return { note, button: "Saving...", quiet: false };
if (done) return { note, button: "Saved", quiet: true };
const button = held < 2
? "Save picture"
: !all ? "Save this one" : kept ? "Save the rest" : `Save all ${held}`;
return { note, button, quiet: false };
}
+49
View File
@@ -37,6 +37,7 @@ export const SOURCE_LOADERS = Object.freeze({
LoadImageOutput: picture("image"),
LoadVideo: video("file"),
AUSBOSS_NODES_ImageCropRotatePad: picture("image"),
AUSBOSS_NODES_LoadImage: picture("image"),
// A wired source_image replaces the file, so the file may stay blank.
AUSBOSS_NODES_LoadImagePad: (inputs) => (linked(inputs?.source_image) ? null : picture("image")(inputs)),
AUSBOSS_NODES_LoadAudio: sound("audio"),
@@ -160,3 +161,51 @@ export function collapseRepeatedErrors(nodeErrors) {
}
return nodeErrors;
}
// ------------------------------------------------------------ known run errors
//
// Some errors that stop a run come from outside the workflow and say nothing
// a person can act on ("KeyError: 'latent'"). Each entry here names one such
// error by what is in ComfyUI's own report, and says in plain words what to
// do. An entry is added only after the cause was found for real.
const KNOWN_RUN_ERRORS = Object.freeze([
{
// Muse MiniMax Director replaces part of H3 for every workflow, and that
// part reads a picture from every guide. ComfyUI's own H3 nodes also make
// guides that hold sound alone, which is how a clip keeps its sound.
matches: ({ type, message, traceback }) =>
type === "KeyError" && message.includes("'latent'") && traceback.includes("muse_minimax_hybrid_patch"),
summary: "Another node pack stopped this run",
detail:
"This error comes from the Muse MiniMax Director pack, not from this workflow. Turn that pack off in "
+ "Manager, restart ComfyUI and run again.",
},
{
// The w6a8 H3 files load from ComfyUI 0.38.0 on; older versions stop in
// the model loader on the name of the format.
matches: ({ message }) => message.includes("w6a8_int8"),
summary: "This model needs a newer ComfyUI",
detail:
"Your ComfyUI is too old to read this model file. Update ComfyUI to 0.38 or newer and run again.",
},
]);
/**
* Plain advice for a run error the pack knows the cause of, from the
* `execution_error` event's detail. `null` for every other error.
*/
export function explainRunError(detail) {
const report = {
type: String(detail?.exception_type ?? "").split(".").pop(),
message: String(detail?.exception_message ?? ""),
traceback: [].concat(detail?.traceback ?? []).join("\n"),
};
for (const known of KNOWN_RUN_ERRORS) {
try {
if (known.matches(report)) return { summary: known.summary, detail: known.detail };
} catch (_error) {
// A report in a shape this entry did not expect is simply not a match.
}
}
return null;
}
+50 -4
View File
@@ -57,9 +57,9 @@ export function goesBehind(flying, ask, epoch) {
// The pack's own picture loaders. One of them wired straight into Mask by
// Touch is run by the node itself, the way a press on Show picture runs it:
// it may crop, turn or pad its file, so the file alone is not the picture,
// it may crop, turn, pad or resize its file, so the file alone is not the picture,
// but running it costs next to nothing.
export const OWN_LOADERS = new Set(["AUSBOSS_NODES_ImageCropRotatePad", "AUSBOSS_NODES_LoadImagePad"]);
export const OWN_LOADERS = new Set(["AUSBOSS_NODES_ImageCropRotatePad", "AUSBOSS_NODES_LoadImage", "AUSBOSS_NODES_LoadImagePad"]);
// What a loader will hand on, as far as the page can tell: its file and its
// settings, as one text. Another text means another picture. Widgets that
@@ -74,6 +74,25 @@ export function loaderSignature(widgets) {
return JSON.stringify(settings);
}
// What the picture says when a run stopped at the node. ComfyUI's own text
// for a full graphics card is ten lines of numbers; here it is one plain
// line. Anything else is said as it came.
export const OUT_OF_MEMORY = "The graphics card ran out of memory, so the node could not look. Free some memory on it, then click again.";
export function stopMessage(message) {
const text = String(message ?? "");
return /out of memory|OutOfMemory/i.test(text) ? OUT_OF_MEMORY : text;
}
// A name as it is typed under the picture: "-face" (or the minus sign a
// phone types) takes the name away, "+face" adds it; without a sign it does
// what `takes` says. Returns { word, add }, the word cleaned.
export function typedName(text, takes = false) {
const typed = String(text ?? "").trim();
const sign = /^[-\u2212\u2013+]/.exec(typed)?.[0] ?? "";
const word = cleanWord(sign ? typed.slice(1) : typed);
return { word, add: sign ? sign === "+" : !takes };
}
// A word as the node sends it to SAM 3: commas, colons and brackets are the
// text reader's own syntax and go; spaces are collapsed.
export function cleanWord(word) {
@@ -1044,19 +1063,46 @@ export function strokePieces(planes, list, sizes, pixels, stroke, ranks, wholes
// picked area, and as untouched while almost none of it is.
const NEARLY = 0.03;
// Which pieces hold a whole pick: nearly all of one picked area (`areas`,
// on/off masks, one per chip) lies inside the piece. A person holds the
// sweater picked on them; hair that a picked jacket only laps over does not.
export const HOLDS = 0.9;
export function piecesHolding(planes, count, areas) {
const holds = new Uint8Array(count);
for (const area of areas ?? []) {
if (!area) continue;
let size = 0;
for (let index = 0; index < area.length; index += 1) if (area[index]) size += 1;
if (!size) continue;
const inside = piecesInside(planes, count, area);
for (let piece = 0; piece < count; piece += 1) if (inside[piece] >= HOLDS * size) holds[piece] = 1;
}
return holds;
}
// Which piece a pointer at pixel `index` lights up: the first piece there,
// in the order they are offered (`ranks`; without it, smallest first), that
// would still change something. Adding, that is a piece not yet (nearly)
// all picked, so clicking the same spot again goes on from the glasses to
// the face to the person. Taking away, it is a piece that has some of the
// picked area in it. -1 when there is none.
export function pieceAt(planes, index, { sizes, inside, adding = true, ranks = null } = {}) {
//
// Taking away from a spot that is not picked itself (`here` false) never
// means a thing that holds a whole pick somewhere else (`holds`, from
// piecesHolding): with a sweater picked, pointing at the face does not
// offer the person, which would take the sweater along.
export function pieceAt(planes, index, { sizes, inside, adding = true, ranks = null, here = true, holds = null } = {}) {
for (const piece of candidatesAt(planes, index, ranks)) {
const size = sizes?.[piece] ?? 0;
if (!size) continue;
const picked = inside?.[piece] ?? 0;
const slack = Math.max(4, size * NEARLY);
if (adding ? size - picked > slack : picked > slack) return piece;
if (adding) {
if (size - picked > slack) return piece;
continue;
}
if (picked <= slack || (!here && holds?.[piece])) continue;
return piece;
}
return -1;
}
+106 -19
View File
@@ -77,6 +77,7 @@ import {
pieceRanks,
pieceWholes,
pieceSizes,
piecesHolding,
piecesInside,
prefixStamps,
previewPixels,
@@ -85,9 +86,11 @@ import {
sharedPixels,
shrinkMask,
stampOf,
stopMessage,
strokePieces,
thinStroke,
touchFits,
typedName,
} from "./touch_math.mjs";
const CSS_ID = "ausboss-touch-css";
@@ -190,9 +193,17 @@ function ensureCss() {
.ausboss-touch-chip>button:hover{opacity:1;background:rgba(255,255,255,.14);}
.ausboss-touch-chip>button.more{padding:0 6px;background:rgba(0,0,0,.35);opacity:.95;}
.ausboss-touch-chip.open>button.more{background:rgba(0,0,0,.2);}
.ausboss-touch-name{box-sizing:border-box;flex:none;width:104px;height:20px;padding:0 9px;border:1px dashed rgba(0,180,170,.5);border-radius:10px;background:transparent;color:#dffcf9;font:600 10px/18px -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;outline:none;}
.ausboss-touch-namebox{box-sizing:border-box;flex:none;display:inline-flex;align-items:stretch;height:20px;border:1px dashed rgba(0,180,170,.5);border-radius:10px;overflow:hidden;}
.ausboss-touch-namebox:focus-within{border-style:solid;border-color:${BRAND};background:rgba(0,0,0,.4);}
.ausboss-touch-namebox.away{border-color:rgba(${LIT_AWAY.join(",")},.6);}
.ausboss-touch-namebox.away:focus-within{border-color:rgb(${LIT_AWAY.join(",")});}
.ausboss-touch-sign{box-sizing:border-box;flex:none;width:22px;padding:0;border:0;border-right:1px solid rgba(0,180,170,.35);background:rgba(0,180,170,.16);color:#dffcf9;font:700 13px/18px -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;cursor:pointer;}
.ausboss-touch-sign:hover{background:rgba(0,180,170,.34);color:#fff;}
.ausboss-touch-sign:disabled{opacity:.4;cursor:default;}
.ausboss-touch-namebox.away .ausboss-touch-sign{border-right-color:rgba(${LIT_AWAY.join(",")},.4);background:rgba(${LIT_AWAY.join(",")},.24);color:#ffe9e2;}
.ausboss-touch-namebox.away .ausboss-touch-sign:hover{background:rgba(${LIT_AWAY.join(",")},.42);}
.ausboss-touch-name{box-sizing:border-box;flex:none;width:118px;height:18px;padding:0 8px 0 6px;border:0;background:transparent;color:#dffcf9;font:600 10px/18px -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;outline:none;}
.ausboss-touch-name::placeholder{color:#78908e;font-weight:500;}
.ausboss-touch-name:focus{border-style:solid;border-color:${BRAND};background:rgba(0,0,0,.4);}
.ausboss-touch-gap{flex:1 1 auto;min-width:0;}
.ausboss-touch-stage{position:relative;flex:1 1 auto;min-height:0;width:100%;overflow:hidden;border:1px solid rgba(0,180,170,.27);border-radius:6px;background:rgba(0,0,0,.28);}
[data-node-id] .ausboss-touch-stage{box-sizing:border-box;min-height:${STAGE_MIN}px;}
@@ -224,9 +235,12 @@ function ensureCss() {
.ausboss-touch.fining .ausboss-touch-fining{display:flex;}
.ausboss-touch-fining::before{content:"";flex:none;width:7px;height:7px;border-radius:50%;background:${BRAND};animation:ausboss-touch-pulse 1s ease-in-out infinite;}
@keyframes ausboss-touch-pulse{0%,100%{opacity:.25;}50%{opacity:1;}}
.ausboss-touch-btn.lookpill{display:inline-flex;align-items:center;gap:5px;height:${BAR_HEIGHT}px;padding:0 9px 0 8px;border:1px solid rgba(0,180,170,.6);border-radius:10px;letter-spacing:0;text-transform:none;font:600 10px/18px -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;color:#dffcf9;background:linear-gradient(90deg,rgba(0,180,170,.38) var(--done,0%),rgba(0,180,170,.08) var(--done,0%));}
.ausboss-touch-btn.lookpill{display:inline-flex;align-items:center;gap:5px;height:${BAR_HEIGHT}px;padding:0 9px 0 0;overflow:hidden;border:1px solid rgba(0,180,170,.8);border-radius:10px;letter-spacing:0;text-transform:none;font:600 10px/18px -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;color:#dffcf9;background:linear-gradient(90deg,rgba(0,180,170,.38) var(--done,0%),rgba(0,180,170,.08) var(--done,0%));}
.ausboss-touch-btn.lookpill:hover{border-color:${BRAND};color:#fff;background:linear-gradient(90deg,rgba(0,180,170,.5) var(--done,0%),rgba(0,180,170,.16) var(--done,0%));}
.ausboss-touch-btn.lookpill .icon{flex:none;font-size:8px;letter-spacing:-1px;opacity:.9;}
.ausboss-touch-btn.lookpill .key{flex:none;display:inline-flex;align-items:center;gap:4px;align-self:stretch;padding:0 7px 0 8px;background:${BRAND};color:#04201e;font-weight:700;}
.ausboss-touch-btn.lookpill:hover .key{background:#35d6cb;}
.ausboss-touch-btn.lookpill.paused .key{background:#9fb4b2;}
.ausboss-touch-btn.lookpill .icon{flex:none;font-size:8px;letter-spacing:-1px;}
.ausboss-touch-btn.lookpill.paused{border-color:rgba(120,144,142,.6);color:#c8dddd;background:linear-gradient(90deg,rgba(120,144,142,.3) var(--done,0%),rgba(120,144,142,.06) var(--done,0%));}
.ausboss-touch-btn.lookpill.paused .icon{letter-spacing:0;}
.ausboss-touch-btn.lookpill .count{opacity:.8;}
@@ -527,6 +541,7 @@ function resolve(face) {
face.raw = raw;
face.exact = exact;
face.chipAreas = null;
face.holds = null;
face.inside = pic.pieces ? piecesInside(pic.pieces.planes, pic.pieces.list.length, raw) : null;
face.hoverMask = null;
}
@@ -697,6 +712,11 @@ function requestRun(face, ask) {
return false;
}
const run = { ask, stamp: face.stamp, epoch: face.sourceEpoch, queued: false };
// Runs of this node that are at a picture it no longer has. The one that
// is running ends by itself once the next job waits; the ones that still
// wait in the queue would each run for nothing, one after the other, so
// they are taken out before this one is sent.
const stale = face.flying.filter((other) => other.queued && other.epoch !== run.epoch);
face.flying.push(run);
face.inFlight = true;
face.askedAt = performance.now();
@@ -707,7 +727,15 @@ function requestRun(face, ask) {
face.flying = face.flying.filter((other) => other !== run);
if (!face.flying.length) settle(face);
};
Promise.resolve(face.host.run(ask === "scope" ? scopeAsk(face) : ask)).then((queued) => {
const cleared = stale.length && face.host.dropWaiting
? Promise.resolve(face.host.dropWaiting()).then((gone) => {
// What was taken out never answers: the newest of the stale ones,
// because a run of this node goes to the front of the queue.
const out = new Set(stale.slice(Math.max(0, stale.length - (Number(gone) || 0))));
if (out.size) face.flying = face.flying.filter((other) => !out.has(other));
}, () => {})
: Promise.resolve();
cleared.then(() => face.host.run(ask === "scope" ? scopeAsk(face) : ask)).then((queued) => {
if (queued === false) {
failed();
return;
@@ -1258,11 +1286,23 @@ function takeAll(face, index) {
refreshHover(face);
}
// Whether a typed name is taken away: what the sign in front of the field
// was set to, or else what the tool does right now (Erase, or Ctrl held).
function nameTakes(face) {
return face.nameAway ?? face.away;
}
// A typed name, as every thing of that name. "-face" takes it away and
// "+face" adds it, whatever the sign says.
function addName(face, text) {
const word = cleanWord(text);
if (!word || !face.pic || face.held) return false;
const typed = typedName(text, nameTakes(face));
if (!typed.word || !face.pic || face.held) return false;
flushPending(face);
addItem(face, { t: "all", op: face.away ? 0 : 1, w: word });
if (!typed.add && !face.items.some((item) => item.op === 1)) {
setNote(face, "Nothing is picked yet. Pick something first, then take a name away from it.", { life: 3200 });
return false;
}
addItem(face, { t: "all", op: typed.add ? 1 : 0, w: typed.word });
return true;
}
@@ -1413,9 +1453,19 @@ function syncTools(face) {
face.lookButton.style.display = offer ? "" : "none";
}
if (face.nameField) {
face.nameField.disabled = !live || face.held > 0;
// A typed name is added, or taken away while the tool takes away.
face.nameField.placeholder = face.away ? "\u2212 type a name" : "+ type a name";
const off = !live || face.held > 0;
const takes = nameTakes(face);
face.nameField.disabled = off;
face.nameSign.disabled = off;
face.nameBox.classList.toggle("away", takes);
face.nameSign.textContent = takes ? "\u2212" : "+";
face.nameSign.title = takes
? "A name you type is taken away from the mask. Click to add by name instead."
: "A name you type is added to the mask. Click to take away by name instead.";
face.nameField.placeholder = takes ? "take away by name" : "add by name";
face.nameField.title = takes
? "Type what to take out of the mask, like \"face\" or \"hair\", and press Enter. Every thing of that name is taken away."
: "Type what to pick, like \"screen\" or \"earring\", and press Enter. Every thing of that name is taken. Start with a minus, like \"-face\", to take it away instead.";
}
if (face.newButton) face.newButton.disabled = !live || face.held > 0 || Boolean(face.fresh);
// The switch shows what a press does right now: with Ctrl held, Paint
@@ -1949,12 +1999,31 @@ function pointOf(face, event) {
return [clamp(x, 0, face.pic.width - 1), clamp(y, 0, face.pic.height - 1)];
}
// The pieces that hold a whole pick, worked out once per change to the
// picks and only when something is being taken away.
function holdsOf(face) {
const pic = face.pic;
if (!pic?.pieces || !face.raw) return null;
if (!face.holds || face.holds.length !== pic.pieces.list.length) {
const areas = chipGroups(face.items).filter((chip) => !chip.away).map((chip) => chipArea(face, chip));
face.holds = piecesHolding(pic.pieces.planes, pic.pieces.list.length, areas);
}
return face.holds;
}
function pieceUnder(face, point, adding) {
const pic = face.pic;
if (!pic?.pieces || !point) return -1;
const x = clamp(Math.floor(point[0] * pic.scale), 0, pic.pw - 1);
const y = clamp(Math.floor(point[1] * pic.scale), 0, pic.ph - 1);
return pieceAt(pic.pieces.planes, y * pic.pw + x, { sizes: pic.pieces.sizes, inside: face.inside, adding, ranks: pic.pieces.ranks });
const at = y * pic.pw + x;
if (adding) return pieceAt(pic.pieces.planes, at, { sizes: pic.pieces.sizes, inside: face.inside, ranks: pic.pieces.ranks });
// Taking away from a spot that is not picked: never a thing that holds a
// whole pick somewhere else (the person, for the sweater picked on them).
return pieceAt(pic.pieces.planes, at, {
sizes: pic.pieces.sizes, inside: face.inside, adding, ranks: pic.pieces.ranks,
here: face.raw?.[at] >= 0.5, holds: holdsOf(face),
});
}
// The pixel of the small copy under a point of the picture.
@@ -2324,7 +2393,8 @@ function syncLooking(face) {
pill.classList.toggle("paused", paused);
pill.style.setProperty("--done", `${total ? Math.round((done / total) * 100) : 0}%`);
face.lookIcon.textContent = paused ? "\u25b6" : "\u275a\u275a";
face.lookWord.textContent = paused ? "Paused" : "Looking";
face.lookVerb.textContent = paused ? "Look on" : "Pause";
face.lookWord.textContent = paused ? "paused" : "looking";
face.lookCount.textContent = total ? `${done}/${total}` : "\u2026";
const far = total ? ` ${done} of ${total}` : "";
pill.title = paused
@@ -2717,6 +2787,8 @@ function setSoft(face, soft) {
// Pick takes whole things; Paint and Erase are the brush.
function setTool(face, tool) {
// The sign in front of the name field follows the tool again.
face.nameAway = null;
if (!TOOLS.includes(tool)) return;
face.tool = tool;
face.snap = tool === "pick";
@@ -2773,16 +2845,21 @@ export function mountTouchStage(node, host) {
const bar = el("div", "ausboss-touch-bar");
const chips = el("div", "ausboss-touch-chips");
const chipList = el("span", "ausboss-touch-chiplist");
// A name typed here picks every thing of that name, or takes it away:
// the sign in front says which, and a press on it changes it.
const nameBox = el("span", "ausboss-touch-namebox");
const nameSign = el("button", "ausboss-touch-sign", "+");
nameSign.type = "button";
const nameField = el("input", "ausboss-touch-name");
nameField.type = "text";
nameField.placeholder = "+ type a name";
nameField.placeholder = "add by name";
nameField.maxLength = 60;
nameField.spellcheck = false;
nameField.title = "Type what to pick, like \"screen\" or \"earring\", and press Enter. Every thing of that name is taken.";
nameBox.append(nameSign, nameField);
const newButton = el("button", "ausboss-touch-new", "+ new");
newButton.type = "button";
newButton.title = "Start a new area: what you paint next gets a chip of its own, also where it touches another area.";
chips.append(chipList, newButton, nameField);
chips.append(chipList, newButton, nameBox);
root.append(tools, stage, bar, chips);
const frame = el("div", "ausboss-touch-frame");
@@ -2827,7 +2904,7 @@ export function mountTouchStage(node, host) {
const face = node.__ausbossTouch = {
node, host, root, stage, frame, img, tint, lit, ink, path, dots, ringBack, ring, coreRing, dab, brushLabel, tag, hint, noteEl, abort,
chips, chipList, newButton, nameField, chipsShown: null,
chips, chipList, newButton, nameField, nameBox, nameSign, nameAway: null, chipsShown: null,
flying: [],
pendingTimer: 0,
alive: true,
@@ -3031,10 +3108,15 @@ export function mountTouchStage(node, host) {
if (face.pic?.paused && !face.inFlight) resumeLook(face);
else pauseLook(face);
}, signal);
// The press it takes comes first, as a button of its own look: "Pause"
// while the node looks, "Look on" once it is paused.
face.lookIcon = el("span", "icon");
face.lookVerb = el("span", "verb");
face.lookWord = el("span", "word");
face.lookCount = el("span", "count");
face.lookPill.append(face.lookIcon, face.lookWord, face.lookCount);
const lookKey = el("span", "key");
lookKey.append(face.lookIcon, face.lookVerb);
face.lookPill.append(lookKey, face.lookWord, face.lookCount);
face.lookPill.style.display = "none";
// First in the line under the picture: what the node is doing with the
// picture, then what is picked; the buttons that pick come after.
@@ -3044,6 +3126,11 @@ export function mountTouchStage(node, host) {
for (const type of ["keydown", "keyup", "keypress", "pointerdown", "mousedown", "dblclick"]) {
chips.addEventListener(type, (event) => event.stopPropagation(), { signal });
}
nameSign.addEventListener("click", () => {
face.nameAway = !nameTakes(face);
syncTools(face);
nameField.focus();
}, { signal });
nameField.addEventListener("keydown", (event) => {
if (event.key === "Enter") {
event.preventDefault();
@@ -3096,7 +3183,7 @@ export function mountTouchStage(node, host) {
// The run stopped at this node with a message for the person.
face.stopped = (message) => {
settle(face);
setNote(face, String(message ?? ""));
setNote(face, stopMessage(message));
// It stays up until something else is said or the next result comes in.
face.stopNote = true;
};
+63
View File
@@ -12,6 +12,7 @@ import { formatWidgetVisibility } from "../shared/save_video_formats.mjs";
import { hideInputsInDef } from "../shared/widget_visibility.mjs";
import { castChips } from "../shared/h3_cast_chips.mjs";
import { clipSetsDuration } from "../shared/h3_duration.mjs";
import { loadImagePreview, loadImageStrip } from "../shared/load_image_strip.mjs";
import { momentStrip } from "../shared/moment_strip.mjs";
import { mountWidgetCard } from "../shared/widget_card.mjs";
import { FONT_UI, THEME } from "../shared/theme.mjs";
@@ -27,6 +28,9 @@ import { valueToTake, wiredLimits } from "../shared/wired_limits.mjs";
const viewUrl = (value) => api.apiURL(`/view?${mediaViewQuery(value)}`);
const isMode = (name, ...modes) => (values) => modes.includes(values[name]);
// Load Image: the choices that read the width and height boxes.
const loadImageUsesBox = (values) => ["fit inside", "crop to fill", "crop"].includes(values.size)
|| (values.size === "crop to ratio" && values.ratio === "width : height");
// Stitch Inpaint: Seam lives in the card's gear menu (shared/stitch_seam.mjs
// holds the menu and the rules). The gear in the card's corner opens the
// menu; a "blend in" chip beside it shows the mode at a glance and opens the
@@ -121,6 +125,15 @@ const CARDS = {
{ widget: "interpolation", label: "Filter", kind: "select" },
],
},
AUSBOSS_NODES_EditLock: {
minWidth: 300,
rows: [
{ widget: "lock", label: "Lock", kind: "segment",
titles: { auto: "Lock the untouched parts; step aside when the whole picture changes", always: "Lock even when the whole picture changes", off: "Do nothing" } },
{ widget: "tolerance", label: "Tolerance", decimals: 2, suffix: "×" },
],
},
AUSBOSS_NODES_EditLockRestore: { minWidth: 300, rows: [{ widget: "feather", label: "Feather", suffix: "px" }] },
AUSBOSS_NODES_ColorMatch: {
minWidth: 300,
rows: [
@@ -281,6 +294,14 @@ const CARDS = {
{ widget: "batch_size", label: "Batch" },
],
},
AUSBOSS_NODES_FlashVSRUpscale: {
minWidth: 340,
rows: [
{ widget: "model", label: "Model", kind: "select" },
{ widget: "scale", label: "Scale", suffix: "×", decimals: 2 },
{ widget: "color_match", label: "Keep colors" },
],
},
AUSBOSS_NODES_AlignImage: {
minWidth: 300,
rows: [
@@ -331,6 +352,23 @@ const CARDS = {
rows: [{ widget: "text", kind: "textarea", placeholder: "Prompt, caption, or shared text", height: 100, grow: true,
looks: { big: { height: 62, placeholder: "type here" } } }],
},
// One line for each run. The three settings under the box say where a run
// ends, whether a leading "1." comes off, and how many lines run at most.
AUSBOSS_NODES_TextLines: {
minWidth: 320,
rows: [
{ widget: "text", kind: "textarea", placeholder: "One line for each run", height: 100, grow: true },
{ widget: "split", label: "Split at", kind: "segment" },
{ widget: "remove_numbering", label: "Numbering", onText: "remove", offText: "keep" },
{ widget: "limit", label: "Limit" },
],
},
// The seed arrives on a socket (forceInput), so the card is the prompt
// alone, with its {a|b} choice sets.
AUSBOSS_NODES_PromptVariations: {
minWidth: 300,
rows: [{ widget: "text", kind: "textarea", placeholder: "A woman in a {red|blue|green} {sweater|jacket}. One choice is picked from each set.", height: 100, grow: true }],
},
// All the words go in the box, and the strip under it shows when each
// moment plays. The pictures, the video, the voice and the song arrive on
// sockets, and each picture's job sits under the words.
@@ -400,6 +438,31 @@ const CARDS = {
title: "The longest the sound may be. Anything past it is cut off and shows in red. 0 means no limit." },
],
},
// Load Image: the file, then where it is in the folder and the size it
// goes in and comes out at, then the size settings. ComfyUI's own picture
// preview sits under the card, so its mask editor and copy and paste work
// as they do on the stock loader.
AUSBOSS_NODES_LoadImage: {
minWidth: 320, first: true, hide: ["upload"],
rows: [
{ widget: "image", label: "Source", kind: "select", preview: { kind: "image", url: viewUrl },
button: { text: PANEL_LABELS.load, title: "Upload a picture into ComfyUI's input folder", onClick: (node) => node.widgets?.find((w) => w.name === "upload")?.callback?.() } },
{ panel: loadImageStrip, height: 26 },
{ panel: loadImagePreview, height: 72 },
{ widget: "size", label: "Size", kind: "select" },
{ widget: "megapixels", label: "Megapixels", suffix: "MP", when: isMode("size", "megapixels") },
{ widget: "longest_side", label: "Longest side", suffix: "px", when: isMode("size", "longest side") },
{ widget: "scale", label: "Scale", suffix: "\u00d7", when: isMode("size", "scale") },
{ widget: "ratio", label: "Ratio", kind: "select", when: isMode("size", "crop to ratio") },
{ widget: "width", label: "Width", suffix: "px", when: loadImageUsesBox },
{ widget: "height", label: "Height", suffix: "px", when: loadImageUsesBox },
{ widget: "crop_from", label: "Keep", kind: "select", when: isMode("size", "crop to fill", "crop", "crop to ratio") },
{ widget: "multiple", label: "Round to", snap: true, step: 8, when: (values) => values.size !== "off" },
{ group: "more", label: "More" },
{ widget: "method", label: "Method", kind: "select", group: "more" },
{ widget: "enlarge", label: "Enlarge", group: "more" },
],
},
AUSBOSS_NODES_LoadImagePad: {
minWidth: 340, first: true, hide: ["upload"],
rows: [
+2
View File
@@ -19,6 +19,7 @@ import { BRAND, chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange } fro
import { collectGraphNodes } from "../shared/appearance.mjs";
import { copyToClipboard } from "../shared/clipboard.mjs";
import { confirmDiscard } from "../shared/discard_prompt.mjs";
import { closeOnBackdropClick } from "../shared/dialog_backdrop.mjs";
import { WIDGET_FRAME, fillNodeHeight, holdNodeMinHeight } from "../shared/panel_layout.mjs";
import { hideInputsInDef, hideWidget } from "../shared/widget_visibility.mjs";
import { suppressCoreImagePreview } from "../shared/core_preview.mjs";
@@ -551,6 +552,7 @@ function render(state) {
if (note.author) header.append(el("p", "", `by ${note.author}`));
dialog.append(header);
renderSections({ note, rows: [] }, dialog);
closeOnBackdropClick(dialog);
document.body.append(dialog);
state.reader = dialog;
dialog.addEventListener("close", () => {
+198
View File
@@ -172,6 +172,64 @@
}
}
},
"AUSBOSS_NODES_EditLock": {
"display_name": "编辑锁定 🆎",
"description": "让图片里编辑没有改动的部分保持在原位,颜色也不变。编辑模型会把整张图重画一遍,没改的部分常常略微放大、偏移或偏色。把这个节点放在模型和采样器之间,并接上你要编辑的图片。不需要遮罩:它在出图过程中看出编辑改了哪里。如果编辑改变的是整张图(新风格、新光线、新天气),它会自动让开。解码后再接上编辑锁定还原 🆎,未改动的部分就能换回你原图的像素。",
"inputs": {
"model": {
"name": "模型"
},
"vae": {
"name": "vae"
},
"image": {
"name": "图像"
},
"lock": {
"name": "锁定"
},
"tolerance": {
"name": "容差"
},
"mask": {
"name": "遮罩"
}
},
"outputs": {
"0": {
"name": "模型"
},
"1": {
"name": "编辑锁"
}
}
},
"AUSBOSS_NODES_EditLockRestore": {
"display_name": "编辑锁定还原 🆎",
"description": "把编辑没有改动的部分换回你原图自己的像素。放在 VAE 解码之后,并接上编辑锁定 🆎 的 edit_lock 输出。未改动的部分与原图逐像素一致,只有编辑的部分是新的。如果锁定让开了,图片原样通过。",
"inputs": {
"image": {
"name": "图像"
},
"edit_lock": {
"name": "编辑锁"
},
"feather": {
"name": "羽化"
}
},
"outputs": {
"0": {
"name": "图像"
},
"1": {
"name": "编辑遮罩"
},
"2": {
"name": "报告"
}
}
},
"AUSBOSS_NODES_Float": {
"display_name": "浮点数 🆎",
"description": "一个独立的 FLOAT 值。在多个节点之间共用同一个强度、缩放或 CFG,只需在一处修改。",
@@ -593,6 +651,71 @@
}
}
},
"AUSBOSS_NODES_LoadImage": {
"display_name": "加载图像 🆎",
"description": "在同一个节点里加载图片并设定尺寸。可以选择文件、上传,或用箭头逐张浏览输入文件夹。尺寸可以关闭,也可以按百万像素、最长边、缩放倍数、放入一个框内,或裁剪填满一个框来调整。也可以不缩放,直接从图片中裁出一块或裁成某个比例,并选择保留哪一边。运行之前,节点就会显示输入和输出的图片及两者的尺寸。",
"inputs": {
"image": {
"name": "图像"
},
"size": {
"name": "尺寸"
},
"megapixels": {
"name": "百万像素"
},
"longest_side": {
"name": "最长边"
},
"scale": {
"name": "缩放倍数"
},
"width": {
"name": "宽度"
},
"height": {
"name": "高度"
},
"multiple": {
"name": "取整倍数"
},
"method": {
"name": "插值"
},
"enlarge": {
"name": "放大"
},
"crop_from": {
"name": "保留部分"
},
"ratio": {
"name": "比例"
}
},
"outputs": {
"0": {
"name": "图像"
},
"1": {
"name": "遮罩"
},
"2": {
"name": "宽度"
},
"3": {
"name": "高度"
},
"4": {
"name": "文件名"
},
"5": {
"name": "原始宽度"
},
"6": {
"name": "原始高度"
}
}
},
"AUSBOSS_NODES_LoadImagePad": {
"display_name": "加载图像 + 扩边 🆎",
"description": "在一个节点里加载图像并扩边成扩图画布。拖动节点上画布的任意一边,直观地设置每边的扩边量;遮罩正好覆盖新扩出的部分,可选择向内羽化跨过接缝。画布会取整到整数倍,但不会给你没扩的边加条带;设置百万像素目标时会先缩放原图,让遮罩接缝保持清晰。",
@@ -1052,6 +1175,9 @@
},
"step_preview": {
"name": "步骤预览"
},
"autosave": {
"name": "自动保存"
}
},
"outputs": {
@@ -1240,6 +1366,35 @@
}
}
},
"AUSBOSS_NODES_TextLines": {
"display_name": "逐行文本 🆎",
"description": "文本的每一行都会让后面的节点运行一次。输入五条提示词,每行一条,运行一次就得到五张图。空行会跳过,行首的序号或项目符号可以去掉。",
"inputs": {
"text": {
"name": "文本"
},
"split": {
"name": "分隔方式"
},
"remove_numbering": {
"name": "去掉序号"
},
"limit": {
"name": "上限"
}
},
"outputs": {
"0": {
"name": "行"
},
"1": {
"name": "序号"
},
"2": {
"name": "数量"
}
}
},
"AUSBOSS_NODES_TiledUpscale": {
"display_name": "分块放大 🆎",
"description": "以百万像素设置成品尺寸,并把图片切成模型可以逐块重画的图块。一块就能装下的图片保持完整。把图块送进采样器,再和 stitcher 一起送进分块放大拼合 🆎。小图不会被重画到远超其细节的程度:最多重画到原百万像素的 max_growth 倍,再用普通方式放大。report 会说明对你的图片做了什么。",
@@ -1591,5 +1746,48 @@
"AUSBOSS_NODES_WorkflowNoteTile": {
"display_name": "工作流说明卡片 🆎",
"description": "点击打开完整说明的小按钮。点击铅笔编辑,拖动角落调整大小。旧版节点包会将它显示为缺失节点,请更新 ComfyUI-AusBoss。"
},
"AUSBOSS_NODES_FlashVSRUpscale": {
"display_name": "FlashVSR 视频放大 🆎",
"description": "用 FlashVSR 模型把视频放大并变清晰。选好模型文件,设定放大倍数,然后运行。节点每次只读取几帧,所以长视频和短视频占用的显存一样多,每一帧都会返回。接上 Wan 2.1 VAE 可以得到更慢但更细致的结果。",
"inputs": {
"frames": {
"name": "帧"
},
"model": {
"name": "模型"
},
"scale": {
"name": "放大倍数"
},
"color_match": {
"name": "保留颜色"
},
"vae": {
"name": "vae"
}
},
"outputs": {
"0": {
"name": "帧"
}
}
},
"AUSBOSS_NODES_PromptVariations": {
"display_name": "提示词变体 🆎",
"description": "每次运行都会变化的提示词框。把选项写在花括号里,例如 {红色|蓝色|绿色} 的 {毛衣|夹克},节点会从每组里选一个。种子决定选哪个:同一个种子得到同一个提示词,每次换新种子就得到新的组合。没有花括号的文字原样输出。",
"inputs": {
"text": {
"name": "文本"
},
"seed": {
"name": "种子"
}
},
"outputs": {
"0": {
"name": "提示词"
}
}
}
}
+455
View File
@@ -0,0 +1,455 @@
"""Edit Lock: keep what an edit did not change. Pure torch, no ComfyUI imports.
At every sampling step an edit model predicts the finished picture. Where
that prediction sits close to the original, the edit is not happening
there, so the original is put back and the model carries on from the real
picture. This is the target TailSteer trains a model toward
(original where nothing changed, the model's edit elsewhere), applied while
sampling instead of through training.
What counts as changed is measured against the quiet part of the picture:
the tenth of it where the prediction differs least, which a local edit
leaves near the level of the model's own redraw noise. The node watches the
first steps, where it only undoes the model's zoom and shift, and decides
once the picture has formed. An edit of the whole picture (a style, the
light) has no quiet part: the first look checks for that and the lock steps
aside. A soft change over the whole picture (rain, snow, haze) has no clear
peak: the decision checks for that, and the picture is only held in place.
"""
from __future__ import annotations
import torch
import torch.nn.functional as F
LOCK_MODES = ("auto", "always", "off")
# A spot counts as changed when it differs from the original by STRONG times
# the quiet level, or by WEAK times while it touches a spot that does. So a
# faint change next to a clear one belongs to the edit, and a faint change
# alone is redraw noise. Set against what 14 plain MiniMax-H3-Image edits
# changed in the end: this frees about 80% of it at the first look and 3%
# of what stayed.
WEAK = 2.0
STRONG = 3.0
# The model often draws the whole picture a little larger or shifted. That
# is measured and discounted before anything is compared, up to these
# limits; a bigger move is treated as part of the edit.
# The node watches the start of a run and decides once the noise is down to
# this share of where it began. The first prediction is a blur: rain, snow,
# smoke and the light a new hair color throws on a face only show a few
# steps in. While it watches it only undoes the zoom and shift.
DECIDE_AT = 0.8
# A local edit has a peak: somewhere the picture clearly changes. Rain, snow
# and haze change the whole picture a little and no part clearly. A lock
# would hold them back, or let them through in patches where it hands a wide
# part of the picture to the edit. So two things are read at the decision,
# in units of the quiet level: the strongest spot, and the strongest
# hundredth when the lock would free SOFT_WIDE of the picture or more. On
# recorded MiniMax-H3-Image runs the strongest spot read 4.7 or more for
# every local edit, glasses and makeup included, and 3.7 or less for light
# rain, fog and snow; with a wide part freed, the strongest hundredth read
# 4.4 or more for local edits and 3.6 or less for rain and snow.
SOFT_WIDE = 0.10
SOFT_PEAK = 4.0
# Kept this much or more: the report adds what to do if the edit is missing.
# A soft effect over the whole picture (rain, snow, smoke) looks like a small
# edit at the first look, and under the lock the model then drops it.
NEARLY_ALL = 0.95
MAX_ZOOM = 0.05
MAX_SHIFT = 4.0
# The whole picture is changing when even its calmest fifth sits this far
# from the original at the first look, in units of the original's own
# spread. Measured on MiniMax-H3-Image: 28 local edits at 1, 4 and 16 MP came
# in at 0.22 or less (zoomed ones included), 12 whole-picture edits (styles,
# light, weather) at 0.27 or more.
WHOLE_PICTURE = 0.243
# Blur and growth of the change map, as a share of the short side.
REACH = 1.0 / 54.0
# A result this much larger or smaller than the picture is another picture.
SIZE_SLACK = 0.04
def box_blur(x: torch.Tensor, radius: int) -> torch.Tensor:
if radius <= 0:
return x
size = 2 * radius + 1
return F.avg_pool2d(F.pad(x, (radius,) * 4, mode="replicate"), size, stride=1)
def reach(height: int, width: int) -> int:
return max(1, round(min(height, width) * REACH))
def _moved(source: torch.Tensor, move: torch.Tensor) -> torch.Tensor:
"""The original sampled at (zoom_x * x + shift_x, zoom_y * y + shift_y), x and y in cells from the centre.
move = [zoom_x - 1, zoom_y - 1, shift_x, shift_y].
"""
height, width = source.shape[-2:]
theta = torch.zeros(source.shape[0], 2, 3, device=source.device, dtype=source.dtype)
theta[:, 0, 0] = 1.0 + move[0]
theta[:, 1, 1] = 1.0 + move[1]
theta[:, 0, 2] = 2.0 * move[2] / width
theta[:, 1, 2] = 2.0 * move[3] / height
grid = F.affine_grid(theta, list(source.shape), align_corners=False)
return F.grid_sample(source, grid, mode="bilinear", padding_mode="border", align_corners=False)
def measure_redraw(pred: torch.Tensor, source: torch.Tensor) -> torch.Tensor:
"""How much larger and how far shifted the prediction is drawn, as the move that lays the original over it.
pred and source are [1, C, H, W]. Fitted on the calmer half of the
picture, so the edit itself does not pull the answer, from a coarse grid
down to the full one. Returns [zoom_x - 1, zoom_y - 1, shift_x, shift_y];
zeros when nothing can be measured.
"""
pred, source = pred.float(), source.float()
move = torch.zeros(4, device=pred.device, dtype=torch.float32)
limit = torch.tensor([MAX_ZOOM, MAX_ZOOM, MAX_SHIFT, MAX_SHIFT], device=pred.device)
for level in (4, 2, 1):
if min(pred.shape[-2:]) // level < 16:
continue
a = box_blur(F.avg_pool2d(pred, level) if level > 1 else pred, 1)
b = box_blur(F.avg_pool2d(source, level) if level > 1 else source, 1)
height, width = a.shape[-2:]
ys = (torch.arange(height, device=a.device, dtype=torch.float32) + 0.5 - height / 2)[:, None].expand(height, width)
xs = (torch.arange(width, device=a.device, dtype=torch.float32) + 0.5 - width / 2)[None, :].expand(height, width)
here = move.clone()
here[2:] = here[2:] / level
for _ in range(6):
laid = _moved(b, here)
rest = a - laid
rest = rest - rest.flatten(2).median(dim=2).values[:, :, None, None]
wide = F.pad(laid, (1, 1, 1, 1), mode="replicate")
gx = (wide[..., 1:-1, 2:] - wide[..., 1:-1, :-2]) / 2.0
gy = (wide[..., 2:, 1:-1] - wide[..., :-2, 1:-1]) / 2.0
size = rest.abs().mean(dim=1, keepdim=True)
calm = (size <= size.flatten().median()).float()
calm[..., :2, :] = 0.0
calm[..., -2:, :] = 0.0
calm[..., :, :2] = 0.0
calm[..., :, -2:] = 0.0
jac = (torch.stack([gx * xs, gy * ys, gx, gy], dim=-1) * calm[..., None]).reshape(-1, 4)
normal = jac.T @ jac + 1e-6 * torch.eye(4, device=a.device)
try:
change = torch.linalg.solve(normal, jac.T @ (rest * calm).reshape(-1))
except RuntimeError:
return torch.zeros(4, device=pred.device, dtype=torch.float32)
if not bool(torch.isfinite(change).all()):
return torch.zeros(4, device=pred.device, dtype=torch.float32)
here = here + change
if float(change.abs().max()) < 1e-4:
break
move = here.clone()
move[2:] = move[2:] * level
move = torch.maximum(torch.minimum(move, limit), -limit)
return move
def redraws(pred: torch.Tensor, source: torch.Tensor) -> list[torch.Tensor]:
"""measure_redraw for each picture of a batch."""
return [measure_redraw(pred[index:index + 1], source[:1]) for index in range(pred.shape[0])]
def difference(pred: torch.Tensor, source: torch.Tensor, moves: list[torch.Tensor] | None = None) -> torch.Tensor:
"""How far each spot of the prediction is from the original, [B, 1, H, W].
Two things are not a change. A redraw of the whole picture slightly
larger or shifted: the original is laid over the prediction first. And
an even tint: each channel's middle difference is taken out. The result
is in units of the original's own spread, which keeps the numbers alike
between models.
"""
pred = pred.float()
source = source.float()
moves = moves if moves is not None else redraws(pred, source)
out = []
for index in range(pred.shape[0]):
delta = pred[index:index + 1] - _moved(source[:1], moves[index])
delta = delta - delta.flatten(2).median(dim=2).values[:, :, None, None]
out.append(delta.abs().mean(dim=1, keepdim=True))
magnitude = torch.cat(out) / source.std().clamp_min(1e-6)
return box_blur(magnitude, reach(*magnitude.shape[-2:]))
def moved_back(pred: torch.Tensor, moves: list[torch.Tensor]) -> torch.Tensor:
"""The prediction with its zoom and shift undone, so it sits where the original does.
Resampling softens a latent, so a move under a tenth of a cell at the
corner is left alone, and the rest is resampled bicubic: on recorded
runs that kept 85% of the fine detail where bilinear kept 65%.
"""
out = []
for index in range(pred.shape[0]):
one = pred[index:index + 1]
move = moves[index]
height, width = one.shape[-2:]
corner = (move[0].abs() * width / 2 + move[2].abs()).maximum(move[1].abs() * height / 2 + move[3].abs())
if float(corner) < 0.1:
out.append(one)
continue
theta = torch.zeros(1, 2, 3, device=one.device, dtype=torch.float32)
theta[:, 0, 0] = 1.0 / (1.0 + move[0])
theta[:, 1, 1] = 1.0 / (1.0 + move[1])
theta[:, 0, 2] = -2.0 * move[2] / (1.0 + move[0]) / width
theta[:, 1, 2] = -2.0 * move[3] / (1.0 + move[1]) / height
grid = F.affine_grid(theta, list(one.shape), align_corners=False)
back = F.grid_sample(one.float(), grid, mode="bicubic", padding_mode="border", align_corners=False)
out.append(back.to(one.dtype))
return torch.cat(out)
def broad_change(pred: torch.Tensor, source: torch.Tensor) -> torch.Tensor:
"""How far the calmest fifth of each picture sits from the original, [B].
Read on a smoothed copy, where a redraw one percent larger nearly
vanishes and a new style, new light or new weather does not. An even
tint is taken out first: the model adds one by itself, a stronger one
on large pictures, and that is no edit.
"""
delta = (pred - source).float()
delta = delta - delta.flatten(2).median(dim=2).values[:, :, None, None]
delta = box_blur(delta, max(1, round(min(delta.shape[-2:]) / 30.0)))
level = (delta * delta).mean(dim=1).sqrt().flatten(1)
stride = max(1, level.shape[1] // 200000)
spread = source.float().std().clamp_min(1e-6)
return torch.quantile(level[:, ::stride], 0.2, dim=1) / spread
def quiet_level(magnitude: torch.Tensor) -> torch.Tensor:
"""The tenth of each picture that differs least, [B]."""
flat = magnitude.flatten(1)
stride = max(1, flat.shape[1] // 200000)
return torch.quantile(flat[:, ::stride], 0.1, dim=1)
def peaks(magnitude: torch.Tensor, quiet: torch.Tensor) -> tuple[float, float]:
"""How clear the clearest change is, in units of the quiet level: (strongest spot, strongest hundredth)."""
ratio = (magnitude / quiet.clamp_min(1e-6)[:, None, None, None]).flatten(1)
stride = max(1, ratio.shape[1] // 200000)
return float(ratio.max(dim=1).values.min()), float(torch.quantile(ratio[:, ::stride], 0.99, dim=1).min())
def change_core(magnitude: torch.Tensor, quiet: torch.Tensor, tolerance: float = 1.0,
held: torch.Tensor | None = None) -> torch.Tensor:
"""1 where the edit changed the picture, 0 where it did not, hard-edged, [B, 1, H, W].
`held` is what earlier steps called changed: it stays changed, and
faint change that touches it joins it.
"""
ratio = magnitude / quiet.clamp_min(1e-6)[:, None, None, None]
weak = (ratio > WEAK * tolerance).float()
core = (ratio > STRONG * tolerance).float()
if held is not None:
weak = torch.maximum(weak, held)
core = torch.maximum(core, held)
for _ in range(sum(core.shape[-2:])):
grown = F.max_pool2d(core, 3, stride=1, padding=1) * weak
if torch.equal(grown, core):
break
core = grown
return core
def soften(core: torch.Tensor) -> torch.Tensor:
"""The hard change map with a margin and a soft edge, so the edit has room to blend in."""
grow = reach(*core.shape[-2:])
return box_blur(F.max_pool2d(core, 2 * grow + 1, stride=1, padding=grow), grow)
def fit_latent(latent: torch.Tensor, height: int, width: int) -> torch.Tensor | None:
"""The original's latent on the result's grid, or None when they are different pictures."""
h, w = latent.shape[-2:]
if (h, w) == (height, width):
return latent
if abs(h / height - 1.0) > SIZE_SLACK or abs(w / width - 1.0) > SIZE_SLACK:
return None
return F.interpolate(latent, size=(height, width), mode="bilinear", align_corners=False)
class EditLock:
"""One lock: the original, the settings, and what the last run kept."""
def __init__(self, mode: str = "auto", tolerance: float = 1.0):
self.mode = mode
self.tolerance = tolerance
self.source: torch.Tensor | None = None # IMAGE, [1, H, W, 3]
self.latent: torch.Tensor | None = None # [1, C, H, W] or [1, C, 1, H, W], model space
self.user_mask: torch.Tensor | None = None # MASK, white = the edit may happen
self.status = "waiting"
self.mask: torch.Tensor | None = None # [B, 1, h, w], 1 = changed, soft-edged
self.core: torch.Tensor | None = None # the same before its margin, hard-edged
self.quiet: torch.Tensor | None = None # [B], the quiet level at the decision
self.broad: float | None = None # the first look's whole-picture reading
self.wide: float | None = None # share of the picture the lock would free, at the decision
self.top: float | None = None # the strongest spot then, in units of the quiet level
self.peak: float | None = None # and the strongest hundredth
self._sigma: float | None = None
self._first = True
self._first_sigma = 1.0
self._decided = False
def _begin(self) -> None:
self.status = "waiting"
self.mask = None
self.core = None
self.quiet = None
self.broad = None
self.wide = None
self.top = None
self.peak = None
self._first = True
self._decided = False
def _decides_now(self, args: dict, sigma: float) -> bool:
"""True once the noise is down far enough, or this is the run's last step."""
steps = (args.get("model_options") or {}).get("transformer_options", {}).get("sample_sigmas")
if steps is None or len(steps) < 2:
return True # the sampler does not say where the run ends: decide at once
if sigma <= float(steps[-2]) * 1.0001:
return True
return sigma <= DECIDE_AT * self._first_sigma
def step(self, args: dict) -> torch.Tensor:
"""ComfyUI's post-CFG hook: the prediction comes in, the locked prediction goes out."""
pred = args["denoised"]
sigma = float(args["sigma"].flatten()[0])
if self._sigma is None or sigma >= self._sigma:
self._begin() # the noise level went up: a new run
self._sigma = sigma
if self.status in ("whole picture", "size", "video", "vae") or self.latent is None:
return pred
video = pred.ndim == 5
if video and pred.shape[2] != 1:
self.status = "video"
return pred
flat = pred[:, :, 0] if video else pred
latent = self.latent[:, :, 0] if self.latent.ndim == 5 else self.latent
if latent.shape[1] != flat.shape[1]:
self.status = "vae"
return pred
source = fit_latent(latent.to(device=flat.device, dtype=torch.float32), *flat.shape[-2:])
if source is None:
self.status = "size"
return pred
if self.status == "soft":
# nothing is put back, the picture is only held where the original sits
back = moved_back(flat, redraws(flat, source))
return back[:, :, None] if video else back
if self.user_mask is not None:
mask = self._given_mask(flat)
else:
if self._first:
self._first_sigma = sigma
self.broad = float(broad_change(flat, source).max())
if self.mode == "auto" and self.broad > WHOLE_PICTURE:
self.status = "whole picture"
return pred
moves = redraws(flat, source)
magnitude = difference(flat, source, moves)
if not self._decided and not self._decides_now(args, sigma):
# still watching: the model draws its own picture, only its zoom and shift are undone
self._first = False
self.status = "watching"
if self.broad > WHOLE_PICTURE:
return pred # too much is changing to trust the measured move
back = moved_back(flat, moves)
return back[:, :, None] if video else back
if not self._decided:
self._decided = True
# the yardstick is set once, here: later steps are read against it
self.quiet = quiet_level(magnitude)
self.top, self.peak = peaks(magnitude, self.quiet)
self.wide = float(change_core(magnitude, self.quiet, self.tolerance).flatten(1).mean(dim=1).max())
thin = self.top < SOFT_PEAK or (self.wide >= SOFT_WIDE and self.peak < SOFT_PEAK)
if self.mode == "auto" and not self._first and thin:
# a soft change over the whole picture: a lock would hold it back or let it through in patches
self.status = "soft"
back = moved_back(flat, moves)
return back[:, :, None] if video else back
held = self.core if self.core is not None and self.core.shape[0] == flat.shape[0] else None
self.core = change_core(magnitude, self.quiet.to(magnitude.device), self.tolerance,
held.to(magnitude.device) if held is not None else None).detach()
mask = soften(self.core)
self._first = False
self.mask = mask.detach()
self.status = "locked"
keep = (1.0 - mask).to(flat.dtype)
locked = flat * (1.0 - keep) + source.to(flat.dtype) * keep
return locked[:, :, None] if video else locked
def _given_mask(self, flat: torch.Tensor) -> torch.Tensor:
mask = self.user_mask
if mask.ndim == 2:
mask = mask[None]
mask = mask[:1, None].to(device=flat.device, dtype=torch.float32)
mask = F.interpolate(mask, size=flat.shape[-2:], mode="bilinear", align_corners=False).clamp(0.0, 1.0)
return soften(mask).expand(flat.shape[0], -1, -1, -1)
def kept_share(self) -> float | None:
if self.status != "locked" or self.mask is None:
return None
return float((self.mask < 0.5).float().mean())
def pixel_mask(self, height: int, width: int) -> torch.Tensor | None:
"""The change mask at the picture's size, [B, H, W], or None when nothing was locked."""
if self.status != "locked" or self.mask is None:
return None
mask = F.interpolate(self.mask.float().cpu(), size=(height, width), mode="bilinear", align_corners=False)
return mask[:, 0].clamp(0.0, 1.0)
def restore_pixels(result: torch.Tensor, source: torch.Tensor, mask: torch.Tensor,
feather: int) -> tuple[torch.Tensor, torch.Tensor]:
"""The original's own pixels where the mask is black. result [B, H, W, C], source [1, h, w, 3], mask [b, H, W].
The fade lies outside the edit: the mask is widened by the feather first.
"""
frames, height, width = int(result.shape[0]), int(result.shape[1]), int(result.shape[2])
edit = mask[:, None].float()
if edit.shape[0] not in (1, frames):
edit = edit[:1]
if feather > 0:
size = 2 * feather + 1
edit = F.max_pool2d(edit, size, stride=1, padding=feather)
edit = box_blur(edit, feather)
original = source[..., :3].float()
if tuple(original.shape[1:3]) != (height, width):
original = F.interpolate(original.movedim(-1, 1), size=(height, width), mode="bicubic",
align_corners=False, antialias=True).movedim(1, -1).clamp(0.0, 1.0)
weight = edit.movedim(1, -1).to(result.device, result.dtype)
out = result.clone()
out[..., :3] = result[..., :3] * weight + original.to(result.device, result.dtype) * (1.0 - weight)
edit_mask = edit[:, 0].expand(frames, -1, -1).clone()
return out, edit_mask
def describe(lock: EditLock) -> str:
if lock.status == "locked":
kept = lock.kept_share() or 0.0
how = "your mask" if lock.user_mask is not None else "what the edit changed"
text = (f"Edit Lock kept {kept * 100:.0f}% of your picture as it was and left "
f"{(1.0 - kept) * 100:.0f}% to the edit ({how}).")
if kept >= NEARLY_ALL and lock.user_mask is None:
# rain, snow or smoke over the whole picture reads as a small edit and is held back
text += (" If your edit is missing, it is one that spreads thinly over the whole picture "
"(rain, snow, smoke): set lock to off.")
return text
if lock.status == "whole picture":
return ("Edit Lock stepped aside: the edit changes the whole picture, so there was nothing to keep. "
"Set lock to always to lock anyway.")
if lock.status == "soft":
return ("Edit Lock stepped aside: the edit spreads thinly over the whole picture (rain, snow, haze), "
"so no part of it stayed as it was. It only held the picture in place. "
"Set lock to always to lock anyway.")
if lock.status == "off":
return "Edit Lock is off."
if lock.status == "size":
return ("Edit Lock did nothing: the picture and the result are different sizes. "
"Give it the picture at the size of the result.")
if lock.status == "video":
return "Edit Lock did nothing: it works on single pictures, not video."
if lock.status == "vae":
return "Edit Lock did nothing: this VAE does not belong to this model."
return "Edit Lock has not run yet: plug its model output into the sampler."
+946
View File
@@ -0,0 +1,946 @@
"""FlashVSR video upscaling: the model's parts and the loop that runs a clip.
FlashVSR (OpenImagingLab, Apache-2.0) sharpens a clip in one model step.
It is a Wan 2.1 1.3B transformer that is also shown the low-quality frames,
a small projector that turns those frames into tokens, and a small decoder
that reads the frames again while it draws the result.
Everything here is plain PyTorch. The model looks at a clip a few frames at
a time and keeps a short memory of the frames before, so a long clip costs
no more graphics memory than a short one. Module and parameter names follow
the names in the published weights, which is what lets them load.
Shapes used below: a token is 16x16 output pixels of one latent frame, a
latent frame is 4 video frames, and an attention block is 2 latent frames
by 8x8 tokens (128 tokens, 128x128 pixels over 8 frames).
"""
from __future__ import annotations
import math
import os
import torch
import torch.nn as nn
import torch.nn.functional as F
PIXEL_STEP = 128 # the working size is a multiple of this in both directions
BLOCK_TOKENS = 128
KEPT_GROUPS = 3 # earlier 2-frame groups each layer remembers
LOCAL_REACH = 11 # a block looks at blocks inside an 11x11 neighbourhood
SPARSE_RATIO = 2.0
SPARSE_REFERENCE_AREA = 768 * 1280
FIRST_PASS_LATENTS = 6
PASS_LATENTS = 2
MIN_GROUPS = 3 # the first pass alone needs 25 frames
TIMESTEP = 1000.0
DEFAULT_SLOT_BUDGET = 12000
def _cast(parameter: torch.Tensor, like: torch.Tensor) -> torch.Tensor:
return parameter.to(device=like.device, dtype=like.dtype)
# --------------------------------------------------------------------------
# Sizes and frame counts
# --------------------------------------------------------------------------
def _even(value: float) -> int:
return max(2, int(round(value / 2.0)) * 2)
def plan_sizes(height: int, width: int, scale: float) -> tuple[int, int, int, int]:
"""Output size (even numbers) and the padded size the model works at."""
out_h, out_w = _even(height * scale), _even(width * scale)
work_h = math.ceil(out_h / PIXEL_STEP) * PIXEL_STEP
work_w = math.ceil(out_w / PIXEL_STEP) * PIXEL_STEP
return out_h, out_w, work_h, work_w
def plan_groups(frame_count: int) -> int:
"""How many 8-frame groups the padded clip has.
The model reads 8n+1 frames and returns 8n-3, so the clip is padded by
repeating its last frame until 8n-3 covers every frame it has.
"""
return max(MIN_GROUPS, math.ceil((int(frame_count) + 3) / 8))
# --------------------------------------------------------------------------
# Position encoding and attention blocks
# --------------------------------------------------------------------------
def _axis_angles(dim: int, positions: torch.Tensor) -> torch.Tensor:
steps = torch.arange(0, dim, 2, dtype=torch.float64)[: dim // 2] / dim
return torch.outer(positions.double(), 1.0 / (10000.0**steps))
def rope_table(head_dim: int, first_frame: int, frames: int, rows: int, cols: int, device):
"""Rotation angles for every token, as (cos, sin) of shape [tokens, 1, head_dim / 2]."""
side = head_dim // 3
t = _axis_angles(head_dim - 2 * side, torch.arange(first_frame, first_frame + frames))
r = _axis_angles(side, torch.arange(rows))
c = _axis_angles(side, torch.arange(cols))
angles = torch.cat(
[
t[:, None, None, :].expand(frames, rows, cols, -1),
r[None, :, None, :].expand(frames, rows, cols, -1),
c[None, None, :, :].expand(frames, rows, cols, -1),
],
dim=-1,
).reshape(frames * rows * cols, 1, head_dim // 2)
return angles.cos().float().to(device), angles.sin().float().to(device)
def apply_rope(x: torch.Tensor, cos: torch.Tensor, sin: torch.Tensor, heads: int) -> torch.Tensor:
"""Rotate each pair of channels of x [tokens, dim] by its token's angle."""
tokens, dim = x.shape
a, b = x.float().view(tokens, heads, dim // heads // 2, 2).unbind(-1)
return torch.stack((a * cos - b * sin, a * sin + b * cos), dim=-1).view(tokens, dim).to(x.dtype)
def to_blocks(x: torch.Tensor, frames: int, rows: int, cols: int) -> torch.Tensor:
"""[tokens, dim] in (frame, row, column) order -> [blocks, 128, dim]."""
dim = x.shape[-1]
x = x.view(frames // 2, 2, rows // 8, 8, cols // 8, 8, dim).permute(0, 2, 4, 1, 3, 5, 6)
return x.reshape(-1, BLOCK_TOKENS, dim)
def from_blocks(blocks: torch.Tensor, frames: int, rows: int, cols: int) -> torch.Tensor:
dim = blocks.shape[-1]
x = blocks.view(frames // 2, rows // 8, cols // 8, 2, 8, 8, dim).permute(0, 3, 1, 4, 2, 5, 6)
return x.reshape(frames * rows * cols, dim)
def local_block_mask(block_rows: int, block_cols: int, reach: int, device) -> torch.Tensor:
"""[blocks, blocks] True where a key block is inside a query block's neighbourhood."""
r = torch.arange(block_rows, device=device).repeat_interleave(block_cols)
c = torch.arange(block_cols, device=device).repeat(block_rows)
dr, dc = r[None, :] - r[:, None], c[None, :] - c[:, None]
low, high = -(reach // 2), reach - 1 - reach // 2
return (dr >= low) & (dr <= high) & (dc >= low) & (dc <= high)
def choose_key_blocks(
q_blocks: torch.Tensor,
k_blocks: torch.Tensor,
heads: int,
local: torch.Tensor,
query_groups: int,
keep: int,
) -> torch.Tensor:
"""Pick, for every head, which key blocks each query block reads.
A block's mean query is scored against every block's mean key. Blocks
outside the neighbourhood are ruled out, the scores of a query block are
turned into shares that sum to one, and for each head and each 2-frame
group of queries the `keep` largest shares win. Returns two
[heads, query blocks, key blocks] tensors: True where a pair is kept,
and the shares themselves (0 outside the neighbourhood).
"""
nq, _, dim = q_blocks.shape
nk = k_blocks.shape[0]
head_dim = dim // heads
q_mean = q_blocks.float().mean(1).view(nq, heads, head_dim).transpose(0, 1)
k_mean = k_blocks.float().mean(1).view(nk, heads, head_dim).transpose(0, 1)
scores = q_mean @ k_mean.transpose(1, 2) / math.sqrt(head_dim)
per_group = local.shape[0]
allowed = local.repeat(nq // per_group, nk // per_group)
shares = scores.masked_fill(~allowed, float("-inf")).softmax(dim=-1)
flat = shares.view(heads, query_groups, per_group * nk)
keep = min(flat.shape[-1] - 1, int(keep))
threshold = flat.topk(keep + 1, dim=-1).values[..., -1:]
return (flat > threshold).view(heads, nq, nk), shares
def sparse_block_attention(
q: torch.Tensor,
k: torch.Tensor,
v: torch.Tensor,
chosen: torch.Tensor,
shares: torch.Tensor | None = None,
slot_budget: int = DEFAULT_SLOT_BUDGET,
) -> torch.Tensor:
"""Attention where each query block only reads its chosen key blocks.
q is [heads, query blocks, 128, head_dim], k and v are
[heads, key blocks, 128, head_dim] and chosen is
[heads, query blocks, key blocks]. Each (head, query block) is a row
that gathers the keys it chose. Rows with a similar number of chosen
blocks run together, all at the width of the row that chose most. A
row that chose nothing returns zeros. `slot_budget` caps
(rows x chosen blocks) per call, which caps memory.
With `shares` (from choose_key_blocks) a narrower row is filled up
with its next-best blocks from its neighbourhood, so a call needs no
padding mask, which is what makes it fast: a row then reads a few
blocks more than it chose, never fewer. Without `shares` the padding
is masked and every row reads exactly what it chose.
"""
heads, nq, tokens, head_dim = q.shape
nk = k.shape[1]
rows = chosen.reshape(heads * nq, nk)
counts = rows.sum(dim=1)
if shares is None:
rank, usable = rows.float(), counts
else:
flat_shares = shares.reshape(heads * nq, nk).float()
rank, usable = rows.float() * 2 + flat_shares, (flat_shares > 0).sum(dim=1)
order = torch.argsort(counts)
picks = torch.argsort(rank, dim=1, descending=True, stable=True)
picks = picks + (torch.arange(heads, device=q.device).repeat_interleave(nq) * nk)[:, None]
q_rows = q.reshape(heads * nq, tokens, head_dim)
k_rows = k.reshape(heads * nk, tokens, head_dim)
v_rows = v.reshape(heads * nk, tokens, head_dim)
out = torch.zeros_like(q_rows)
sorted_counts = counts[order].tolist()
total = len(sorted_counts)
start = 0
while start < total and sorted_counts[start] == 0:
start += 1
while start < total:
end = start + 1
while end < total and (end - start + 1) * sorted_counts[end] <= slot_budget:
end += 1
rows_here = order[start:end]
widest = sorted_counts[end - 1]
index = picks[rows_here, :widest]
keys = k_rows[index].view(end - start, widest * tokens, head_dim)
values = v_rows[index].view(end - start, widest * tokens, head_dim)
mask = None
real = torch.arange(widest, device=q.device)[None, :] < usable[rows_here][:, None]
if not bool(real.all()):
mask = real.repeat_interleave(tokens, dim=1)[:, None, :]
out[rows_here] = F.scaled_dot_product_attention(q_rows[rows_here], keys, values, attn_mask=mask)
start = end
return out.view(heads, nq, tokens, head_dim)
class AttentionPlan:
"""What stays the same for every layer and pass at one working size."""
def __init__(self, rows: int, cols: int, device, slot_budget: int = DEFAULT_SLOT_BUDGET):
self.rows, self.cols = rows, cols
self.per_group = (rows // 8) * (cols // 8)
self.local = local_block_mask(rows // 8, cols // 8, LOCAL_REACH, device)
ratio = SPARSE_RATIO * SPARSE_REFERENCE_AREA / (rows * 16 * cols * 16)
self.keep = int(self.per_group * self.per_group * ratio) - 1
self.slot_budget = slot_budget
# --------------------------------------------------------------------------
# The transformer
# --------------------------------------------------------------------------
class _RMSNorm(nn.Module):
def __init__(self, dim: int, eps: float, device=None, dtype=None):
super().__init__()
self.eps = eps
self.weight = nn.Parameter(torch.ones(dim, device=device, dtype=dtype))
def forward(self, x: torch.Tensor) -> torch.Tensor:
y = x.float()
y = y * torch.rsqrt(y.pow(2).mean(dim=-1, keepdim=True) + self.eps)
return y.to(x.dtype) * _cast(self.weight, x)
def _heads_first(blocks: torch.Tensor, heads: int) -> torch.Tensor:
count, tokens, dim = blocks.shape
return blocks.view(count, tokens, heads, dim // heads).permute(2, 0, 1, 3).contiguous()
class _SelfAttention(nn.Module):
def __init__(self, dim, heads, eps, operations, device=None, dtype=None):
super().__init__()
self.heads = heads
kw = {"device": device, "dtype": dtype}
self.q = operations.Linear(dim, dim, **kw)
self.k = operations.Linear(dim, dim, **kw)
self.v = operations.Linear(dim, dim, **kw)
self.o = operations.Linear(dim, dim, **kw)
self.norm_q = _RMSNorm(dim, eps, **kw)
self.norm_k = _RMSNorm(dim, eps, **kw)
def forward(self, x, rope, grid, memory: dict, plan: AttentionPlan):
frames, rows, cols = grid
cos, sin = rope
q = to_blocks(apply_rope(self.norm_q(self.q(x))[0], cos, sin, self.heads), *grid)
k = to_blocks(apply_rope(self.norm_k(self.k(x))[0], cos, sin, self.heads), *grid)
v = to_blocks(self.v(x)[0], *grid)
if memory.get("k") is not None:
k = torch.cat([memory["k"], k], dim=0)
v = torch.cat([memory["v"], v], dim=0)
chosen, shares = choose_key_blocks(q, k, self.heads, plan.local, frames // 2, plan.keep)
out = sparse_block_attention(
_heads_first(q, self.heads),
_heads_first(k, self.heads),
_heads_first(v, self.heads),
chosen,
shares,
plan.slot_budget,
)
if k.shape[0] // plan.per_group > KEPT_GROUPS:
k, v = k[plan.per_group :], v[plan.per_group :]
memory["k"], memory["v"] = k, v
out = out.permute(1, 2, 0, 3).reshape(-1, BLOCK_TOKENS, x.shape[-1])
return self.o(from_blocks(out, *grid)[None])
class _CrossAttention(nn.Module):
def __init__(self, dim, heads, eps, operations, device=None, dtype=None):
super().__init__()
self.heads = heads
kw = {"device": device, "dtype": dtype}
self.q = operations.Linear(dim, dim, **kw)
self.k = operations.Linear(dim, dim, **kw)
self.v = operations.Linear(dim, dim, **kw)
self.o = operations.Linear(dim, dim, **kw)
self.norm_q = _RMSNorm(dim, eps, **kw)
self.norm_k = _RMSNorm(dim, eps, **kw)
def _split(self, x: torch.Tensor) -> torch.Tensor:
batch, tokens, dim = x.shape
return x.view(batch, tokens, self.heads, dim // self.heads).transpose(1, 2)
def forward(self, x, context, memory: dict):
if memory.get("k") is None: # the prompt never changes during a run
memory["k"] = self._split(self.norm_k(self.k(context)))
memory["v"] = self._split(self.v(context))
out = F.scaled_dot_product_attention(self._split(self.norm_q(self.q(x))), memory["k"], memory["v"])
return self.o(out.transpose(1, 2).reshape(x.shape))
class _Block(nn.Module):
def __init__(self, dim, heads, ffn_dim, eps, operations, device=None, dtype=None):
super().__init__()
self.dim, self.eps = dim, eps
kw = {"device": device, "dtype": dtype}
self.self_attn = _SelfAttention(dim, heads, eps, operations, **kw)
self.cross_attn = _CrossAttention(dim, heads, eps, operations, **kw)
self.norm3 = operations.LayerNorm(dim, eps=eps, elementwise_affine=True, **kw)
self.ffn = nn.Sequential(
operations.Linear(dim, ffn_dim, **kw), nn.GELU(approximate="tanh"), operations.Linear(ffn_dim, dim, **kw)
)
self.modulation = nn.Parameter(torch.zeros(1, 6, dim, **kw))
def _plain_norm(self, x: torch.Tensor) -> torch.Tensor:
return F.layer_norm(x, (self.dim,), eps=self.eps)
def forward(self, x, context, time_mod, rope, grid, memory: dict, plan: AttentionPlan):
shift_a, scale_a, gate_a, shift_m, scale_m, gate_m = (_cast(self.modulation, x) + time_mod).chunk(6, dim=1)
x = x + gate_a * self.self_attn(self._plain_norm(x) * (1 + scale_a) + shift_a, rope, grid, memory["self"], plan)
x = x + self.cross_attn(self.norm3(x), context, memory["cross"])
return x + gate_m * self.ffn(self._plain_norm(x) * (1 + scale_m) + shift_m)
class _Head(nn.Module):
def __init__(self, dim, out_dim, eps, operations, device=None, dtype=None):
super().__init__()
self.dim, self.eps = dim, eps
self.head = operations.Linear(dim, out_dim * 4, device=device, dtype=dtype)
self.modulation = nn.Parameter(torch.zeros(1, 2, dim, device=device, dtype=dtype))
def forward(self, x, time_embed):
shift, scale = (_cast(self.modulation, x) + time_embed).chunk(2, dim=1)
return self.head(F.layer_norm(x, (self.dim,), eps=self.eps) * (1 + scale) + shift)
# --------------------------------------------------------------------------
# The low-quality projector
# --------------------------------------------------------------------------
class _ChannelNorm(nn.Module):
def __init__(self, dim: int, device=None, dtype=None):
super().__init__()
self.scale = dim**0.5
self.gamma = nn.Parameter(torch.ones(dim, 1, 1, 1, device=device, dtype=dtype))
def forward(self, x: torch.Tensor) -> torch.Tensor:
return F.normalize(x.float(), dim=1).to(x.dtype) * self.scale * _cast(self.gamma, x)
class LowQualityProjector(nn.Module):
"""Turns enlarged low-quality frames into one set of tokens per 4 frames.
Two convolutions that only look backwards in time, each halving the
frame rate, then one linear layer. `push` is fed the first frame alone,
then 4 frames at a time, and remembers what the next call needs.
"""
def __init__(self, out_dim=1536, hidden=(2048, 3072), patch=16, operations=nn, device=None, dtype=None):
super().__init__()
self.patch = patch
kw = {"device": device, "dtype": dtype}
self.conv1 = operations.Conv3d(3 * patch * patch, hidden[0], (4, 3, 3), stride=(2, 1, 1), **kw)
self.norm1 = _ChannelNorm(hidden[0], **kw)
self.conv2 = operations.Conv3d(hidden[0], hidden[1], (4, 3, 3), stride=(2, 1, 1), **kw)
self.norm2 = _ChannelNorm(hidden[1], **kw)
self.linear_layers = nn.ModuleList([operations.Linear(hidden[1], out_dim, **kw)])
def _fold(self, clip: torch.Tensor) -> torch.Tensor:
batch, channels, frames, height, width = clip.shape
p = self.patch
x = clip.view(batch, channels, frames, height // p, p, width // p, p).permute(0, 1, 4, 6, 2, 3, 5)
return x.reshape(batch, channels * p * p, frames, height // p, width // p)
@staticmethod
def _causal(conv, x: torch.Tensor, earlier) -> torch.Tensor:
front = 2
if earlier is not None:
x = torch.cat([earlier, x], dim=2)
front -= earlier.shape[2]
return conv(F.pad(x, (1, 1, 1, 1, front, 0), mode="replicate"))
def push(self, memory: dict, clip: torch.Tensor):
"""clip is [1, 3, frames, height, width] in -1..1. Returns tokens, or None for the first frame."""
first = not memory
if first:
clip = torch.cat([clip[:, :, :1].repeat(1, 1, 3, 1, 1), clip], dim=2)
x = self._fold(clip)
tail = x[:, :, -2:].clone()
x = F.silu(self.norm1(self._causal(self.conv1, x, memory.get("conv1"))))
memory["conv1"] = tail
tail = x[:, :, -2:].clone()
if first:
memory["conv2"] = tail
return None
x = F.silu(self.norm2(self._causal(self.conv2, x, memory["conv2"])))
memory["conv2"] = tail
return self.linear_layers[0](x.flatten(2).transpose(1, 2))
# --------------------------------------------------------------------------
# The fast decoder
# --------------------------------------------------------------------------
class _SoftClamp(nn.Module):
def forward(self, x):
return torch.tanh(x / 3) * 3
class _MemoryBlock(nn.Module):
"""A residual block that also sees the frame before."""
def __init__(self, width: int, operations, device=None, dtype=None):
super().__init__()
kw = {"device": device, "dtype": dtype}
self.conv = nn.Sequential(
operations.Conv2d(width * 2, width, 3, padding=1, **kw),
nn.ReLU(),
operations.Conv2d(width, width, 3, padding=1, **kw),
nn.ReLU(),
operations.Conv2d(width, width, 3, padding=1, **kw),
)
def forward(self, x, past):
return F.relu(self.conv(torch.cat([x, past], dim=1)) + x)
class _TimeGrow(nn.Module):
"""Makes `stride` frames out of each frame."""
def __init__(self, width: int, stride: int, operations, device=None, dtype=None):
super().__init__()
self.conv = operations.Conv2d(width, width * stride, 1, bias=False, device=device, dtype=dtype)
def forward(self, x):
_, channels, height, width = x.shape
return self.conv(x).reshape(-1, channels, height, width)
class _Upsample(nn.Module):
def forward(self, x):
return F.interpolate(x, scale_factor=2, mode="nearest")
class ConditionedDecoder(nn.Module):
"""Latent frames plus the low-quality frames in, 4 video frames per latent frame out."""
def __init__(self, latent_channels=16, widths=(512, 256, 128, 128), operations=nn, device=None, dtype=None):
super().__init__()
kw = {"device": device, "dtype": dtype}
a, b, c, d = widths
def conv(n_in, n_out, bias=True):
return operations.Conv2d(n_in, n_out, 3, padding=1, bias=bias, **kw)
def memory_blocks(width):
return [_MemoryBlock(width, operations, **kw) for _ in range(3)]
self.latent_channels = latent_channels
self.decoder = nn.Sequential(
_SoftClamp(),
conv(latent_channels + 3 * 4 * 8 * 8, a),
nn.ReLU(),
conv(a, a, bias=False),
nn.ReLU(),
*memory_blocks(a),
_Upsample(),
_TimeGrow(a, 1, operations, **kw),
conv(a, b, bias=False),
*memory_blocks(b),
_Upsample(),
_TimeGrow(b, 2, operations, **kw),
conv(b, c, bias=False),
*memory_blocks(c),
_Upsample(),
_TimeGrow(c, 2, operations, **kw),
conv(c, d, bias=False),
nn.ReLU(),
conv(d, d, bias=False),
nn.ReLU(),
conv(d, 3),
)
@staticmethod
def fold_frames(clip: torch.Tensor) -> torch.Tensor:
"""[3, 4, height, width] -> [768, height / 8, width / 8]."""
channels, frames, height, width = clip.shape
x = clip.view(channels, frames, height // 8, 8, width // 8, 8).permute(0, 1, 3, 5, 2, 4)
return x.reshape(channels * frames * 64, height // 8, width // 8)
def decode(self, memory: dict, x: torch.Tensor) -> torch.Tensor:
"""x is [latent frames, 768 + latent channels, h, w]. Returns [4 x latent frames, 3, 8h, 8w] in 0..1.
The first 3 frames of the first call are lead-in and are dropped.
"""
first = not memory
memory["started"] = True
for index, layer in enumerate(self.decoder):
if isinstance(layer, _MemoryBlock):
before = memory.get(index)
if before is None:
before = torch.zeros_like(x[:1])
memory[index] = x[-1:].clone()
x = layer(x, torch.cat([before, x[:-1]], dim=0))
else:
x = layer(x)
return x[3:] if first else x
# --------------------------------------------------------------------------
# The whole model
# --------------------------------------------------------------------------
class FlashVSRModel(nn.Module):
def __init__(
self,
dim=1536,
heads=12,
ffn_dim=8960,
layers=30,
latent_channels=16,
text_dim=4096,
text_len=512,
freq_dim=256,
eps=1e-6,
projector_hidden=(2048, 3072),
decoder_widths=(512, 256, 128, 128),
operations=nn,
device=None,
dtype=None,
):
super().__init__()
self.dim, self.heads, self.freq_dim, self.latent_channels = dim, heads, freq_dim, latent_channels
kw = {"device": device, "dtype": dtype}
self.patch_embedding = operations.Conv3d(latent_channels, dim, (1, 2, 2), stride=(1, 2, 2), **kw)
self.text_embedding = nn.Sequential(
operations.Linear(text_dim, dim, **kw), nn.GELU(approximate="tanh"), operations.Linear(dim, dim, **kw)
)
self.time_embedding = nn.Sequential(
operations.Linear(freq_dim, dim, **kw), nn.SiLU(), operations.Linear(dim, dim, **kw)
)
self.time_projection = nn.Sequential(nn.SiLU(), operations.Linear(dim, dim * 6, **kw))
self.blocks = nn.ModuleList([_Block(dim, heads, ffn_dim, eps, operations, **kw) for _ in range(layers)])
self.head = _Head(dim, latent_channels, eps, operations, **kw)
self.lq_proj_in = LowQualityProjector(dim, projector_hidden, operations=operations, **kw)
self.tc_decoder = ConditionedDecoder(latent_channels, decoder_widths, operations=operations, **kw)
self.register_buffer("positive_conditioning", torch.zeros(text_len, text_dim, **kw))
def start(self, like: torch.Tensor) -> dict:
"""The values that never change during one clip."""
half = self.freq_dim // 2
steps = torch.pow(10000.0, -torch.arange(half, dtype=torch.float64) / half) * TIMESTEP
wave = torch.cat([torch.cos(steps), torch.sin(steps)])[None].to(device=like.device, dtype=like.dtype)
time_embed = self.time_embedding(wave)
return {
"time_embed": time_embed[:, None],
"time_mod": self.time_projection(time_embed).unflatten(1, (6, self.dim)),
"context": self.text_embedding(_cast(self.positive_conditioning, like)[None]),
"layers": [{"self": {}, "cross": {}} for _ in self.blocks],
"projector": {},
"decoder": {},
}
def denoise(self, state: dict, noise: torch.Tensor, lq_tokens: torch.Tensor, first_frame: int, plan: AttentionPlan):
"""One pass over a few latent frames. Returns the clean latent frames."""
x = self.patch_embedding(noise)
frames, rows, cols = x.shape[2:]
grid = (frames, rows, cols)
x = x.flatten(2).transpose(1, 2) + lq_tokens
rope = rope_table(self.dim // self.heads, first_frame, frames, rows, cols, x.device)
for block, memory in zip(self.blocks, state["layers"]):
x = block(x, state["context"], state["time_mod"], rope, grid, memory, plan)
x = self.head(x, state["time_embed"])
x = x.view(1, frames, rows, cols, 2, 2, self.latent_channels).permute(0, 6, 1, 2, 4, 3, 5)
return noise - x.reshape(1, self.latent_channels, frames, rows * 2, cols * 2)
def pass_layout(groups: int):
"""(first latent frame, latent frames) of each pass over a clip of `groups` 8-frame groups."""
yield 0, FIRST_PASS_LATENTS
for index in range(1, groups - 2):
yield 4 + 2 * index, PASS_LATENTS
def match_colors(frames: torch.Tensor, source: torch.Tensor) -> torch.Tensor:
"""Give each frame its source frame's mean and spread, per colour channel. Both [n, 3, h, w]."""
f, s = frames.float(), source.float()
f_mean, s_mean = f.mean(dim=(2, 3), keepdim=True), s.mean(dim=(2, 3), keepdim=True)
f_std, s_std = f.std(dim=(2, 3), keepdim=True) + 1e-5, s.std(dim=(2, 3), keepdim=True) + 1e-5
return (f - f_mean) / f_std * s_std + s_mean
TILE_OVERLAP = 128
def plan_tiles(work_h: int, work_w: int, max_pixels: int | None) -> list[tuple[int, int, int, int]]:
"""Cut the working size into as few overlapping tiles as fit `max_pixels` each.
Returns (top, left, height, width) boxes. Tile sides are multiples of
128 and corners sit on the 16-pixel token grid. One box, the whole
picture, when it fits or when no limit is given.
"""
if not max_pixels or work_h * work_w <= max_pixels:
return [(0, 0, work_h, work_w)]
def side(total: int, parts: int) -> int:
if parts == 1:
return total
return min(total, math.ceil((total + (parts - 1) * TILE_OVERLAP) / parts / PIXEL_STEP) * PIXEL_STEP)
best = None
for rows in range(1, work_h // PIXEL_STEP + 1):
for cols in range(1, work_w // PIXEL_STEP + 1):
tile_h, tile_w = side(work_h, rows), side(work_w, cols)
if tile_h * tile_w <= max_pixels and (best is None or rows * cols < best[0] * best[1]):
best = (rows, cols, tile_h, tile_w)
if best is None: # even one 128x128 tile is over the limit: use the smallest tiles there are
best = (work_h // PIXEL_STEP, work_w // PIXEL_STEP, PIXEL_STEP, PIXEL_STEP)
rows, cols, tile_h, tile_w = best
def starts(total: int, tile: int, parts: int) -> list[int]:
if parts == 1:
return [0]
return [round(i * (total - tile) / (parts - 1) / 16) * 16 for i in range(parts)]
return [(top, left, tile_h, tile_w) for top in starts(work_h, tile_h, rows) for left in starts(work_w, tile_w, cols)]
def tile_weight(box: tuple[int, int, int, int], work_h: int, work_w: int) -> torch.Tensor:
"""[height, width] blend weights for a tile: 1 inside, fading over the overlap on edges that meet another tile."""
top, left, height, width = box
def ramp(length: int, fade_start: bool, fade_end: bool) -> torch.Tensor:
w = torch.ones(length)
fade = (torch.arange(TILE_OVERLAP) + 0.5) / TILE_OVERLAP
if fade_start:
w[:TILE_OVERLAP] = fade
if fade_end:
w[-TILE_OVERLAP:] = torch.minimum(w[-TILE_OVERLAP:], fade.flip(0))
return w
rows = ramp(height, top > 0, top + height < work_h)
cols = ramp(width, left > 0, left + width < work_w)
return rows[:, None] * cols[None, :]
@torch.no_grad()
def upscale_frames(
model: FlashVSRModel,
frames: torch.Tensor,
scale: float,
*,
device,
dtype,
color_match: bool = True,
seed: int = 0,
slot_budget: int = DEFAULT_SLOT_BUDGET,
max_tile_pixels: int | None = None,
decode_latents=None,
on_pass=None,
) -> torch.Tensor:
"""Upscale a clip. `frames` is [count, height, width, 3] in 0..1; so is the result, at the new size.
A picture larger than `max_tile_pixels` is done in overlapping tiles,
one after the other, and blended; that is what bounds graphics memory.
`decode_latents`, when given, takes the clean latent frames of a tile
([1, 16, frames, h, w]) and returns [frames, height, width, 3]; it is how
another decoder (the Wan 2.1 VAE) is used in place of the fast one.
`on_pass(done, total)` is called after each pass.
"""
count, height, width, _ = frames.shape
out_h, out_w, work_h, work_w = plan_sizes(height, width, scale)
groups = plan_groups(count)
layout = list(pass_layout(groups))
tiles = plan_tiles(work_h, work_w, max_tile_pixels)
def enlarged(start: int, stop: int) -> torch.Tensor:
"""Frames start..stop-1 of the padded clip at the working size: [n, 3, work_h, work_w] in 0..1."""
index = torch.arange(start, stop).clamp(max=count - 1)
x = frames[index][..., :3].to(device).movedim(-1, 1).float()
if (height, width) != (out_h, out_w):
x = F.interpolate(x, size=(out_h, out_w), mode="bicubic", align_corners=False).clamp(0, 1)
return F.pad(x, (0, work_w - out_w, 0, work_h - out_h), mode="replicate")
noise = torch.randn(
(1, model.latent_channels, 2 * groups, work_h // 8, work_w // 8), generator=torch.Generator().manual_seed(seed)
)
result = torch.zeros((count, out_h, out_w, 3), dtype=torch.float32)
total_weight = torch.zeros((work_h, work_w), dtype=torch.float32)
like = torch.zeros(1, device=device, dtype=dtype)
done = 0
for box in tiles:
top, left, tile_h, tile_w = box
weight = tile_weight(box, work_h, work_w)
total_weight[top : top + tile_h, left : left + tile_w] += weight
weight = weight.to(device)
def crop(start: int, stop: int) -> torch.Tensor:
return enlarged(start, stop)[..., top : top + tile_h, left : left + tile_w]
def signed_clip(start: int, stop: int) -> torch.Tensor:
return (crop(start, stop) * 2 - 1).movedim(0, 1)[None].to(dtype)
def store(decoded: torch.Tensor, written: int) -> int:
"""Add decoded frames [n, 3, tile_h, tile_w] to the result; returns how many frames the tile has given."""
decoded = decoded[: count - written].float()
if decoded.shape[0] == 0:
return written
stop = written + decoded.shape[0]
if color_match:
decoded = match_colors(decoded, crop(written, stop))
bottom, right = min(top + tile_h, out_h), min(left + tile_w, out_w)
if bottom > top and right > left:
piece = (decoded.clamp(0, 1) * weight)[..., : bottom - top, : right - left]
result[written:stop, top:bottom, left:right] += piece.movedim(1, -1).cpu()
return stop
state = model.start(like)
plan = AttentionPlan(tile_h // 16, tile_w // 16, device, slot_budget)
tile_noise = noise[..., top // 8 : (top + tile_h) // 8, left // 8 : (left + tile_w) // 8]
kept_latents = []
written = 0
model.lq_proj_in.push(state["projector"], signed_clip(0, 1))
for first, latent_count in layout:
tokens = torch.cat(
[
model.lq_proj_in.push(state["projector"], signed_clip(4 * i + 1, 4 * i + 5))
for i in range(first, first + latent_count)
],
dim=1,
)
chunk = tile_noise[:, :, first : first + latent_count].to(device=device, dtype=dtype)
latents = model.denoise(state, chunk, tokens, first, plan)
if decode_latents is not None:
kept_latents.append(latents.float().cpu())
else:
for i in range(first, first + latent_count):
if written >= count:
break
source = signed_clip(0, 1)[0].repeat(1, 4, 1, 1) if i == 0 else signed_clip(4 * i - 3, 4 * i + 1)[0]
both = torch.cat([ConditionedDecoder.fold_frames(source), latents[0, :, i - first]], dim=0)
written = store(model.tc_decoder.decode(state["decoder"], both[None]), written)
done += 1
if on_pass is not None:
on_pass(done, len(layout) * len(tiles))
state.clear() # the layers' memory is no longer needed; the next tile or another decoder wants the room
if decode_latents is not None:
decoded = decode_latents(torch.cat(kept_latents, dim=2)).movedim(-1, 1)
for start in range(0, min(count, decoded.shape[0]), 8):
written = store(decoded[start : start + 8].to(device), written)
if len(tiles) > 1:
result /= total_weight[:out_h, :out_w, None]
return result
# --------------------------------------------------------------------------
# ComfyUI side: loading the file and running a clip. ComfyUI is imported
# inside the functions so the code above runs without it.
# --------------------------------------------------------------------------
MODEL_PARTS = {
"blocks.0.self_attn.q.weight": "the transformer",
"lq_proj_in.conv1.weight": "the low-quality projector",
"tc_decoder.decoder.1.weight": "the fast decoder",
"positive_conditioning": "the stored prompt",
}
NOT_A_FLASHVSR_FILE = (
"This is not a FlashVSR model file for this node: it has no {missing}. "
"Pick the FlashVSR file named in the node's help page."
)
_loaded: dict = {}
# Measured on one clip (640x1024, bf16): about 9.6 KB of graphics memory per working pixel on top of
# the weights. Most of it is the keys and values every layer keeps of the last few frames.
WORKING_BYTES_PER_PIXEL = 12_000
MEMORY_TO_ASK_FOR = 16 * 1024**3
MEMORY_HEADROOM = 1024**3
def working_memory(pixels: int, bytes_per_value: int = 2) -> int:
"""A rough count of the graphics memory a picture of `pixels` needs besides the weights, in bytes."""
return int(pixels * WORKING_BYTES_PER_PIXEL * bytes_per_value / 2)
def tile_pixels_that_fit(free_bytes: int, bytes_per_value: int = 2) -> int:
"""The largest tile, in pixels, that `free_bytes` of graphics memory can hold."""
return max(PIXEL_STEP * PIXEL_STEP, int((free_bytes - MEMORY_HEADROOM) / working_memory(1_000_000, bytes_per_value) * 1_000_000))
def load_flashvsr(path: str, dtype: torch.dtype | None = None):
"""The model behind ComfyUI's memory manager, and the number type it runs in. Kept between runs."""
import comfy.model_management as mm
import comfy.model_patcher
import comfy.ops
import comfy.utils
stamp = (path, os.path.getmtime(path), dtype)
if _loaded.get("stamp") == stamp:
return _loaded["patcher"], _loaded["dtype"]
_loaded.clear()
weights = comfy.utils.load_torch_file(path, safe_load=True)
missing = [what for key, what in MODEL_PARTS.items() if key not in weights]
if missing:
raise ValueError(NOT_A_FLASHVSR_FILE.format(missing=" or ".join(missing)))
device, offload = mm.get_torch_device(), mm.unet_offload_device()
if dtype is None:
# The file is 16-bit, so that is the first choice: no weight has to be converted.
if mm.should_use_fp16(device):
dtype = torch.float16
elif mm.should_use_bf16(device):
dtype = torch.bfloat16
else:
dtype = torch.float32
# manual_cast: every layer brings its weights to the device and number type of what it is given,
# so a model ComfyUI keeps partly, or wholly, outside graphics memory still runs.
model = FlashVSRModel(operations=comfy.ops.manual_cast, device=offload, dtype=dtype)
model.eval()
# ComfyUI's own wrapper for a model: the one that loads weights as they are needed, where it has one.
wrapper = getattr(comfy.model_patcher, "CoreModelPatcher", comfy.model_patcher.ModelPatcher)
patcher = wrapper(model, load_device=device, offload_device=offload)
assign = bool(getattr(patcher, "is_dynamic", lambda: False)())
model.load_state_dict(weights, strict=True, assign=assign)
model.requires_grad_(False)
_loaded.update(stamp=stamp, patcher=patcher, dtype=dtype)
return patcher, dtype
def _memory_for_work(patcher, device) -> int:
"""Graphics memory left for the picture once all of the model's weights are in it."""
import comfy.model_management as mm
free = mm.get_free_memory(device)
try:
still_to_load = max(0, int(patcher.model_size()) - int(patcher.loaded_size()))
except Exception:
still_to_load = 0
return free - still_to_load
def run_flashvsr(
path: str,
frames: torch.Tensor,
scale: float,
color_match: bool = True,
vae=None,
seed: int = 0,
max_tile_pixels: int | None = None,
):
"""Upscale `frames` with the model file at `path`. `vae`, when given, decodes in place of the fast decoder."""
import comfy.latent_formats
import comfy.model_management as mm
from ._execution_helpers import progress_bar, raise_if_interrupted
patcher, dtype = load_flashvsr(path)
device = patcher.load_device
_, _, work_h, work_w = plan_sizes(frames.shape[1], frames.shape[2], scale)
wanted = working_memory(work_h * work_w, dtype.itemsize)
mm.load_models_gpu([patcher], memory_required=min(wanted, MEMORY_TO_ASK_FOR))
if max_tile_pixels is None and device.type != "cpu":
max_tile_pixels = tile_pixels_that_fit(_memory_for_work(patcher, device), dtype.itemsize)
passes = len(list(pass_layout(plan_groups(frames.shape[0]))))
decode = None
if vae is not None:
latent_format = comfy.latent_formats.Wan21()
def decode(latents: torch.Tensor) -> torch.Tensor:
images = vae.decode(latent_format.process_out(latents))
return images.reshape(-1, *images.shape[-3:])
while True:
progress = progress_bar(passes * len(plan_tiles(work_h, work_w, max_tile_pixels)))
def on_pass(done: int, total: int) -> None:
raise_if_interrupted()
if progress is not None:
progress.update_absolute(done, total)
try:
return upscale_frames(
patcher.model,
frames,
scale,
device=device,
dtype=dtype,
color_match=color_match,
seed=seed,
max_tile_pixels=max_tile_pixels,
decode_latents=decode,
on_pass=on_pass,
)
except torch.cuda.OutOfMemoryError:
# Out of graphics memory: start again in tiles half the size, down to the smallest tile.
tried = max_tile_pixels if max_tile_pixels is not None else work_h * work_w
if tried <= PIXEL_STEP * PIXEL_STEP:
raise
max_tile_pixels = max(PIXEL_STEP * PIXEL_STEP, min(tried, work_h * work_w) // 2)
mm.soft_empty_cache()
MODEL_FOLDER = "diffusion_models"
EXPECTED_MODEL_NAME = "flashvsr_v1.1_fp16.safetensors"
MODEL_NOT_FOUND = (
"FlashVSR Upscale could not find {name} in ComfyUI/models/diffusion_models. "
"Download the FlashVSR model file named in the node's help page and put it there."
)
def list_flashvsr_models() -> list[str]:
"""FlashVSR files in the diffusion models folder; every file there when none is named FlashVSR."""
try:
import folder_paths
except ImportError: # Offline tests import this module without ComfyUI.
return [EXPECTED_MODEL_NAME]
names = list(folder_paths.get_filename_list(MODEL_FOLDER))
ours = [name for name in names if "flashvsr" in name.lower().replace("_", "").replace("-", "")]
return ours or names or [EXPECTED_MODEL_NAME]
def resolve_flashvsr_model(name: str) -> str:
import folder_paths
path = folder_paths.get_full_path(MODEL_FOLDER, name)
if not path:
raise FileNotFoundError(MODEL_NOT_FOUND.format(name=name))
return path
+170
View File
@@ -0,0 +1,170 @@
"""Pictures Save Image holds until they are kept.
With Auto save off, a run writes its pictures to ComfyUI's temp folder and
shows them on the node. A click on the node's Save button keeps the ones
that are wanted: they are copied into the output folder under the names the
node would have given them. Everything here works from names this module
made itself; the only thing a caller sends is the run's token and which
pictures to keep.
"""
from __future__ import annotations
from datetime import datetime
import json
from pathlib import Path
import re
import secrets
import shutil
from ._image_save_helpers import (
IMAGE_SAVE_LOCK,
existing_action,
name_stem,
next_free_counter,
plan_exact_names,
plan_local_names,
require_output_path,
resolve_output_root,
sidecar_path,
split_prefix,
strip_image_extension,
)
HELD_FOLDER = "ausboss_held"
_TOKEN = re.compile(r"^[0-9a-f]{16}$")
GONE = "These pictures are no longer held. Run the workflow again."
def plan_destinations(settings: dict, count: int, now: datetime, root: Path, output_root: Path, picks=None):
"""Where each picture goes, as (path, what to do if it exists).
Call it with IMAGE_SAVE_LOCK held: the counter it reads stays free only
until the lock is let go. `picks` keeps some of a run's pictures; an
exact name then keeps the number it would have had in the whole run.
"""
wanted = list(range(count)) if picks is None else list(picks)
extension = settings["extension"]
exact = settings.get("exact") or ""
if exact:
names = plan_exact_names(strip_image_extension(exact), extension, count)
return [(root / names[index], settings["on_existing"]) for index in wanted]
subfolder, base = split_prefix(settings["filename_prefix"])
folder = root / subfolder if subfolder else root
require_output_path(folder, output_root)
stem = name_stem(
base,
{"date": bool(settings["name_date"]), "time": bool(settings["name_time"]), "size": bool(settings["name_size"])},
now,
int(settings["width"]),
int(settings["height"]),
)
counter = bool(settings["name_counter"])
existing = [entry.name for entry in folder.iterdir()] if folder.is_dir() else []
names = plan_local_names(
stem, extension, len(wanted), counter=counter, batch=bool(settings["name_batch"]),
next_counter=next_free_counter(existing, stem),
)
# With a counter the name is free by construction. Without one, the
# legacy policy decides whether to overwrite.
policy = "overwrite" if counter else settings["on_existing"]
return [(folder / name, policy) for name in names]
def settle_destinations(planned, has_caption: bool, output_root: Path) -> list[str]:
"""Check every destination, then say 'write' or 'skip' for each.
The whole batch is settled before any write: an "error" on a later
picture stops the save before the first one lands.
"""
for path, _policy in planned:
require_output_path(path, output_root)
if has_caption:
require_output_path(sidecar_path(path), output_root)
return [
existing_action(path.exists() or (has_caption and sidecar_path(path).exists()), policy)
for path, policy in planned
]
def _held_name(token: str, index: int, extension: str) -> str:
return f"{token}_{index:03d}.{extension}"
def hold_pictures(temp_root, frames, settings: dict, encode) -> tuple[str, list[dict]]:
"""Write a run's pictures to the temp folder and remember how to name them.
`encode(path, frame)` writes one picture in the run's format. Returns
the run's token and the entries the node shows them from.
"""
folder = Path(temp_root) / HELD_FOLDER
folder.mkdir(parents=True, exist_ok=True)
token = secrets.token_hex(8)
previews = []
for index, frame in enumerate(frames):
name = _held_name(token, index, settings["extension"])
encode(folder / name, frame)
previews.append({"filename": name, "subfolder": HELD_FOLDER, "type": "temp"})
manifest = dict(settings, count=len(previews), kept={})
(folder / f"{token}.json").write_text(json.dumps(manifest), encoding="utf-8")
return token, previews
def keep_pictures(temp_root, output_root, token, picks=None, now: datetime | None = None) -> dict:
"""Copy held pictures into the output folder. Returns what was saved.
`picks` lists which pictures of the run to keep, counted from 0; None
keeps them all. A picture kept before is not saved a second time.
"""
if not isinstance(token, str) or not _TOKEN.match(token):
raise ValueError("Save Image: that is not a run it is holding.")
folder = Path(temp_root) / HELD_FOLDER
manifest_path = folder / f"{token}.json"
if not manifest_path.is_file():
raise LookupError(GONE)
manifest = json.loads(manifest_path.read_text(encoding="utf-8"))
count = int(manifest["count"])
kept = {int(index): str(path) for index, path in dict(manifest.get("kept") or {}).items()}
if picks is None:
wanted = list(range(count))
else:
wanted = []
for pick in picks:
if isinstance(pick, bool) or not isinstance(pick, int) or not 0 <= pick < count:
raise ValueError("Save Image: that picture is not in this run.")
if pick not in wanted:
wanted.append(pick)
todo = [index for index in wanted if index not in kept]
output_root = Path(output_root)
caption = str(manifest.get("caption") or "")
has_caption = bool(caption.strip())
skipped: list[int] = []
saved: list[int] = []
with IMAGE_SAVE_LOCK:
root = resolve_output_root(manifest.get("output_dir", ""), output_root)
planned = plan_destinations(manifest, count, now or datetime.now(), root, output_root, picks=todo)
actions = settle_destinations(planned, has_caption, output_root)
resolved_root = output_root.resolve()
for (path, _policy), action, index in zip(planned, actions, todo):
if action == "skip":
skipped.append(index)
continue
source = folder / _held_name(token, index, manifest["extension"])
if not source.is_file():
raise LookupError(GONE)
path.parent.mkdir(parents=True, exist_ok=True)
shutil.copyfile(source, path)
if has_caption:
sidecar_path(path).write_text(caption, encoding="utf-8")
kept[index] = path.resolve().relative_to(resolved_root).as_posix()
saved.append(index)
manifest["kept"] = {str(index): path for index, path in kept.items()}
manifest_path.write_text(json.dumps(manifest), encoding="utf-8")
return {
"count": count,
"saved": [{"index": index, "path": kept[index]} for index in saved],
"kept": sorted(kept),
"skipped": skipped,
}
+34
View File
@@ -10,6 +10,7 @@ from __future__ import annotations
import json
import re
import secrets
import threading
from datetime import datetime
from pathlib import Path, PurePosixPath, PureWindowsPath
@@ -271,6 +272,36 @@ def frame_to_pil(frame: torch.Tensor) -> Image.Image:
return Image.fromarray(array)
# A small copy of each picture, for the node's face. The saved file can be
# tens of megabytes; this one is a few hundred kilobytes, so the picture
# shows at once on a slow connection too. It lives in the temp folder, which
# ComfyUI empties when it starts.
PREVIEW_FOLDER = "ausboss_preview"
PREVIEW_EDGE = 2048
def write_light_previews(temp_root, frames) -> list[str]:
"""Write one small WebP per frame; returns each place below the temp folder.
Never in the way of a save: if anything goes wrong the list is empty
and the node shows the saved file itself, as it always did.
"""
try:
folder = Path(temp_root) / PREVIEW_FOLDER
folder.mkdir(parents=True, exist_ok=True)
token = secrets.token_hex(8)
places = []
for index, frame in enumerate(frames):
image = frame_to_pil(frame)
image.thumbnail((PREVIEW_EDGE, PREVIEW_EDGE), Image.Resampling.LANCZOS)
name = f"{token}_{index:03d}.webp"
image.save(folder / name, format="WEBP", quality=88, method=2)
places.append(f"{PREVIEW_FOLDER}/{name}")
return places
except Exception:
return []
def _png_info(metadata: dict | None):
if not metadata:
return None
@@ -340,6 +371,8 @@ __all__ = [
"IMAGE_FORMATS",
"IMAGE_SAVE_LOCK",
"OUTPUT_DIR_RULE",
"PREVIEW_EDGE",
"PREVIEW_FOLDER",
"counter_pattern",
"encode_image",
"existing_action",
@@ -357,4 +390,5 @@ __all__ = [
"sidecar_path",
"split_prefix",
"strip_image_extension",
"write_light_previews",
]
+247
View File
@@ -0,0 +1,247 @@
"""Load Image: the size a picture comes out at, as plain numbers.
``plan_load_size`` turns the node's size choice into what the picture is
resized to and what is cut from it. It holds no tensors, so it is tested as
numbers, and ``js/shared/load_size.mjs`` repeats it for the size the node
shows before a run (``tests/fixtures/load_size_cases.json`` holds both to the
same answers). ``apply_load_size`` runs a plan on a picture and its mask.
"""
from __future__ import annotations
import math
import numpy as np
import torch
from ._resize_helpers import plan_resize, resample_batch, resolve_target, snap_to_multiple
SIZE_MODES = (
"off",
"megapixels",
"longest side",
"scale",
"fit inside",
"crop to fill",
"crop",
"crop to ratio",
)
# Which part of the picture a crop keeps.
CROP_SIDES = (
"center",
"top",
"bottom",
"left",
"right",
"top left",
"top right",
"bottom left",
"bottom right",
)
# The last one takes its shape from the width and height boxes.
RATIOS = (
"1:1",
"4:3",
"3:4",
"3:2",
"2:3",
"16:9",
"9:16",
"5:4",
"4:5",
"21:9",
"9:21",
"2:1",
"1:2",
"width : height",
)
def _round_half_up(value: float) -> int:
return int(math.floor(value + 0.5))
def _multiple_below(value: int, multiple: int) -> int:
"""The largest multiple that is not above ``value``, never below one step."""
step = max(1, int(multiple))
return max(step, (int(value) // step) * step)
def _multiple_inside(value: int, multiple: int) -> int:
"""``value`` rounded down to a multiple, or left alone when it is smaller
than one step: a cut never asks for more than the picture holds."""
step = max(1, int(multiple))
return (int(value) // step) * step if int(value) >= step else int(value)
def _crop_start(spare: int, side: str, low: str, high: str) -> int:
"""Where a cut starts along one edge with ``spare`` pixels to lose."""
if low in side:
return 0
if high in side:
return int(spare)
return int(spare) // 2
def _ratio_terms(ratio: str, width: int, height: int) -> tuple[int, int]:
if ratio == "width : height":
return max(1, int(width)), max(1, int(height))
across, _, down = str(ratio).partition(":")
return max(1, int(across)), max(1, int(down))
def plan_load_size(
source_width: int,
source_height: int,
size: str = "off",
megapixels: float = 1.0,
longest_side: int = 1024,
scale: float = 1.0,
width: int = 1024,
height: int = 1024,
multiple: int = 1,
enlarge: bool = True,
crop_from: str = "center",
ratio: str = "1:1",
) -> dict[str, int]:
"""What one picture is resized to (``resize_width``/``resize_height``),
where a crop starts in the resized picture (``crop_x``/``crop_y``) and
the size that comes out (``width``/``height``).
``off`` gives the picture back as it is; ``multiple`` rounds only a size
that is being changed. With ``enlarge`` off nothing comes out larger than
the picture: a target above it leaves the picture at its own size, and
``crop to fill`` cuts the box's shape out of the picture without growing
it. ``fit inside`` rounds down, so the result never leaves its box.
``crop`` cuts a width x height piece out of the picture and ``crop to
ratio`` cuts the largest piece of a shape; neither resizes. ``crop_from``
names the part every cut keeps.
"""
source_w, source_h = int(source_width), int(source_height)
if source_w <= 0 or source_h <= 0:
raise ValueError("Load Image needs a picture larger than 0x0.")
if size not in SIZE_MODES:
raise ValueError(f"size must be one of {SIZE_MODES}, got '{size}'.")
if crop_from not in CROP_SIDES:
raise ValueError(f"crop_from must be one of {CROP_SIDES}, got '{crop_from}'.")
if ratio not in RATIOS:
raise ValueError(f"ratio must be one of {RATIOS}, got '{ratio}'.")
if size == "off":
return {
"resize_width": source_w,
"resize_height": source_h,
"crop_x": 0,
"crop_y": 0,
"width": source_w,
"height": source_h,
}
step = max(1, int(multiple))
def cut(resize_w: int, resize_h: int, out_w: int, out_h: int) -> dict[str, int]:
return {
"resize_width": resize_w,
"resize_height": resize_h,
"crop_x": _crop_start(resize_w - out_w, crop_from, "left", "right"),
"crop_y": _crop_start(resize_h - out_h, crop_from, "top", "bottom"),
"width": out_w,
"height": out_h,
}
if size == "crop":
out_w = _multiple_inside(min(max(1, int(width)), source_w), step)
out_h = _multiple_inside(min(max(1, int(height)), source_h), step)
return cut(source_w, source_h, out_w, out_h)
if size == "crop to ratio":
across, down = _ratio_terms(ratio, width, height)
if source_w * down >= source_h * across:
out_h = source_h
out_w = min(source_w, max(1, _round_half_up(source_h * across / down)))
else:
out_w = source_w
out_h = min(source_h, max(1, _round_half_up(source_w * down / across)))
return cut(source_w, source_h, _multiple_inside(out_w, step), _multiple_inside(out_h, step))
if size == "crop to fill":
box_w, box_h = max(1, int(width)), max(1, int(height))
if not enlarge:
grow = max(box_w / source_w, box_h / source_h)
if grow > 1.0:
# The box keeps its shape and shrinks to what the picture holds.
box_w = max(1, int(math.floor(box_w / grow + 1e-6)))
box_h = max(1, int(math.floor(box_h / grow + 1e-6)))
canvas_w = min(_multiple_below(box_w, step), max(step, source_w))
canvas_h = min(_multiple_below(box_h, step), max(step, source_h))
else:
canvas_w = snap_to_multiple(box_w, step)
canvas_h = snap_to_multiple(box_h, step)
plan = plan_resize(source_w, source_h, canvas_w, canvas_h, "cover_crop", 1)
return cut(plan["resize_width"], plan["resize_height"], canvas_w, canvas_h)
if size == "megapixels":
target_w, target_h = resolve_target(source_w, source_h, "megapixels", megapixels=megapixels)
elif size == "longest side":
target_w, target_h = resolve_target(source_w, source_h, "longest_edge", edge_length=longest_side)
elif size == "scale":
target_w, target_h = resolve_target(source_w, source_h, "scale_factor", scale_factor=scale)
else: # fit inside
fit = min(max(1, int(width)) / source_w, max(1, int(height)) / source_h)
target_w = max(1, _round_half_up(source_w * fit))
target_h = max(1, _round_half_up(source_h * fit))
if not enlarge and (target_w > source_w or target_h > source_h):
target_w, target_h = source_w, source_h
def rounded(target: int, source: int, box: int) -> int:
value = snap_to_multiple(target, step)
if size == "fit inside" and value > box:
value = _multiple_below(box, step)
if not enlarge and value > source:
value = _multiple_below(source, step)
return value
out_w = rounded(target_w, source_w, max(1, int(width)))
out_h = rounded(target_h, source_h, max(1, int(height)))
return {
"resize_width": out_w,
"resize_height": out_h,
"crop_x": 0,
"crop_y": 0,
"width": out_w,
"height": out_h,
}
def frames_to_image_and_mask(frames) -> tuple[torch.Tensor, torch.Tensor]:
"""RGBA PIL frames to a BHWC RGB batch and a BHW mask.
The mask is what ComfyUI's own Load Image gives: white where the picture
is see-through, black where it is solid, and all black for a picture
with no transparency (here at the picture's own size).
"""
images, masks = [], []
for frame in frames:
array = np.asarray(frame.convert("RGBA"), dtype=np.float32) / 255.0
images.append(torch.from_numpy(array[..., :3].copy()))
masks.append(torch.from_numpy(1.0 - array[..., 3]))
return torch.stack(images, dim=0), torch.stack(masks, dim=0)
def apply_load_size(
image: torch.Tensor, mask: torch.Tensor, plan: dict[str, int], method: str
) -> tuple[torch.Tensor, torch.Tensor]:
"""Run a plan on a BHWC picture and its BHW mask. A plan that changes
nothing hands both back untouched."""
resize_w, resize_h = int(plan["resize_width"]), int(plan["resize_height"])
out_w, out_h = int(plan["width"]), int(plan["height"])
if (int(image.shape[2]), int(image.shape[1])) != (resize_w, resize_h):
image = resample_batch(image, resize_w, resize_h, method)
mask = resample_batch(mask.unsqueeze(-1), resize_w, resize_h, method).squeeze(-1).clamp(0.0, 1.0)
if (resize_w, resize_h) != (out_w, out_h):
x0, y0 = int(plan["crop_x"]), int(plan["crop_y"])
image = image[:, y0 : y0 + out_h, x0 : x0 + out_w, :].contiguous()
mask = mask[:, y0 : y0 + out_h, x0 : x0 + out_w].contiguous()
return image, mask
__all__ = ["CROP_SIDES", "RATIOS", "SIZE_MODES", "apply_load_size", "frames_to_image_and_mask", "plan_load_size"]
+77
View File
@@ -41,6 +41,16 @@ RADIUS_MAX = 4096.0
# The face's own picture: the long side is at most this.
SMALL_SIDE = 1024
# SAM 3 is asked about a copy of a big picture: its long side is at most
# this. ComfyUI's SAM 3 reads every picture at 1008 pixels and returns each
# answer at the size of the picture it was given, on the graphics card. At
# 8192 pixels one word with sixteen matches needed over 27 GB there, and a
# look at 3840 took twice as long as at 2048, all for outlines the model
# never saw that finely. Twice what the model reads keeps its second pass
# (a close-up of each thing it found) as sharp as before on pictures up to
# this size, which come out exactly as they did.
WORK_SIDE = 2048
# How a find stroke is asked (find_points, choose_found). Measured on 27
# strokes over three pictures, each drawn 13 slightly different ways: four
# points alone returned the stroked thing in 87 % of 351 tries, two points
@@ -386,6 +396,73 @@ def read_ask(ask, height: int, width: int) -> tuple:
return "look", None
# ---------------------------------------------------------------------------
# The copy of a big picture that SAM 3 is asked about
# ---------------------------------------------------------------------------
class WorkView:
"""One picture as SAM 3 is asked about it.
A picture whose long side is over WORK_SIDE is asked about on a smaller
copy (`frame`, averaged down, so nothing shimmers), and what SAM 3
answers there is brought back to the picture's own size with `full`.
A smaller picture is its own copy: `same` is true and nothing changes.
Touches and pieces keep their places in pixels of the picture. `point`
gives a place on the copy, `full_point` a place on the picture that
`point` leads back to the same pixel of the copy.
"""
def __init__(self, frame: torch.Tensor):
self.height, self.width = int(frame.shape[1]), int(frame.shape[2])
long_side = max(self.height, self.width)
self.same = long_side <= WORK_SIDE
if self.same:
self.frame, self.work_height, self.work_width = frame, self.height, self.width
return
scale = WORK_SIDE / long_side
self.work_height = max(1, int(math.floor(self.height * scale + 0.5)))
self.work_width = max(1, int(math.floor(self.width * scale + 0.5)))
small = F.interpolate(
frame.detach().float().cpu().movedim(-1, 1), size=(self.work_height, self.work_width), mode="area",
)
self.frame = small.movedim(1, -1).clamp(0.0, 1.0).contiguous()
def point(self, point) -> tuple:
x = min(self.work_width - 1, max(0, int(point[0]) * self.work_width // self.width))
y = min(self.work_height - 1, max(0, int(point[1]) * self.work_height // self.height))
return (x, y)
def full_point(self, point) -> tuple:
x = min(self.width - 1, -(-int(point[0]) * self.width // self.work_width))
y = min(self.height - 1, -(-int(point[1]) * self.height // self.work_height))
return (x, y)
def points(self, points) -> tuple:
return tuple(self.point(point) for point in points)
def length(self, value: float) -> float:
"""A length of the picture (a brush's radius) on the copy."""
return float(value) * self.work_width / self.width
def full_box(self, box) -> list:
if self.same:
return list(box)
x0, y0, x1, y1 = (int(value) for value in box)
return [
x0 * self.width // self.work_width, y0 * self.height // self.work_height,
min(self.width, -(-x1 * self.width // self.work_width)), min(self.height, -(-y1 * self.height // self.work_height)),
]
def full(self, mask: torch.Tensor) -> torch.Tensor:
"""An answer from the copy at the picture's own size (bool)."""
if self.same or tuple(mask.shape) == (self.height, self.width):
return mask
soft = F.interpolate(mask[None, None].float(), size=(self.height, self.width), mode="bilinear", align_corners=False)
return soft[0, 0] >= 0.5
# ---------------------------------------------------------------------------
# Strokes
# ---------------------------------------------------------------------------
+35
View File
@@ -0,0 +1,35 @@
"""Pick one choice from each {a|b|c} set in a prompt, decided by a seed.
Only a set that holds a ``|`` is a choice. Braces without one are left as
they are, so a JSON prompt passes through unchanged. Sets can sit inside
other sets; the innermost ones are picked first.
"""
from __future__ import annotations
import random
import re
# An innermost {...} that holds at least one "|", with the one space in
# front of it, so an empty pick does not leave two spaces behind.
_CHOICE = re.compile(r"( ?)\{([^{}]*\|[^{}]*)\}")
def pick_variations(text: str, seed: int) -> tuple[str, list[str]]:
"""Return the prompt with every choice set replaced, and the picks in order."""
rng = random.Random(int(seed))
picks: list[str] = []
def choose(match: re.Match) -> str:
options = [option.strip() for option in match.group(2).split("|")]
pick = rng.choice(options)
picks.append(pick)
return match.group(1) + pick if pick else ""
while True:
text, count = _CHOICE.subn(choose, text)
if not count:
return text, picks
__all__ = ["pick_variations"]
+97
View File
@@ -0,0 +1,97 @@
"""Only one copy of the pack loads.
A Manager install lands in ``custom_nodes/ausboss-nodes`` and a git clone in
``custom_nodes/ComfyUI-AusBoss``. With both in place every route is added
twice and ComfyUI stops while starting. So each copy looks for the others
and all of them agree on the one that loads; the rest step aside and say
which folder to delete.
A copy from before this file existed cannot step aside, so it always loads
and a newer copy yields to it. Among copies that can, the newest version
loads.
"""
from __future__ import annotations
import os
import tomllib
PACK_NAME = "ausboss-nodes"
# A copy that has this file knows how to step aside.
_GUARD_FILE = os.path.join("nodes", "_single_copy.py")
def _read_pack(folder: str) -> dict | None:
"""Name the pack copy in ``folder``, or None when it is another pack."""
try:
with open(os.path.join(folder, "pyproject.toml"), "rb") as f:
project = tomllib.load(f).get("project", {})
except Exception:
return None
if project.get("name") != PACK_NAME:
return None
if not os.path.isfile(os.path.join(folder, "__init__.py")):
return None
version = project.get("version")
return {
"folder": folder,
"version": version if isinstance(version, str) else "unknown",
"guarded": os.path.isfile(os.path.join(folder, _GUARD_FILE)),
}
def _version_key(version: str) -> tuple:
parts = []
for part in version.split("."):
digits = "".join(ch for ch in part if ch.isdigit())
parts.append(int(digits) if digits else -1)
return tuple(parts)
def find_copies(own_folder: str, roots: list[str]) -> list[dict]:
"""Every copy of the pack below ``roots``, this one included."""
own = os.path.realpath(own_folder)
seen = {own}
copies = [_read_pack(own) or {"folder": own, "version": "unknown", "guarded": True}]
for root in roots:
try:
names = sorted(os.listdir(root))
except OSError:
continue
for name in names:
# ComfyUI skips these too.
if name.endswith(".disabled") or name.startswith("."):
continue
folder = os.path.realpath(os.path.join(root, name))
if folder in seen or not os.path.isdir(folder):
continue
seen.add(folder)
pack = _read_pack(folder)
if pack:
copies.append(pack)
return copies
def pick_copy(copies: list[dict]) -> dict:
"""The one copy that loads. Every copy reaches the same answer."""
unguarded = [c for c in copies if not c["guarded"]]
pool = unguarded or copies
return max(pool, key=lambda c: (_version_key(c["version"]), c["folder"]))
def other_copy_that_loads(own_folder: str, roots: list[str] | None = None) -> dict | None:
"""The copy this one steps aside for, or None when this one loads."""
if roots is None:
# Outside ComfyUI nothing is served, so there is nothing to clash.
try:
import folder_paths
roots = list(folder_paths.get_folder_paths("custom_nodes"))
except Exception:
return None
roots = list(dict.fromkeys(os.path.realpath(r) for r in roots))
copies = find_copies(own_folder, roots)
if len(copies) < 2:
return None
chosen = pick_copy(copies)
return None if chosen["folder"] == os.path.realpath(own_folder) else chosen
+67
View File
@@ -0,0 +1,67 @@
"""Cut a block of text into the items Text Lines runs one at a time.
Pure text handling with no ComfyUI imports, so it runs under the
standard-library tests.
"""
from __future__ import annotations
import re
SPLIT_EACH_LINE = "each line"
SPLIT_BLANK_LINE = "blank line"
SPLIT_MODES = (SPLIT_EACH_LINE, SPLIT_BLANK_LINE)
# The words a list writer puts before an item's number: "Prompt 3:", "Shot 2 -".
# Not "image" or "picture": an edit prompt may open with "Image 1: ...".
_LABEL = r"(?:prompt|shot|scene|line|step|item)"
# A marker at the start of an item that only counts or bullets it. A bare
# number needs punctuation after it, and that punctuation must not be followed
# by a digit, so "2 women on a beach", "1.5x zoom" and "10:30 at night" stay
# whole. A bullet needs a space after it, so "*bold* text" stays whole.
_MARKER = re.compile(
r"""^\s*(?:
[\[【(]\s*(?:%(label)s[\s_#-]*)?\d+\s*[\]】)]\s*[:.\-–—]? # [prompt 1] (2)
| %(label)s[\s_#-]*\d+\s*[:.)\-–—] # Prompt 1: Shot 2 -
| \#?\d+\s*[.):](?!\d) # 1. 2) #3:
| [-*•·–—](?=\s|$) # - bullet
)\s*"""
% {"label": _LABEL},
re.IGNORECASE | re.VERBOSE,
)
_BLANK_LINE = re.compile(r"\n[ \t]*(?:\n[ \t]*)+")
def strip_marker(item: str) -> str:
"""Take one leading number or bullet off an item."""
return _MARKER.sub("", item, count=1).strip()
def split_items(text, split=SPLIT_EACH_LINE, remove_numbering=True, limit=0) -> list[str]:
"""The items of `text`, in order, with empty ones left out.
`split` picks where one item ends: at every line break, or only at an
empty line (so an item can hold several lines). `remove_numbering` takes
a leading "1." or "-" off each item. `limit` keeps the first so many;
0 keeps them all.
"""
text = str(text or "").replace("\r\n", "\n").replace("\r", "\n")
if split == SPLIT_BLANK_LINE:
parts = _BLANK_LINE.split(text)
else:
parts = text.split("\n")
items = []
for part in parts:
item = part.strip()
if remove_numbering:
item = strip_marker(item)
if item:
items.append(item)
limit = int(limit or 0)
if limit > 0:
items = items[:limit]
return items
+213
View File
@@ -0,0 +1,213 @@
"""Edit Lock 🆎 and Edit Lock Restore 🆎: an edit leaves the rest of the picture alone.
An edit model redraws the whole picture, so the parts nobody asked to change
come back a little moved and a little tinted. Edit Lock watches the model's
own prediction at every step, reads where it differs from the original, and
puts the original back everywhere else, so the model finishes the edit on
top of the real picture. Edit Lock Restore then swaps the original's own
pixels in for those parts after the decode. The deciding and blending live
in _edit_lock_helpers.py.
"""
from __future__ import annotations
import torch
from ._edit_lock_helpers import (
LOCK_MODES,
EditLock,
describe,
restore_pixels,
)
class AusBossEditLock:
CATEGORY = "🆎 AusBoss/Image"
DESCRIPTION = (
"Keeps every part of your picture that an edit did not change "
"exactly where it was, with the colors it had. Edit models redraw "
"the whole picture, so untouched parts often come back slightly "
"zoomed, shifted or tinted. Put this between the model and the "
"sampler and give it the picture you are editing. It needs no "
"mask: it sees what the edit changes while the picture is made. "
"When the edit changes the whole picture (a new style, new light, "
"new weather) it steps aside. Add Edit Lock Restore 🆎 after the "
"decode to get your own pixels back in the untouched parts."
)
SEARCH_ALIASES = [
"edit lock",
"pixel drift",
"pixel shift",
"color shift",
"consistency",
"keep unchanged",
"preserve original",
"tail steer",
"no drift edit",
"ausboss",
]
@classmethod
def INPUT_TYPES(cls):
return {
"required": {
"model": (
"MODEL",
{"tooltip": "The edit model. Patch last, after any LoRAs."},
),
"vae": (
"VAE",
{"tooltip": "The same VAE the workflow decodes with."},
),
"image": (
"IMAGE",
{
"tooltip": (
"The picture you are editing, at the size of the "
"result. Use the same picture the edit model gets."
),
},
),
"lock": (
list(LOCK_MODES),
{
"default": LOCK_MODES[0],
"tooltip": (
"auto locks the untouched parts and steps aside "
"when the whole picture changes. always locks "
"even then. off does nothing."
),
},
),
"tolerance": (
"FLOAT",
{
"default": 1.0,
"min": 0.25,
"max": 4.0,
"step": 0.05,
"tooltip": (
"How big a change must be to count as part of the "
"edit. Raise it if the lock lets small unwanted "
"changes through; lower it if it holds back part "
"of your edit."
),
},
),
},
"optional": {
"mask": (
"MASK",
{
"tooltip": (
"Optional. White marks where the edit may happen; "
"everything else is locked. With a mask the node "
"does not look for the change itself."
),
},
),
},
}
RETURN_TYPES = ("MODEL", "AUSBOSS_EDIT_LOCK")
RETURN_NAMES = ("model", "edit_lock")
OUTPUT_TOOLTIPS = (
"The model with the lock on. Plug it into the sampler.",
"What the lock kept. Plug it into Edit Lock Restore 🆎 after the decode.",
)
FUNCTION = "patch"
def patch(self, model, vae, image, lock, tolerance, mask=None):
if image.ndim != 4:
raise ValueError("Edit Lock: image must be an IMAGE batch.")
state = EditLock(mode=str(lock), tolerance=float(tolerance))
source = image[:1, ..., :3]
state.source = source.detach().float().cpu()
if mask is not None:
state.user_mask = mask.detach().float().cpu()
if state.mode == "off":
state.status = "off"
return (model, state)
latent = vae.encode(source)
patched = model.clone()
state.latent = patched.model.process_latent_in(latent).detach().float().cpu()
patched.set_model_sampler_post_cfg_function(state.step)
return (patched, state)
class AusBossEditLockRestore:
CATEGORY = "🆎 AusBoss/Image"
DESCRIPTION = (
"Puts your picture's own pixels back in every part the edit did not "
"change. Use it right after the VAE decode, with the edit_lock "
"output of Edit Lock 🆎. The untouched parts then match your "
"original pixel for pixel; only the edit is new. When the lock "
"stepped aside the picture passes through unchanged."
)
SEARCH_ALIASES = [
"edit lock restore",
"restore original pixels",
"paste back",
"keep unchanged",
"ausboss",
]
@classmethod
def INPUT_TYPES(cls):
return {
"required": {
"image": (
"IMAGE",
{"tooltip": "The edited picture, straight from the VAE decode."},
),
"edit_lock": (
"AUSBOSS_EDIT_LOCK",
{"tooltip": "From Edit Lock 🆎."},
),
"feather": (
"INT",
{
"default": 16,
"min": 0,
"max": 256,
"step": 1,
"tooltip": (
"How softly your original fades into the edit, in "
"pixels. The fade stays outside the edit."
),
},
),
},
}
RETURN_TYPES = ("IMAGE", "MASK", "STRING")
RETURN_NAMES = ("image", "edit_mask", "report")
OUTPUT_TOOLTIPS = (
"The edit with your original pixels in the untouched parts.",
"White where the edit changed the picture.",
"How much of the picture was kept. Plug it into Show Text 🆎 to read it.",
)
FUNCTION = "restore"
def restore(self, image, edit_lock, feather):
if image.ndim != 4:
raise ValueError("Edit Lock Restore: image must be an IMAGE batch.")
if not isinstance(edit_lock, EditLock):
raise ValueError("Edit Lock Restore: edit_lock needs the output of Edit Lock.")
height, width = int(image.shape[1]), int(image.shape[2])
mask = edit_lock.pixel_mask(height, width)
if mask is None or edit_lock.source is None:
return (image, torch.ones((int(image.shape[0]), height, width)), describe(edit_lock))
result, edit_mask = restore_pixels(image, edit_lock.source, mask, int(feather))
return (result, edit_mask, describe(edit_lock))
NODE_CLASS_MAPPINGS = {
"AUSBOSS_NODES_EditLock": AusBossEditLock,
"AUSBOSS_NODES_EditLockRestore": AusBossEditLockRestore,
}
NODE_DISPLAY_NAME_MAPPINGS = {
"AUSBOSS_NODES_EditLock": "Edit Lock 🆎",
"AUSBOSS_NODES_EditLockRestore": "Edit Lock Restore 🆎",
}
+87
View File
@@ -0,0 +1,87 @@
"""FlashVSR Upscale 🆎."""
from __future__ import annotations
from ._flashvsr_helpers import EXPECTED_MODEL_NAME, list_flashvsr_models, resolve_flashvsr_model, run_flashvsr
class AusBossFlashVSRUpscale:
CATEGORY = "🆎 AusBoss/Video"
DESCRIPTION = (
"Makes a video larger and sharper with the FlashVSR model. Pick the "
"model file, set how much larger, and run. It reads the clip a few "
"frames at a time, so a long clip needs no more graphics memory than "
"a short one, and every frame comes back. Connect the Wan 2.1 VAE "
"for a slower, finer finish."
)
SEARCH_ALIASES = [
"flashvsr",
"video upscale",
"upscale video",
"video super resolution",
"vsr",
"sharpen video",
"ausboss",
]
@classmethod
def INPUT_TYPES(cls):
models = list_flashvsr_models()
return {
"required": {
"frames": (
"IMAGE",
{"tooltip": "The video frames to make larger."},
),
"model": (
models,
{
"default": EXPECTED_MODEL_NAME if EXPECTED_MODEL_NAME in models else models[0],
"tooltip": "The FlashVSR model file, from ComfyUI/models/diffusion_models.",
},
),
"scale": (
"FLOAT",
{
"default": 2.0,
"min": 1.0,
"max": 4.0,
"step": 0.25,
"tooltip": "How many times larger each side gets. 1 keeps the size and only sharpens.",
},
),
"color_match": (
"BOOLEAN",
{
"default": True,
"tooltip": "Keeps each frame's colours the same as your video. Leave it on.",
},
),
},
"optional": {
"vae": (
"VAE",
{
"tooltip": (
"Optional. Connect the Wan 2.1 VAE for a slower, finer finish. "
"Left empty, the fast decoder inside the model file is used."
)
},
),
},
}
RETURN_TYPES = ("IMAGE",)
RETURN_NAMES = ("frames",)
OUTPUT_TOOLTIPS = ("The larger, sharper frames: as many as went in.",)
FUNCTION = "upscale"
def upscale(self, frames, model, scale, color_match, vae=None):
output = run_flashvsr(resolve_flashvsr_model(model), frames, float(scale), bool(color_match), vae)
return (output,)
NODE_CLASS_MAPPINGS = {"AUSBOSS_NODES_FlashVSRUpscale": AusBossFlashVSRUpscale}
NODE_DISPLAY_NAME_MAPPINGS = {"AUSBOSS_NODES_FlashVSRUpscale": "FlashVSR Upscale 🆎"}
__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS"]
+263
View File
@@ -0,0 +1,263 @@
"""Load Image 🆎."""
from __future__ import annotations
from ._execution_helpers import ignore_extra_inputs
from ._load_image_helpers import (
CROP_SIDES,
RATIOS,
SIZE_MODES,
apply_load_size,
frames_to_image_and_mask,
plan_load_size,
)
from ._media_helpers import list_input_images, load_image_frames, resolve_input_path
from ._resize_helpers import INTERPOLATION_MODES
from ._transform_engine import stable_file_fingerprint
class AusBossLoadImage:
CATEGORY = "🆎 AusBoss/Image"
DESCRIPTION = (
"Loads a picture and sets its size in the same node. Pick a file, "
"upload one, or step through the input folder with the arrows. "
"Size can stay off, or bring the picture to a megapixel count, a "
"longest side, a scale, a box it must fit inside, or a box it fills "
"by cropping. It can also cut a piece or a shape out of the picture "
"without resizing, keeping the side you choose. The node shows the "
"picture going in and coming out, with both sizes, before you run."
)
SEARCH_ALIASES = [
"load image",
"load picture",
"image loader",
"resize on load",
"megapixels",
"longest side",
"crop",
"aspect ratio",
"ausboss",
]
@classmethod
def INPUT_TYPES(cls):
return {
"required": {
"image": (
list_input_images(),
{
"image_upload": True,
"tooltip": "The picture to load. Pick one from ComfyUI's input folder or upload a new one.",
},
),
"size": (
list(SIZE_MODES),
{
"default": "off",
"tooltip": (
"How the picture is resized. off keeps it as it "
"is. megapixels, longest side and scale keep its "
"shape. fit inside shrinks or grows it to sit in "
"a box. crop to fill covers the box and cuts off "
"what sticks out. crop cuts a piece out without "
"resizing. crop to ratio cuts the largest piece "
"of a shape."
),
},
),
"megapixels": (
"FLOAT",
{
"default": 1.0,
"min": 0.01,
"max": 64.0,
"step": 0.01,
"tooltip": "For megapixels: the picture's total size. 1.0 is about 1024 x 1024.",
},
),
"longest_side": (
"INT",
{
"default": 1024,
"min": 16,
"max": 16384,
"step": 1,
"tooltip": "For longest side: the length of the longer edge, in pixels. The other edge follows.",
},
),
"scale": (
"FLOAT",
{
"default": 1.0,
"min": 0.05,
"max": 8.0,
"step": 0.01,
"tooltip": "For scale: 0.5 is half the size, 2 is double.",
},
),
"width": (
"INT",
{
"default": 1024,
"min": 16,
"max": 16384,
"step": 1,
"tooltip": "For fit inside, crop to fill and crop: the box's width in pixels.",
},
),
"height": (
"INT",
{
"default": 1024,
"min": 16,
"max": 16384,
"step": 1,
"tooltip": "For fit inside, crop to fill and crop: the box's height in pixels.",
},
),
"multiple": (
"INT",
{
"default": 8,
"min": 1,
"max": 256,
"step": 1,
"tooltip": (
"Rounds the new width and height to a multiple of "
"this. Most models want 8 or 16. 1 leaves the "
"numbers as they are. Not used while size is off."
),
},
),
"method": (
list(INTERPOLATION_MODES),
{
"default": "lanczos",
"tooltip": "How pixels are resampled. lanczos is the sharpest for photos; nearest keeps pixel art crisp.",
},
),
"enlarge": (
"BOOLEAN",
{
"default": True,
"tooltip": (
"On: a small picture is made bigger to reach the "
"size you asked for. Off: a picture is only ever "
"made smaller, and a small one comes out at its "
"own size."
),
},
),
"crop_from": (
list(CROP_SIDES),
{
"default": "center",
"tooltip": (
"For the three crop choices: the part of the "
"picture that is kept. top keeps the top and cuts "
"from the bottom."
),
},
),
"ratio": (
list(RATIOS),
{
"default": "1:1",
"tooltip": (
"For crop to ratio: the shape to cut, width to "
"height. width : height uses the numbers in the "
"width and height boxes."
),
},
),
},
}
RETURN_TYPES = ("IMAGE", "MASK", "INT", "INT", "STRING", "INT", "INT")
RETURN_NAMES = (
"image",
"mask",
"width",
"height",
"filename",
"original_width",
"original_height",
)
OUTPUT_TOOLTIPS = (
"The picture, at its new size.",
"White where the picture is see-through, black where it is solid. "
"All black for a picture with no transparency. Same size as the picture.",
"Width of the picture that comes out, in pixels.",
"Height of the picture that comes out, in pixels.",
"The file's name without its folder or its ending, ready for a save "
"node's prefix.",
"Width of the file before any resize.",
"Height of the file before any resize.",
)
FUNCTION = "load"
def load(
self,
image,
size="off",
megapixels=1.0,
longest_side=1024,
scale=1.0,
width=1024,
height=1024,
multiple=8,
method="lanczos",
enlarge=True,
crop_from="center",
ratio="1:1",
):
path = resolve_input_path(image)
picture, mask = frames_to_image_and_mask(load_image_frames(path))
source_w, source_h = int(picture.shape[2]), int(picture.shape[1])
plan = plan_load_size(
source_w,
source_h,
str(size),
float(megapixels),
int(longest_side),
float(scale),
int(width),
int(height),
int(multiple),
bool(enlarge),
str(crop_from),
str(ratio),
)
picture, mask = apply_load_size(picture, mask, plan, str(method))
return (
picture,
mask,
int(plan["width"]),
int(plan["height"]),
path.stem,
source_w,
source_h,
)
@classmethod
@ignore_extra_inputs
def VALIDATE_INPUTS(cls, image):
try:
resolve_input_path(image)
except Exception as exc:
return f"Load Image: {exc}"
return True
@classmethod
def IS_CHANGED(cls, image, **values):
try:
path = resolve_input_path(image)
except Exception:
path = image or ""
return stable_file_fingerprint(path, {"image": image, **values})
NODE_CLASS_MAPPINGS = {"AUSBOSS_NODES_LoadImage": AusBossLoadImage}
NODE_DISPLAY_NAME_MAPPINGS = {"AUSBOSS_NODES_LoadImage": "Load Image 🆎"}
__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS"]
+65 -30
View File
@@ -42,6 +42,7 @@ from ._mask_by_touch_helpers import (
WORDS_MORE,
Memory,
PieceSieve,
WorkView,
apply_item,
box_of,
choose_found,
@@ -126,6 +127,8 @@ QUICK = True
# Shared by every Mask by Touch node: what SAM 3 answered, per picture.
_MEMORY = Memory()
# How many of those smaller copies a node keeps: this picture's and the last one's.
VIEWS_KEPT = 2
# What the text reader made of each word, per text reader. A word reads the
# same for every picture, so it is read once.
_WORDS = OrderedDict()
@@ -836,25 +839,44 @@ class AusBossMaskByTouch:
# What Fine edges is set to in the run at hand: the subject is asked
# of that model.
self._edge_choice = FINE_OFF
# The smaller copies of big pictures SAM 3 is asked about, newest last.
self._views = OrderedDict()
# -- what SAM 3 finds ---------------------------------------------------
def _tap(self, session: _Session, frame, frame_key: str, point):
"""The thing at one point, without its stray specks. None for nothing.
def _view(self, frame, frame_key: str) -> WorkView:
"""The picture as SAM 3 is asked about it: itself, or a smaller copy
of a big one, kept for the next run on the same picture."""
held = self._views.get(frame_key)
if held is not None and (held.height, held.width) == (int(frame.shape[1]), int(frame.shape[2])):
self._views.move_to_end(frame_key)
return held
view = WorkView(frame)
if not view.same:
self._views[frame_key] = view
while len(self._views) > VIEWS_KEPT:
self._views.popitem(last=False)
return view
def _tap(self, session: _Session, view: WorkView, frame_key: str, point):
"""The thing at one point, without its stray specks, at the size SAM 3
was asked at (`view`). None for nothing. `point` is a pixel of the
picture.
Hovering's pieces and taps share this, and what it returned is
remembered, so a tap on a piece that was shown gives that piece."""
key = (session.token, frame_key, ("tap", int(point[0]), int(point[1])))
found, answer = _MEMORY.get(key)
if not found:
answer = drop_specks(session.ask(frame, [point]), point)
spot = view.point(point)
answer = drop_specks(session.ask(view.frame, [spot]), spot)
answer = answer if bool(answer.any()) else None
_MEMORY.put(key, answer)
return answer
def _named(self, session: _Session, frame, frame_key: str, word: str) -> list:
def _named(self, session: _Session, view: WorkView, frame_key: str, word: str) -> list:
"""Everything in one picture that SAM 3 calls by a word, tidied:
[(H x W bool, how sure), ...].
[(bool at the size SAM 3 was asked at, how sure), ...].
Hovering's named pieces and `name` touches share this, and what it
returned is remembered, so a touch on a named piece that was shown
@@ -862,7 +884,7 @@ class AusBossMaskByTouch:
key = (session.token, session.reader, frame_key, ("word", word))
found, matches = _MEMORY.get_matches(key)
if not found:
matches = tidy_matches(*session.ask_word(frame, word))
matches = tidy_matches(*session.ask_word(view.frame, word))
_MEMORY.put_matches(key, matches)
return matches
@@ -873,6 +895,9 @@ class AusBossMaskByTouch:
The area of a `paint` touch made with a soft brush is float, 0..1.
"""
height, width = int(frame.shape[1]), int(frame.shape[2])
# What SAM 3 is asked comes back at the size it was asked at, and is
# brought to the picture's own size here.
view = self._view(frame, frame_key)
if item.kind in ("subject", "background"):
# The picture's main subject, as ComfyUI's background-removal
# model sees it, or everything but it.
@@ -881,25 +906,25 @@ class AusBossMaskByTouch:
return (area, "thing", ()) if bool(area.any()) else (None, "none", ())
if item.kind == "all":
# Every thing called by that word, joined.
matches = self._named(session, frame, frame_key, item.word) if item.word else []
matches = self._named(session, view, frame_key, item.word) if item.word else []
if not matches:
return None, "none", ()
area = torch.zeros(height, width, dtype=torch.bool)
area = torch.zeros(view.work_height, view.work_width, dtype=torch.bool)
for mask, _ in matches:
area |= mask
return area, "thing", tuple(range(len(matches)))
return view.full(area), "thing", tuple(range(len(matches)))
if item.kind in ("tap", "name"):
if not (0 <= item.x < width and 0 <= item.y < height):
return None, "none", ()
if item.kind == "tap":
answer = self._tap(session, frame, frame_key, (item.x, item.y))
return (answer, "thing", ()) if answer is not None else (None, "none", ())
answer = self._tap(session, view, frame_key, (item.x, item.y))
return (view.full(answer), "thing", ()) if answer is not None else (None, "none", ())
if not item.word:
return None, "none", ()
# Of the things called by that word, the smallest at the point.
matches = self._named(session, frame, frame_key, item.word)
index = match_under(matches, (item.x, item.y))
return (None, "none", ()) if index is None else (matches[index][0], "thing", (index,))
matches = self._named(session, view, frame_key, item.word)
index = match_under(matches, view.point((item.x, item.y)))
return (None, "none", ()) if index is None else (view.full(matches[index][0]), "thing", (index,))
if item.kind not in ("find", "paint"):
return None, "none", ()
if item.kind == "paint" and item.soft > 0:
@@ -918,14 +943,18 @@ class AusBossMaskByTouch:
found, answer = _MEMORY.get(key)
if not found:
many, pair = find_points(item.pts, height, width)
# The stroke as it lies on the copy SAM 3 is asked about.
under = stroke if view.same else stroke_area(
view.points(item.pts), max(1.0, view.length(item.r)), view.work_height, view.work_width,
)
answer = choose_found(
session.ask(frame, many) if many else None,
session.ask(frame, pair) if pair else None,
stroke,
session.ask(view.frame, view.points(many)) if many else None,
session.ask(view.frame, view.points(pair)) if pair else None,
under,
)
_MEMORY.put(key, answer)
# Over empty space the paint is kept as it is.
return (answer, "thing", ()) if answer is not None else (stroke, "paint", ())
return (view.full(answer), "thing", ()) if answer is not None else (stroke, "paint", ())
def _look(self, session: _Session, frame, key: str, pieces: dict, pointer=None, tell=None) -> dict:
"""Find a picture's pieces for hovering.
@@ -943,6 +972,7 @@ class AusBossMaskByTouch:
piece.
"""
height, width = int(frame.shape[1]), int(frame.shape[2])
view = self._view(frame, key)
queue = _scope_queue(width, height)
sieve = pieces["sieve"]
fresh = {} # (name or None, point) -> (area, is it tidy and remembered)
@@ -967,7 +997,7 @@ class AusBossMaskByTouch:
if pointer is not None:
since = time.perf_counter()
known = _MEMORY.has((session.token, key, ("tap", pointer[0], pointer[1])))
answer = self._tap(session, frame, key, pointer)
answer = self._tap(session, view, key, pointer)
answered(known, since)
if answer is not None and sieve.offer(pointer, answer, pointed=True):
fresh[(None, pointer)] = (answer, True)
@@ -993,8 +1023,10 @@ class AusBossMaskByTouch:
break
ahead.append(later)
session.read_ahead(ahead, stop=_jobs_waiting)
matches = self._named(session, frame, key, what)
for (area, sure), point in zip(matches, match_points(matches)):
matches = self._named(session, view, key, what)
for (area, sure), spot in zip(matches, match_points(matches)):
# The match's own point, as a pixel of the picture.
point = None if spot is None else view.full_point(spot)
if point is not None and sieve.offer(point, area, name=what, sure=sure):
fresh[(what, point)] = (area, True)
pieces["words"] += 1
@@ -1002,7 +1034,7 @@ class AusBossMaskByTouch:
memory_key = (session.token, key, ("tap", what[0], what[1]))
known, answer = _MEMORY.get(memory_key)
if not known:
answer = session.ask(frame, [what])
answer = session.ask(view.frame, [view.point(what)])
if not bool(answer.any()):
_MEMORY.put(memory_key, None)
answer = None
@@ -1025,6 +1057,7 @@ class AusBossMaskByTouch:
first, and the small copies packed into planes. `fresh` holds the
areas found since the last time, and is emptied."""
height, width = int(frame.shape[1]), int(frame.shape[2])
view = self._view(frame, key)
small_width, small_height, _ = small_size(width, height)
sieve = pieces["sieve"]
before = {ident: slot for slot, ident in enumerate(pieces["ids"])}
@@ -1036,18 +1069,19 @@ class AusBossMaskByTouch:
else:
# A piece kept by a look that was stopped half way is asked
# for again: its answer was not held on to.
answer, tidy = fresh.get(ident) or (self._piece(session, frame, key, name, point), True)
answer, tidy = fresh.get(ident) or (self._piece(session, view, key, name, point), True)
if answer is None:
continue
if not tidy:
# What a tap at this point gives: the same answer, tidied
# the same way, remembered so the tap asks nothing.
answer = drop_specks(answer, point)
answer = drop_specks(answer, view.point(point))
_MEMORY.put((session.token, key, ("tap", point[0], point[1])), answer)
sure = sieve.sure_of(name, point)
entry = {
"x": point[0], "y": point[1],
"share": round(float(answer.sum()) / (height * width), 5), "box": box_of(answer),
"share": round(float(answer.sum()) / (view.work_height * view.work_width), 5),
"box": view.full_box(box_of(answer)),
"kind": "point" if name is None else "name", "name": name,
"sure": None if sure is None else round(sure, 3),
}
@@ -1064,13 +1098,13 @@ class AusBossMaskByTouch:
pieces["list"] = [row[4] for row in rows]
pieces["planes"] = pack_planes(masks)
def _piece(self, session: _Session, frame, key: str, name, point):
def _piece(self, session: _Session, view: WorkView, key: str, name, point):
"""The area of a piece from what is remembered: a point's answer, or
the match of a word that the piece's own point stands for."""
if name is None:
return self._tap(session, frame, key, point)
matches = self._named(session, frame, key, name)
index = match_under(matches, point)
return self._tap(session, view, key, point)
matches = self._named(session, view, key, name)
index = match_under(matches, view.point(point))
return None if index is None else matches[index][0]
# -- files for the node's face -------------------------------------------
@@ -1385,8 +1419,9 @@ class AusBossMaskByTouch:
if asked == "scope" and (pieces is None or pointer is not None or pieces["next"] < pieces["total"]):
if pieces is None:
words = len(WORDS_FIRST) + len(WORDS_MORE)
view = self._view(image[:1], key)
pieces = {
"sieve": PieceSieve(height, width), "next": 0, "total": len(_scope_queue(width, height)),
"sieve": PieceSieve(view.work_height, view.work_width), "next": 0, "total": len(_scope_queue(width, height)),
"words": 0, "words_total": words, "number": 0, "ids": [], "list": [], "planes": [],
}
# Remembered from the start: a look that is stopped half way
+73
View File
@@ -0,0 +1,73 @@
"""Prompt Variations 🆎 — one prompt, a different mix of choices on every run."""
from __future__ import annotations
from ._prompt_variations_helpers import pick_variations
class AusBossPromptVariations:
CATEGORY = "🆎 AusBoss/Utility"
DESCRIPTION = (
"A prompt box that changes on every run. Write choices in curly "
"brackets, such as a {red|blue|green} {sweater|jacket}, and the node "
"picks one from each set. The seed decides the picks: the same seed "
"gives the same prompt again, and a new seed on each run gives a new "
"mix. Text without brackets comes out exactly as typed."
)
SEARCH_ALIASES = [
"random prompt", "wildcard", "dynamic prompt", "variations",
"random choice", "prompt mixer", "ausboss",
]
@classmethod
def INPUT_TYPES(cls):
return {
"required": {
"text": (
"STRING",
{
"default": "",
"multiline": True,
"dynamicPrompts": False,
"tooltip": (
"Your prompt. Put choices in curly brackets, split "
"by |, such as {tank top|sweater|shirt}. One is "
"picked from each set."
),
},
),
"seed": (
"INT",
{
"default": 0,
"min": 0,
"max": 0xFFFFFFFFFFFFFFFF,
"forceInput": True,
"tooltip": (
"Wire in the seed your sampler uses. A new seed "
"picks new choices; the same seed picks the same "
"ones again."
),
},
),
},
}
RETURN_TYPES = ("STRING",)
RETURN_NAMES = ("prompt",)
OUTPUT_TOOLTIPS = ("The prompt with one choice picked from each set.",)
FUNCTION = "pick"
def pick(self, text, seed):
prompt, _picks = pick_variations(text, seed)
return (prompt,)
NODE_CLASS_MAPPINGS = {
"AUSBOSS_NODES_PromptVariations": AusBossPromptVariations,
}
NODE_DISPLAY_NAME_MAPPINGS = {
"AUSBOSS_NODES_PromptVariations": "Prompt Variations 🆎",
}
__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS"]
+103 -48
View File
@@ -6,26 +6,21 @@ from datetime import datetime
from pathlib import Path
from ._execution_helpers import ignore_extra_inputs
from ._image_hold_helpers import hold_pictures, keep_pictures, plan_destinations, settle_destinations
from ._image_save_helpers import (
EXISTING_POLICIES,
FORMAT_EXTENSIONS,
IMAGE_FORMATS,
IMAGE_SAVE_LOCK,
encode_image,
existing_action,
fill_name_tokens,
metadata_disabled,
name_stem,
next_free_counter,
plan_exact_names,
plan_local_names,
resolve_output_root,
require_output_path,
sanitize_exact_name,
sidecar_path,
split_prefix,
strip_image_extension,
write_light_previews,
)
from ._route_errors import safe_route_error
from ._step_preview_helpers import STEP_PREVIEW_DEFAULT, register_step_preview_handler
from ._video_save_helpers import workflow_metadata
@@ -68,6 +63,33 @@ def _register_folder_route() -> None:
shown = "" if target == root else target.relative_to(root).as_posix()
return web.json_response({"path": shown, "folders": folders})
@PromptServer.instance.routes.post("/ausboss/save_image/keep")
async def keep_held(request):
"""Save pictures a run is holding (Auto save off). The body names the
run by the token the node was given and, optionally, which of its
pictures to keep. Names and folders come from what the run stored,
never from the request."""
try:
body = await request.json()
except Exception:
return web.json_response({"error": "bad request"}, status=400)
if not isinstance(body, dict):
return web.json_response({"error": "bad request"}, status=400)
picks = body.get("picks")
if picks is not None and not isinstance(picks, list):
return web.json_response({"error": "bad request"}, status=400)
try:
answer = keep_pictures(
folder_paths.get_temp_directory(), folder_paths.get_output_directory(), body.get("token"), picks,
)
except LookupError as exc:
return web.json_response({"error": safe_route_error(exc, "Those pictures are gone.")}, status=404)
except ValueError as exc:
return web.json_response({"error": safe_route_error(exc, "Could not save.")}, status=400)
except Exception as exc:
return web.json_response({"error": safe_route_error(exc, "Could not save.")}, status=500)
return web.json_response(answer)
class AusBossSaveImage:
CATEGORY = "🆎 AusBoss/Image"
@@ -277,6 +299,17 @@ class AusBossSaveImage:
),
},
),
"autosave": (
"BOOLEAN",
{
"default": True,
"tooltip": (
"On: every run saves its pictures. Off: the "
"pictures only show on the node, and its Save "
"button keeps the ones you want."
),
},
),
},
"hidden": {"prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"},
}
@@ -310,6 +343,7 @@ class AusBossSaveImage:
name_batch=False,
preview=True,
step_preview=STEP_PREVIEW_DEFAULT,
autosave=True,
prompt=None,
extra_pnginfo=None,
):
@@ -343,60 +377,67 @@ class AusBossSaveImage:
else:
exact = sanitize_exact_name(exact_name)
with IMAGE_SAVE_LOCK:
planned: list[tuple[Path, str]] = [] # (path, collision policy)
if exact:
base = strip_image_extension(exact)
for name in plan_exact_names(base, extension, count):
planned.append((root / name, on_existing))
else:
subfolder, base = split_prefix(filename_prefix)
folder = root / subfolder if subfolder else root
require_output_path(folder, output_root)
stem = name_stem(
base,
{"date": bool(name_date), "time": bool(name_time), "size": bool(name_size)},
now,
width,
height,
)
counter = bool(name_counter)
existing = [entry.name for entry in folder.iterdir()] if folder.is_dir() else []
names = plan_local_names(
stem, extension, count, counter=counter, batch=bool(name_batch),
next_counter=next_free_counter(existing, stem),
)
# The shared lock keeps this counter free until writing finishes.
# Without it, the legacy policy decides whether to overwrite.
policy = "overwrite" if counter else on_existing
planned.extend((folder / name, policy) for name in names)
settings = {
"format": format,
"extension": extension,
"width": width,
"height": height,
"exact": exact,
"filename_prefix": filename_prefix,
"on_existing": on_existing,
"output_dir": str(output_dir or ""),
"name_counter": bool(name_counter),
"name_date": bool(name_date),
"name_time": bool(name_time),
"name_size": bool(name_size),
"name_batch": bool(name_batch),
"caption": caption_value,
}
has_caption = bool(caption_value.strip())
if not autosave:
# Nothing is saved yet. The pictures wait in the temp folder, in
# their final format, and the node's Save button keeps the ones
# that are wanted (the keep route above). A bad name or folder
# still stops the run here, not at the click.
with IMAGE_SAVE_LOCK:
settle_destinations(plan_destinations(settings, count, now, root, output_root), has_caption, output_root)
token, previews = hold_pictures(
folder_paths.get_temp_directory(), images, settings,
lambda path, frame: encode_image(path, frame, format, metadata),
)
return {
"ui": {
"images": previews, "ausboss_saved_path": [], "ausboss_held": [token],
"ausboss_preview": self._light_previews(images, preview),
},
"result": ("", images),
}
with IMAGE_SAVE_LOCK:
# Validate the whole batch before any write, including caption targets,
# then settle every collision: an "error" on a later frame must stop
# the run before the first frame lands, not after.
for path, _policy in planned:
require_output_path(path, output_root)
if caption_value.strip():
require_output_path(sidecar_path(path), output_root)
actions = [
existing_action(path.exists() or (bool(caption_value.strip()) and sidecar_path(path).exists()), policy)
for path, policy in planned
]
planned = plan_destinations(settings, count, now, root, output_root)
actions = settle_destinations(planned, has_caption, output_root)
saved: list[Path] = []
saved_frames = []
for (path, _policy), action, frame in zip(planned, actions, images):
if action == "skip":
continue
path.parent.mkdir(parents=True, exist_ok=True)
encode_image(path, frame, format, metadata)
if caption_value.strip():
if has_caption:
sidecar_path(path).write_text(caption_value, encoding="utf-8")
saved.append(path)
saved_frames.append(frame)
# Every destination was confined to the output folder above, so each
# saved file previews from there and is shown relative to it. The
# preview switch is display only: these entries are also how the
# queue lists the save, and there is no temp file to skip.
# saved file previews from there and is shown relative to it. These
# entries are also how the queue lists the save, so the preview
# switch leaves them alone; it only skips the small copies the node
# shows on its face (ausboss_preview).
previews: list[dict] = []
resolved_root = output_root.resolve()
shown_paths: list[str] = []
@@ -410,10 +451,24 @@ class AusBossSaveImage:
})
shown_paths.append(resolved.relative_to(resolved_root).as_posix())
return {
"ui": {"images": previews, "ausboss_saved_path": shown_paths[:1]},
"ui": {
"images": previews, "ausboss_saved_path": shown_paths[:1],
"ausboss_preview": self._light_previews(saved_frames, preview),
},
"result": (str(saved[0]) if saved else "", images),
}
@staticmethod
def _light_previews(frames, preview) -> list[str]:
# The node's face shows these instead of the full files. Preview
# off: nothing is shown, so nothing is written.
if not preview:
return []
try:
return write_light_previews(folder_paths.get_temp_directory(), frames)
except Exception:
return []
@classmethod
def IS_CHANGED(cls, **_values):
# A saver's job is the side effect: deleting the file and queueing
+100
View File
@@ -0,0 +1,100 @@
"""Text Lines 🆎 — run what comes after once for each line of text."""
from __future__ import annotations
from ._text_lines_helpers import SPLIT_EACH_LINE, SPLIT_MODES, split_items
MAX_LIMIT = 1000
class AusBossTextLines:
CATEGORY = "🆎 AusBoss/Utility"
DESCRIPTION = (
"Runs what comes after once for each line of your text. Type five "
"prompts, one on each line, and one run makes five pictures. Empty "
"lines are skipped, and a number or bullet at the start of a line "
"can be taken off."
)
SEARCH_ALIASES = [
"prompt list",
"one prompt per line",
"each line",
"split text",
"text to list",
"batch prompts",
"queue prompts",
"ausboss",
]
@classmethod
def INPUT_TYPES(cls):
return {
"required": {
"text": (
"STRING",
{
"default": "",
"multiline": True,
"tooltip": "One line for each run. Type it here, or wire in text another node wrote.",
},
),
"split": (
list(SPLIT_MODES),
{
"default": SPLIT_EACH_LINE,
"tooltip": (
"each line: every line is its own run. blank line: lines stay "
"together, and an empty line starts the next run."
),
},
),
"remove_numbering": (
"BOOLEAN",
{
"default": True,
"tooltip": (
'On: a number or bullet at the start is taken off, like "1.", "-" '
'or "[prompt 2]". Off: every line stays as written.'
),
},
),
"limit": (
"INT",
{
"default": 0,
"min": 0,
"max": MAX_LIMIT,
"step": 1,
"tooltip": "The most lines to run. 0 runs them all.",
},
),
},
}
RETURN_TYPES = ("STRING", "INT", "INT")
RETURN_NAMES = ("line", "number", "count")
OUTPUT_IS_LIST = (True, True, False)
OUTPUT_TOOLTIPS = (
"Each line, one at a time. What comes after runs once for each.",
"The line's place in the list, starting at 1. Add it to a seed to give each run its own.",
"How many lines run.",
)
FUNCTION = "split"
def split(self, text, split=SPLIT_EACH_LINE, remove_numbering=True, limit=0):
items = split_items(text, split, remove_numbering, limit)
if not items:
raise ValueError(
"Text Lines has no lines to run. Type at least one line, or check the node that writes its text."
)
return (items, list(range(1, len(items) + 1)), len(items))
NODE_CLASS_MAPPINGS = {
"AUSBOSS_NODES_TextLines": AusBossTextLines,
}
NODE_DISPLAY_NAME_MAPPINGS = {
"AUSBOSS_NODES_TextLines": "Text Lines 🆎",
}
__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS"]
+3 -2
View File
@@ -2,8 +2,8 @@
name = "ausboss-nodes"
# Manager/registry search matches against this text, so it names the actual
# nodes instead of describing the collection abstractly.
description = "ComfyUI-AusBoss (AusBoss nodes): image and video nodes with compact controls: Image and Video Crop + Rotate + Pad (frame or clip), Load Image + Pad, Image Folder, Image Resize, Align Image, Image Size, Color Match, Image Compare A/B, Realign to Source (experimental), Save Image (PNG, WebP/JXL, captions), Load Video, Load Audio, Save Video, Select Frame, Frame Interpolate, Mask Refine, Mask by Name and Mask by Touch (type a name or click a thing, get its mask), LaMa Inpaint, Crop For Inpaint, Stitch Inpaint, Tiled Upscale and Tiled Upscale Stitch, LoRA Loader, Krea 2 Encode and Outpaint Model Patch, Latent Size, Layout Boxes, Seed, Select Every Nth, Split Batch, Merge Batches, Text, H3 Prompt Writer, Integer, Float, Math Expression, Show Text, Free Memory, Workflow Note, Workflow Note Tile, Callout, Callout Tile, Workflow Switches, Run Timer, and Step Preview (stop bad runs). Example workflows for Qwen Image 2.1, Krea 2, Klein 9B and LTX 2.3."
version = "2.23.0"
description = "ComfyUI-AusBoss (AusBoss nodes): image and video nodes with compact controls: Image and Video Crop + Rotate + Pad (frame or clip), Load Image, Load Image + Pad, Image Folder, Image Resize, Align Image, Image Size, Color Match, Image Compare A/B, Realign to Source (experimental), Save Image (PNG, WebP/JXL, captions), Load Video, Load Audio, Save Video, Select Frame, Frame Interpolate, Mask Refine, Mask by Name and Mask by Touch, LaMa Inpaint, Crop For Inpaint, Stitch Inpaint, Tiled Upscale and Tiled Upscale Stitch, FlashVSR Upscale, Edit Lock and Edit Lock Restore, LoRA Loader, Krea 2 Encode and Outpaint Model Patch, Latent Size, Layout Boxes, Seed, Select Every Nth, Split Batch, Merge Batches, Text, Text Lines, Prompt Variations, H3 Prompt Writer, Integer, Float, Math Expression, Show Text, Free Memory, Workflow Note, Workflow Note Tile, Callout, Callout Tile, Workflow Switches, Run Timer, and Step Preview. Example workflows for Qwen Image 2.1, Krea 2, Klein 9B and LTX 2.3."
version = "2.25.0"
# comfy-cli serializes this to JSON verbatim, so `file` publishes the literal
# string {"file": "LICENSE"} to the registry listing. `text` puts a readable
# name there instead. Both forms are supported; the LICENSE file is unchanged.
@@ -21,6 +21,7 @@ keywords = [
"image folder", "batch folder", "callout", "sticky note", "arrows",
"tiled upscale", "upscale", "tiles", "restore", "layout boxes", "bounding boxes", "moss image", "replace text", "rotate box",
"step preview", "live preview", "stop run",
"text lines", "prompt list", "prompt variations", "wildcards", "flashvsr", "video upscale", "edit lock", "load image",
]
# Read by comfy-cli into the registry's supported_os field. Nothing in the pack
+6
View File
@@ -56,6 +56,9 @@ PUBLIC_NODE_IDS = {
"AUSBOSS_NODES_ColorMatch",
"AUSBOSS_NODES_Compare",
"AUSBOSS_NODES_CropForInpaint",
"AUSBOSS_NODES_EditLock",
"AUSBOSS_NODES_EditLockRestore",
"AUSBOSS_NODES_FlashVSRUpscale",
"AUSBOSS_NODES_Float",
"AUSBOSS_NODES_FrameInterpolate",
"AUSBOSS_NODES_FreeMemory",
@@ -70,6 +73,7 @@ PUBLIC_NODE_IDS = {
"AUSBOSS_NODES_LaMaInpaint",
"AUSBOSS_NODES_LayoutBoxes",
"AUSBOSS_NODES_LoadAudio",
"AUSBOSS_NODES_LoadImage",
"AUSBOSS_NODES_LoadImagePad",
"AUSBOSS_NODES_LoadVideo",
"AUSBOSS_NODES_LoraLoader",
@@ -77,6 +81,7 @@ PUBLIC_NODE_IDS = {
"AUSBOSS_NODES_MaskByTouch",
"AUSBOSS_NODES_MathExpression",
"AUSBOSS_NODES_MergeBatches",
"AUSBOSS_NODES_PromptVariations",
"AUSBOSS_NODES_RealignToSource",
"AUSBOSS_NODES_RefineMask",
"AUSBOSS_NODES_Resolution",
@@ -92,6 +97,7 @@ PUBLIC_NODE_IDS = {
"AUSBOSS_NODES_StitchInpaint",
"AUSBOSS_NODES_TiledUpscaleStitch",
"AUSBOSS_NODES_Text",
"AUSBOSS_NODES_TextLines",
"AUSBOSS_NODES_TiledUpscale",
"AUSBOSS_NODES_VideoCropRotatePad",
"AUSBOSS_NODES_VideoCropRotatePadClip",
+89 -1
View File
@@ -5,7 +5,7 @@ import test from "node:test";
import { fileURLToPath } from "node:url";
import {
ARROW_ANGLE, ARROW_CHOICES, SMALL_MARK, arrowText, fitFontSize, linkTarget, parseBlocks, pastedLink, repointLinks, targetId,
ARROW_ANGLE, ARROW_CHOICES, CARD_TEMPLATE, SMALL_MARK, arrowText, cardCells, parseCard, fitFontSize, linkTarget, parseBlocks, pastedLink, repointLinks, targetId,
toggleSmall, urlLabel, wrapLink, tileLinkFields, tileLinkText,
} from "../js/shared/callout.mjs";
@@ -322,3 +322,91 @@ test("a note pasted with what its links name follows the copies", () => {
assert.equal(repointLinks("[elsewhere](#40) ⬆️ plain", nodes, groups), null);
assert.equal(repointLinks(undefined, nodes, groups), null);
});
// Info card. The words of a piece list, so a test reads like the card.
const words = (pieces) => pieces.map((piece) => piece.text ?? "").join("");
test("an Info card reads a title, rows and small print from plain text", () => {
const blocks = parseCard([
"⏱ Too slow?",
"###### Redraw time on an RTX 5090. Smaller cards take longer.",
"",
"2x, 18 steps | ~4 min",
"2x, 10 steps | ~3 min",
"1.5x, 18 steps | ~2.5 min",
"**1.5x, 10 steps (default) | ~2 min**",
"",
"###### 1.5x is a 4608-wide sheet, 2x is 6144.",
].join("\n"));
assert.equal(blocks.length, 3);
const [head, rows, foot] = blocks;
assert.deepEqual(head.map((line) => line.kind), ["title", "text"]);
assert.equal(head[0].icon, "clock");
assert.equal(words(head[0].pieces), "Too slow?");
assert.equal(head[1].small, true);
assert.deepEqual(
rows.map((row) => [row.kind, words(row.cells[0]), words(row.cells[1]), row.highlight]),
[
["row", "2x, 18 steps", "~4 min", false],
["row", "2x, 10 steps", "~3 min", false],
["row", "1.5x, 18 steps", "~2.5 min", false],
["row", "1.5x, 10 steps (default)", "~2 min", true],
],
);
assert.equal(foot[0].kind, "text");
assert.equal(foot[0].small, true);
});
test("a row is marked by bold on the whole row, written either way", () => {
assert.equal(parseCard("T\n**a | b**")[0][1].highlight, true);
assert.equal(parseCard("T\n**a** | **b**")[0][1].highlight, true);
// Bold on one word stresses the word; the row is not marked.
assert.equal(parseCard("T\n**a** b | c")[0][1].highlight, false);
assert.equal(parseCard("T\na | **b**")[0][1].highlight, false);
});
test("a row splits at the first | outside a link", () => {
assert.deepEqual(cardCells("Size (1.5x | 2x)"), ["Size (1.5x", "2x)"]);
assert.deepEqual(cardCells("[a|b](https://example.com/a|b) | v"), ["[a|b](https://example.com/a|b)", "v"]);
assert.deepEqual(cardCells("a | b | c"), ["a", "b | c"]);
// A pasted Markdown table row loses its outer pipes; its --- line is dropped.
assert.deepEqual(cardCells("| 2x | ~4 min |"), ["2x", "~4 min"]);
assert.deepEqual(parseCard("T\n| a | b |\n|---|:--:|\n| c | d |")[0].map((line) => line.kind), ["title", "row", "row"]);
// One side empty is not a row.
for (const line of ["a |", "| b", "|", "no pipe"]) assert.equal(cardCells(line), null, line);
});
test("only the card's first line is its title, and only a known emoji is an icon", () => {
assert.equal(parseCard("a | b\nT")[0][0].kind, "row");
assert.equal(parseCard("###### small\nT")[0][0].kind, "text");
assert.deepEqual(parseCard("T\nU")[0].map((line) => line.kind), ["title", "text"]);
for (const [title, icon] of [["ℹ️ Note", "info"], ["⚠️ Careful", "warning"], ["💡 Tip", "tip"], ["✅ Done", "check"], ["⏱️Fast", "clock"], ["🙂 Hi", null], ["Plain", null]]) {
const line = parseCard(title)[0][0];
assert.equal(line.icon, icon, title);
if (icon) assert.ok(!/^\s/.test(words(line.pieces)), title);
}
assert.equal(words(parseCard("🙂 Hi")[0][0].pieces), "🙂 Hi");
});
test("the card's starter text shows every part of a card", () => {
const [head, rows, foot] = parseCard(CARD_TEMPLATE);
assert.equal(head[0].icon, "info");
assert.equal(head[1].small, true);
assert.deepEqual(rows.map((row) => row.highlight), [false, true]);
assert.equal(foot[0].small, true);
});
test("a plain callout reads a | as text, so no note written before changes", () => {
const [[line]] = parseBlocks("2x, 18 steps | ~4 min");
assert.deepEqual(line, [{ text: "2x, 18 steps | ~4 min", bold: false }]);
});
test("an Info card saves as a plain Callout, so an older pack shows its text", () => {
// Tiles save as Callout Tile and an older pack reports that node missing.
// A card is readable as a plain note there, so it keeps the plain type.
const source = readFileSync(join(ROOT, "js", "callout", "index.js"), "utf-8");
const saved = /serializeNoteIdentity\(saved, (\[[^\]]*\])\.includes/.exec(source);
assert.ok(saved, "the tile list in onSerialize moved");
assert.ok(!saved[1].includes("card"), "an Info card would save as a Callout Tile");
assert.match(source, /\["card","Info card"\]/, "the Info card is gone from the note's menu");
});
+71
View File
@@ -0,0 +1,71 @@
import assert from "node:assert/strict";
import test from "node:test";
import { readFileSync } from "node:fs";
import vm from "node:vm";
// Run the real extension entry with a fake page in place of ComfyUI.
function page({ settings = {}, answer = { ok: true, status: 200 } } = {}) {
const requests = [];
const toasts = [];
const app = {
ui: { settings: { getSettingValue: (id) => settings[id] } },
registerExtension(extension) { this.extension = extension; },
};
const api = {
async fetchApi(path, options) {
requests.push({ path, ...options });
if (answer instanceof Error) throw answer;
return answer;
},
};
const context = vm.createContext({ app, api, showToast: (toast) => toasts.push(toast), JSON });
const source = readFileSync(new URL("../js/clear_vram/index.js", import.meta.url), "utf8")
.replace(/^import[\s\S]*?;\s*/gm, "");
vm.runInContext(source, context);
return { extension: app.extension, requests, toasts };
}
async function click(p) {
const [item] = p.extension.getCanvasMenuItems();
await item.callback();
}
test("the setting follows the pack's id and category rule and is on by default", () => {
const [setting] = page().extension.settings;
assert.equal(setting.id, "AusBoss.Memory.ClearVramMenu");
assert.equal(setting.type, "boolean");
assert.equal(setting.defaultValue, true);
assert.deepEqual([...setting.category], ["🆎 AusBoss", "Memory", "Clear VRAM menu"]);
});
test("the canvas menu shows Clear VRAM unless the setting is off", () => {
assert.deepEqual([...page().extension.getCanvasMenuItems().map((item) => item.content)], ["Clear VRAM 🆎"]);
const off = page({ settings: { "AusBoss.Memory.ClearVramMenu": false } });
assert.equal(off.extension.getCanvasMenuItems().length, 0);
});
test("a ComfyUI that forbids manual unloading gets no entry", () => {
const p = page({ settings: { "Comfy.Memory.AllowManualUnload": false } });
assert.equal(p.extension.getCanvasMenuItems().length, 0);
});
test("a click sends ComfyUI's own free request and confirms it", async () => {
const p = page();
await click(p);
assert.equal(p.requests.length, 1);
assert.equal(p.requests[0].path, "/free");
assert.equal(p.requests[0].method, "POST");
assert.deepEqual(JSON.parse(p.requests[0].body), { unload_models: true, free_memory: true });
assert.equal(p.toasts.length, 1);
assert.equal(p.toasts[0].severity, "success");
});
test("a refused or failed request shows the error", async () => {
for (const answer of [{ ok: false, status: 500 }, new Error("Failed to fetch")]) {
const p = page({ answer });
await click(p);
assert.equal(p.toasts.length, 1);
assert.equal(p.toasts[0].severity, "error");
assert.match(p.toasts[0].detail, answer instanceof Error ? /Failed to fetch/ : /500/);
}
});
+73
View File
@@ -0,0 +1,73 @@
import assert from "node:assert/strict";
import test from "node:test";
import { readFileSync } from "node:fs";
import { closeOnBackdropClick, pointOutside } from "../js/shared/dialog_backdrop.mjs";
// A stand-in for a modal <dialog>: a box from (100, 100) to (500, 400) with
// one child, the card's content.
function fakeDialog() {
const dialog = new EventTarget();
dialog.closed = 0;
dialog.close = () => { dialog.closed += 1; };
dialog.getBoundingClientRect = () => ({ left: 100, top: 100, right: 500, bottom: 400 });
const child = new EventTarget();
closeOnBackdropClick(dialog);
return { dialog, child };
}
// Events fired at the dialog itself, with the target the browser would give.
function fire(dialog, type, target, x, y) {
const event = new Event(type);
Object.defineProperties(event, {
target: { value: target },
clientX: { value: x },
clientY: { value: y },
});
dialog.dispatchEvent(event);
}
function click(dialog, down, up) {
fire(dialog, "pointerdown", down.target, down.x, down.y);
fire(dialog, "click", up.target, up.x, up.y);
}
test("pointOutside is true only beyond the box", () => {
const rect = { left: 10, top: 10, right: 20, bottom: 20 };
assert.equal(pointOutside(rect, 15, 15), false);
assert.equal(pointOutside(rect, 10, 20), false);
assert.equal(pointOutside(rect, 9, 15), true);
assert.equal(pointOutside(rect, 15, 21), true);
});
test("a click on the backdrop closes the popup", () => {
const { dialog } = fakeDialog();
click(dialog, { target: dialog, x: 40, y: 40 }, { target: dialog, x: 40, y: 40 });
assert.equal(dialog.closed, 1);
});
test("a click inside the card keeps it open", () => {
const { dialog, child } = fakeDialog();
click(dialog, { target: child, x: 200, y: 200 }, { target: child, x: 200, y: 200 });
// The card's own padding and scroll bar are the dialog element itself.
click(dialog, { target: dialog, x: 495, y: 200 }, { target: dialog, x: 495, y: 200 });
assert.equal(dialog.closed, 0);
});
test("selecting text or dragging out of the card keeps it open", () => {
const { dialog, child } = fakeDialog();
// The browser sends the click to the dialog, the common parent.
click(dialog, { target: child, x: 200, y: 200 }, { target: dialog, x: 40, y: 40 });
assert.equal(dialog.closed, 0);
// A press on the backdrop that ends on the card does not close it either.
click(dialog, { target: dialog, x: 40, y: 40 }, { target: dialog, x: 200, y: 200 });
assert.equal(dialog.closed, 0);
// A click with no press before it (a key on a focused button) is not outside.
fire(dialog, "click", dialog, 40, 40);
assert.equal(dialog.closed, 0);
});
test("the Workflow Note popup closes on a backdrop click", () => {
const source = readFileSync(new URL("../js/workflow_note/index.js", import.meta.url), "utf8");
const reader = source.slice(source.indexOf('el("dialog", "ausboss-note-reader")'), source.indexOf("dialog.showModal()"));
assert.match(reader, /closeOnBackdropClick\(dialog\)/);
});
+473
View File
@@ -0,0 +1,473 @@
{"about":"Load Image size plans. nodes/_load_image_helpers.py made these; js/shared/load_size.mjs must give the same.",
"columns":["source_width", "source_height", "size", "megapixels", "longest_side", "scale", "width", "height", "multiple", "enlarge", "crop_from", "ratio", "resize_width", "resize_height", "crop_x", "crop_y", "out_width", "out_height"],
"rows":[
[912,1632,"off",1.0,1024,1.0,1024,1024,1,true,"center","1:1",912,1632,0,0,912,1632],
[912,1632,"off",1.0,1024,1.0,1024,1024,16,true,"center","1:1",912,1632,0,0,912,1632],
[912,1632,"megapixels",0.25,1024,1.0,1024,1024,1,true,"center","1:1",374,669,0,0,374,669],
[912,1632,"megapixels",2.0,1024,1.0,1024,1024,1,true,"center","1:1",1057,1892,0,0,1057,1892],
[912,1632,"longest side",1.0,1000,1.0,1024,1024,1,true,"center","1:1",559,1000,0,0,559,1000],
[912,1632,"longest side",1.0,2048,1.0,1024,1024,1,true,"center","1:1",1144,2048,0,0,1144,2048],
[912,1632,"scale",1.0,1024,0.33,1024,1024,1,true,"center","1:1",301,539,0,0,301,539],
[912,1632,"scale",1.0,1024,1.5,1024,1024,1,true,"center","1:1",1368,2448,0,0,1368,2448],
[912,1632,"fit inside",1.0,1024,1.0,1024,1024,1,true,"center","1:1",572,1024,0,0,572,1024],
[912,1632,"crop to fill",1.0,1024,1.0,1024,1024,1,true,"center","1:1",1024,1833,0,404,1024,1024],
[912,1632,"fit inside",1.0,1024,1.0,1280,720,1,true,"center","1:1",402,720,0,0,402,720],
[912,1632,"crop to fill",1.0,1024,1.0,1280,720,1,true,"center","1:1",1280,2291,0,785,1280,720],
[912,1632,"fit inside",1.0,1024,1.0,1000,600,1,true,"center","1:1",335,600,0,0,335,600],
[912,1632,"crop to fill",1.0,1024,1.0,1000,600,1,true,"center","1:1",1000,1790,0,595,1000,600],
[912,1632,"megapixels",0.25,1024,1.0,1024,1024,1,false,"center","1:1",374,669,0,0,374,669],
[912,1632,"megapixels",2.0,1024,1.0,1024,1024,1,false,"center","1:1",912,1632,0,0,912,1632],
[912,1632,"longest side",1.0,1000,1.0,1024,1024,1,false,"center","1:1",559,1000,0,0,559,1000],
[912,1632,"longest side",1.0,2048,1.0,1024,1024,1,false,"center","1:1",912,1632,0,0,912,1632],
[912,1632,"scale",1.0,1024,0.33,1024,1024,1,false,"center","1:1",301,539,0,0,301,539],
[912,1632,"scale",1.0,1024,1.5,1024,1024,1,false,"center","1:1",912,1632,0,0,912,1632],
[912,1632,"fit inside",1.0,1024,1.0,1024,1024,1,false,"center","1:1",572,1024,0,0,572,1024],
[912,1632,"crop to fill",1.0,1024,1.0,1024,1024,1,false,"center","1:1",912,1632,0,360,912,912],
[912,1632,"fit inside",1.0,1024,1.0,1280,720,1,false,"center","1:1",402,720,0,0,402,720],
[912,1632,"crop to fill",1.0,1024,1.0,1280,720,1,false,"center","1:1",912,1632,0,559,912,513],
[912,1632,"fit inside",1.0,1024,1.0,1000,600,1,false,"center","1:1",335,600,0,0,335,600],
[912,1632,"crop to fill",1.0,1024,1.0,1000,600,1,false,"center","1:1",912,1632,0,542,912,547],
[912,1632,"megapixels",0.25,1024,1.0,1024,1024,16,true,"center","1:1",368,672,0,0,368,672],
[912,1632,"megapixels",2.0,1024,1.0,1024,1024,16,true,"center","1:1",1056,1888,0,0,1056,1888],
[912,1632,"longest side",1.0,1000,1.0,1024,1024,16,true,"center","1:1",560,1008,0,0,560,1008],
[912,1632,"longest side",1.0,2048,1.0,1024,1024,16,true,"center","1:1",1152,2048,0,0,1152,2048],
[912,1632,"scale",1.0,1024,0.33,1024,1024,16,true,"center","1:1",304,544,0,0,304,544],
[912,1632,"scale",1.0,1024,1.5,1024,1024,16,true,"center","1:1",1376,2448,0,0,1376,2448],
[912,1632,"fit inside",1.0,1024,1.0,1024,1024,16,true,"center","1:1",576,1024,0,0,576,1024],
[912,1632,"crop to fill",1.0,1024,1.0,1024,1024,16,true,"center","1:1",1024,1833,0,404,1024,1024],
[912,1632,"fit inside",1.0,1024,1.0,1280,720,16,true,"center","1:1",400,720,0,0,400,720],
[912,1632,"crop to fill",1.0,1024,1.0,1280,720,16,true,"center","1:1",1280,2291,0,785,1280,720],
[912,1632,"fit inside",1.0,1024,1.0,1000,600,16,true,"center","1:1",336,592,0,0,336,592],
[912,1632,"crop to fill",1.0,1024,1.0,1000,600,16,true,"center","1:1",1008,1804,0,598,1008,608],
[912,1632,"megapixels",0.25,1024,1.0,1024,1024,16,false,"center","1:1",368,672,0,0,368,672],
[912,1632,"megapixels",2.0,1024,1.0,1024,1024,16,false,"center","1:1",912,1632,0,0,912,1632],
[912,1632,"longest side",1.0,1000,1.0,1024,1024,16,false,"center","1:1",560,1008,0,0,560,1008],
[912,1632,"longest side",1.0,2048,1.0,1024,1024,16,false,"center","1:1",912,1632,0,0,912,1632],
[912,1632,"scale",1.0,1024,0.33,1024,1024,16,false,"center","1:1",304,544,0,0,304,544],
[912,1632,"scale",1.0,1024,1.5,1024,1024,16,false,"center","1:1",912,1632,0,0,912,1632],
[912,1632,"fit inside",1.0,1024,1.0,1024,1024,16,false,"center","1:1",576,1024,0,0,576,1024],
[912,1632,"crop to fill",1.0,1024,1.0,1024,1024,16,false,"center","1:1",912,1632,0,360,912,912],
[912,1632,"fit inside",1.0,1024,1.0,1280,720,16,false,"center","1:1",400,720,0,0,400,720],
[912,1632,"crop to fill",1.0,1024,1.0,1280,720,16,false,"center","1:1",912,1632,0,560,912,512],
[912,1632,"fit inside",1.0,1024,1.0,1000,600,16,false,"center","1:1",336,592,0,0,336,592],
[912,1632,"crop to fill",1.0,1024,1.0,1000,600,16,false,"center","1:1",912,1632,0,544,912,544],
[1920,1080,"off",1.0,1024,1.0,1024,1024,1,true,"center","1:1",1920,1080,0,0,1920,1080],
[1920,1080,"off",1.0,1024,1.0,1024,1024,16,true,"center","1:1",1920,1080,0,0,1920,1080],
[1920,1080,"megapixels",0.25,1024,1.0,1024,1024,1,true,"center","1:1",667,375,0,0,667,375],
[1920,1080,"megapixels",2.0,1024,1.0,1024,1024,1,true,"center","1:1",1886,1061,0,0,1886,1061],
[1920,1080,"longest side",1.0,1000,1.0,1024,1024,1,true,"center","1:1",1000,563,0,0,1000,563],
[1920,1080,"longest side",1.0,2048,1.0,1024,1024,1,true,"center","1:1",2048,1152,0,0,2048,1152],
[1920,1080,"scale",1.0,1024,0.33,1024,1024,1,true,"center","1:1",634,356,0,0,634,356],
[1920,1080,"scale",1.0,1024,1.5,1024,1024,1,true,"center","1:1",2880,1620,0,0,2880,1620],
[1920,1080,"fit inside",1.0,1024,1.0,1024,1024,1,true,"center","1:1",1024,576,0,0,1024,576],
[1920,1080,"crop to fill",1.0,1024,1.0,1024,1024,1,true,"center","1:1",1821,1024,398,0,1024,1024],
[1920,1080,"fit inside",1.0,1024,1.0,1280,720,1,true,"center","1:1",1280,720,0,0,1280,720],
[1920,1080,"crop to fill",1.0,1024,1.0,1280,720,1,true,"center","1:1",1280,720,0,0,1280,720],
[1920,1080,"fit inside",1.0,1024,1.0,1000,600,1,true,"center","1:1",1000,563,0,0,1000,563],
[1920,1080,"crop to fill",1.0,1024,1.0,1000,600,1,true,"center","1:1",1067,600,33,0,1000,600],
[1920,1080,"megapixels",0.25,1024,1.0,1024,1024,1,false,"center","1:1",667,375,0,0,667,375],
[1920,1080,"megapixels",2.0,1024,1.0,1024,1024,1,false,"center","1:1",1886,1061,0,0,1886,1061],
[1920,1080,"longest side",1.0,1000,1.0,1024,1024,1,false,"center","1:1",1000,563,0,0,1000,563],
[1920,1080,"longest side",1.0,2048,1.0,1024,1024,1,false,"center","1:1",1920,1080,0,0,1920,1080],
[1920,1080,"scale",1.0,1024,0.33,1024,1024,1,false,"center","1:1",634,356,0,0,634,356],
[1920,1080,"scale",1.0,1024,1.5,1024,1024,1,false,"center","1:1",1920,1080,0,0,1920,1080],
[1920,1080,"fit inside",1.0,1024,1.0,1024,1024,1,false,"center","1:1",1024,576,0,0,1024,576],
[1920,1080,"crop to fill",1.0,1024,1.0,1024,1024,1,false,"center","1:1",1821,1024,398,0,1024,1024],
[1920,1080,"fit inside",1.0,1024,1.0,1280,720,1,false,"center","1:1",1280,720,0,0,1280,720],
[1920,1080,"crop to fill",1.0,1024,1.0,1280,720,1,false,"center","1:1",1280,720,0,0,1280,720],
[1920,1080,"fit inside",1.0,1024,1.0,1000,600,1,false,"center","1:1",1000,563,0,0,1000,563],
[1920,1080,"crop to fill",1.0,1024,1.0,1000,600,1,false,"center","1:1",1067,600,33,0,1000,600],
[1920,1080,"megapixels",0.25,1024,1.0,1024,1024,16,true,"center","1:1",672,368,0,0,672,368],
[1920,1080,"megapixels",2.0,1024,1.0,1024,1024,16,true,"center","1:1",1888,1056,0,0,1888,1056],
[1920,1080,"longest side",1.0,1000,1.0,1024,1024,16,true,"center","1:1",1008,560,0,0,1008,560],
[1920,1080,"longest side",1.0,2048,1.0,1024,1024,16,true,"center","1:1",2048,1152,0,0,2048,1152],
[1920,1080,"scale",1.0,1024,0.33,1024,1024,16,true,"center","1:1",640,352,0,0,640,352],
[1920,1080,"scale",1.0,1024,1.5,1024,1024,16,true,"center","1:1",2880,1616,0,0,2880,1616],
[1920,1080,"fit inside",1.0,1024,1.0,1024,1024,16,true,"center","1:1",1024,576,0,0,1024,576],
[1920,1080,"crop to fill",1.0,1024,1.0,1024,1024,16,true,"center","1:1",1821,1024,398,0,1024,1024],
[1920,1080,"fit inside",1.0,1024,1.0,1280,720,16,true,"center","1:1",1280,720,0,0,1280,720],
[1920,1080,"crop to fill",1.0,1024,1.0,1280,720,16,true,"center","1:1",1280,720,0,0,1280,720],
[1920,1080,"fit inside",1.0,1024,1.0,1000,600,16,true,"center","1:1",992,560,0,0,992,560],
[1920,1080,"crop to fill",1.0,1024,1.0,1000,600,16,true,"center","1:1",1081,608,36,0,1008,608],
[1920,1080,"megapixels",0.25,1024,1.0,1024,1024,16,false,"center","1:1",672,368,0,0,672,368],
[1920,1080,"megapixels",2.0,1024,1.0,1024,1024,16,false,"center","1:1",1888,1056,0,0,1888,1056],
[1920,1080,"longest side",1.0,1000,1.0,1024,1024,16,false,"center","1:1",1008,560,0,0,1008,560],
[1920,1080,"longest side",1.0,2048,1.0,1024,1024,16,false,"center","1:1",1920,1072,0,0,1920,1072],
[1920,1080,"scale",1.0,1024,0.33,1024,1024,16,false,"center","1:1",640,352,0,0,640,352],
[1920,1080,"scale",1.0,1024,1.5,1024,1024,16,false,"center","1:1",1920,1072,0,0,1920,1072],
[1920,1080,"fit inside",1.0,1024,1.0,1024,1024,16,false,"center","1:1",1024,576,0,0,1024,576],
[1920,1080,"crop to fill",1.0,1024,1.0,1024,1024,16,false,"center","1:1",1821,1024,398,0,1024,1024],
[1920,1080,"fit inside",1.0,1024,1.0,1280,720,16,false,"center","1:1",1280,720,0,0,1280,720],
[1920,1080,"crop to fill",1.0,1024,1.0,1280,720,16,false,"center","1:1",1280,720,0,0,1280,720],
[1920,1080,"fit inside",1.0,1024,1.0,1000,600,16,false,"center","1:1",992,560,0,0,992,560],
[1920,1080,"crop to fill",1.0,1024,1.0,1000,600,16,false,"center","1:1",1053,592,30,0,992,592],
[640,480,"off",1.0,1024,1.0,1024,1024,1,true,"center","1:1",640,480,0,0,640,480],
[640,480,"off",1.0,1024,1.0,1024,1024,16,true,"center","1:1",640,480,0,0,640,480],
[640,480,"megapixels",0.25,1024,1.0,1024,1024,1,true,"center","1:1",577,433,0,0,577,433],
[640,480,"megapixels",2.0,1024,1.0,1024,1024,1,true,"center","1:1",1633,1225,0,0,1633,1225],
[640,480,"longest side",1.0,1000,1.0,1024,1024,1,true,"center","1:1",1000,750,0,0,1000,750],
[640,480,"longest side",1.0,2048,1.0,1024,1024,1,true,"center","1:1",2048,1536,0,0,2048,1536],
[640,480,"scale",1.0,1024,0.33,1024,1024,1,true,"center","1:1",211,158,0,0,211,158],
[640,480,"scale",1.0,1024,1.5,1024,1024,1,true,"center","1:1",960,720,0,0,960,720],
[640,480,"fit inside",1.0,1024,1.0,1024,1024,1,true,"center","1:1",1024,768,0,0,1024,768],
[640,480,"crop to fill",1.0,1024,1.0,1024,1024,1,true,"center","1:1",1366,1024,171,0,1024,1024],
[640,480,"fit inside",1.0,1024,1.0,1280,720,1,true,"center","1:1",960,720,0,0,960,720],
[640,480,"crop to fill",1.0,1024,1.0,1280,720,1,true,"center","1:1",1280,960,0,120,1280,720],
[640,480,"fit inside",1.0,1024,1.0,1000,600,1,true,"center","1:1",800,600,0,0,800,600],
[640,480,"crop to fill",1.0,1024,1.0,1000,600,1,true,"center","1:1",1000,750,0,75,1000,600],
[640,480,"megapixels",0.25,1024,1.0,1024,1024,1,false,"center","1:1",577,433,0,0,577,433],
[640,480,"megapixels",2.0,1024,1.0,1024,1024,1,false,"center","1:1",640,480,0,0,640,480],
[640,480,"longest side",1.0,1000,1.0,1024,1024,1,false,"center","1:1",640,480,0,0,640,480],
[640,480,"longest side",1.0,2048,1.0,1024,1024,1,false,"center","1:1",640,480,0,0,640,480],
[640,480,"scale",1.0,1024,0.33,1024,1024,1,false,"center","1:1",211,158,0,0,211,158],
[640,480,"scale",1.0,1024,1.5,1024,1024,1,false,"center","1:1",640,480,0,0,640,480],
[640,480,"fit inside",1.0,1024,1.0,1024,1024,1,false,"center","1:1",640,480,0,0,640,480],
[640,480,"crop to fill",1.0,1024,1.0,1024,1024,1,false,"center","1:1",640,480,80,0,480,480],
[640,480,"fit inside",1.0,1024,1.0,1280,720,1,false,"center","1:1",640,480,0,0,640,480],
[640,480,"crop to fill",1.0,1024,1.0,1280,720,1,false,"center","1:1",640,480,0,60,640,360],
[640,480,"fit inside",1.0,1024,1.0,1000,600,1,false,"center","1:1",640,480,0,0,640,480],
[640,480,"crop to fill",1.0,1024,1.0,1000,600,1,false,"center","1:1",640,480,0,48,640,384],
[640,480,"megapixels",0.25,1024,1.0,1024,1024,16,true,"center","1:1",576,432,0,0,576,432],
[640,480,"megapixels",2.0,1024,1.0,1024,1024,16,true,"center","1:1",1632,1232,0,0,1632,1232],
[640,480,"longest side",1.0,1000,1.0,1024,1024,16,true,"center","1:1",1008,752,0,0,1008,752],
[640,480,"longest side",1.0,2048,1.0,1024,1024,16,true,"center","1:1",2048,1536,0,0,2048,1536],
[640,480,"scale",1.0,1024,0.33,1024,1024,16,true,"center","1:1",208,160,0,0,208,160],
[640,480,"scale",1.0,1024,1.5,1024,1024,16,true,"center","1:1",960,720,0,0,960,720],
[640,480,"fit inside",1.0,1024,1.0,1024,1024,16,true,"center","1:1",1024,768,0,0,1024,768],
[640,480,"crop to fill",1.0,1024,1.0,1024,1024,16,true,"center","1:1",1366,1024,171,0,1024,1024],
[640,480,"fit inside",1.0,1024,1.0,1280,720,16,true,"center","1:1",960,720,0,0,960,720],
[640,480,"crop to fill",1.0,1024,1.0,1280,720,16,true,"center","1:1",1280,960,0,120,1280,720],
[640,480,"fit inside",1.0,1024,1.0,1000,600,16,true,"center","1:1",800,592,0,0,800,592],
[640,480,"crop to fill",1.0,1024,1.0,1000,600,16,true,"center","1:1",1008,756,0,74,1008,608],
[640,480,"megapixels",0.25,1024,1.0,1024,1024,16,false,"center","1:1",576,432,0,0,576,432],
[640,480,"megapixels",2.0,1024,1.0,1024,1024,16,false,"center","1:1",640,480,0,0,640,480],
[640,480,"longest side",1.0,1000,1.0,1024,1024,16,false,"center","1:1",640,480,0,0,640,480],
[640,480,"longest side",1.0,2048,1.0,1024,1024,16,false,"center","1:1",640,480,0,0,640,480],
[640,480,"scale",1.0,1024,0.33,1024,1024,16,false,"center","1:1",208,160,0,0,208,160],
[640,480,"scale",1.0,1024,1.5,1024,1024,16,false,"center","1:1",640,480,0,0,640,480],
[640,480,"fit inside",1.0,1024,1.0,1024,1024,16,false,"center","1:1",640,480,0,0,640,480],
[640,480,"crop to fill",1.0,1024,1.0,1024,1024,16,false,"center","1:1",640,480,80,0,480,480],
[640,480,"fit inside",1.0,1024,1.0,1280,720,16,false,"center","1:1",640,480,0,0,640,480],
[640,480,"crop to fill",1.0,1024,1.0,1280,720,16,false,"center","1:1",640,480,0,64,640,352],
[640,480,"fit inside",1.0,1024,1.0,1000,600,16,false,"center","1:1",640,480,0,0,640,480],
[640,480,"crop to fill",1.0,1024,1.0,1000,600,16,false,"center","1:1",640,480,0,48,640,384],
[333,777,"off",1.0,1024,1.0,1024,1024,1,true,"center","1:1",333,777,0,0,333,777],
[333,777,"off",1.0,1024,1.0,1024,1024,16,true,"center","1:1",333,777,0,0,333,777],
[333,777,"megapixels",0.25,1024,1.0,1024,1024,1,true,"center","1:1",327,764,0,0,327,764],
[333,777,"megapixels",2.0,1024,1.0,1024,1024,1,true,"center","1:1",926,2160,0,0,926,2160],
[333,777,"longest side",1.0,1000,1.0,1024,1024,1,true,"center","1:1",429,1000,0,0,429,1000],
[333,777,"longest side",1.0,2048,1.0,1024,1024,1,true,"center","1:1",878,2048,0,0,878,2048],
[333,777,"scale",1.0,1024,0.33,1024,1024,1,true,"center","1:1",110,256,0,0,110,256],
[333,777,"scale",1.0,1024,1.5,1024,1024,1,true,"center","1:1",500,1166,0,0,500,1166],
[333,777,"fit inside",1.0,1024,1.0,1024,1024,1,true,"center","1:1",439,1024,0,0,439,1024],
[333,777,"crop to fill",1.0,1024,1.0,1024,1024,1,true,"center","1:1",1024,2390,0,683,1024,1024],
[333,777,"fit inside",1.0,1024,1.0,1280,720,1,true,"center","1:1",309,720,0,0,309,720],
[333,777,"crop to fill",1.0,1024,1.0,1280,720,1,true,"center","1:1",1280,2987,0,1133,1280,720],
[333,777,"fit inside",1.0,1024,1.0,1000,600,1,true,"center","1:1",257,600,0,0,257,600],
[333,777,"crop to fill",1.0,1024,1.0,1000,600,1,true,"center","1:1",1000,2334,0,867,1000,600],
[333,777,"megapixels",0.25,1024,1.0,1024,1024,1,false,"center","1:1",327,764,0,0,327,764],
[333,777,"megapixels",2.0,1024,1.0,1024,1024,1,false,"center","1:1",333,777,0,0,333,777],
[333,777,"longest side",1.0,1000,1.0,1024,1024,1,false,"center","1:1",333,777,0,0,333,777],
[333,777,"longest side",1.0,2048,1.0,1024,1024,1,false,"center","1:1",333,777,0,0,333,777],
[333,777,"scale",1.0,1024,0.33,1024,1024,1,false,"center","1:1",110,256,0,0,110,256],
[333,777,"scale",1.0,1024,1.5,1024,1024,1,false,"center","1:1",333,777,0,0,333,777],
[333,777,"fit inside",1.0,1024,1.0,1024,1024,1,false,"center","1:1",333,777,0,0,333,777],
[333,777,"crop to fill",1.0,1024,1.0,1024,1024,1,false,"center","1:1",333,777,0,222,333,333],
[333,777,"fit inside",1.0,1024,1.0,1280,720,1,false,"center","1:1",309,720,0,0,309,720],
[333,777,"crop to fill",1.0,1024,1.0,1280,720,1,false,"center","1:1",333,777,0,295,333,187],
[333,777,"fit inside",1.0,1024,1.0,1000,600,1,false,"center","1:1",257,600,0,0,257,600],
[333,777,"crop to fill",1.0,1024,1.0,1000,600,1,false,"center","1:1",333,777,0,289,333,199],
[333,777,"megapixels",0.25,1024,1.0,1024,1024,16,true,"center","1:1",320,768,0,0,320,768],
[333,777,"megapixels",2.0,1024,1.0,1024,1024,16,true,"center","1:1",928,2160,0,0,928,2160],
[333,777,"longest side",1.0,1000,1.0,1024,1024,16,true,"center","1:1",432,1008,0,0,432,1008],
[333,777,"longest side",1.0,2048,1.0,1024,1024,16,true,"center","1:1",880,2048,0,0,880,2048],
[333,777,"scale",1.0,1024,0.33,1024,1024,16,true,"center","1:1",112,256,0,0,112,256],
[333,777,"scale",1.0,1024,1.5,1024,1024,16,true,"center","1:1",496,1168,0,0,496,1168],
[333,777,"fit inside",1.0,1024,1.0,1024,1024,16,true,"center","1:1",432,1024,0,0,432,1024],
[333,777,"crop to fill",1.0,1024,1.0,1024,1024,16,true,"center","1:1",1024,2390,0,683,1024,1024],
[333,777,"fit inside",1.0,1024,1.0,1280,720,16,true,"center","1:1",304,720,0,0,304,720],
[333,777,"crop to fill",1.0,1024,1.0,1280,720,16,true,"center","1:1",1280,2987,0,1133,1280,720],
[333,777,"fit inside",1.0,1024,1.0,1000,600,16,true,"center","1:1",256,592,0,0,256,592],
[333,777,"crop to fill",1.0,1024,1.0,1000,600,16,true,"center","1:1",1008,2352,0,872,1008,608],
[333,777,"megapixels",0.25,1024,1.0,1024,1024,16,false,"center","1:1",320,768,0,0,320,768],
[333,777,"megapixels",2.0,1024,1.0,1024,1024,16,false,"center","1:1",320,768,0,0,320,768],
[333,777,"longest side",1.0,1000,1.0,1024,1024,16,false,"center","1:1",320,768,0,0,320,768],
[333,777,"longest side",1.0,2048,1.0,1024,1024,16,false,"center","1:1",320,768,0,0,320,768],
[333,777,"scale",1.0,1024,0.33,1024,1024,16,false,"center","1:1",112,256,0,0,112,256],
[333,777,"scale",1.0,1024,1.5,1024,1024,16,false,"center","1:1",320,768,0,0,320,768],
[333,777,"fit inside",1.0,1024,1.0,1024,1024,16,false,"center","1:1",320,768,0,0,320,768],
[333,777,"crop to fill",1.0,1024,1.0,1024,1024,16,false,"center","1:1",320,747,0,213,320,320],
[333,777,"fit inside",1.0,1024,1.0,1280,720,16,false,"center","1:1",304,720,0,0,304,720],
[333,777,"crop to fill",1.0,1024,1.0,1280,720,16,false,"center","1:1",320,747,0,285,320,176],
[333,777,"fit inside",1.0,1024,1.0,1000,600,16,false,"center","1:1",256,592,0,0,256,592],
[333,777,"crop to fill",1.0,1024,1.0,1000,600,16,false,"center","1:1",320,747,0,277,320,192],
[8192,5464,"off",1.0,1024,1.0,1024,1024,1,true,"center","1:1",8192,5464,0,0,8192,5464],
[8192,5464,"off",1.0,1024,1.0,1024,1024,16,true,"center","1:1",8192,5464,0,0,8192,5464],
[8192,5464,"megapixels",0.25,1024,1.0,1024,1024,1,true,"center","1:1",612,408,0,0,612,408],
[8192,5464,"megapixels",2.0,1024,1.0,1024,1024,1,true,"center","1:1",1732,1155,0,0,1732,1155],
[8192,5464,"longest side",1.0,1000,1.0,1024,1024,1,true,"center","1:1",1000,667,0,0,1000,667],
[8192,5464,"longest side",1.0,2048,1.0,1024,1024,1,true,"center","1:1",2048,1366,0,0,2048,1366],
[8192,5464,"scale",1.0,1024,0.33,1024,1024,1,true,"center","1:1",2703,1803,0,0,2703,1803],
[8192,5464,"scale",1.0,1024,1.5,1024,1024,1,true,"center","1:1",12288,8196,0,0,12288,8196],
[8192,5464,"fit inside",1.0,1024,1.0,1024,1024,1,true,"center","1:1",1024,683,0,0,1024,683],
[8192,5464,"crop to fill",1.0,1024,1.0,1024,1024,1,true,"center","1:1",1536,1024,256,0,1024,1024],
[8192,5464,"fit inside",1.0,1024,1.0,1280,720,1,true,"center","1:1",1079,720,0,0,1079,720],
[8192,5464,"crop to fill",1.0,1024,1.0,1280,720,1,true,"center","1:1",1280,854,0,67,1280,720],
[8192,5464,"fit inside",1.0,1024,1.0,1000,600,1,true,"center","1:1",900,600,0,0,900,600],
[8192,5464,"crop to fill",1.0,1024,1.0,1000,600,1,true,"center","1:1",1000,667,0,33,1000,600],
[8192,5464,"megapixels",0.25,1024,1.0,1024,1024,1,false,"center","1:1",612,408,0,0,612,408],
[8192,5464,"megapixels",2.0,1024,1.0,1024,1024,1,false,"center","1:1",1732,1155,0,0,1732,1155],
[8192,5464,"longest side",1.0,1000,1.0,1024,1024,1,false,"center","1:1",1000,667,0,0,1000,667],
[8192,5464,"longest side",1.0,2048,1.0,1024,1024,1,false,"center","1:1",2048,1366,0,0,2048,1366],
[8192,5464,"scale",1.0,1024,0.33,1024,1024,1,false,"center","1:1",2703,1803,0,0,2703,1803],
[8192,5464,"scale",1.0,1024,1.5,1024,1024,1,false,"center","1:1",8192,5464,0,0,8192,5464],
[8192,5464,"fit inside",1.0,1024,1.0,1024,1024,1,false,"center","1:1",1024,683,0,0,1024,683],
[8192,5464,"crop to fill",1.0,1024,1.0,1024,1024,1,false,"center","1:1",1536,1024,256,0,1024,1024],
[8192,5464,"fit inside",1.0,1024,1.0,1280,720,1,false,"center","1:1",1079,720,0,0,1079,720],
[8192,5464,"crop to fill",1.0,1024,1.0,1280,720,1,false,"center","1:1",1280,854,0,67,1280,720],
[8192,5464,"fit inside",1.0,1024,1.0,1000,600,1,false,"center","1:1",900,600,0,0,900,600],
[8192,5464,"crop to fill",1.0,1024,1.0,1000,600,1,false,"center","1:1",1000,667,0,33,1000,600],
[8192,5464,"megapixels",0.25,1024,1.0,1024,1024,16,true,"center","1:1",608,416,0,0,608,416],
[8192,5464,"megapixels",2.0,1024,1.0,1024,1024,16,true,"center","1:1",1728,1152,0,0,1728,1152],
[8192,5464,"longest side",1.0,1000,1.0,1024,1024,16,true,"center","1:1",1008,672,0,0,1008,672],
[8192,5464,"longest side",1.0,2048,1.0,1024,1024,16,true,"center","1:1",2048,1360,0,0,2048,1360],
[8192,5464,"scale",1.0,1024,0.33,1024,1024,16,true,"center","1:1",2704,1808,0,0,2704,1808],
[8192,5464,"scale",1.0,1024,1.5,1024,1024,16,true,"center","1:1",12288,8192,0,0,12288,8192],
[8192,5464,"fit inside",1.0,1024,1.0,1024,1024,16,true,"center","1:1",1024,688,0,0,1024,688],
[8192,5464,"crop to fill",1.0,1024,1.0,1024,1024,16,true,"center","1:1",1536,1024,256,0,1024,1024],
[8192,5464,"fit inside",1.0,1024,1.0,1280,720,16,true,"center","1:1",1072,720,0,0,1072,720],
[8192,5464,"crop to fill",1.0,1024,1.0,1280,720,16,true,"center","1:1",1280,854,0,67,1280,720],
[8192,5464,"fit inside",1.0,1024,1.0,1000,600,16,true,"center","1:1",896,592,0,0,896,592],
[8192,5464,"crop to fill",1.0,1024,1.0,1000,600,16,true,"center","1:1",1008,673,0,32,1008,608],
[8192,5464,"megapixels",0.25,1024,1.0,1024,1024,16,false,"center","1:1",608,416,0,0,608,416],
[8192,5464,"megapixels",2.0,1024,1.0,1024,1024,16,false,"center","1:1",1728,1152,0,0,1728,1152],
[8192,5464,"longest side",1.0,1000,1.0,1024,1024,16,false,"center","1:1",1008,672,0,0,1008,672],
[8192,5464,"longest side",1.0,2048,1.0,1024,1024,16,false,"center","1:1",2048,1360,0,0,2048,1360],
[8192,5464,"scale",1.0,1024,0.33,1024,1024,16,false,"center","1:1",2704,1808,0,0,2704,1808],
[8192,5464,"scale",1.0,1024,1.5,1024,1024,16,false,"center","1:1",8192,5456,0,0,8192,5456],
[8192,5464,"fit inside",1.0,1024,1.0,1024,1024,16,false,"center","1:1",1024,688,0,0,1024,688],
[8192,5464,"crop to fill",1.0,1024,1.0,1024,1024,16,false,"center","1:1",1536,1024,256,0,1024,1024],
[8192,5464,"fit inside",1.0,1024,1.0,1280,720,16,false,"center","1:1",1072,720,0,0,1072,720],
[8192,5464,"crop to fill",1.0,1024,1.0,1280,720,16,false,"center","1:1",1280,854,0,67,1280,720],
[8192,5464,"fit inside",1.0,1024,1.0,1000,600,16,false,"center","1:1",896,592,0,0,896,592],
[8192,5464,"crop to fill",1.0,1024,1.0,1000,600,16,false,"center","1:1",992,662,0,35,992,592],
[1000,1000,"longest side",1.0,1000,1.0,1024,1024,64,true,"center","1:1",1024,1024,0,0,1024,1024],
[30,20,"megapixels",1.0,1024,1.0,1024,1024,64,false,"center","1:1",64,64,0,0,64,64],
[912,1632,"crop to fill",1.0,1024,1.0,1024,768,8,true,"center","1:1",1024,1833,0,532,1024,768],
[912,1632,"crop",1.0,1024,1.0,513,300,8,true,"center","1:1",912,1632,200,668,512,296],
[912,1632,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"center","4:3",912,1632,0,476,912,680],
[912,1632,"crop to fill",1.0,1024,1.0,1024,1024,16,true,"top","1:1",1024,1833,0,0,1024,1024],
[912,1632,"crop",1.0,1024,1.0,4096,512,64,true,"top","1:1",912,1632,8,0,896,512],
[912,1632,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"top","3:4",912,1632,0,0,912,1216],
[912,1632,"crop to fill",1.0,1024,1.0,1024,768,1,true,"bottom","1:1",1024,1833,0,1065,1024,768],
[912,1632,"crop",1.0,1024,1.0,768,768,1,true,"bottom","1:1",912,1632,72,864,768,768],
[912,1632,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"bottom","3:2",912,1632,0,1024,912,608],
[912,1632,"crop to fill",1.0,1024,1.0,1024,1024,8,false,"left","1:1",912,1632,0,360,912,912],
[912,1632,"crop",1.0,1024,1.0,513,300,8,true,"left","1:1",912,1632,0,668,512,296],
[912,1632,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"left","2:3",912,1632,0,132,912,1368],
[912,1632,"crop to fill",1.0,1024,1.0,1024,768,16,true,"right","1:1",1024,1833,0,532,1024,768],
[912,1632,"crop",1.0,1024,1.0,4096,512,64,true,"right","1:1",912,1632,16,560,896,512],
[912,1632,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"right","16:9",912,1632,0,560,912,512],
[912,1632,"crop to fill",1.0,1024,1.0,1024,1024,1,true,"top left","1:1",1024,1833,0,0,1024,1024],
[912,1632,"crop",1.0,1024,1.0,768,768,1,true,"top left","1:1",912,1632,0,0,768,768],
[912,1632,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"top left","9:16",912,1632,0,0,912,1621],
[912,1632,"crop to fill",1.0,1024,1.0,1024,768,8,true,"top right","1:1",1024,1833,0,0,1024,768],
[912,1632,"crop",1.0,1024,1.0,513,300,8,true,"top right","1:1",912,1632,400,0,512,296],
[912,1632,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"top right","5:4",912,1632,0,0,912,728],
[912,1632,"crop to fill",1.0,1024,1.0,1024,1024,16,false,"bottom left","1:1",912,1632,0,720,912,912],
[912,1632,"crop",1.0,1024,1.0,4096,512,64,true,"bottom left","1:1",912,1632,0,1120,896,512],
[912,1632,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"bottom left","4:5",912,1632,0,496,912,1136],
[912,1632,"crop to fill",1.0,1024,1.0,1024,768,1,true,"bottom right","1:1",1024,1833,0,1065,1024,768],
[912,1632,"crop",1.0,1024,1.0,768,768,1,true,"bottom right","1:1",912,1632,144,864,768,768],
[912,1632,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"bottom right","21:9",912,1632,0,1241,912,391],
[1920,1080,"crop to fill",1.0,1024,1.0,1024,1024,8,true,"center","1:1",1821,1024,398,0,1024,1024],
[1920,1080,"crop",1.0,1024,1.0,513,300,8,true,"center","1:1",1920,1080,704,392,512,296],
[1920,1080,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"center","9:21",1920,1080,732,0,456,1080],
[1920,1080,"crop to fill",1.0,1024,1.0,1024,768,16,true,"top","1:1",1366,768,171,0,1024,768],
[1920,1080,"crop",1.0,1024,1.0,4096,512,64,true,"top","1:1",1920,1080,0,0,1920,512],
[1920,1080,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"top","2:1",1920,1080,0,0,1920,960],
[1920,1080,"crop to fill",1.0,1024,1.0,1024,1024,1,false,"bottom","1:1",1821,1024,398,0,1024,1024],
[1920,1080,"crop",1.0,1024,1.0,768,768,1,true,"bottom","1:1",1920,1080,576,312,768,768],
[1920,1080,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"bottom","1:2",1920,1080,690,0,540,1080],
[1920,1080,"crop to fill",1.0,1024,1.0,1024,768,8,true,"left","1:1",1366,768,0,0,1024,768],
[1920,1080,"crop",1.0,1024,1.0,513,300,8,true,"left","1:1",1920,1080,0,392,512,296],
[1920,1080,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"left","width : height",1920,1080,0,0,1920,1080],
[1920,1080,"crop to fill",1.0,1024,1.0,1024,1024,16,true,"right","1:1",1821,1024,797,0,1024,1024],
[1920,1080,"crop",1.0,1024,1.0,4096,512,64,true,"right","1:1",1920,1080,0,284,1920,512],
[1920,1080,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"right","1:1",1920,1080,848,4,1072,1072],
[1920,1080,"crop to fill",1.0,1024,1.0,1024,768,1,true,"top left","1:1",1366,768,0,0,1024,768],
[1920,1080,"crop",1.0,1024,1.0,768,768,1,true,"top left","1:1",1920,1080,0,0,768,768],
[1920,1080,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"top left","4:3",1920,1080,0,0,1440,1080],
[1920,1080,"crop to fill",1.0,1024,1.0,1024,1024,8,false,"top right","1:1",1821,1024,797,0,1024,1024],
[1920,1080,"crop",1.0,1024,1.0,513,300,8,true,"top right","1:1",1920,1080,1408,0,512,296],
[1920,1080,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"top right","3:4",1920,1080,1112,0,808,1080],
[1920,1080,"crop to fill",1.0,1024,1.0,1024,768,16,true,"bottom left","1:1",1366,768,0,0,1024,768],
[1920,1080,"crop",1.0,1024,1.0,4096,512,64,true,"bottom left","1:1",1920,1080,0,568,1920,512],
[1920,1080,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"bottom left","3:2",1920,1080,0,8,1616,1072],
[1920,1080,"crop to fill",1.0,1024,1.0,1024,1024,1,true,"bottom right","1:1",1821,1024,797,0,1024,1024],
[1920,1080,"crop",1.0,1024,1.0,768,768,1,true,"bottom right","1:1",1920,1080,1152,312,768,768],
[1920,1080,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"bottom right","2:3",1920,1080,1200,0,720,1080],
[1336,1784,"crop to fill",1.0,1024,1.0,1024,768,8,true,"center","1:1",1024,1368,0,300,1024,768],
[1336,1784,"crop",1.0,1024,1.0,513,300,8,true,"center","1:1",1336,1784,412,744,512,296],
[1336,1784,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"center","16:9",1336,1784,0,516,1336,752],
[1336,1784,"crop to fill",1.0,1024,1.0,1024,1024,16,false,"top","1:1",1024,1368,0,0,1024,1024],
[1336,1784,"crop",1.0,1024,1.0,4096,512,64,true,"top","1:1",1336,1784,28,0,1280,512],
[1336,1784,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"top","9:16",1336,1784,172,0,992,1776],
[1336,1784,"crop to fill",1.0,1024,1.0,1024,768,1,true,"bottom","1:1",1024,1368,0,600,1024,768],
[1336,1784,"crop",1.0,1024,1.0,768,768,1,true,"bottom","1:1",1336,1784,284,1016,768,768],
[1336,1784,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"bottom","5:4",1336,1784,0,715,1336,1069],
[1336,1784,"crop to fill",1.0,1024,1.0,1024,1024,8,true,"left","1:1",1024,1368,0,172,1024,1024],
[1336,1784,"crop",1.0,1024,1.0,513,300,8,true,"left","1:1",1336,1784,0,744,512,296],
[1336,1784,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"left","4:5",1336,1784,0,60,1336,1664],
[1336,1784,"crop to fill",1.0,1024,1.0,1024,768,16,true,"right","1:1",1024,1368,0,300,1024,768],
[1336,1784,"crop",1.0,1024,1.0,4096,512,64,true,"right","1:1",1336,1784,56,636,1280,512],
[1336,1784,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"right","21:9",1336,1784,8,612,1328,560],
[1336,1784,"crop to fill",1.0,1024,1.0,1024,1024,1,false,"top left","1:1",1024,1368,0,0,1024,1024],
[1336,1784,"crop",1.0,1024,1.0,768,768,1,true,"top left","1:1",1336,1784,0,0,768,768],
[1336,1784,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"top left","9:21",1336,1784,0,0,765,1784],
[1336,1784,"crop to fill",1.0,1024,1.0,1024,768,8,true,"top right","1:1",1024,1368,0,0,1024,768],
[1336,1784,"crop",1.0,1024,1.0,513,300,8,true,"top right","1:1",1336,1784,824,0,512,296],
[1336,1784,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"top right","2:1",1336,1784,0,0,1336,664],
[1336,1784,"crop to fill",1.0,1024,1.0,1024,1024,16,true,"bottom left","1:1",1024,1368,0,344,1024,1024],
[1336,1784,"crop",1.0,1024,1.0,4096,512,64,true,"bottom left","1:1",1336,1784,0,1272,1280,512],
[1336,1784,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"bottom left","1:2",1336,1784,0,8,880,1776],
[1336,1784,"crop to fill",1.0,1024,1.0,1024,768,1,true,"bottom right","1:1",1024,1368,0,600,1024,768],
[1336,1784,"crop",1.0,1024,1.0,768,768,1,true,"bottom right","1:1",1336,1784,568,1016,768,768],
[1336,1784,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"bottom right","width : height",1336,1784,0,1032,1336,752],
[640,480,"crop to fill",1.0,1024,1.0,1024,1024,8,false,"center","1:1",640,480,80,0,480,480],
[640,480,"crop",1.0,1024,1.0,513,300,8,true,"center","1:1",640,480,64,92,512,296],
[640,480,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"center","1:1",640,480,80,0,480,480],
[640,480,"crop to fill",1.0,1024,1.0,1024,768,16,true,"top","1:1",1024,768,0,0,1024,768],
[640,480,"crop",1.0,1024,1.0,4096,512,64,true,"top","1:1",640,480,0,0,640,448],
[640,480,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"top","4:3",640,480,0,0,640,480],
[640,480,"crop to fill",1.0,1024,1.0,1024,1024,1,true,"bottom","1:1",1366,1024,171,0,1024,1024],
[640,480,"crop",1.0,1024,1.0,768,768,1,true,"bottom","1:1",640,480,0,0,640,480],
[640,480,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"bottom","3:4",640,480,140,0,360,480],
[640,480,"crop to fill",1.0,1024,1.0,1024,768,8,true,"left","1:1",1024,768,0,0,1024,768],
[640,480,"crop",1.0,1024,1.0,513,300,8,true,"left","1:1",640,480,0,92,512,296],
[640,480,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"left","3:2",640,480,0,28,640,424],
[640,480,"crop to fill",1.0,1024,1.0,1024,1024,16,false,"right","1:1",640,480,160,0,480,480],
[640,480,"crop",1.0,1024,1.0,4096,512,64,true,"right","1:1",640,480,0,16,640,448],
[640,480,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"right","2:3",640,480,320,0,320,480],
[640,480,"crop to fill",1.0,1024,1.0,1024,768,1,true,"top left","1:1",1024,768,0,0,1024,768],
[640,480,"crop",1.0,1024,1.0,768,768,1,true,"top left","1:1",640,480,0,0,640,480],
[640,480,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"top left","16:9",640,480,0,0,640,360],
[640,480,"crop to fill",1.0,1024,1.0,1024,1024,8,true,"top right","1:1",1366,1024,342,0,1024,1024],
[640,480,"crop",1.0,1024,1.0,513,300,8,true,"top right","1:1",640,480,128,0,512,296],
[640,480,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"top right","9:16",640,480,376,0,264,480],
[640,480,"crop to fill",1.0,1024,1.0,1024,768,16,true,"bottom left","1:1",1024,768,0,0,1024,768],
[640,480,"crop",1.0,1024,1.0,4096,512,64,true,"bottom left","1:1",640,480,0,32,640,448],
[640,480,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"bottom left","5:4",640,480,0,0,592,480],
[640,480,"crop to fill",1.0,1024,1.0,1024,1024,1,false,"bottom right","1:1",640,480,160,0,480,480],
[640,480,"crop",1.0,1024,1.0,768,768,1,true,"bottom right","1:1",640,480,0,0,640,480],
[640,480,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"bottom right","4:5",640,480,256,0,384,480],
[1000,777,"crop to fill",1.0,1024,1.0,1024,768,8,true,"center","1:1",1024,796,0,14,1024,768],
[1000,777,"crop",1.0,1024,1.0,513,300,8,true,"center","1:1",1000,777,244,240,512,296],
[1000,777,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"center","21:9",1000,777,0,176,1000,424],
[1000,777,"crop to fill",1.0,1024,1.0,1024,1024,16,true,"top","1:1",1318,1024,147,0,1024,1024],
[1000,777,"crop",1.0,1024,1.0,4096,512,64,true,"top","1:1",1000,777,20,0,960,512],
[1000,777,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"top","9:21",1000,777,340,0,320,768],
[1000,777,"crop to fill",1.0,1024,1.0,1024,768,1,true,"bottom","1:1",1024,796,0,28,1024,768],
[1000,777,"crop",1.0,1024,1.0,768,768,1,true,"bottom","1:1",1000,777,116,9,768,768],
[1000,777,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"bottom","2:1",1000,777,0,277,1000,500],
[1000,777,"crop to fill",1.0,1024,1.0,1024,1024,8,false,"left","1:1",999,776,0,0,776,776],
[1000,777,"crop",1.0,1024,1.0,513,300,8,true,"left","1:1",1000,777,0,240,512,296],
[1000,777,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"left","1:2",1000,777,0,0,384,776],
[1000,777,"crop to fill",1.0,1024,1.0,1024,768,16,true,"right","1:1",1024,796,0,14,1024,768],
[1000,777,"crop",1.0,1024,1.0,4096,512,64,true,"right","1:1",1000,777,40,132,960,512],
[1000,777,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"right","width : height",1000,777,8,108,992,560],
[1000,777,"crop to fill",1.0,1024,1.0,1024,1024,1,true,"top left","1:1",1318,1024,0,0,1024,1024],
[1000,777,"crop",1.0,1024,1.0,768,768,1,true,"top left","1:1",1000,777,0,0,768,768],
[1000,777,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"top left","1:1",1000,777,0,0,777,777],
[1000,777,"crop to fill",1.0,1024,1.0,1024,768,8,true,"top right","1:1",1024,796,0,0,1024,768],
[1000,777,"crop",1.0,1024,1.0,513,300,8,true,"top right","1:1",1000,777,488,0,512,296],
[1000,777,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"top right","4:3",1000,777,0,0,1000,744],
[1000,777,"crop to fill",1.0,1024,1.0,1024,1024,16,false,"bottom left","1:1",989,768,0,0,768,768],
[1000,777,"crop",1.0,1024,1.0,4096,512,64,true,"bottom left","1:1",1000,777,0,265,960,512],
[1000,777,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"bottom left","3:4",1000,777,0,9,576,768],
[1000,777,"crop to fill",1.0,1024,1.0,1024,768,1,true,"bottom right","1:1",1024,796,0,28,1024,768],
[1000,777,"crop",1.0,1024,1.0,768,768,1,true,"bottom right","1:1",1000,777,232,9,768,768],
[1000,777,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"bottom right","3:2",1000,777,0,110,1000,667],
[30,2000,"crop to fill",1.0,1024,1.0,1024,1024,8,true,"center","1:1",1024,68267,0,33621,1024,1024],
[30,2000,"crop",1.0,1024,1.0,513,300,8,true,"center","1:1",30,2000,3,852,24,296],
[30,2000,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"center","2:3",30,2000,3,980,24,40],
[30,2000,"crop to fill",1.0,1024,1.0,1024,768,16,true,"top","1:1",1024,68267,0,0,1024,768],
[30,2000,"crop",1.0,1024,1.0,4096,512,64,true,"top","1:1",30,2000,0,0,30,512],
[30,2000,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"top","16:9",30,2000,7,0,16,16],
[30,2000,"crop to fill",1.0,1024,1.0,1024,1024,1,false,"bottom","1:1",30,2000,0,1970,30,30],
[30,2000,"crop",1.0,1024,1.0,768,768,1,true,"bottom","1:1",30,2000,0,1232,30,768],
[30,2000,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"bottom","9:16",30,2000,0,1947,30,53],
[30,2000,"crop to fill",1.0,1024,1.0,1024,768,8,true,"left","1:1",1024,68267,0,33749,1024,768],
[30,2000,"crop",1.0,1024,1.0,513,300,8,true,"left","1:1",30,2000,0,852,24,296],
[30,2000,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"left","5:4",30,2000,0,988,24,24],
[30,2000,"crop to fill",1.0,1024,1.0,1024,1024,16,true,"right","1:1",1024,68267,0,33621,1024,1024],
[30,2000,"crop",1.0,1024,1.0,4096,512,64,true,"right","1:1",30,2000,0,744,30,512],
[30,2000,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"right","4:5",30,2000,14,984,16,32],
[30,2000,"crop to fill",1.0,1024,1.0,1024,768,1,true,"top left","1:1",1024,68267,0,0,1024,768],
[30,2000,"crop",1.0,1024,1.0,768,768,1,true,"top left","1:1",30,2000,0,0,30,768],
[30,2000,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"top left","21:9",30,2000,0,0,30,13],
[30,2000,"crop to fill",1.0,1024,1.0,1024,1024,8,false,"top right","1:1",24,1600,0,0,24,24],
[30,2000,"crop",1.0,1024,1.0,513,300,8,true,"top right","1:1",30,2000,6,0,24,296],
[30,2000,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"top right","9:21",30,2000,6,0,24,64],
[30,2000,"crop to fill",1.0,1024,1.0,1024,768,16,true,"bottom left","1:1",1024,68267,0,67499,1024,768],
[30,2000,"crop",1.0,1024,1.0,4096,512,64,true,"bottom left","1:1",30,2000,0,1488,30,512],
[30,2000,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"bottom left","2:1",30,2000,0,1985,16,15],
[30,2000,"crop to fill",1.0,1024,1.0,1024,1024,1,true,"bottom right","1:1",1024,68267,0,67243,1024,1024],
[30,2000,"crop",1.0,1024,1.0,768,768,1,true,"bottom right","1:1",30,2000,0,1232,30,768],
[30,2000,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"bottom right","1:2",30,2000,0,1940,30,60],
[10,10,"crop to fill",1.0,1024,1.0,1024,768,8,true,"center","1:1",1024,1024,0,128,1024,768],
[10,10,"crop",1.0,1024,1.0,513,300,8,true,"center","1:1",10,10,1,1,8,8],
[10,10,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"center","width : height",10,10,1,2,8,6],
[10,10,"crop to fill",1.0,1024,1.0,1024,1024,16,false,"top","1:1",16,16,0,0,16,16],
[10,10,"crop",1.0,1024,1.0,4096,512,64,true,"top","1:1",10,10,0,0,10,10],
[10,10,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"top","1:1",10,10,0,0,10,10],
[10,10,"crop to fill",1.0,1024,1.0,1024,768,1,true,"bottom","1:1",1024,1024,0,256,1024,768],
[10,10,"crop",1.0,1024,1.0,768,768,1,true,"bottom","1:1",10,10,0,0,10,10],
[10,10,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"bottom","4:3",10,10,0,2,10,8],
[10,10,"crop to fill",1.0,1024,1.0,1024,1024,8,true,"left","1:1",1024,1024,0,0,1024,1024],
[10,10,"crop",1.0,1024,1.0,513,300,8,true,"left","1:1",10,10,0,1,8,8],
[10,10,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"left","3:4",10,10,0,1,8,8],
[10,10,"crop to fill",1.0,1024,1.0,1024,768,16,true,"right","1:1",1024,1024,0,128,1024,768],
[10,10,"crop",1.0,1024,1.0,4096,512,64,true,"right","1:1",10,10,0,0,10,10],
[10,10,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"right","3:2",10,10,0,1,10,7],
[10,10,"crop to fill",1.0,1024,1.0,1024,1024,1,false,"top left","1:1",10,10,0,0,10,10],
[10,10,"crop",1.0,1024,1.0,768,768,1,true,"top left","1:1",10,10,0,0,10,10],
[10,10,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"top left","2:3",10,10,0,0,7,10],
[10,10,"crop to fill",1.0,1024,1.0,1024,768,8,true,"top right","1:1",1024,1024,0,0,1024,768],
[10,10,"crop",1.0,1024,1.0,513,300,8,true,"top right","1:1",10,10,2,0,8,8],
[10,10,"crop to ratio",1.0,1024,1.0,1600,900,8,true,"top right","16:9",10,10,2,0,8,6],
[10,10,"crop to fill",1.0,1024,1.0,1024,1024,16,true,"bottom left","1:1",1024,1024,0,0,1024,1024],
[10,10,"crop",1.0,1024,1.0,4096,512,64,true,"bottom left","1:1",10,10,0,0,10,10],
[10,10,"crop to ratio",1.0,1024,1.0,1600,900,16,true,"bottom left","9:16",10,10,0,0,6,10],
[10,10,"crop to fill",1.0,1024,1.0,1024,768,1,true,"bottom right","1:1",1024,1024,0,256,1024,768],
[10,10,"crop",1.0,1024,1.0,768,768,1,true,"bottom right","1:1",10,10,0,0,10,10],
[10,10,"crop to ratio",1.0,1024,1.0,1600,900,1,true,"bottom right","5:4",10,10,0,2,10,8],
[1336,1784,"crop to ratio",1.0,1024,1.0,1280,544,1,true,"top","1:1",1336,1784,0,0,1336,1336],
[1920,1080,"crop to ratio",1.0,1024,1.0,1280,544,8,true,"bottom right","1:1",1920,1080,840,0,1080,1080],
[1336,1784,"crop to ratio",1.0,1024,1.0,1280,544,1,true,"top","4:3",1336,1784,0,0,1336,1002],
[1920,1080,"crop to ratio",1.0,1024,1.0,1280,544,8,true,"bottom right","4:3",1920,1080,480,0,1440,1080],
[1336,1784,"crop to ratio",1.0,1024,1.0,1280,544,1,true,"top","3:4",1336,1784,0,0,1336,1781],
[1920,1080,"crop to ratio",1.0,1024,1.0,1280,544,8,true,"bottom right","3:4",1920,1080,1112,0,808,1080],
[1336,1784,"crop to ratio",1.0,1024,1.0,1280,544,1,true,"top","3:2",1336,1784,0,0,1336,891],
[1920,1080,"crop to ratio",1.0,1024,1.0,1280,544,8,true,"bottom right","3:2",1920,1080,304,0,1616,1080],
[1336,1784,"crop to ratio",1.0,1024,1.0,1280,544,1,true,"top","2:3",1336,1784,73,0,1189,1784],
[1920,1080,"crop to ratio",1.0,1024,1.0,1280,544,8,true,"bottom right","2:3",1920,1080,1200,0,720,1080],
[1336,1784,"crop to ratio",1.0,1024,1.0,1280,544,1,true,"top","16:9",1336,1784,0,0,1336,752],
[1920,1080,"crop to ratio",1.0,1024,1.0,1280,544,8,true,"bottom right","16:9",1920,1080,0,0,1920,1080],
[1336,1784,"crop to ratio",1.0,1024,1.0,1280,544,1,true,"top","9:16",1336,1784,166,0,1004,1784],
[1920,1080,"crop to ratio",1.0,1024,1.0,1280,544,8,true,"bottom right","9:16",1920,1080,1312,0,608,1080],
[1336,1784,"crop to ratio",1.0,1024,1.0,1280,544,1,true,"top","5:4",1336,1784,0,0,1336,1069],
[1920,1080,"crop to ratio",1.0,1024,1.0,1280,544,8,true,"bottom right","5:4",1920,1080,576,0,1344,1080],
[1336,1784,"crop to ratio",1.0,1024,1.0,1280,544,1,true,"top","4:5",1336,1784,0,0,1336,1670],
[1920,1080,"crop to ratio",1.0,1024,1.0,1280,544,8,true,"bottom right","4:5",1920,1080,1056,0,864,1080],
[1336,1784,"crop to ratio",1.0,1024,1.0,1280,544,1,true,"top","21:9",1336,1784,0,0,1336,573],
[1920,1080,"crop to ratio",1.0,1024,1.0,1280,544,8,true,"bottom right","21:9",1920,1080,0,264,1920,816],
[1336,1784,"crop to ratio",1.0,1024,1.0,1280,544,1,true,"top","9:21",1336,1784,285,0,765,1784],
[1920,1080,"crop to ratio",1.0,1024,1.0,1280,544,8,true,"bottom right","9:21",1920,1080,1464,0,456,1080],
[1336,1784,"crop to ratio",1.0,1024,1.0,1280,544,1,true,"top","2:1",1336,1784,0,0,1336,668],
[1920,1080,"crop to ratio",1.0,1024,1.0,1280,544,8,true,"bottom right","2:1",1920,1080,0,120,1920,960],
[1336,1784,"crop to ratio",1.0,1024,1.0,1280,544,1,true,"top","1:2",1336,1784,222,0,892,1784],
[1920,1080,"crop to ratio",1.0,1024,1.0,1280,544,8,true,"bottom right","1:2",1920,1080,1384,0,536,1080],
[1336,1784,"crop to ratio",1.0,1024,1.0,1280,544,1,true,"top","width : height",1336,1784,0,0,1336,568],
[1920,1080,"crop to ratio",1.0,1024,1.0,1280,544,8,true,"bottom right","width : height",1920,1080,0,264,1920,816]
]}
+146 -1
View File
@@ -116,6 +116,67 @@
]
]
},
"AUSBOSS_NODES_EditLock": {
"required": [
"model",
"vae",
"image",
"lock",
"tolerance"
],
"optional": [
"mask"
],
"outputs": [
[
"MODEL",
"model"
],
[
"AUSBOSS_EDIT_LOCK",
"edit_lock"
]
]
},
"AUSBOSS_NODES_EditLockRestore": {
"required": [
"image",
"edit_lock",
"feather"
],
"optional": [],
"outputs": [
[
"IMAGE",
"image"
],
[
"MASK",
"edit_mask"
],
[
"STRING",
"report"
]
]
},
"AUSBOSS_NODES_FlashVSRUpscale": {
"required": [
"frames",
"model",
"scale",
"color_match"
],
"optional": [
"vae"
],
"outputs": [
[
"IMAGE",
"frames"
]
]
},
"AUSBOSS_NODES_Float": {
"required": [
"value"
@@ -522,6 +583,53 @@
]
]
},
"AUSBOSS_NODES_LoadImage": {
"required": [
"image",
"size",
"megapixels",
"longest_side",
"scale",
"width",
"height",
"multiple",
"method",
"enlarge",
"crop_from",
"ratio"
],
"optional": [],
"outputs": [
[
"IMAGE",
"image"
],
[
"MASK",
"mask"
],
[
"INT",
"width"
],
[
"INT",
"height"
],
[
"STRING",
"filename"
],
[
"INT",
"original_width"
],
[
"INT",
"original_height"
]
]
},
"AUSBOSS_NODES_LoadImagePad": {
"required": [
"image",
@@ -739,6 +847,19 @@
]
]
},
"AUSBOSS_NODES_PromptVariations": {
"required": [
"text",
"seed"
],
"optional": [],
"outputs": [
[
"STRING",
"prompt"
]
]
},
"AUSBOSS_NODES_RealignToSource": {
"required": [
"edited",
@@ -842,7 +963,8 @@
"name_size",
"name_batch",
"preview",
"step_preview"
"step_preview",
"autosave"
],
"outputs": [
[
@@ -992,6 +1114,29 @@
]
]
},
"AUSBOSS_NODES_TextLines": {
"required": [
"text",
"split",
"remove_numbering",
"limit"
],
"optional": [],
"outputs": [
[
"STRING",
"line"
],
[
"INT",
"number"
],
[
"INT",
"count"
]
]
},
"AUSBOSS_NODES_TiledUpscale": {
"required": [
"image",
+63
View File
@@ -4,6 +4,8 @@ import test from "node:test";
import {
describeNodePreview,
describeOwnResult,
lightPreviewQuery,
ownResultIsCurrent,
describeSourcePreview,
linkById,
outputLocatorId,
@@ -192,3 +194,64 @@ test("without node.imgs the stored output is the result, ahead of the input", ()
node.imgs = [{ src: "own-result" }];
assert.deepEqual(describeNodePreview(node, "images", "/view?stored"), { kind: "url", url: "own-result" });
});
test("a picture the frontend gave up loading does not hide the newer result", () => {
// The frontend loads a result into node.imgs with a time limit. A 31 MB
// sheet over a slow link ran past it, node.imgs kept the run before, and
// the panel went on showing that older picture.
const view = (name, folder = "", type = "output") =>
`http://host/api/view?filename=${name}&subfolder=${folder}&type=${type}&rand=0.5`;
const before = { images: [{ filename: "sheet_00009.png", subfolder: "", type: "output" }] };
const after = { images: [{ filename: "75dc_000.png", subfolder: "ausboss_held", type: "temp" }] };
const node = { inputs: [], imgs: [{ src: view("sheet_00009.png") }] };
// Loaded for the record on the node: node.imgs is the result.
assert.equal(ownResultIsCurrent(node, before, before), true);
// A newer run, and node.imgs was never set again: it is the run before.
assert.equal(ownResultIsCurrent(node, after, before), false);
assert.deepEqual(
describeNodePreview(node, "images", "/view?stored", ownResultIsCurrent(node, after, before)),
{ kind: "url", url: "/view?stored" },
);
// The same name written over (exact name, overwrite) is still a newer run.
const again = { images: [{ filename: "sheet_00009.png", subfolder: "", type: "output" }] };
assert.equal(ownResultIsCurrent(node, again, before), false);
// Set while a still newer run came in: the names tell them apart.
assert.equal(ownResultIsCurrent(node, after, after), false);
// Once the frontend does load it, node.imgs is the result again.
node.imgs = [{ src: view("75dc_000.png", "ausboss_held", "temp") }];
assert.equal(ownResultIsCurrent(node, after, after), true);
assert.deepEqual(
describeNodePreview(node, "images", "/view?stored", ownResultIsCurrent(node, after, after)),
{ kind: "url", url: node.imgs[0].src },
);
// A frame streamed during a run is not a stored file: it stays the result.
assert.equal(ownResultIsCurrent({ imgs: [{ src: "blob:http://host/1" }] }, after, before), true);
// No stored picture to compare with: node.imgs is all there is.
assert.equal(ownResultIsCurrent(node, null, undefined), true);
assert.equal(ownResultIsCurrent(node, { images: [] }, before), true);
// Nothing in node.imgs is never current.
assert.equal(ownResultIsCurrent({ imgs: [] }, after, after), false);
assert.equal(ownResultIsCurrent(null, after, after), false);
});
test("Save Image's small copy is what the panel asks for", () => {
const record = {
images: [
{ filename: "sheet_00001.png", subfolder: "", type: "output" },
{ filename: "sheet_00002.png", subfolder: "", type: "output" },
],
ausboss_preview: ["ausboss_preview/ab12_000.webp", "ausboss_preview/ab12_001.webp"],
};
// The newest by default, or the one the arrows picked.
assert.equal(lightPreviewQuery(record), "filename=ab12_001.webp&subfolder=ausboss_preview&type=temp");
assert.equal(lightPreviewQuery(record, 0), "filename=ab12_000.webp&subfolder=ausboss_preview&type=temp");
// No copies (an older run, another node, the preview off): the file itself.
assert.equal(lightPreviewQuery({ images: record.images }), null);
assert.equal(lightPreviewQuery({ images: record.images, ausboss_preview: [] }), null);
// A list that does not match the pictures is not trusted.
assert.equal(lightPreviewQuery({ images: record.images, ausboss_preview: ["ausboss_preview/x.webp"] }), null);
assert.equal(lightPreviewQuery({ images: record.images, ausboss_preview: ["", 5] }), null);
assert.equal(lightPreviewQuery(null), null);
});
+149
View File
@@ -0,0 +1,149 @@
import assert from "node:assert/strict";
import { readFileSync } from "node:fs";
import test from "node:test";
import {
CROP_GRID, CROP_MODES, SIZE_MODES, changeText, cropSideAt, keptPart, placeText, planLoadSize, shapeText, sizeText, stepFile, thumbSizes,
} from "../js/shared/load_size.mjs";
const table = JSON.parse(readFileSync(new URL("./fixtures/load_size_cases.json", import.meta.url), "utf8"));
test("the size the node shows is the size the run gives, case by case", () => {
assert.ok(table.rows.length > 200);
const seen = new Set();
for (const row of table.rows) {
const [sourceWidth, sourceHeight, size, megapixels, longest_side, scale, width, height, multiple, enlarge, crop_from, ratio, ...wanted] = row;
seen.add(size);
const plan = planLoadSize(sourceWidth, sourceHeight, { size, megapixels, longest_side, scale, width, height, multiple, enlarge, crop_from, ratio });
assert.deepEqual(
[plan.resizeWidth, plan.resizeHeight, plan.cropX, plan.cropY, plan.width, plan.height],
wanted,
JSON.stringify(row.slice(0, 12)),
);
}
assert.deepEqual([...seen].sort(), [...SIZE_MODES].sort(), "every size choice is in the table");
});
test("off gives the picture back whatever the other settings say", () => {
const plan = planLoadSize(913, 1631, { size: "off", multiple: 64, megapixels: 4, enlarge: false });
assert.deepEqual([plan.width, plan.height, plan.cropX, plan.cropY], [913, 1631, 0, 0]);
});
test("longest side lands on the number asked for, and round to moves it to a multiple", () => {
assert.deepEqual(planLoadSize(912, 1632, { size: "longest side", longest_side: 2048, multiple: 1 }).height, 2048);
const rounded = planLoadSize(912, 1632, { size: "longest side", longest_side: 2000, multiple: 16 });
assert.equal(rounded.height, 2000);
assert.equal(rounded.width % 16, 0);
});
test("with enlarge off a small picture keeps its size, and crop to fill only cuts", () => {
const kept = planLoadSize(640, 480, { size: "megapixels", megapixels: 4, multiple: 1, enlarge: false });
assert.deepEqual([kept.width, kept.height], [640, 480]);
const cut = planLoadSize(800, 600, { size: "crop to fill", width: 1024, height: 1024, multiple: 1, enlarge: false });
assert.deepEqual([cut.width, cut.height, cut.resizeWidth, cut.resizeHeight, cut.cropX, cut.cropY], [600, 600, 800, 600, 100, 0]);
});
test("fit inside never leaves its box, rounding included", () => {
const plan = planLoadSize(1920, 1080, { size: "fit inside", width: 1000, height: 1000, multiple: 64 });
assert.ok(plan.width <= 1000 && plan.height <= 1000);
assert.equal(plan.width % 64, 0);
});
test("a picture with no size yet, or a choice the node does not know, has no plan", () => {
assert.equal(planLoadSize(0, 0, { size: "scale" }), null);
assert.equal(planLoadSize(100, 100, { size: "" }), null);
assert.equal(planLoadSize(100, 100, { size: "stretch" }), null);
});
test("the size line shows one size when nothing changes and both when it does", () => {
assert.equal(sizeText(912, 1632, planLoadSize(912, 1632, { size: "off" })), "912 × 1632");
assert.equal(
sizeText(912, 1632, planLoadSize(912, 1632, { size: "longest side", longest_side: 2048, multiple: 8 })),
"912 × 1632 → 1144 × 2048",
);
assert.equal(sizeText(0, 0, null), "");
assert.equal(sizeText(912, 1632, null), "912 × 1632");
});
test("a crop keeps the side that is asked for", () => {
const cut = (crop_from, size = "crop to fill") => planLoadSize(200, 100, { size, width: 100, height: 100, multiple: 1, crop_from, ratio: "1:1" });
for (const size of CROP_MODES) {
assert.equal(cut("left", size).cropX, 0, size);
assert.equal(cut("center", size).cropX, 50, size);
assert.equal(cut("top right", size).cropX, 100, size);
}
assert.equal(cut("sideways").cropX, 50, "a side the node does not know is the middle");
const tall = planLoadSize(100, 300, { size: "crop", width: 100, height: 100, multiple: 1, crop_from: "bottom" });
assert.deepEqual([tall.resizeWidth, tall.resizeHeight, tall.cropY, tall.height], [100, 300, 200, 100], "crop does not resize");
assert.equal(CROP_GRID.length, 9);
assert.equal(new Set(CROP_GRID).size, 9);
});
test("a click on the small picture picks the part under it", () => {
assert.equal(cropSideAt(0.1, 0.1), "top left");
assert.equal(cropSideAt(0.5, 0.05), "top");
assert.equal(cropSideAt(0.5, 0.5), "center");
assert.equal(cropSideAt(0.95, 0.5), "right");
assert.equal(cropSideAt(0.99, 0.99), "bottom right");
});
test("the preview lights the part that is kept and words what changes", () => {
const top = planLoadSize(1336, 1784, { size: "crop to fill", width: 1024, height: 1024, multiple: 1, crop_from: "top" });
const part = keptPart(top);
assert.deepEqual([part.x, part.y, part.width], [0, 0, 1]);
assert.ok(Math.abs(part.height - 1024 / 1368) < 1e-9);
assert.equal(changeText(1336, 1784, top), "77% size · cuts 449 px of height");
const piece = planLoadSize(1336, 1784, { size: "crop", width: 768, height: 768, multiple: 1 });
assert.equal(changeText(1336, 1784, piece), "cuts 568 × 1016 px");
assert.equal(changeText(1336, 1784, planLoadSize(1336, 1784, { size: "off" })), "");
assert.equal(changeText(1336, 1784, planLoadSize(1336, 1784, { size: "scale", scale: 0.5, multiple: 1 })), "50% size");
assert.deepEqual(keptPart(null), { x: 0, y: 0, width: 1, height: 1 });
});
test("the two small pictures share one scale and stay in their box", () => {
const half = planLoadSize(1336, 1784, { size: "scale", scale: 0.5, multiple: 1 });
const sizes = thumbSizes(1336, 1784, half, 76, 68);
assert.deepEqual(sizes.input, [51, 68]);
assert.deepEqual(sizes.output, [25, 34], "half the size is drawn half as large");
const grown = thumbSizes(100, 100, planLoadSize(100, 100, { size: "scale", scale: 8, multiple: 1 }), 76, 68);
assert.deepEqual(grown.output, [68, 68]);
assert.deepEqual(grown.input, [10, 10], "never too small to see");
const wide = thumbSizes(4000, 500, null, 76, 68);
assert.ok(wide.input[0] <= 76 && wide.input[1] >= 10);
});
test("a shape is named the way people say it", () => {
assert.equal(shapeText(1024, 1024), "1:1");
assert.equal(shapeText(1336, 1784), "3:4");
assert.equal(shapeText(1336, 752), "16:9", "rounded to a multiple of 8, still 16:9");
assert.equal(shapeText(1080, 1920), "9:16");
assert.equal(shapeText(1000, 777), "~1.29:1");
assert.equal(shapeText(777, 1000), "~1:1.29");
assert.equal(shapeText(0, 10), "");
});
test("the arrows go round the list, and a file that is not listed steps onto it", () => {
const files = ["a.png", "b.png", "sub/c.png"];
assert.equal(stepFile(files, "a.png", 1), "b.png");
assert.equal(stepFile(files, "sub/c.png", 1), "a.png");
assert.equal(stepFile(files, "a.png", -1), "sub/c.png");
assert.equal(stepFile(files, "gone.png", 1), "a.png");
assert.equal(stepFile(files, "gone.png", -1), "sub/c.png");
assert.equal(stepFile(["only.png"], "only.png", 1), null);
assert.equal(stepFile([""], "", 1), null, "an empty input folder lists one blank");
assert.equal(stepFile(undefined, "a.png", 1), null);
});
test("the place in the list counts from one", () => {
const files = ["a.png", "b.png", "sub/c.png"];
assert.equal(placeText(files, "b.png"), "2 / 3");
assert.equal(placeText(files, "gone.png"), "– / 3");
assert.equal(placeText([""], ""), "");
});
test("Load Image is one of the loaders checked for a picked file before a run", async () => {
const { SOURCE_LOADERS } = await import("../js/shared/run_check.mjs");
assert.equal(typeof SOURCE_LOADERS.AUSBOSS_NODES_LoadImage, "function");
assert.ok(SOURCE_LOADERS.AUSBOSS_NODES_LoadImage({ image: "" }));
assert.equal(SOURCE_LOADERS.AUSBOSS_NODES_LoadImage({ image: "pic.png" }), null);
});
+8
View File
@@ -741,3 +741,11 @@ test("every DOM widget stays visible when the graph is zoomed out", () => {
}
assert.ok(calls >= 14, `expected the pack's DOM widgets, found ${calls}`);
});
// Save Image's settings card keeps the height released workflows were laid
// out around. A new row made it 32 px taller, and a node saved at its
// smallest size grew over the node under it. A new control shares a row.
test("Save Image's settings card stays the height saved workflows expect", () => {
const source = readFileSync(join(JS_ROOT, "save_image", "index.js"), "utf-8");
assert.match(source, /const CARD_HEIGHT = 288;/, "js/save_image/index.js: the card's height changed; saved nodes at their smallest size would grow");
});
+67 -1
View File
@@ -1,7 +1,7 @@
import assert from "node:assert/strict";
import test from "node:test";
import { keepIndex, stepIndex, stepperLabel } from "../js/shared/picture_steps.mjs";
import { keepIndex, keepWords, stepIndex, stepperLabel } from "../js/shared/picture_steps.mjs";
test("a new run keeps the picture that was showing, if it still has one", () => {
assert.equal(keepIndex(1, 3), 1);
@@ -26,3 +26,69 @@ test("the label counts from one and is empty for a single picture", () => {
assert.equal(stepperLabel(0, 1), "");
assert.equal(stepperLabel(0, 0), "");
});
test("all the pictures are one more stop before the first", async () => {
const { ALL, allLabel, stepWithAll } = await import("../js/shared/picture_steps.mjs");
assert.equal(stepWithAll(ALL, 3, 1), 0);
assert.equal(stepWithAll(0, 3, 1), 1);
assert.equal(stepWithAll(2, 3, 1), ALL);
assert.equal(stepWithAll(ALL, 3, -1), 2);
assert.equal(stepWithAll(0, 3, -1), ALL);
assert.equal(stepWithAll(1, 3, 0), 1);
assert.equal(stepWithAll(0, 0, 1), ALL);
assert.equal(allLabel(5), "all 5");
assert.equal(allLabel(1), "");
});
test("the grid gives each picture the most room its shape allows", async () => {
const { gridShape } = await import("../js/shared/picture_steps.mjs");
// Five portraits in a tall stage: two across beats one row or one column.
assert.deepEqual(gridShape(5, 440, 1100, 3 / 4), { columns: 2, rows: 3 });
// The same five in a wide stage go in one row.
assert.deepEqual(gridShape(5, 1600, 440, 3 / 4), { columns: 5, rows: 1 });
// Wide pictures in a tall stage stack.
assert.deepEqual(gridShape(3, 400, 900, 16 / 9), { columns: 1, rows: 3 });
assert.deepEqual(gridShape(1, 400, 400, 1), { columns: 1, rows: 1 });
// A stage that has no size yet still gets a whole grid.
assert.deepEqual(gridShape(5, 0, 0, 1), { columns: 3, rows: 2 });
assert.deepEqual(gridShape(4, 400, 400, Number.NaN), { columns: 2, rows: 2 });
});
test("held pictures map to their run and their place in it", async () => {
const { heldPlaces } = await import("../js/shared/picture_steps.mjs");
const a = "0123456789abcdef";
const b = "fedcba9876543210";
const name = (token, index) => ({ filename: `${token}_00${index}.png`, subfolder: "ausboss_held", type: "temp" });
// One run of three pictures.
assert.deepEqual(
heldPlaces({ images: [name(a, 0), name(a, 1), name(a, 2)], ausboss_held: [a] }),
[{ token: a, index: 0 }, { token: a, index: 1 }, { token: a, index: 2 }],
);
// A list run: one picture from each of two runs.
assert.deepEqual(
heldPlaces({ images: [name(a, 0), name(b, 0)], ausboss_held: [a, b] }),
[{ token: a, index: 0 }, { token: b, index: 0 }],
);
// A saved run holds nothing, and a picture from another run is not trusted.
assert.deepEqual(heldPlaces({ images: [{ filename: "shot_00001.png" }] }), []);
assert.deepEqual(heldPlaces({ images: [name(a, 0), name(b, 0)], ausboss_held: [a] }), []);
assert.deepEqual(heldPlaces(undefined), []);
});
test("the row over held pictures says what is saved and what a click does", () => {
// One picture: not saved, then saved under its name.
assert.deepEqual(keepWords({ held: 1 }), { note: "Not saved yet", button: "Save picture", quiet: false });
assert.deepEqual(keepWords({ held: 1, saving: true }), { note: "Not saved yet", button: "Saving...", quiet: false });
assert.deepEqual(
keepWords({ held: 1, kept: 1, done: true, name: "sheet_00001.png" }),
{ note: "Saved as sheet_00001.png", button: "Saved", quiet: true },
);
assert.equal(keepWords({ held: 1, kept: 1, done: true }).note, "Saved");
// Several, all showing: every one, then only the ones left.
assert.deepEqual(keepWords({ held: 4 }), { note: "Not saved yet", button: "Save all 4", quiet: false });
assert.deepEqual(keepWords({ held: 4, kept: 1 }), { note: "1 of 4 saved", button: "Save the rest", quiet: false });
assert.deepEqual(keepWords({ held: 4, kept: 4, done: true }), { note: "All 4 saved", button: "Saved", quiet: true });
// The arrows on one picture: that one alone.
assert.deepEqual(keepWords({ held: 4, kept: 1, all: false }), { note: "1 of 4 saved", button: "Save this one", quiet: false });
assert.deepEqual(keepWords({ held: 4, kept: 1, all: false, done: true }), { note: "1 of 4 saved", button: "Saved", quiet: true });
});
+38
View File
@@ -4,6 +4,7 @@ import test from "node:test";
import {
collapseRepeatedErrors,
emptySourceMessage,
explainRunError,
findEmptySources,
nodeLacksSource,
nodesThatRun,
@@ -199,3 +200,40 @@ test("an empty Load Audio asks for a sound file", () => {
prompt[1].inputs.audio = "song.mp3";
assert.deepEqual(findEmptySources(prompt, outputs), []);
});
// ------------------------------------------------------------ known run errors
// The report a user posted: ComfyUI 0.44.0, H3 keeping the clip's sound, with
// Muse MiniMax Director installed.
const MUSE_REPORT = {
node_type: "SamplerCustomAdvanced",
exception_type: "KeyError",
exception_message: "'latent'",
traceback: [
' File "G:\\ComfyUI\\ComfyUI\\comfy\\samplers.py", line 953, in encode_model_conds\n out = model_function(**params)\n',
' File "G:\\ComfyUI\\ComfyUI\\custom_nodes\\muse-minimax-director-v1-2\\muse_minimax_hybrid_patch.py", line 30, in extra_conds_with_hybrid\n visual_latents.extend(item["latent"] for item in keyframes)\n',
],
};
test("the Muse MiniMax Director error is explained and names the pack", () => {
const known = explainRunError(MUSE_REPORT);
assert.match(known.detail, /Muse MiniMax Director/);
assert.match(known.detail, /Turn that pack off/);
});
test("the same KeyError from anywhere else is left alone", () => {
assert.equal(explainRunError({ ...MUSE_REPORT, traceback: [' File "comfy/samplers.py", line 953\n'] }), null);
assert.equal(explainRunError({ ...MUSE_REPORT, exception_message: "'samples'" }), null);
});
test("an old ComfyUI loading a w6a8 model is told to update", () => {
const known = explainRunError({ exception_type: "KeyError", exception_message: "'w6a8_int8'", traceback: [] });
assert.match(known.detail, /0\.38/);
});
test("an unknown error, or no report at all, gives nothing", () => {
assert.equal(explainRunError({ exception_type: "RuntimeError", exception_message: "CUDA out of memory", traceback: [] }), null);
assert.equal(explainRunError(null), null);
assert.equal(explainRunError({}), null);
assert.equal(explainRunError({ exception_type: "KeyError", exception_message: "'latent'", traceback: "muse_minimax_hybrid_patch" }) !== null, true);
});
+373
View File
@@ -0,0 +1,373 @@
"""Edit Lock: a local edit keeps the rest of the picture, a whole-picture edit is left alone."""
from __future__ import annotations
import sys
import unittest
from pathlib import Path
import torch
ROOT = Path(__file__).resolve().parent.parent
sys.path.insert(0, str(ROOT))
if "nodes" in sys.modules and not hasattr(sys.modules["nodes"], "__path__"):
del sys.modules["nodes"]
from nodes._edit_lock_helpers import ( # noqa: E402
WHOLE_PICTURE,
EditLock,
box_blur,
broad_change,
change_core,
describe,
difference,
measure_redraw,
quiet_level,
restore_pixels,
soften,
)
from nodes.node_edit_lock import ( # noqa: E402
NODE_CLASS_MAPPINGS,
NODE_DISPLAY_NAME_MAPPINGS,
AusBossEditLock,
AusBossEditLockRestore,
)
H, W = 96, 80
BOX = (slice(30, 60), slice(20, 50)) # where the planted edit sits
def latents(seed: int = 0, video: bool = True):
gen = torch.Generator().manual_seed(seed)
# a real latent is smooth from cell to cell, so these are too
source, other = (box_blur(torch.randn(1, 24, H, W, generator=gen), 4) for _ in range(2))
source, other = source / source.std(), other / other.std()
redraw = 0.15 * torch.randn(1, 24, H, W, generator=gen) # the model's own redraw noise
if video:
return source[:, :, None], other[:, :, None], redraw[:, :, None]
return source, other, redraw
def local_prediction(source, other, redraw, tint: float = 0.0):
pred = source + redraw + tint
pred[..., BOX[0], BOX[1]] = other[..., BOX[0], BOX[1]]
return pred
def lock_for(source, mode="auto", tolerance=1.0):
lock = EditLock(mode=mode, tolerance=tolerance)
lock.latent = source.clone()
lock.source = torch.zeros(1, H * 16, W * 16, 3)
return lock
def run(lock, pred, sigma=1.0, steps=None):
args = {"denoised": pred, "sigma": torch.tensor([sigma])}
if steps is not None:
# the sampler's own list of noise levels, the way ComfyUI hands it to the hook
args["model_options"] = {"transformer_options": {"sample_sigmas": torch.tensor(steps)}}
return lock.step(args)
SIX = [1.0, 0.97, 0.89, 0.75, 0.53, 0.23, 0.0]
class EditLockTests(unittest.TestCase):
def test_local_edit_keeps_the_rest(self):
for video in (True, False):
source, other, redraw = latents(video=video)
pred = local_prediction(source, other, redraw, tint=0.2)
lock = lock_for(source)
out = run(lock, pred)
self.assertEqual(lock.status, "locked")
self.assertEqual(out.shape, pred.shape)
# far from the edit the original is back exactly, tint and redraw noise gone
self.assertTrue(torch.equal(out[..., :12, :], source[..., :12, :].to(out.dtype)))
self.assertTrue(torch.equal(out[..., 80:, :], source[..., 80:, :].to(out.dtype)))
# inside the edit the model's prediction is untouched
inner = (slice(36, 54), slice(26, 44))
self.assertTrue(torch.equal(out[..., inner[0], inner[1]], pred[..., inner[0], inner[1]]))
kept = lock.kept_share()
self.assertGreater(kept, 0.7)
self.assertLess(kept, 0.92)
self.assertIn("kept", describe(lock))
def test_report_says_what_to_do_when_nearly_all_was_kept(self):
source, other, redraw = latents(video=False)
lock = lock_for(source)
run(lock, local_prediction(source, other, redraw))
self.assertNotIn("set lock to off", describe(lock))
# a faint change everywhere (rain) and one small clear spot: nearly all of it is kept
pred = source + redraw
pred[..., 40:46, 30:36] = other[..., 40:46, 30:36]
lock = lock_for(source)
run(lock, pred)
self.assertGreater(lock.kept_share(), 0.95)
self.assertIn("set lock to off", describe(lock))
def test_it_watches_first_and_locks_when_the_noise_is_down(self):
source, other, redraw = latents(video=False)
lock = lock_for(source)
# the model's own redraw noise fades from step to step, as it does in a real run
for sigma, fade in ((1.0, 1.0), (0.97, 0.8), (0.89, 0.7)):
pred = local_prediction(source, other, redraw * fade)
out = run(lock, pred, sigma, SIX)
self.assertEqual(lock.status, "watching")
self.assertIsNone(lock.pixel_mask(H * 16, W * 16))
# nothing is put back yet, and with no zoom to undo the prediction passes as it is
self.assertTrue(torch.equal(out, pred))
pred = local_prediction(source, other, redraw * 0.65)
out = run(lock, pred, 0.75, SIX)
self.assertEqual(lock.status, "locked")
self.assertGreater(lock.top, 4.0)
self.assertTrue(torch.equal(out[..., :12, :], source[..., :12, :]))
inner = (slice(36, 54), slice(26, 44))
self.assertTrue(torch.equal(out[..., inner[0], inner[1]], pred[..., inner[0], inner[1]]))
def test_a_faint_change_everywhere_is_let_through(self):
source, _, redraw = latents(video=False)
rain = 0.25 * box_blur(torch.randn(1, 24, H, W, generator=torch.Generator().manual_seed(5)), 1)
for mode, status in (("auto", "soft"), ("always", "locked")):
lock = lock_for(source, mode=mode)
# nothing shows at the first look; then the rain comes in everywhere, and no spot changes clearly
for sigma, fade, wet in ((1.0, 1.0, 0.0), (0.97, 0.9, 0.5), (0.89, 0.8, 1.0)):
run(lock, source + redraw * fade + rain * wet, sigma, SIX)
self.assertEqual(lock.status, "watching")
pred = source + redraw * 0.7 + rain * 1.5
out = run(lock, pred, 0.75, SIX)
self.assertEqual(lock.status, status)
self.assertLess(lock.top, 4.0)
if mode == "auto":
self.assertLess(float((out - pred).abs().max()), 1e-4)
self.assertIn("stepped aside", describe(lock))
def test_a_wide_faint_change_with_no_peak_is_not_locked_in_patches(self):
source, _, redraw = latents(video=False)
gen = torch.Generator().manual_seed(9)
snow = torch.zeros(1, 24, H, W)
snow[..., :, :34] = 0.25 * torch.randn(1, 24, H, 34, generator=gen) # faint, over two fifths of the picture
theta = torch.tensor([[[1 / 1.015, 0.0, 0.0], [0.0, 1 / 1.015, 0.0]]])
grid = torch.nn.functional.affine_grid(theta, list(source.shape), align_corners=False)
zoomed = torch.nn.functional.grid_sample(source, grid, mode="bilinear", padding_mode="border", align_corners=False)
for mode, status in (("auto", "soft"), ("always", "locked")):
lock = lock_for(source, mode=mode)
for sigma, fade in ((1.0, 1.0), (0.97, 0.8), (0.89, 0.7)):
run(lock, source + redraw * fade, sigma, SIX)
pred = source + redraw * 0.65 + snow
out = run(lock, pred, 0.75, SIX)
self.assertEqual(lock.status, status)
self.assertGreater(lock.wide, 0.10)
self.assertLess(lock.peak, 4.0)
if mode == "always":
self.assertLess(lock.kept_share(), 0.8)
continue
self.assertIsNone(lock.pixel_mask(H * 16, W * 16))
self.assertLess(float((out - pred).abs().max()), 1e-4)
self.assertIn("held the picture in place", describe(lock))
# for the rest of the run only the zoom is undone
out = run(lock, zoomed, 0.53, SIX)
self.assertEqual(lock.status, "soft")
smooth = lambda x: box_blur(x, 2)[..., 6:-6, 6:-6]
self.assertLess(float((smooth(out) - smooth(source)).abs().mean()),
float((smooth(zoomed) - smooth(source)).abs().mean()) * 0.35)
def test_the_last_step_decides_when_the_noise_never_gets_that_low(self):
source, other, redraw = latents(video=False)
lock = lock_for(source)
two = [1.0, 0.92, 0.0]
run(lock, local_prediction(source, other, redraw), 1.0, two)
self.assertEqual(lock.status, "watching")
run(lock, local_prediction(source, other, redraw * 0.8), 0.92, two)
self.assertEqual(lock.status, "locked")
# a one-step run decides at once
lock = lock_for(source)
run(lock, local_prediction(source, other, redraw), 1.0, [1.0, 0.0])
self.assertEqual(lock.status, "locked")
def test_the_zoom_is_undone_while_it_watches(self):
source, other, redraw = latents(video=False)
theta = torch.tensor([[[1 / 1.015, 0.0, 0.0], [0.0, 1 / 1.015, 0.0]]])
grid = torch.nn.functional.affine_grid(theta, list(source.shape), align_corners=False)
zoomed = torch.nn.functional.grid_sample(source, grid, mode="bilinear", padding_mode="border", align_corners=False)
lock = lock_for(source)
out = run(lock, zoomed, 1.0, SIX)
self.assertEqual(lock.status, "watching")
# read on smoothed copies: this is about where things sit, and resampling costs fine detail either way
smooth = lambda x: box_blur(x, 2)[..., 6:-6, 6:-6]
off_before = float((smooth(zoomed) - smooth(source)).abs().mean())
off_after = float((smooth(out) - smooth(source)).abs().mean())
self.assertLess(off_after, off_before * 0.35)
def test_whole_picture_edit_is_left_alone(self):
source, other, _ = latents()
pred = 0.3 * source + other # a new picture over the old one
lock = lock_for(source)
out = run(lock, pred)
self.assertEqual(lock.status, "whole picture")
self.assertTrue(torch.equal(out, pred))
self.assertIsNone(lock.pixel_mask(H * 16, W * 16))
# and it stays aside for the rest of the run
self.assertTrue(torch.equal(run(lock, pred, 0.8), pred))
self.assertIn("stepped aside", describe(lock))
def test_a_slightly_larger_redraw_is_measured_and_is_not_an_edit(self):
source, other, redraw = latents(video=False)
# drawn 1.5% wider, 1% taller and half a cell to the right
theta = torch.tensor([[[1 / 1.015, 0.0, -1.0 / W], [0.0, 1 / 1.01, 0.0]]])
grid = torch.nn.functional.affine_grid(theta, list(source.shape), align_corners=False)
zoomed = torch.nn.functional.grid_sample(source, grid, mode="bilinear", padding_mode="border", align_corners=False)
move = measure_redraw(local_prediction(zoomed, other, redraw), source)
self.assertAlmostEqual(float(move[0]), 1 / 1.015 - 1, delta=0.002)
self.assertAlmostEqual(float(move[1]), 1 / 1.01 - 1, delta=0.002)
self.assertAlmostEqual(float(move[2]), -0.5, delta=0.15)
self.assertAlmostEqual(float(move[3]), 0.0, delta=0.15)
self.assertLess(float(measure_redraw(source + redraw, source).abs().max()), 0.02)
self.assertLess(float(broad_change(zoomed + redraw, source)), WHOLE_PICTURE / 2)
lock = lock_for(source)
out = run(lock, local_prediction(zoomed, other, redraw))
self.assertEqual(lock.status, "locked")
# the zoom did not read as an edit: only the planted box is free, and the rest is the original, unzoomed
self.assertGreater(lock.kept_share(), 0.7)
self.assertTrue(torch.equal(out[..., :12, :], source[..., :12, :]))
# an even tint is not one either; new light across the picture is
self.assertLess(float(broad_change(source + redraw + 0.6, source)), WHOLE_PICTURE / 2)
self.assertGreater(float(broad_change(source + redraw + 0.6 * other, source)), WHOLE_PICTURE)
def test_always_locks_a_whole_picture_edit(self):
source, other, _ = latents()
lock = lock_for(source, mode="always")
run(lock, 0.3 * source + other)
self.assertEqual(lock.status, "locked")
def test_changed_stays_changed_and_a_new_run_starts_clean(self):
source, other, redraw = latents()
lock = lock_for(source)
run(lock, local_prediction(source, other, redraw), 1.0)
first = lock.mask.clone()
run(lock, source + redraw, 0.8) # a later step that agrees with the original everywhere
self.assertTrue(torch.all(lock.mask >= first))
run(lock, source + redraw, 1.0) # the noise level went up: a new run
self.assertLess(float(lock.mask.max()), 0.5)
def test_given_mask_is_used_as_is(self):
source, other, redraw = latents()
lock = lock_for(source)
mask = torch.zeros(1, H * 16, W * 16)
mask[:, : H * 8] = 1.0 # the top half may change
lock.user_mask = mask
pred = 0.3 * source + other # would count as a whole-picture edit
out = run(lock, pred)
self.assertEqual(lock.status, "locked")
self.assertTrue(torch.equal(out[..., :40, :], pred[..., :40, :]))
self.assertTrue(torch.equal(out[..., 56:, :], source[..., 56:, :]))
self.assertIn("your mask", describe(lock))
def test_other_sizes_video_and_wrong_vae_do_nothing(self):
source, other, redraw = latents()
pred = local_prediction(source, other, redraw)
lock = lock_for(source[..., :48, :40].clone())
self.assertTrue(torch.equal(run(lock, pred), pred))
self.assertEqual(lock.status, "size")
lock = lock_for(source)
clip = pred.expand(-1, -1, 5, -1, -1)
self.assertTrue(torch.equal(run(lock, clip), clip))
self.assertEqual(lock.status, "video")
lock = lock_for(source[:, :16].clone())
self.assertTrue(torch.equal(run(lock, pred), pred))
self.assertEqual(lock.status, "vae")
for status in ("size", "video", "vae"):
lock.status = status
self.assertIn("did nothing", describe(lock))
def test_a_grid_one_cell_off_still_locks(self):
source, other, redraw = latents(video=False)
lock = lock_for(torch.nn.functional.interpolate(source, size=(H + 2, W + 1), mode="bilinear"))
run(lock, local_prediction(source, other, redraw))
self.assertEqual(lock.status, "locked")
self.assertGreater(lock.kept_share(), 0.7)
def test_tolerance_moves_the_line(self):
source, other, redraw = latents(video=False)
pred = source + redraw
pred[..., BOX[0], BOX[1]] += 0.45 * other[..., BOX[0], BOX[1]] # a faint change
magnitude = difference(pred, source)
quiet = quiet_level(magnitude)
loose = change_core(magnitude, quiet, 0.5)
strict = change_core(magnitude, quiet, 2.0)
self.assertGreater(float(loose[..., 40:50, 30:40].mean()), 0.9)
self.assertEqual(float(strict.max()), 0.0)
def test_faint_change_counts_only_beside_a_clear_one(self):
quiet = torch.tensor([1.0])
magnitude = torch.ones(1, 1, 40, 40)
magnitude[..., 5:15, 5:15] = 2.2 # faint, alone: redraw noise
magnitude[..., 22:34, 22:34] = 2.2 # faint ...
magnitude[..., 26:30, 26:30] = 4.0 # ... around a clear change
core = change_core(magnitude, quiet)
self.assertEqual(float(core[..., 5:15, 5:15].max()), 0.0)
self.assertEqual(float(core[..., 22:34, 22:34].min()), 1.0)
self.assertEqual(float(core.sum()), 144.0)
# what an earlier step held stays, and faint change that touches it joins
held = torch.zeros_like(core)
held[..., 8:10, 8:10] = 1.0
again = change_core(torch.ones(1, 1, 40, 40), quiet, held=held)
self.assertEqual(float(again.sum()), 4.0)
joined = change_core(magnitude, quiet, held=held)
self.assertEqual(float(joined[..., 5:15, 5:15].min()), 1.0)
soft = soften(core)
self.assertTrue(torch.all(soft[..., 22:34, 22:34] == 1.0))
self.assertGreater(float(soft[0, 0, 21, 28]), 0.5)
self.assertEqual(float(soft[0, 0, 2, 2]), 0.0)
def test_restore_gives_the_original_pixels_back(self):
gen = torch.Generator().manual_seed(1)
original = torch.rand(1, 128, 160, 3, generator=gen)
result = torch.rand(2, 128, 160, 3, generator=gen)
mask = torch.zeros(1, 128, 160)
mask[:, 40:80, 60:100] = 1.0
out, edit = restore_pixels(result, original, mask, 8)
self.assertEqual(out.shape, result.shape)
self.assertEqual(edit.shape, (2, 128, 160))
self.assertTrue(torch.equal(out[:, :16], original[:, :16].expand(2, -1, -1, -1)))
self.assertTrue(torch.equal(out[:, 40:80, 60:100], result[:, 40:80, 60:100]))
# the fade lies outside the edit
self.assertTrue(torch.all(edit[:, 40:80, 60:100] == 1.0))
self.assertGreater(float(edit[0, 36, 80]), 0.0)
# another size: the original is resized to the result
small = torch.rand(1, 64, 80, 3, generator=gen)
out, _ = restore_pixels(result, small, mask, 0)
self.assertEqual(out.shape, result.shape)
def test_restore_node_passes_through_when_nothing_was_locked(self):
lock = EditLock()
lock.status = "whole picture"
image = torch.rand(1, 32, 48, 3)
out, mask, report = AusBossEditLockRestore().restore(image, lock, 16)
self.assertTrue(torch.equal(out, image))
self.assertEqual(mask.shape, (1, 32, 48))
self.assertTrue(torch.all(mask == 1.0))
self.assertIn("stepped aside", report)
def test_restore_node_after_a_locked_run(self):
source, other, redraw = latents()
lock = lock_for(source)
lock.source = torch.rand(1, H * 4, W * 4, 3)
run(lock, local_prediction(source, other, redraw))
image = torch.rand(1, H * 4, W * 4, 3)
out, mask, report = AusBossEditLockRestore().restore(image, lock, 4)
self.assertTrue(torch.equal(out[:, :24], lock.source[:, :24]))
self.assertTrue(torch.equal(out[:, 150:210, 110:170], image[:, 150:210, 110:170]))
self.assertGreater(float(mask[0, 180, 140]), 0.99)
self.assertIn("kept", report)
def test_mappings(self):
keys = {"AUSBOSS_NODES_EditLock", "AUSBOSS_NODES_EditLockRestore"}
self.assertEqual(set(NODE_CLASS_MAPPINGS), keys)
self.assertEqual(set(NODE_DISPLAY_NAME_MAPPINGS), keys)
self.assertIs(NODE_CLASS_MAPPINGS["AUSBOSS_NODES_EditLock"], AusBossEditLock)
for name in NODE_DISPLAY_NAME_MAPPINGS.values():
self.assertTrue(name.endswith(" 🆎"))
if __name__ == "__main__":
unittest.main()
+225
View File
@@ -0,0 +1,225 @@
from __future__ import annotations
from pathlib import Path
import importlib.util
import math
import unittest
import torch
ROOT = Path(__file__).resolve().parent.parent
# Loaded by path: the model code is plain PyTorch and needs nothing the pack imports.
_spec = importlib.util.spec_from_file_location("ausboss_flashvsr_helpers", ROOT / "nodes" / "_flashvsr_helpers.py")
vsr = importlib.util.module_from_spec(_spec)
_spec.loader.exec_module(vsr)
def tiny_model(seed: int = 0):
torch.manual_seed(seed)
model = vsr.FlashVSRModel(
dim=24,
heads=2,
ffn_dim=48,
layers=2,
text_dim=8,
text_len=4,
freq_dim=16,
projector_hidden=(8, 12),
decoder_widths=(8, 8, 4, 4),
)
for parameter in model.parameters():
torch.nn.init.normal_(parameter, std=0.2)
model.positive_conditioning.normal_()
return model.eval()
class SizeTests(unittest.TestCase):
def test_output_is_even_and_the_working_size_is_a_multiple_of_128(self):
self.assertEqual(vsr.plan_sizes(360, 640, 2.0), (720, 1280, 768, 1280))
self.assertEqual(vsr.plan_sizes(271, 479, 1.5), (406, 718, 512, 768))
self.assertEqual(vsr.plan_sizes(64, 64, 2.0), (128, 128, 128, 128))
def test_the_padded_clip_always_covers_every_frame(self):
for count in (1, 5, 21, 22, 29, 30, 81, 200):
groups = vsr.plan_groups(count)
self.assertGreaterEqual(groups, 3)
self.assertGreaterEqual(8 * groups - 3, count)
latents = sum(n for _, n in vsr.pass_layout(groups))
self.assertEqual(latents, 2 * groups)
def test_passes_follow_one_another_without_a_gap(self):
expected = 0
for first, count in vsr.pass_layout(6):
self.assertEqual(first, expected)
expected += count
class BlockTests(unittest.TestCase):
def test_blocks_round_trip(self):
x = torch.randn(4 * 16 * 24, 6)
back = vsr.from_blocks(vsr.to_blocks(x, 4, 16, 24), 4, 16, 24)
self.assertTrue(torch.equal(x, back))
def test_a_block_holds_two_frames_of_an_8_by_8_patch(self):
frames, rows, cols = 2, 16, 16
t, r, c = torch.meshgrid(torch.arange(frames), torch.arange(rows), torch.arange(cols), indexing="ij")
ids = torch.stack([t, r // 8, c // 8], dim=-1).reshape(-1, 3).float()
blocks = vsr.to_blocks(ids, frames, rows, cols)
self.assertEqual(blocks.shape, (4, 128, 3))
for block in blocks:
self.assertEqual(block[:, 1:].unique(dim=0).shape[0], 1)
self.assertEqual(sorted(block[:, 0].unique().tolist()), [0.0, 1.0])
def test_the_neighbourhood_is_centred_and_cut_at_the_edges(self):
mask = vsr.local_block_mask(3, 20, 11, "cpu")
row = mask[20 + 10].view(3, 20) # the block at row 1, column 10
self.assertTrue(row[:, 5:16].all())
self.assertFalse(row[:, :5].any() or row[:, 16:].any())
self.assertEqual(int(mask[0].sum()), 3 * 6) # the corner block: all 3 rows, columns 0-5
def test_selection_keeps_the_asked_number_inside_the_neighbourhood(self):
torch.manual_seed(1)
heads, per_group = 2, 6
local = vsr.local_block_mask(2, 3, 3, "cpu")
q = torch.randn(2 * per_group, 128, 8)
k = torch.randn(3 * per_group, 128, 8)
chosen, shares = vsr.choose_key_blocks(q, k, heads, local, 2, keep=20)
self.assertTrue((shares[chosen] > 0).all())
self.assertTrue((shares[:, ~local.repeat(2, 3)] == 0).all())
self.assertEqual(chosen.shape, (heads, 12, 18))
self.assertTrue((chosen.view(heads, 2, -1).sum(-1) == 20).all())
self.assertFalse((chosen & ~local.repeat(2, 3)).any())
class SparseAttentionTests(unittest.TestCase):
def dense(self, q, k, v, chosen):
heads, nq, tokens, dim = q.shape
nk = k.shape[1]
scores = torch.einsum("hqtd,hksd->hqtks", q, k) / math.sqrt(dim)
scores = scores.masked_fill(~chosen[:, :, None, :, None], float("-inf"))
weights = scores.reshape(heads, nq, tokens, nk * tokens).softmax(-1).nan_to_num(0.0)
return weights @ v.reshape(heads, 1, nk * tokens, dim)
def test_it_matches_plain_masked_attention(self):
torch.manual_seed(2)
q, k, v = torch.randn(3, 7, 128, 4), torch.randn(3, 11, 128, 4), torch.randn(3, 11, 128, 4)
chosen = torch.rand(3, 7, 11) < 0.4
chosen[0, 0] = False # a row that chose nothing
chosen[1, 2] = True # a row that chose everything
want = self.dense(q, k, v, chosen)
for budget in (1, 8, 40, 100000):
got = vsr.sparse_block_attention(q, k, v, chosen, slot_budget=budget)
self.assertTrue(torch.allclose(got, want, atol=1e-5), budget)
self.assertTrue((got[0, 0] == 0).all())
def test_with_shares_a_row_is_filled_up_from_its_neighbourhood_and_never_reads_less(self):
torch.manual_seed(4)
q, k, v = torch.randn(2, 6, 128, 4), torch.randn(2, 9, 128, 4), torch.randn(2, 9, 128, 4)
allowed = torch.rand(2, 6, 9) < 0.8
allowed[..., 0] = True
shares = torch.rand(2, 6, 9) * allowed
chosen = (shares > 0.5) & allowed
chosen[..., 0] = True # every row chose something
chosen[1, 3] = allowed[1, 3] # the widest row: everything it may read
widest = int(chosen.sum(-1).max())
# one call at the widest row's width: each row reads its chosen blocks, then its best other ones
rank = chosen.float() * 2 + shares
top = torch.zeros_like(chosen).scatter(-1, rank.argsort(-1, descending=True)[..., :widest], True)
want = self.dense(q, k, v, top & allowed)
got = vsr.sparse_block_attention(q, k, v, chosen, shares, slot_budget=100000)
self.assertTrue(torch.allclose(got, want, atol=1e-5))
self.assertTrue(((top & allowed) | ~chosen).all())
class DecoderTests(unittest.TestCase):
def test_frames_one_at_a_time_match_all_at_once(self):
decoder = tiny_model().tc_decoder.double() # double precision: random weights make large numbers
x = torch.randn(5, 16 + 768, 4, 6, dtype=torch.float64)
with torch.no_grad():
whole = decoder.decode({}, x)
memory = {}
parts = torch.cat([decoder.decode(memory, x[i : i + 1]) for i in range(5)])
self.assertEqual(whole.shape, (5 * 4 - 3, 3, 32, 48))
self.assertTrue(torch.allclose(whole, parts, rtol=1e-9, atol=1e-9))
class ProjectorTests(unittest.TestCase):
def test_one_set_of_tokens_per_four_frames(self):
model = tiny_model()
memory = {}
clip = torch.rand(1, 3, 9, 32, 48) * 2 - 1
with torch.no_grad():
self.assertIsNone(model.lq_proj_in.push(memory, clip[:, :, :1]))
first = model.lq_proj_in.push(memory, clip[:, :, 1:5])
second = model.lq_proj_in.push(memory, clip[:, :, 5:9])
self.assertEqual(first.shape, (1, 2 * 3, 24))
self.assertEqual(second.shape, first.shape)
self.assertFalse(torch.allclose(first, second))
class WholeClipTests(unittest.TestCase):
def run_clip(self, count, height, width, scale, **kw):
torch.manual_seed(3)
frames = torch.rand(count, height, width, 3)
return vsr.upscale_frames(tiny_model(), frames, scale, device="cpu", dtype=torch.float32, **kw), frames
def test_every_frame_comes_back_at_the_new_size(self):
for count, height, width, scale in ((1, 64, 64, 2.0), (23, 50, 90, 2.0), (30, 128, 128, 1.0)):
out, _ = self.run_clip(count, height, width, scale)
self.assertEqual(out.shape, (count, vsr._even(height * scale), vsr._even(width * scale), 3))
self.assertTrue(torch.isfinite(out).all())
self.assertTrue(0.0 <= float(out.min()) and float(out.max()) <= 1.0)
def test_the_same_seed_gives_the_same_clip(self):
a, _ = self.run_clip(9, 64, 64, 2.0, seed=5)
b, _ = self.run_clip(9, 64, 64, 2.0, seed=5)
c, _ = self.run_clip(9, 64, 64, 2.0, seed=6)
self.assertTrue(torch.equal(a, b))
self.assertFalse(torch.equal(a, c))
def test_colour_match_brings_the_means_back_to_the_source(self):
out, frames = self.run_clip(5, 64, 64, 2.0, color_match=True)
self.assertLess(float((out.mean(dim=(1, 2)) - frames.mean(dim=(1, 2))).abs().max()), 0.05)
def test_another_decoder_gets_every_latent_frame(self):
seen = {}
def decode(latents):
seen["shape"] = tuple(latents.shape)
frames = 4 * (latents.shape[2] - 1) + 1
return torch.full((frames, latents.shape[3] * 8, latents.shape[4] * 8, 3), 0.5)
out, _ = self.run_clip(23, 64, 64, 2.0, decode_latents=decode, color_match=False)
self.assertEqual(seen["shape"], (1, 16, 8, 16, 16))
self.assertEqual(out.shape, (23, 128, 128, 3))
self.assertTrue(torch.allclose(out, torch.full_like(out, 0.5)))
def test_a_large_picture_is_done_in_tiles_that_cover_it(self):
self.assertEqual(vsr.plan_tiles(1152, 2048, None), [(0, 0, 1152, 2048)])
self.assertEqual(vsr.plan_tiles(640, 1024, 640 * 1024), [(0, 0, 640, 1024)])
for work_h, work_w, limit in ((1152, 2048, 1_300_000), (2176, 3840, 2_000_000), (768, 768, 100_000), (128, 1280, 50_000)):
tiles = vsr.plan_tiles(work_h, work_w, limit)
self.assertGreater(len(tiles), 1)
cover = torch.zeros(work_h, work_w)
for top, left, height, width in tiles:
self.assertEqual((height % 128, width % 128, top % 16, left % 16), (0, 0, 0, 0))
self.assertTrue(top + height <= work_h and left + width <= work_w)
self.assertLessEqual(height * width, max(limit, 128 * 128))
cover[top : top + height, left : left + width] += vsr.tile_weight((top, left, height, width), work_h, work_w)
self.assertGreater(float(cover.min()), 0.5)
def test_tiles_give_every_frame_at_the_same_size(self):
whole, _ = self.run_clip(9, 128, 192, 2.0)
tiled, _ = self.run_clip(9, 128, 192, 2.0, max_tile_pixels=256 * 256)
self.assertEqual(tiled.shape, whole.shape)
self.assertTrue(torch.isfinite(tiled).all())
self.assertTrue(0.0 <= float(tiled.min()) and float(tiled.max()) <= 1.0)
def test_progress_counts_the_passes(self):
calls = []
self.run_clip(40, 64, 64, 2.0, on_pass=lambda done, total: calls.append((done, total)))
self.assertEqual(calls, [(1, 4), (2, 4), (3, 4), (4, 4)])
if __name__ == "__main__":
unittest.main()
+110
View File
@@ -0,0 +1,110 @@
from __future__ import annotations
from datetime import datetime
from pathlib import Path
import sys
import tempfile
import unittest
ROOT = Path(__file__).resolve().parent.parent
sys.path.insert(0, str(ROOT))
if "nodes" in sys.modules and not hasattr(sys.modules["nodes"], "__path__"):
del sys.modules["nodes"]
from nodes._image_hold_helpers import GONE, HELD_FOLDER, hold_pictures, keep_pictures
NOW = datetime(2026, 11, 10, 9, 30, 0)
def settings(**changes):
base = {
"format": "png", "extension": "png", "width": 64, "height": 96, "exact": "",
"filename_prefix": "shoot", "on_existing": "overwrite", "output_dir": "",
"name_counter": True, "name_date": False, "name_time": False, "name_size": False,
"name_batch": False, "caption": "",
}
base.update(changes)
return base
class HoldTests(unittest.TestCase):
def setUp(self):
self.box = tempfile.TemporaryDirectory()
self.temp = Path(self.box.name) / "temp"
self.output = Path(self.box.name) / "output"
self.temp.mkdir()
self.output.mkdir()
def tearDown(self):
self.box.cleanup()
def hold(self, count=3, **changes):
frames = [f"picture {index}".encode() for index in range(count)]
return hold_pictures(self.temp, frames, settings(**changes), lambda path, frame: path.write_bytes(frame))
def keep(self, token, picks=None):
return keep_pictures(self.temp, self.output, token, picks, now=NOW)
def test_a_held_run_saves_nothing_until_it_is_kept(self):
token, previews = self.hold()
self.assertEqual(len(previews), 3)
self.assertTrue(all(entry["type"] == "temp" and entry["subfolder"] == HELD_FOLDER for entry in previews))
self.assertEqual(list(self.output.iterdir()), [])
answer = self.keep(token)
self.assertEqual([item["path"] for item in answer["saved"]], ["shoot_00001.png", "shoot_00002.png", "shoot_00003.png"])
self.assertEqual((self.output / "shoot_00002.png").read_bytes(), b"picture 1")
def test_one_picture_can_be_kept_and_is_not_saved_twice(self):
token, _ = self.hold()
first = self.keep(token, [2])
self.assertEqual(first["saved"], [{"index": 2, "path": "shoot_00001.png"}])
self.assertEqual((self.output / "shoot_00001.png").read_bytes(), b"picture 2")
again = self.keep(token, [2])
self.assertEqual(again["saved"], [])
rest = self.keep(token)
self.assertEqual([item["index"] for item in rest["saved"]], [0, 1])
self.assertEqual(rest["kept"], [0, 1, 2])
self.assertEqual(sorted(entry.name for entry in self.output.iterdir()), ["shoot_00001.png", "shoot_00002.png", "shoot_00003.png"])
def test_the_folder_and_caption_of_the_run_are_used(self):
token, _ = self.hold(count=1, output_dir="sets/portraits", caption="a portrait")
answer = self.keep(token)
self.assertEqual(answer["saved"][0]["path"], "sets/portraits/shoot_00001.png")
self.assertEqual((self.output / "sets/portraits/shoot_00001.txt").read_text(), "a portrait")
def test_an_exact_name_keeps_its_place_in_the_run(self):
token, _ = self.hold(count=3, exact="portrait")
whole = [item["path"] for item in self.keep(self.hold(count=3, exact="other")[0])["saved"]]
picked = self.keep(token, [1])["saved"][0]["path"]
self.assertEqual(picked, whole[1].replace("other", "portrait"))
def test_a_request_cannot_name_a_place(self):
token, _ = self.hold()
for bad in ["../" + token, token + "/..", "", None, 5, token.upper(), "g" * 16]:
with self.assertRaises(ValueError):
self.keep(bad)
for picks in [[3], [-1], ["0"], [True], [0.0]]:
with self.assertRaises(ValueError):
self.keep(token, picks)
self.assertEqual(list(self.output.iterdir()), [])
def test_pictures_that_are_gone_say_so(self):
with self.assertRaises(LookupError) as caught:
self.keep("0" * 16)
self.assertEqual(str(caught.exception), GONE)
token, previews = self.hold(count=1)
(self.temp / HELD_FOLDER / previews[0]["filename"]).unlink()
with self.assertRaises(LookupError):
self.keep(token)
def test_a_folder_outside_the_output_folder_is_refused_at_the_click_too(self):
token, _ = self.hold(count=1)
manifest = self.temp / HELD_FOLDER / f"{token}.json"
manifest.write_text(manifest.read_text().replace('"output_dir": ""', '"output_dir": "../elsewhere"'))
with self.assertRaises(ValueError):
self.keep(token)
self.assertFalse((Path(self.box.name) / "elsewhere").exists())
if __name__ == "__main__":
unittest.main()
+77
View File
@@ -508,3 +508,80 @@ class SaveImageLocalModeTests(SaveImageNodeTests):
if __name__ == "__main__":
unittest.main()
class SaveImageLightPreviewTests(unittest.TestCase):
"""The small copy the node shows on its face instead of the full file."""
def run_node(self, output_root, temp_root, **overrides):
class FakeFolderPaths:
@staticmethod
def get_output_directory():
return str(output_root)
@staticmethod
def get_temp_directory():
return str(temp_root)
values = {
"images": gradient_batch(1, 64, 4096),
"filename_prefix": "sheet",
"format": "png",
"save_metadata": False,
}
values.update(overrides)
with patch.object(node_save_image, "folder_paths", FakeFolderPaths):
return node_save_image.AusBossSaveImage().save(**values)
def test_a_big_picture_gets_a_small_copy_and_the_file_stays_full_size(self):
from nodes._image_save_helpers import PREVIEW_EDGE
with tempfile.TemporaryDirectory() as out, tempfile.TemporaryDirectory() as temp:
result = self.run_node(out, temp)
(place,) = result["ui"]["ausboss_preview"]
self.assertRegex(place, r"^ausboss_preview/[0-9a-f]{16}_000\.webp$")
with Image.open(Path(temp) / place) as small:
self.assertEqual(small.format, "WEBP")
self.assertEqual(small.size, (PREVIEW_EDGE, 32))
with Image.open(result["result"][0]) as saved:
self.assertEqual(saved.size, (4096, 64))
# The queue still lists the saved file, not the copy.
self.assertEqual(result["ui"]["images"], [{"filename": "sheet_00001.png", "subfolder": "", "type": "output"}])
def test_every_saved_picture_has_its_copy_in_order(self):
with tempfile.TemporaryDirectory() as out, tempfile.TemporaryDirectory() as temp:
result = self.run_node(out, temp, images=gradient_batch(3, 8, 16))
places = result["ui"]["ausboss_preview"]
self.assertEqual(len(places), len(result["ui"]["images"]))
self.assertEqual([place[-8:] for place in places], ["000.webp", "001.webp", "002.webp"])
for place in places:
with Image.open(Path(temp) / place) as small:
self.assertEqual(small.size, (16, 8))
def test_held_pictures_get_copies_too(self):
with tempfile.TemporaryDirectory() as out, tempfile.TemporaryDirectory() as temp:
result = self.run_node(out, temp, autosave=False)
(place,) = result["ui"]["ausboss_preview"]
self.assertTrue((Path(temp) / place).is_file())
self.assertEqual(len(result["ui"]["ausboss_held"]), 1)
def test_preview_off_writes_no_copy(self):
with tempfile.TemporaryDirectory() as out, tempfile.TemporaryDirectory() as temp:
result = self.run_node(out, temp, preview=False)
self.assertEqual(result["ui"]["ausboss_preview"], [])
self.assertFalse((Path(temp) / "ausboss_preview").exists())
self.assertTrue(Path(result["result"][0]).is_file())
def test_a_skipped_file_has_no_copy(self):
with tempfile.TemporaryDirectory() as out, tempfile.TemporaryDirectory() as temp:
(Path(out) / "photo.png").write_bytes(b"original")
result = self.run_node(out, temp, exact_name="photo", on_existing="skip")
self.assertEqual(result["ui"]["images"], [])
self.assertEqual(result["ui"]["ausboss_preview"], [])
def test_a_copy_that_cannot_be_written_never_stops_the_save(self):
with tempfile.TemporaryDirectory() as out, tempfile.TemporaryDirectory() as temp:
blocked = Path(temp) / "not_a_folder"
blocked.write_text("x", encoding="utf-8")
result = self.run_node(out, blocked)
self.assertEqual(result["ui"]["ausboss_preview"], [])
self.assertTrue(Path(result["result"][0]).is_file())
+274
View File
@@ -0,0 +1,274 @@
"""Load Image: the size plan as numbers, and the node on real files."""
from __future__ import annotations
import json
import os
from pathlib import Path
import shutil
import sys
import tempfile
from types import SimpleNamespace
import unittest
from unittest.mock import patch
import numpy as np
import torch
from PIL import Image
ROOT = Path(__file__).resolve().parent.parent
sys.path.insert(0, str(ROOT))
if "nodes" in sys.modules and not hasattr(sys.modules["nodes"], "__path__"):
del sys.modules["nodes"]
from nodes import _media_helpers # noqa: E402
from nodes._load_image_helpers import ( # noqa: E402
CROP_SIDES,
RATIOS,
SIZE_MODES,
apply_load_size,
plan_load_size,
)
from nodes.node_load_image import ( # noqa: E402
NODE_CLASS_MAPPINGS,
NODE_DISPLAY_NAME_MAPPINGS,
AusBossLoadImage,
)
TABLE = ROOT / "tests" / "fixtures" / "load_size_cases.json"
class PlanTests(unittest.TestCase):
def test_the_table_the_browser_is_held_to_is_what_the_planner_gives(self):
table = json.loads(TABLE.read_text(encoding="utf-8"))
self.assertGreater(len(table["rows"]), 200)
for row in table["rows"]:
plan = plan_load_size(*row[:12])
got = [plan["resize_width"], plan["resize_height"], plan["crop_x"], plan["crop_y"], plan["width"], plan["height"]]
self.assertEqual(got, row[12:], row[:12])
def test_a_crop_keeps_the_side_that_is_asked_for(self):
# 200 x 100 into a 100 x 100 box: 100 pixels of width to lose.
starts = {"left": 0, "top left": 0, "bottom left": 0, "center": 50, "top": 50, "bottom": 50, "right": 100, "top right": 100, "bottom right": 100}
self.assertEqual(set(starts), set(CROP_SIDES))
for side, start in starts.items():
for size in ("crop to fill", "crop", "crop to ratio"):
plan = plan_load_size(200, 100, size, width=100, height=100, multiple=1, crop_from=side, ratio="1:1")
self.assertEqual((plan["crop_x"], plan["crop_y"], plan["width"], plan["height"]), (start, 0, 100, 100), (side, size))
tall = plan_load_size(100, 300, "crop to fill", width=100, height=100, multiple=1, crop_from="bottom left")
self.assertEqual((tall["crop_x"], tall["crop_y"]), (0, 200))
def test_crop_and_crop_to_ratio_never_resize_and_never_leave_the_picture(self):
for source in ((1336, 1784), (1920, 1080), (30, 2000), (10, 10)):
for multiple in (1, 8, 64):
for size, ratio in (("crop", "1:1"), *(("crop to ratio", ratio) for ratio in RATIOS)):
plan = plan_load_size(*source, size, width=1000, height=700, multiple=multiple, crop_from="bottom right", ratio=ratio)
self.assertEqual((plan["resize_width"], plan["resize_height"]), source, (source, size, ratio))
self.assertGreaterEqual(plan["width"], 1)
self.assertGreaterEqual(plan["height"], 1)
self.assertLessEqual(plan["crop_x"] + plan["width"], source[0])
self.assertLessEqual(plan["crop_y"] + plan["height"], source[1])
plan = plan_load_size(1920, 1080, "crop", width=1000, height=700, multiple=64)
self.assertEqual((plan["width"], plan["height"]), (960, 640), "rounded down, inside the box")
plan = plan_load_size(1336, 1784, "crop to ratio", multiple=1, ratio="16:9")
self.assertEqual((plan["width"], plan["height"]), (1336, 752), "the widest 16:9 piece the picture holds")
plan = plan_load_size(1336, 1784, "crop to ratio", width=1600, height=900, multiple=1, ratio="width : height")
self.assertEqual((plan["width"], plan["height"]), (1336, 752), "the boxes give the shape")
def test_off_gives_the_picture_back_whatever_else_is_set(self):
plan = plan_load_size(913, 1631, "off", megapixels=4.0, multiple=64, enlarge=False)
self.assertEqual((plan["width"], plan["height"], plan["crop_x"], plan["crop_y"]), (913, 1631, 0, 0))
def test_each_choice_keeps_its_promise(self):
plan = plan_load_size(912, 1632, "megapixels", megapixels=2.0, multiple=1)
self.assertAlmostEqual(plan["width"] * plan["height"] / 1e6, 2.0, delta=0.01)
self.assertAlmostEqual(plan["width"] / plan["height"], 912 / 1632, delta=0.002)
plan = plan_load_size(912, 1632, "longest side", longest_side=2048, multiple=1)
self.assertEqual((plan["width"], plan["height"]), (1144, 2048))
plan = plan_load_size(1920, 1080, "longest side", longest_side=1280, multiple=1)
self.assertEqual((plan["width"], plan["height"]), (1280, 720))
plan = plan_load_size(1920, 1080, "scale", scale=0.5, multiple=1)
self.assertEqual((plan["width"], plan["height"]), (960, 540))
plan = plan_load_size(1920, 1080, "fit inside", width=1024, height=1024, multiple=1)
self.assertEqual((plan["width"], plan["height"]), (1024, 576))
plan = plan_load_size(1920, 1080, "crop to fill", width=1024, height=1024, multiple=1)
self.assertEqual((plan["width"], plan["height"]), (1024, 1024))
self.assertEqual((plan["resize_width"], plan["resize_height"]), (1821, 1024))
self.assertEqual((plan["crop_x"], plan["crop_y"]), (398, 0))
def test_round_to_gives_multiples_and_fit_inside_stays_in_its_box(self):
for size in SIZE_MODES[1:]:
plan = plan_load_size(1000, 777, size, megapixels=1.3, longest_side=1111, scale=1.37, width=900, height=700, multiple=64)
self.assertEqual((plan["width"] % 64, plan["height"] % 64), (0, 0), size)
plan = plan_load_size(1920, 1080, "fit inside", width=1000, height=1000, multiple=64)
self.assertLessEqual(plan["width"], 1000)
self.assertLessEqual(plan["height"], 1000)
def test_with_enlarge_off_nothing_comes_out_bigger_than_the_file(self):
for size in SIZE_MODES[1:]:
for multiple in (1, 8, 16):
plan = plan_load_size(640, 480, size, megapixels=4.0, longest_side=4096, scale=3.0, width=2048, height=2048, multiple=multiple, enlarge=False)
self.assertLessEqual(plan["width"], 640, (size, multiple))
self.assertLessEqual(plan["height"], 480, (size, multiple))
self.assertLessEqual(plan["resize_width"], 640, (size, multiple))
# Crop to fill still gives the box's shape, cut from the file as it is.
plan = plan_load_size(800, 600, "crop to fill", width=1024, height=1024, multiple=1, enlarge=False)
self.assertEqual((plan["width"], plan["height"], plan["resize_width"], plan["resize_height"], plan["crop_x"]), (600, 600, 800, 600, 100))
# A picture that is big enough is resized as usual.
plan = plan_load_size(4000, 3000, "longest side", longest_side=1024, multiple=1, enlarge=False)
self.assertEqual((plan["width"], plan["height"]), (1024, 768))
def test_bad_input_is_named(self):
with self.assertRaisesRegex(ValueError, "size must be one of"):
plan_load_size(100, 100, "stretch")
with self.assertRaisesRegex(ValueError, "larger than 0x0"):
plan_load_size(0, 100, "off")
with self.assertRaises(ValueError):
plan_load_size(100, 100, "crop", crop_from="middle")
with self.assertRaises(ValueError):
plan_load_size(100, 100, "crop to ratio", ratio="7:5")
def test_a_plan_that_changes_nothing_hands_the_same_tensors_back(self):
image, mask = torch.rand(1, 20, 30, 3), torch.zeros(1, 20, 30)
out_image, out_mask = apply_load_size(image, mask, plan_load_size(30, 20, "off"), "lanczos")
self.assertIs(out_image, image)
self.assertIs(out_mask, mask)
class NodeTests(unittest.TestCase):
def setUp(self):
# The temp folder stands in for ComfyUI's input folder.
self.folder = tempfile.mkdtemp(prefix="ausboss_load_image_")
self.addCleanup(shutil.rmtree, self.folder, True)
stand_in = SimpleNamespace(
get_input_directory=lambda: self.folder,
get_annotated_filepath=lambda name: os.path.join(self.folder, name),
)
patcher = patch.object(_media_helpers, "folder_paths", stand_in)
patcher.start()
self.addCleanup(patcher.stop)
def write(self, name="pic.png", width=96, height=64, mode="RGB"):
path = Path(self.folder) / name
path.parent.mkdir(parents=True, exist_ok=True)
values = np.zeros((height, width, 4), dtype=np.uint8)
values[..., 0] = np.linspace(0, 255, width, dtype=np.uint8)[None, :]
values[..., 1] = np.linspace(0, 255, height, dtype=np.uint8)[:, None]
values[..., 2] = 90
values[..., 3] = 255
values[: height // 2, : width // 2, 3] = 0 # the top left quarter is see-through
Image.fromarray(values).convert(mode).save(path)
return name
def run_node(self, name, **values):
return AusBossLoadImage().load(name, **values)
def test_the_node_is_registered_under_its_permanent_key(self):
self.assertIs(NODE_CLASS_MAPPINGS["AUSBOSS_NODES_LoadImage"], AusBossLoadImage)
self.assertEqual(NODE_DISPLAY_NAME_MAPPINGS["AUSBOSS_NODES_LoadImage"], "Load Image \U0001f18e")
spec = AusBossLoadImage.INPUT_TYPES()
self.assertEqual(
list(spec["required"]),
["image", "size", "megapixels", "longest_side", "scale", "width", "height", "multiple", "method", "enlarge", "crop_from", "ratio"],
)
self.assertEqual(spec["required"]["size"][0], list(SIZE_MODES))
self.assertEqual(spec["required"]["size"][1]["default"], "off")
self.assertEqual(len(AusBossLoadImage.RETURN_TYPES), len(AusBossLoadImage.RETURN_NAMES))
self.assertEqual(len(AusBossLoadImage.RETURN_TYPES), len(AusBossLoadImage.OUTPUT_TOOLTIPS))
for name, (_, options) in spec["required"].items():
self.assertTrue(options.get("tooltip"), name)
def test_with_size_off_the_file_comes_out_as_it_is(self):
name = self.write()
image, mask, width, height, filename, original_w, original_h = self.run_node(name)
self.assertEqual(tuple(image.shape), (1, 64, 96, 3))
self.assertEqual(tuple(mask.shape), (1, 64, 96))
self.assertEqual((width, height, original_w, original_h), (96, 64, 96, 64))
self.assertEqual(filename, "pic")
wanted = np.asarray(Image.open(Path(self.folder) / name).convert("RGB"), dtype=np.float32) / 255.0
self.assertTrue(np.array_equal(image[0].numpy(), wanted), "every pixel as the file has it")
self.assertEqual(float(mask.max()), 0.0, "no transparency: an all black mask")
def test_a_see_through_picture_gives_its_mask_the_way_the_stock_loader_does(self):
name = self.write("cut.png", mode="RGBA")
_, mask, *_ = self.run_node(name)
self.assertEqual(float(mask[0, 5, 5]), 1.0, "see-through is white")
self.assertEqual(float(mask[0, 60, 90]), 0.0, "solid is black")
def test_every_size_choice_gives_the_planned_size_for_picture_and_mask(self):
name = self.write("cut.png", mode="RGBA")
for size in SIZE_MODES[1:]:
with self.subTest(size=size):
values = {"megapixels": 0.02, "longest_side": 160, "scale": 1.5, "width": 80, "height": 80, "multiple": 8}
image, mask, width, height, _, original_w, original_h = self.run_node(name, size=size, **values)
plan = plan_load_size(96, 64, size, **values)
self.assertEqual((width, height), (plan["width"], plan["height"]))
self.assertEqual(tuple(image.shape), (1, height, width, 3))
self.assertEqual(tuple(mask.shape), (1, height, width))
self.assertEqual((original_w, original_h), (96, 64))
self.assertGreaterEqual(float(image.min()), 0.0)
self.assertLessEqual(float(image.max()), 1.0)
self.assertGreaterEqual(float(mask.min()), 0.0)
self.assertLessEqual(float(mask.max()), 1.0)
def test_crop_to_fill_cuts_the_middle(self):
name = self.write("wide.png", width=200, height=100)
image, _, width, height, *_ = self.run_node(name, size="crop to fill", width=100, height=100, multiple=1, method="nearest")
self.assertEqual((width, height), (100, 100))
whole, *_ = self.run_node(name)
self.assertTrue(torch.equal(image, whole[:, :, 50:150, :]), "the middle of the file, untouched")
def test_a_crop_takes_the_side_that_is_asked_for_out_of_the_file(self):
name = self.write("wide.png", width=200, height=100)
whole, *_ = self.run_node(name)
left, *_ = self.run_node(name, size="crop to fill", width=100, height=100, multiple=1, method="nearest", crop_from="left")
self.assertTrue(torch.equal(left, whole[:, :, 0:100, :]))
right, mask, width, height, *_ = self.run_node(name, size="crop", width=60, height=40, multiple=1, crop_from="bottom right")
self.assertEqual((width, height), (60, 40))
self.assertTrue(torch.equal(right, whole[:, 60:100, 140:200, :]), "a piece of the file, not resized")
self.assertEqual(tuple(mask.shape), (1, 40, 60))
shaped, _, width, height, *_ = self.run_node(name, size="crop to ratio", ratio="1:1", multiple=1, crop_from="top")
self.assertEqual((width, height), (100, 100))
self.assertTrue(torch.equal(shaped, whole[:, :, 50:150, :]))
def test_enlarge_off_leaves_a_small_file_alone(self):
name = self.write()
image, _, width, height, *_ = self.run_node(name, size="longest side", longest_side=1024, multiple=1, enlarge=False)
self.assertEqual((width, height), (96, 64))
whole, *_ = self.run_node(name)
self.assertTrue(torch.equal(image, whole))
def test_a_file_in_a_subfolder_gives_its_bare_name(self):
name = self.write("shots/day one/hero.final.png")
*_, filename, _, _ = self.run_node(name)
self.assertEqual(filename, "hero.final")
def test_every_frame_of_an_animation_comes_through(self):
frames = [Image.new("RGB", (40, 30), (index * 60, 20, 20)) for index in range(3)]
path = Path(self.folder) / "turn.gif"
frames[0].save(path, save_all=True, append_images=frames[1:], duration=80, loop=0)
image, mask, width, height, *_ = self.run_node("turn.gif", size="scale", scale=2.0, multiple=1)
self.assertEqual(tuple(image.shape), (3, 60, 80, 3))
self.assertEqual(tuple(mask.shape), (3, 60, 80))
self.assertEqual((width, height), (80, 60))
def test_a_missing_or_outside_file_stops_before_the_run_with_the_nodes_name(self):
self.assertIs(AusBossLoadImage.VALIDATE_INPUTS(image=self.write()), True)
for name in ("", "gone.png", "../secret.png", "//fileserver/share/pic.png"):
verdict = AusBossLoadImage.VALIDATE_INPUTS(image=name)
self.assertIsInstance(verdict, str, name)
self.assertTrue(verdict.startswith("Load Image: "), verdict)
def test_a_changed_file_or_setting_runs_the_node_again(self):
name = self.write()
first = AusBossLoadImage.IS_CHANGED(name, size="off")
self.assertEqual(first, AusBossLoadImage.IS_CHANGED(name, size="off"))
self.assertNotEqual(first, AusBossLoadImage.IS_CHANGED(name, size="scale"))
path = Path(self.folder) / name
Image.new("RGB", (10, 10), (1, 2, 3)).save(path)
os.utime(path, ns=(1, 1))
self.assertNotEqual(first, AusBossLoadImage.IS_CHANGED(name, size="off"))
if __name__ == "__main__":
unittest.main()
+235
View File
@@ -0,0 +1,235 @@
"""Mask by Touch on a big picture: SAM 3 is asked about a smaller copy, and
what it answers comes back at the picture's own size. ComfyUI's detector and
text reader are stood in for by fakes, so this runs without ComfyUI and
without a model."""
from __future__ import annotations
import json
from pathlib import Path
import shutil
import sys
import tempfile
import types
import unittest
import torch
ROOT = Path(__file__).resolve().parent.parent
sys.path.insert(0, str(ROOT))
if "nodes" in sys.modules and not hasattr(sys.modules["nodes"], "__path__"):
del sys.modules["nodes"]
from nodes import _mask_by_touch_helpers as helpers # noqa: E402
from nodes import node_mask_by_touch as node_module # noqa: E402
from nodes._mask_by_name_helpers import IF_NOTHING # noqa: E402
from nodes._mask_by_touch_helpers import WORK_SIDE, WorkView # noqa: E402
UI = "ausboss_mask_by_touch"
# The big picture, and the long side of the copy SAM 3 is asked about here.
H, W = 300, 240
SIDE = 60
# Things as shares of the picture: (left, top, right, bottom).
PERSON = (0.25, 0.1, 0.75, 0.95)
FACE = (0.4, 0.15, 0.6, 0.3)
THINGS = {"person": [(PERSON, 0.98)], "face": [(FACE, 0.9)]}
def box(thing, height, width):
left, top, right, bottom = thing
mask = torch.zeros(height, width)
mask[round(top * height):round(bottom * height), round(left * width):round(right * width)] = 1.0
return mask
def same_area(one, other):
one, other = one.bool(), other.bool()
return float((one & other).sum()) / max(1.0, float((one | other).sum()))
class SizedSam:
"""Stands in for ComfyUI's SAM3_Detect. It answers at the size of the
picture it is given, as the real one does."""
calls: list = []
@classmethod
def execute(cls, model, image, conditioning=None, positive_coords=None, negative_coords=None, threshold=0.5, refine_iterations=2, individual_masks=False):
height, width = int(image.shape[1]), int(image.shape[2])
call = {"size": (height, width)}
cls.calls.append(call)
if conditioning is not None:
call["word"] = conditioning[0][2].rpartition(":")[0]
found = THINGS.get(call["word"], [])
masks = torch.stack([box(thing, height, width) for thing, _ in found]) if found else torch.zeros(0, height, width)
return types.SimpleNamespace(result=(masks, [[{"score": sure} for _, sure in found]]))
call["points"] = points = [(point["x"], point["y"]) for point in json.loads(positive_coords)]
answer = torch.zeros(height, width)
for thing in (FACE, PERSON): # the smallest thing that holds every point
area = box(thing, height, width)
if all(0 <= y < height and 0 <= x < width and float(area[y, x]) > 0 for x, y in points):
answer = area
break
return types.SimpleNamespace(result=(answer[None], [[]]))
class Encode:
def encode(self, clip, text):
return ([["read by", clip, text]],)
class Folders:
def __init__(self, folder):
self.folder = folder
def get_temp_directory(self):
return self.folder
def get_save_image_path(self, prefix, folder, _width, _height):
counter = 1 + sum(1 for name in Path(folder).iterdir() if name.name.startswith(prefix + "_"))
return folder, prefix, counter, "", prefix
class WorkViewTests(unittest.TestCase):
def test_a_picture_up_to_the_work_side_is_asked_about_as_it_is(self):
frame = torch.rand(1, 40, WORK_SIDE, 3)
view = WorkView(frame)
self.assertTrue(view.same)
self.assertIs(view.frame, frame)
self.assertEqual((view.work_height, view.work_width), (40, WORK_SIDE))
self.assertEqual(view.point((17, 5)), (17, 5))
self.assertEqual(view.full_point((17, 5)), (17, 5))
mask = torch.zeros(40, WORK_SIDE, dtype=torch.bool)
self.assertIs(view.full(mask), mask)
self.assertEqual(view.full_box([1, 2, 3, 4]), [1, 2, 3, 4])
def test_a_bigger_picture_gets_a_copy_with_the_long_side_at_the_work_side(self):
frame = torch.rand(1, WORK_SIDE * 2, WORK_SIDE + 500, 3)
view = WorkView(frame)
self.assertFalse(view.same)
self.assertEqual(view.work_height, WORK_SIDE)
self.assertEqual(tuple(view.frame.shape), (1, view.work_height, view.work_width, 3))
self.assertEqual(view.work_width, round((WORK_SIDE + 500) / 2))
# Averaged down: the copy's mean is the picture's.
self.assertAlmostEqual(float(view.frame.mean()), float(frame.mean()), places=3)
def test_a_place_on_the_copy_leads_back_to_itself(self):
for height, width in ((4096, 4096), (3840, 2160), (2049, 8192), (5000, 3333)):
view = WorkView(torch.zeros(1, height, width, 1))
for x in (0, 1, 7, view.work_width // 3, view.work_width - 2, view.work_width - 1):
for y in (0, 1, 5, view.work_height // 2, view.work_height - 1):
full = view.full_point((x, y))
self.assertTrue(0 <= full[0] < width and 0 <= full[1] < height)
self.assertEqual(view.point(full), (x, y), f"{width}x{height} at {x},{y}")
self.assertEqual(view.point((width - 1, height - 1)), (view.work_width - 1, view.work_height - 1))
def test_an_answer_comes_back_at_the_pictures_own_size(self):
view = WorkView(torch.zeros(1, 4096, 3000, 3))
small = box(FACE, view.work_height, view.work_width) > 0.5
full = view.full(small)
self.assertEqual(tuple(full.shape), (4096, 3000))
self.assertEqual(full.dtype, torch.bool)
self.assertGreater(same_area(full, box(FACE, 4096, 3000)), 0.98)
x0, y0, x1, y1 = view.full_box(helpers.box_of(small))
wanted = helpers.box_of(box(FACE, 4096, 3000) > 0.5)
for got, want in zip((x0, y0, x1, y1), wanted):
self.assertLessEqual(abs(got - want), 3)
class BigPictureTests(unittest.TestCase):
def setUp(self):
SizedSam.calls = []
node_module._MEMORY.clear()
node_module._WORDS.clear()
node_module._TRUST.clear()
node_module._UNSTEADY.clear()
node_module._NOTED.clear()
self.swap(node_module, "_core_nodes", lambda: {"SAM3_Detect": SizedSam, "CLIPTextEncode": Encode})
self.swap(node_module, "SCOPE_SPACING", 12)
self.swap(node_module, "SCOPE_SECONDS_BLIND", 1e9)
self.swap(helpers, "WORK_SIDE", SIDE)
folder = tempfile.mkdtemp(prefix="ausboss_touch_big_")
self.addCleanup(shutil.rmtree, folder, True)
self.swap(node_module, "folder_paths", Folders(folder))
self.picture = torch.rand(1, H, W, 3) * 0.9
self.node = node_module.AusBossMaskByTouch()
def swap(self, module, attribute, value):
self.addCleanup(setattr, module, attribute, getattr(module, attribute))
setattr(module, attribute, value)
def run_node(self, text="", image=None, **overrides):
values = {"grow": 0, "soften": 0.0, "smooth": 0, "fill_holes": False, "if_nothing": IF_NOTHING[1]}
values.update(overrides)
return self.node.pick(self.picture if image is None else image, "sam3 model", "sam3 clip", text, **values)
def touches(self, *items):
return json.dumps({"v": 1, "items": list(items)})
def test_sam3_is_never_given_the_big_picture(self):
self.run_node(self.touches({"t": "tap", "op": 1, "x": 120, "y": 66}, {"t": "all", "op": 1, "w": "person"}))
self.assertTrue(SizedSam.calls)
for call in SizedSam.calls:
self.assertEqual(call["size"], (SIDE, 48), "the copy: 300 x 240 with its long side at 60")
def test_a_tap_takes_the_thing_at_its_place_and_the_mask_is_full_size(self):
out = self.run_node(self.touches({"t": "tap", "op": 1, "x": 120, "y": 66})) # on the face
mask = out["result"][0]
self.assertEqual(tuple(mask.shape), (1, H, W))
self.assertGreater(same_area(mask[0] > 0.5, box(FACE, H, W)), 0.9)
# The point was asked where it lies on the copy.
self.assertEqual(SizedSam.calls[0]["points"], [(120 * 48 // W, 66 * SIDE // H)])
def test_a_word_takes_every_thing_of_that_name_at_full_size(self):
out = self.run_node(self.touches({"t": "all", "op": 1, "w": "person"}, {"t": "all", "op": 0, "w": "face"}))
mask = out["result"][0][0] > 0.5
wanted = (box(PERSON, H, W) > 0.5) & ~(box(FACE, H, W) > 0.5)
self.assertGreater(same_area(mask, wanted), 0.93)
self.assertEqual(out["result"][2], "person")
def test_a_stroke_is_asked_about_on_the_copy(self):
stroke = {"t": "find", "op": 1, "r": 8, "pts": [[110, 60], [130, 70]]} # across the face
out = self.run_node(self.touches(stroke))
self.assertGreater(same_area(out["result"][0][0] > 0.5, box(FACE, H, W)), 0.9)
for call in SizedSam.calls:
for x, y in call.get("points", []):
self.assertTrue(0 <= x < 48 and 0 <= y < SIDE)
def test_what_a_look_lights_up_is_what_a_click_on_it_takes(self):
note = self.run_node(ask="scope")["ui"][UI][0]
self.assertEqual((note["width"], note["height"]), (W, H))
pieces = {piece["name"]: piece for piece in note["pieces"]["list"] if piece["name"]}
self.assertEqual(set(pieces), {"person", "face"})
face = pieces["face"]
# Its own point is a pixel of the picture, inside the thing, and its box is the picture's.
self.assertGreater(float(box(FACE, H, W)[face["y"], face["x"]]), 0)
for got, want in zip(face["box"], helpers.box_of(box(FACE, H, W) > 0.5)):
self.assertLessEqual(abs(got - want), 6)
self.assertAlmostEqual(face["share"], float(box(FACE, H, W).mean()), delta=0.01)
# The face picks it as a named touch at that point: nothing is asked again.
before = len(SizedSam.calls)
out = self.run_node(self.touches({"t": "name", "op": 1, "w": "face", "x": face["x"], "y": face["y"]}), ask="look")
self.assertEqual(len(SizedSam.calls), before)
self.assertGreater(same_area(out["result"][0][0] > 0.5, box(FACE, H, W)), 0.9)
# A point piece is remembered under the picture's own pixel as well.
spot = next((piece for piece in note["pieces"]["list"] if not piece["name"]), None)
if spot is not None:
self.run_node(self.touches({"t": "tap", "op": 1, "x": spot["x"], "y": spot["y"]}), ask="look")
self.assertEqual(len(SizedSam.calls), before)
def test_a_small_picture_is_asked_about_as_it_is(self):
small = torch.rand(1, 50, 40, 3) * 0.9
out = self.run_node(self.touches({"t": "tap", "op": 1, "x": 20, "y": 11}), image=small)
self.assertEqual([call["size"] for call in SizedSam.calls], [(50, 40)])
self.assertTrue(torch.equal(out["result"][0][0] > 0.5, box(FACE, 50, 40) > 0.5), "exactly what SAM 3 answered")
def test_paint_stays_exactly_as_painted_on_the_big_picture(self):
stroke = [[20, 20], [200, 20]]
out = self.run_node(self.touches({"t": "paint", "op": 1, "r": 5, "pts": stroke}))
wanted = helpers.stroke_area(tuple(tuple(point) for point in stroke), 5.0, H, W)
self.assertTrue(torch.equal(out["result"][0][0] > 0.5, wanted))
self.assertEqual(SizedSam.calls, [], "paint asks SAM 3 nothing")
if __name__ == "__main__":
unittest.main()
+2 -1
View File
@@ -436,10 +436,11 @@ class LoaderValidationTests(TempFolders):
"""The loaders refuse the same paths before a run, with one message each."""
def test_image_loaders_take_what_core_load_image_takes_and_nothing_else(self):
from nodes import node_image_crop_rotate_pad, node_load_image_pad
from nodes import node_image_crop_rotate_pad, node_load_image, node_load_image_pad
for module, cls, label in (
(node_image_crop_rotate_pad, node_image_crop_rotate_pad.AusBossImageCropRotatePad, "Image Crop + Rotate + Pad"),
(node_load_image, node_load_image.AusBossLoadImage, "Load Image"),
(node_load_image_pad, node_load_image_pad.AusBossLoadImagePad, "Load Image + Pad"),
):
with self.subTest(node=label):
+71
View File
@@ -0,0 +1,71 @@
from __future__ import annotations
from pathlib import Path
import sys
import unittest
ROOT = Path(__file__).resolve().parent.parent
sys.path.insert(0, str(ROOT))
if "nodes" in sys.modules and not hasattr(sys.modules["nodes"], "__path__"):
del sys.modules["nodes"]
from nodes._prompt_variations_helpers import pick_variations
class PickVariationsTests(unittest.TestCase):
def test_one_pick_from_each_set(self):
text, picks = pick_variations("a {red|blue} {sweater|jacket|coat}", 7)
self.assertEqual(len(picks), 2)
self.assertIn(picks[0], ("red", "blue"))
self.assertIn(picks[1], ("sweater", "jacket", "coat"))
self.assertEqual(text, f"a {picks[0]} {picks[1]}")
def test_same_seed_same_prompt(self):
prompt = "{a|b|c|d|e|f} {g|h|i|j|k|l} {m|n|o|p|q|r}"
self.assertEqual(pick_variations(prompt, 123), pick_variations(prompt, 123))
def test_seeds_give_different_mixes(self):
prompt = "{a|b|c|d|e|f} {g|h|i|j|k|l} {m|n|o|p|q|r}"
mixes = {pick_variations(prompt, seed)[0] for seed in range(50)}
self.assertGreater(len(mixes), 30)
def test_every_option_can_come_up(self):
seen = {pick_variations("{one|two|three}", seed)[0] for seed in range(200)}
self.assertEqual(seen, {"one", "two", "three"})
def test_text_without_sets_is_unchanged(self):
for text in ("", "plain words, two spaces\nand a line", '{"subject": "a cat", "light": {"key": "soft"}}'):
self.assertEqual(pick_variations(text, 5), (text, []))
def test_spaces_around_options_are_trimmed(self):
text, _ = pick_variations("a { red | red } hat", 1)
self.assertEqual(text, "a red hat")
def test_empty_choice_leaves_no_double_space(self):
texts = {pick_variations("a {|striped} shirt", seed)[0] for seed in range(40)}
self.assertEqual(texts, {"a shirt", "a striped shirt"})
def test_sets_inside_sets(self):
texts = {pick_variations("{a {red|blue} hat|a scarf}", seed)[0] for seed in range(80)}
self.assertEqual(texts, {"a red hat", "a blue hat", "a scarf"})
def test_choice_inside_json_braces(self):
text, picks = pick_variations('{"top": "{tank top|tank top}"}', 3)
self.assertEqual(text, '{"top": "tank top"}')
self.assertEqual(picks, ["tank top"])
def test_large_seed(self):
text, _ = pick_variations("{x|y}", 0xFFFFFFFFFFFFFFFF)
self.assertIn(text, ("x", "y"))
class NodeTests(unittest.TestCase):
def test_node_returns_a_tuple(self):
from nodes.node_prompt_variations import AusBossPromptVariations
(prompt,) = AusBossPromptVariations().pick("no sets here", 0)
self.assertEqual(prompt, "no sets here")
if __name__ == "__main__":
unittest.main()
+79
View File
@@ -0,0 +1,79 @@
from __future__ import annotations
from pathlib import Path
import sys
import tempfile
import unittest
ROOT = Path(__file__).resolve().parent.parent
sys.path.insert(0, str(ROOT))
if "nodes" in sys.modules and not hasattr(sys.modules["nodes"], "__path__"):
del sys.modules["nodes"]
from nodes._single_copy import other_copy_that_loads
def make_copy(root: Path, name: str, version: str, guarded: bool = True, pack: str = "ausboss-nodes") -> str:
folder = root / name
(folder / "nodes").mkdir(parents=True)
(folder / "__init__.py").write_text("")
(folder / "pyproject.toml").write_text(f'[project]\nname = "{pack}"\nversion = "{version}"\n')
if guarded:
(folder / "nodes" / "_single_copy.py").write_text("")
return str(folder)
def loads(folder: str, root: Path) -> bool:
return other_copy_that_loads(folder, [str(root)]) is None
class SingleCopyTests(unittest.TestCase):
def setUp(self):
self._tmp = tempfile.TemporaryDirectory()
self.root = Path(self._tmp.name).resolve()
def tearDown(self):
self._tmp.cleanup()
def test_a_lone_copy_loads(self):
a = make_copy(self.root, "ComfyUI-AusBoss", "2.24.0")
make_copy(self.root, "some-other-pack", "9.0.0", pack="other")
self.assertTrue(loads(a, self.root))
def test_exactly_one_of_two_copies_loads_and_it_is_the_newer(self):
a = make_copy(self.root, "ComfyUI-AusBoss", "2.24.0")
b = make_copy(self.root, "ausboss-nodes", "2.25.0")
self.assertFalse(loads(a, self.root))
self.assertTrue(loads(b, self.root))
self.assertEqual(other_copy_that_loads(a, [str(self.root)])["version"], "2.25.0")
def test_same_version_still_picks_one(self):
a = make_copy(self.root, "ComfyUI-AusBoss", "2.24.0")
b = make_copy(self.root, "ausboss-nodes", "2.24.0")
self.assertEqual([loads(a, self.root), loads(b, self.root)].count(True), 1)
def test_yields_to_an_older_copy_that_cannot_step_aside(self):
new = make_copy(self.root, "ComfyUI-AusBoss", "2.24.0")
make_copy(self.root, "ausboss-nodes", "2.22.0", guarded=False)
self.assertFalse(loads(new, self.root))
def test_a_disabled_copy_does_not_count(self):
a = make_copy(self.root, "ComfyUI-AusBoss", "2.24.0")
make_copy(self.root, "ausboss-nodes.disabled", "2.25.0")
self.assertTrue(loads(a, self.root))
def test_a_link_to_the_same_folder_is_one_copy(self):
a = make_copy(self.root, "ComfyUI-AusBoss", "2.24.0")
(self.root / "link").symlink_to(a)
self.assertTrue(loads(a, self.root))
self.assertTrue(loads(str(self.root / "link"), self.root))
def test_ten_is_newer_than_nine(self):
a = make_copy(self.root, "ComfyUI-AusBoss", "2.9.0")
b = make_copy(self.root, "ausboss-nodes", "2.10.0")
self.assertFalse(loads(a, self.root))
self.assertTrue(loads(b, self.root))
if __name__ == "__main__":
unittest.main()
+100
View File
@@ -0,0 +1,100 @@
from __future__ import annotations
from pathlib import Path
import sys
import unittest
ROOT = Path(__file__).resolve().parent.parent
sys.path.insert(0, str(ROOT))
if "nodes" in sys.modules and not hasattr(sys.modules["nodes"], "__path__"):
del sys.modules["nodes"]
from nodes._text_lines_helpers import split_items, strip_marker
from nodes.node_text_lines import AusBossTextLines
class SplitItemsTests(unittest.TestCase):
def test_each_line_is_an_item_and_empty_lines_are_skipped(self):
text = "a red car\n\n \na blue boat \r\n\tgreen hills\n"
self.assertEqual(split_items(text), ["a red car", "a blue boat", "green hills"])
def test_blank_line_keeps_lines_together(self):
text = "first line\nsecond line\n\n\nnext item\n \nlast"
self.assertEqual(
split_items(text, "blank line"),
["first line\nsecond line", "next item", "last"],
)
def test_limit_keeps_the_first_items(self):
self.assertEqual(split_items("a\nb\nc\nd", limit=2), ["a", "b"])
self.assertEqual(split_items("a\nb", limit=0), ["a", "b"])
self.assertEqual(split_items("a\nb", limit=9), ["a", "b"])
def test_numbers_and_bullets_come_off(self):
cases = {
"1. close-up, soft smile": "close-up, soft smile",
"2) medium shot": "medium shot",
"#3: from above": "from above",
"- a bullet": "a bullet",
"* a star": "a star",
"• a dot": "a dot",
"[prompt 4] from the side": "from the side",
"【prompt_5】 looking back": "looking back",
"(6) arms crossed": "arms crossed",
"Prompt 7: laughing": "laughing",
"Shot 8 - wide": "wide",
"12. twelve": "twelve",
}
for line, want in cases.items():
self.assertEqual(strip_marker(line), want, line)
def test_text_that_only_starts_like_a_marker_stays(self):
for line in [
"2 women on a beach",
"1.5x zoom on the face",
"10:30 at night, a diner",
"3D render of a robot",
"*bold* light from the left",
"-90 degrees, seen from below",
"1920s street, a man in a hat",
"shot from below",
"Image 1: the woman, in the coat from image 2",
]:
self.assertEqual(strip_marker(line), line, line)
def test_numbering_stays_when_asked(self):
self.assertEqual(split_items("1. a\n- b", remove_numbering=False), ["1. a", "- b"])
def test_a_line_that_is_only_a_marker_is_skipped(self):
self.assertEqual(split_items("1.\n2. real\n-"), ["real"])
def test_nothing_gives_nothing(self):
self.assertEqual(split_items(""), [])
self.assertEqual(split_items(None), [])
self.assertEqual(split_items("\n \n"), [])
class TextLinesNodeTests(unittest.TestCase):
def test_outputs_lines_numbers_and_count(self):
lines, numbers, count = AusBossTextLines().split("1. one\n2. two\n\n3. three")
self.assertEqual(lines, ["one", "two", "three"])
self.assertEqual(numbers, [1, 2, 3])
self.assertEqual(count, 3)
def test_the_line_and_number_outputs_are_lists(self):
self.assertEqual(AusBossTextLines.OUTPUT_IS_LIST, (True, True, False))
self.assertEqual(AusBossTextLines.RETURN_NAMES, ("line", "number", "count"))
def test_no_lines_stops_the_run_with_plain_words(self):
with self.assertRaises(ValueError) as caught:
AusBossTextLines().split(" \n")
self.assertIn("no lines to run", str(caught.exception))
def test_inputs_and_their_order(self):
inputs = AusBossTextLines.INPUT_TYPES()
self.assertEqual(list(inputs), ["required"])
self.assertEqual(list(inputs["required"]), ["text", "split", "remove_numbering", "limit"])
if __name__ == "__main__":
unittest.main()
+1
View File
@@ -44,6 +44,7 @@ NAMED = {
"AusBossImageFolder": ["source", "folder"],
"AusBossLaMaInpaint": ["model"],
"AusBossLoadAudio": ["audio"],
"AusBossLoadImage": ["image"],
"AusBossLoadImagePad": ["image", "source_image"],
"AusBossLoadVideo": ["video"],
"AusBossLoraLoader": ["loras", "on_missing"],
+67 -1
View File
@@ -60,6 +60,7 @@ import {
thinStroke,
touchFits,
} from "../js/shared/touch_math.mjs";
import { OUT_OF_MEMORY, goesBehind as goesBehindAgain, piecesHolding, stopMessage, typedName } from "../js/shared/touch_math.mjs";
import {
GROUP_MAX,
areaKey,
@@ -942,7 +943,7 @@ test("a name is shown only when SAM 3 is sure of it, and surer still for a big t
});
test("the pack's own picture loaders are the ones the node runs by itself", () => {
assert.deepEqual([...OWN_LOADERS].sort(), ["AUSBOSS_NODES_ImageCropRotatePad", "AUSBOSS_NODES_LoadImagePad"]);
assert.deepEqual([...OWN_LOADERS].sort(), ["AUSBOSS_NODES_ImageCropRotatePad", "AUSBOSS_NODES_LoadImage", "AUSBOSS_NODES_LoadImagePad"]);
// A core Load Image is not in the list: its file is the picture, and the node shows it without a run.
assert.equal(OWN_LOADERS.has("LoadImage"), false);
});
@@ -1062,3 +1063,68 @@ test("picks the node moved onto a new picture are taken only while nothing was p
assert.equal(movedTouches({ moved: { from: 7, touches: after } }, before), null, "a note that is not this shape moves nothing");
assert.equal(movedTouches(null, before), null);
});
test("taking away from a spot that is not picked never offers a thing that holds a whole pick", () => {
const { width, masks, planes, sizes, ranks } = scene();
// The jacket is picked. The pointer is on the person's legs, which are not.
const inside = piecesInside(planes, 5, masks.jacket);
const holds = piecesHolding(planes, 5, [masks.jacket]);
assert.deepEqual([...holds], [0, 1, 1, 1, 1], "the jacket, the dress over it, the person and the wall hold all of it");
const legs = 32 * width + 14;
assert.equal(pieceAt(planes, legs, { sizes, inside, ranks, adding: false }), 3, "as before, when nothing is said about the spot");
assert.equal(pieceAt(planes, legs, { sizes, inside, ranks, adding: false, here: false, holds }), -1, "not the person: the jacket would go with it");
// On the jacket itself the spot is picked: the jacket is offered.
const onJacket = 14 * width + 14;
assert.equal(pieceAt(planes, onJacket, { sizes, inside, ranks, adding: false, here: true, holds }), 1);
// The person is picked, and the pointer is on the jacket: the jacket is a part of the pick, and is offered.
const person = piecesInside(planes, 5, masks.person);
const personHolds = piecesHolding(planes, 5, [masks.person]);
assert.equal(pieceAt(planes, onJacket, { sizes, inside: person, ranks, adding: false, here: true, holds: personHolds }), 1);
// A thing a pick only laps over is still offered from a spot that is not picked.
const lap = Uint8Array.from(masks.person, (value, index) => (value && Math.floor(index / width) >= 30 ? 1 : 0));
const lapInside = piecesInside(planes, 5, lap);
const lapHolds = piecesHolding(planes, 5, [masks.wall]);
assert.equal(lapHolds[3], 0, "the person does not hold a pick of the wall");
assert.equal(pieceAt(planes, onJacket + 0, { sizes, inside: lapInside, ranks, adding: false, here: false, holds: lapHolds }), 3, "the person has picked area in it and holds no whole pick");
// Adding is not changed by any of it.
assert.equal(pieceAt(planes, legs, { sizes, inside, ranks, here: false, holds }), 3);
assert.deepEqual([...piecesHolding(planes, 5, [null, new Uint8Array(masks.jacket.length)])], [0, 0, 0, 0, 0], "no area, nothing held");
});
test("a typed name is added or taken away by the sign, and a sign in the text wins", () => {
assert.deepEqual(typedName("face"), { word: "face", add: true });
assert.deepEqual(typedName("face", true), { word: "face", add: false });
assert.deepEqual(typedName("-face"), { word: "face", add: false });
assert.deepEqual(typedName(" - fur collar "), { word: "fur collar", add: false });
assert.deepEqual(typedName("\u2212hair"), { word: "hair", add: false }, "the minus a phone types");
assert.deepEqual(typedName("+hat", true), { word: "hat", add: true });
assert.deepEqual(typedName("t-shirt", false), { word: "t-shirt", add: true }, "a dash inside a word is the word's");
assert.deepEqual(typedName("-"), { word: "", add: false });
assert.deepEqual(typedName(null), { word: "", add: true });
});
test("looks at a picture the node no longer has are taken out of the queue before the next one is sent", () => {
const here = dirname(fileURLToPath(import.meta.url));
const stage = readFileSync(join(here, "..", "js", "shared", "touch_stage.mjs"), "utf8");
const entry = readFileSync(join(here, "..", "js", "mask_by_touch", "index.js"), "utf8");
const run = stage.slice(stage.indexOf("function requestRun"), stage.indexOf("function settle(face)"));
// the stale ones are counted before this run joins them, and dropped before it is sent
assert.ok(run.indexOf("const stale = face.flying.filter(") < run.indexOf("face.flying.push(run)"));
assert.match(run, /other\.queued && other\.epoch !== run\.epoch/);
assert.ok(run.indexOf("face.host.dropWaiting()") < run.indexOf("face.host.run("));
// only this node's own runs (they carry an `ask`) that still wait: never the one that runs, never a workflow run
const drop = entry.slice(entry.indexOf("async function dropWaiting"), entry.indexOf("// The picture goes above the settings"));
assert.match(drop, /queue_pending/);
assert.doesNotMatch(drop, /queue_running|interrupt/);
assert.match(drop, /class_type === NODE_CLASS && String\(step\.inputs\?\.ask \?\? ""\) !== ""/);
// a look still goes behind looks at an older picture, as before
assert.equal(goesBehindAgain([{ ask: "scope", queued: true, epoch: 1 }], "scope", 2), true);
});
test("a full graphics card is said in one plain line, anything else as it came", () => {
const comfy = "Allocation on device 0 would exceed allowed memory. (out of memory)\nCurrently allocated : 2.07 GiB\nRequested : 40.50 MiB";
assert.equal(stopMessage(comfy), OUT_OF_MEMORY);
assert.equal(stopMessage("torch.OutOfMemoryError: CUDA"), OUT_OF_MEMORY);
assert.equal(stopMessage("Nothing is picked on this picture."), "Nothing is picked on this picture.");
assert.equal(stopMessage(null), "");
});
+1 -1
View File
@@ -39,7 +39,7 @@ test("a stopped run's message stays up until the next result, then goes", () =>
const { face, setNote, shown } = noteFace();
const stopped = SOURCE.match(/face\.stopped = \(message\) => \{([\s\S]*?)\n {2}\};/)?.[1];
assert.ok(stopped, "touch_stage.mjs has no face.stopped");
assert.match(stopped, /setNote\(face, String\(message \?\? ""\)\);\s*(?:\/\/[^\n]*\n\s*)*face\.stopNote = true;/,
assert.match(stopped, /setNote\(face, stopMessage\(message\)\);\s*(?:\/\/[^\n]*\n\s*)*face\.stopNote = true;/,
"a stop marks its message as a stop message, after it is set");
// What face.stopped does to the note.
setNote(face, "Mask by Touch: nothing is picked.");