Compare commits

...
Author SHA1 Message Date
ausboss ea5faea605 DIAG ONLY: which nodes carry imgs, and what image (throwaway branch) 2026-11-07 01:42:09 +00:00
ausboss 7760d37819 DIAG ONLY: bisect tile growth, compare callout (throwaway branch) 2026-11-07 01:33:39 +00:00
ausboss a7c07eef7e DIAG ONLY: trace setSize calls for the tile (throwaway branch) 2026-11-07 01:22:59 +00:00
ausboss 92bff53200 DIAG ONLY: dump tile state in face smoke (throwaway branch) 2026-11-07 01:14:40 +00:00
ausboss 95a259cc69 Keep a new Workflow Note Tile compact in the classic canvas (#294) 2026-11-06 19:10:07 -06:00
ausboss eb3b74242a Fix shared note tiles and H3 video edit controls (#293) 2026-11-06 18:48:28 -06:00
ausboss 28c4f6aeb5 Add manual Registry publishing for Model Downloader (#292) 2026-11-06 15:11:41 -06:00
ausboss 3a4ce52760 Release 2.21.1
Update release metadata and notes for the repository-hosted README badge fix.
2026-11-06 11:48:17 -06:00
ausboss e761b3dd0b Serve the release badge from the repository (#290)
Keep the release badge available from GitHub and reject stale generated badge versions during release preflight.
2026-11-05 20:28:47 -06:00
ausboss 3b0baf351a Release 2.21.0 and keep GitHub releases current (#289)
Publish matching pack and frontend versions, release notes, and automatic GitHub Releases after Registry uploads. Point the README badge at the latest release.
2026-11-05 20:19:37 -06:00
ausboss 50389b0cdb Improve crop controls, playback, and media selection (#288)
* Group crop controls and put video scrubbing below the preview

* Stop IN where the connected clip length still fits

* Add play and pause beside the crop scrubber and clarify resize padding

* Preview the current brush beside Size in Image Compare

* Center the crop and its padding together on each axis

* Polish crop controls and load images from Outputs

* Add crop controls preview
2026-11-05 20:07:33 -06:00
ausboss 28dd526447 Remove the LoRA Loader stack row limit (#287) 2026-11-05 20:07:24 -06:00
ausboss abf6cecd52 Style workflow guide and model download tiles (#286)
* Style workflow guide and model download tiles

* Add workflow tile preview
2026-11-05 20:04:58 -06:00
ausboss 12e7d8c33f Limit Latent Size to workflow-approved resolutions and share panel controls (#285) 2026-11-05 18:23:30 -06:00
ausboss de95db228c H3 Prompt Writer: a swap that keeps the clip's sound only gives the new person their own lines, timed from that sound (#277)
* Add Load Audio node: wave, trim, preview and max length

Load a sound file and keep only the part you want. The node shows the
whole file as a wave. Drag the IN and OUT handles (or type the times),
press play to hear just that part, and set Max length to the longest
sound the next step takes: anything past it turns red and is cut off,
so you see what comes out before you run. Max length can be wired.

Only the picked part is decoded. Outputs the audio and its seconds.
Help page, README, changelog, Chinese names, tests and the API snapshot
are included.

* Load Audio: open smaller and go down to 280 wide

* Load Audio: shorter wave, length moves off the wave next to OUT

* Add the Pika H3 Flex example workflow

* H3 Prompt Writer: a swap puts each person picture in one person's place

* H3 Prompt Writer: keep quoted words in a swap and read who goes out of a longer line

A swap dropped every typed line once it had read who goes, so words in
quotes never reached H3 and the new person's lips were guessed. Those
lines now stay as the new person's words, landing on the lip movement of
the video, and a voice with a swap no longer says nobody speaks.

"Elon is @1, he replaces the person at the counter" went whole into the
description of who goes. The words after replaces (or takes the place of,
instead of, ...) are now who goes, and a name given to @1 is left out.

* H3 Prompt Writer: swap lines go to the right speaker

Names given with a comma ("Altman is @1, the man on the left. Dario is
@2, ...") no longer run into each other, and a later "Dario says" or
"He says" goes to that person. A thing that speaks, like the card
reader, says its words from off screen so nobody's lips move. "raps"
and a few other ways of speaking count as speech, so "and raps" stays
out of who goes.

* H3 Prompt Writer: keep how a swap line is said, and its exact time

"The card reader says in a flat robot voice" now names the card reader
and keeps "in a flat robot voice" as how it says the words. A time like
3.2s at the start of a line was read as a list number and lost its 3; it
now stays 3.2, a time typed inside a swap line counts too, and the first
words of a swap say when they start.

* H3 Prompt Writer: a person off screen gets their own voice

"A woman off screen says" went to the person on screen, as their voiceover,
and in a swap it landed on the swapped-in person. Now a person or a name
the line puts off screen (off screen, off camera, behind the camera, O.S.)
speaks from off screen as their own speaker, in a swap and outside one.
An unnamed voiceover, an @ or a he or she still stays the main person's.
Off-screen voices no longer get a 'stays silent with the lips closed' line.

* H3 Prompt Writer: a swap can keep the clip's clothes

A swap always dressed the new person in the picture's clothes. Typing
"keeps her outfit", "in the clip's clothes" or "keep the clothes from the
video" now takes only the face and hair from the picture and keeps the
clothes of whoever goes. "keeps her own clothes" still means the picture's.

* H3 Prompt Writer: a thing said to be off screen speaks for itself in every mode

"A card reader off screen says" got its own voice only in a swap. In copy
its moves and the other modes it became the person on screen's voiceover.
Anything a line puts off screen now speaks for itself; "a voice" and
"narrator" stay the main person's voiceover.

* H3 Prompt Writer: a swap that keeps the clip's sound gives the new person only their own lines, timed from that sound

With the clip's own sound under a swap, H3 heard every voice and moved the
new person's mouth to lines that weren't theirs. The new Clip's own sound
switch leaves out anyone else's words, says the new person keeps the lips
closed between their lines, and puts each untimed line where speech starts
in the video's sound. A typed time still wins.

* H3 Prompt Writer: tell voices apart by pitch when timing lines from the clip's sound

Loudness gaps alone put the new person's lines on the other speaker's words
when two people trade lines quickly. Each line now takes a run of speech
that fits its syllables, starts after a quiet, and keeps one voice at one
pitch. On the lip sync clips this lands every line within 0.15 s of
Whisper's times, except one soft word under a crowd.

* H3 Prompt Writer: a short name for who goes in a swap keeps their line

"The man in the car" for "the man in the back of the police car" was read
as someone else, so with the clip's sound on his line was left out. A
speaker is who goes when every word naming them appears in who goes.

* H3 Prompt Writer: a swap with the clip's sound and no words typed speaks as the video does

With nothing in quotes, it said the new person keeps the lips closed and
says nothing, even when the clip is full of speech, and the soundscape
was the place's steady sound. Now speech in the clip means the new person
speaks as in the video, and the soundscape is the clip's own sound. With no
speech heard and no words typed, it says nothing about the lips.

* Document two-person swaps and off-screen dialogue
2026-11-05 15:58:53 -06:00
ausboss 93f64d07d7 H3 Prompt Writer: swap lines keep their words, speaker, delivery and time (#275)
* Add Load Audio node: wave, trim, preview and max length

Load a sound file and keep only the part you want. The node shows the
whole file as a wave. Drag the IN and OUT handles (or type the times),
press play to hear just that part, and set Max length to the longest
sound the next step takes: anything past it turns red and is cut off,
so you see what comes out before you run. Max length can be wired.

Only the picked part is decoded. Outputs the audio and its seconds.
Help page, README, changelog, Chinese names, tests and the API snapshot
are included.

* Load Audio: open smaller and go down to 280 wide

* Load Audio: shorter wave, length moves off the wave next to OUT

* Add the Pika H3 Flex example workflow

* H3 Prompt Writer: a swap puts each person picture in one person's place

* H3 Prompt Writer: keep quoted words in a swap and read who goes out of a longer line

A swap dropped every typed line once it had read who goes, so words in
quotes never reached H3 and the new person's lips were guessed. Those
lines now stay as the new person's words, landing on the lip movement of
the video, and a voice with a swap no longer says nobody speaks.

"Elon is @1, he replaces the person at the counter" went whole into the
description of who goes. The words after replaces (or takes the place of,
instead of, ...) are now who goes, and a name given to @1 is left out.

* H3 Prompt Writer: swap lines go to the right speaker

Names given with a comma ("Altman is @1, the man on the left. Dario is
@2, ...") no longer run into each other, and a later "Dario says" or
"He says" goes to that person. A thing that speaks, like the card
reader, says its words from off screen so nobody's lips move. "raps"
and a few other ways of speaking count as speech, so "and raps" stays
out of who goes.

* H3 Prompt Writer: keep how a swap line is said, and its exact time

"The card reader says in a flat robot voice" now names the card reader
and keeps "in a flat robot voice" as how it says the words. A time like
3.2s at the start of a line was read as a list number and lost its 3; it
now stays 3.2, a time typed inside a swap line counts too, and the first
words of a swap say when they start.

* H3 Prompt Writer: a person off screen gets their own voice

"A woman off screen says" went to the person on screen, as their voiceover,
and in a swap it landed on the swapped-in person. Now a person or a name
the line puts off screen (off screen, off camera, behind the camera, O.S.)
speaks from off screen as their own speaker, in a swap and outside one.
An unnamed voiceover, an @ or a he or she still stays the main person's.
Off-screen voices no longer get a 'stays silent with the lips closed' line.

* H3 Prompt Writer: a swap can keep the clip's clothes

A swap always dressed the new person in the picture's clothes. Typing
"keeps her outfit", "in the clip's clothes" or "keep the clothes from the
video" now takes only the face and hair from the picture and keeps the
clothes of whoever goes. "keeps her own clothes" still means the picture's.

* H3 Prompt Writer: a thing said to be off screen speaks for itself in every mode

"A card reader off screen says" got its own voice only in a swap. In copy
its moves and the other modes it became the person on screen's voiceover.
Anything a line puts off screen now speaks for itself; "a voice" and
"narrator" stay the main person's voiceover.

* Document two-person swaps and off-screen dialogue
2026-11-05 15:57:11 -06:00
ausboss b3a3d7a8ca Add frameless workflow tiles and branded Markdown guides (#284) 2026-11-05 15:55:47 -06:00
ausboss c1d6136663 Input loaders: share one os.scandir walk instead of per-file stat (#279) (#281)
* Input loaders: share one os.scandir walk instead of per-file stat (#279)

* Keep input file links that resolve inside the media folder
2026-11-05 00:44:28 -06:00
ausboss 515b9ea4bd Frontend: use relative /scripts/ imports for subpath deployments (#276) (#282) 2026-11-05 00:31:20 -06:00
ausboss c37386c1d4 Seed: add a compact look, picked from the gear (#274) 2026-11-03 23:59:16 -06:00
ausboss 7cb0abaacf Add Load Audio node: wave, trim, preview and max length (#272) 2026-11-03 23:58:16 -06:00
140 changed files with 5578 additions and 827 deletions
+33
View File
@@ -11,6 +11,7 @@ on:
# version in pyproject.toml, or on a manual run from main. Editing another
# pyproject field (description, keywords) without a new version publishes
# nothing, and the offline checks must pass before anything is uploaded.
# A successful upload also creates the version's tag and GitHub Release.
# Requires the repository secret REGISTRY_ACCESS_TOKEN, an API key created
# for the "ausboss" publisher at registry.comfy.org.
permissions:
@@ -28,6 +29,7 @@ jobs:
if: ${{ github.repository == 'ausboss/ComfyUI-AusBoss' && github.ref == 'refs/heads/main' }}
outputs:
publish: ${{ steps.version.outputs.publish }}
version: ${{ steps.version.outputs.version }}
steps:
- uses: actions/checkout@v7
with:
@@ -44,6 +46,7 @@ jobs:
run: |
read_version='import sys, tomllib; print(tomllib.loads(sys.stdin.read())["project"]["version"])'
current=$(python -c "$read_version" < pyproject.toml)
echo "version=$current" >> "$GITHUB_OUTPUT"
previous=""
if [ -n "$BEFORE" ] && git cat-file -e "$BEFORE^{commit}" 2>/dev/null; then
previous=$(git show "$BEFORE:pyproject.toml" | python -c "$read_version")
@@ -84,3 +87,33 @@ jobs:
uses: Comfy-Org/publish-node-action@main
with:
personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
github-release:
name: Create GitHub Release
needs: [check, publish-node]
if: ${{ needs.check.outputs.publish == 'true' }}
runs-on: ubuntu-latest
timeout-minutes: 5
permissions:
contents: write
steps:
- uses: actions/checkout@v7
with:
persist-credentials: false
- uses: actions/setup-python@v7
with:
python-version: "3.12"
- name: Publish release notes and tag
env:
GH_TOKEN: ${{ github.token }}
GH_REPO: ${{ github.repository }}
VERSION: ${{ needs.check.outputs.version }}
run: |
tag="v$VERSION"
if gh release view "$tag" >/dev/null 2>&1; then
echo "Release $tag already exists; leaving it unchanged."
exit 0
fi
python scripts/changelog_notes.py --version "$VERSION" --full > "$RUNNER_TEMP/release-notes.md"
gh release create "$tag" --target "$GITHUB_SHA" --title "$VERSION" \
--notes-file "$RUNNER_TEMP/release-notes.md" --latest
@@ -0,0 +1,74 @@
name: Publish Model Downloader addon
on:
workflow_dispatch:
inputs:
addon_commit:
description: Full commit SHA from ComfyUI-AusBoss-Model-Downloader main
required: true
type: string
# The existing AusBoss publisher credential stays in this repository. This
# manual job publishes only the separately maintained Model Downloader addon.
# It does not release or change the main AusBoss node pack.
permissions:
contents: read
concurrency:
group: registry-publish-model-downloader
cancel-in-progress: false
jobs:
publish:
if: github.repository == 'ausboss/ComfyUI-AusBoss' && github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- name: Require an exact addon commit
env:
ADDON_COMMIT: ${{ inputs.addon_commit }}
run: '[[ "$ADDON_COMMIT" =~ ^[0-9a-f]{40}$ ]]'
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
with:
repository: ausboss/ComfyUI-AusBoss-Model-Downloader
ref: ${{ inputs.addon_commit }}
fetch-depth: 0
persist-credentials: false
- name: Require a commit merged into addon main
run: git merge-base --is-ancestor HEAD origin/main
- uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7
with:
python-version: '3.12'
- uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7
with:
node-version: '24'
package-manager-cache: false
- name: Install validation and publishing tools
run: python -m pip install -r requirements-dev.txt comfy-cli==1.25.0
- name: Offline checks
run: |
python -m unittest discover -s tests -v
ruff check --select F,E9 __init__.py downloader tests scripts
node --test tests/*.test.mjs
node --check js/model_downloader/index.js
node --check js/shared/download_controls.mjs
- name: Build and inspect Registry package
run: |
comfy --skip-prompt --no-enable-telemetry node pack
python scripts/check_registry_package.py
- name: Refuse an existing immutable version
run: python scripts/registry_status.py --require-unpublished
- name: Publish addon
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.'
run: |
if [ -z "$REGISTRY_ACCESS_TOKEN" ]; then
echo '::error::REGISTRY_ACCESS_TOKEN is not configured.'
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'
run: python scripts/registry_status.py --report
+51 -2
View File
@@ -4,6 +4,55 @@ All notable changes to ComfyUI-AusBoss are documented here.
## Unreleased
- **Colored link buttons and pop-out notes keep their tile layout when shared.**
Callout Tile and Workflow Note Tile save as distinct node types, so an older
install can report what is missing. Tiles have larger editors and visible
resize grips, start compact when added, and pop-out notes wrap long code lines.
- **H3 Prompt Writer can change something in a video while keeping its person and sound.**
The new `keeps_clip_sound` output helps route the source audio. Video edits
show **From the clip** for their length, and swaps accept an optional
`@1 looks like ...` line describing the connected replacement.
- **Workflow Switches' Off and On buttons now select the state they name.**
Pressing the already selected state leaves it unchanged.
## 2.21.1 - 2026-11-06
- **The README release badge stays available when the badge service is down.**
The badge is served from the repository, shows the current version, and opens
the latest GitHub Release.
## 2.21.0 - 2026-11-05
- **Crop + Rotate + Pad has clearer controls and steadier previews.** Image
and video pickers share Inputs and Outputs tabs and a Load button. Video
previews have a play/pause button, and dragging a locked-length clip stops
where the full selection still fits. Crop, pad and resize controls share
the same compact buttons, and warnings no longer move the controls below.
- **Latent Size can show just the sizes recommended for your workflow.**
Pick the allowed presets in its settings and save them with the workflow.
Workflows without a custom list keep all their choices.
- **Workflow Notes and Callouts can be compact titles, links and guide tiles.**
Guides support formatted text, tables, accent colors and model download
links. YouTube and Discord tiles keep their red and purple choices.
- **Media lists open faster on network shares, and controls load behind
a web address prefix.** File scans reuse directory information. Frontend
imports also work when ComfyUI is served under a path such as `/comfy/`.
- **GitHub Releases now follow version updates automatically.** After the
Registry upload, the publish workflow creates the release with its notes.
The README release badge uses that release and opens its download page.
- **LoRA Loader supports stacks larger than 64 rows.** Folder adds, templates, and absorbed loaders keep the full stack when you save and reopen a workflow.
- **Workflow Note info tiles show a book for guides and a download arrow for models.** Click the dark tile to open the note. Its icon and left edge use the accent you picked.
- **H3 Prompt Writer swaps two people.** With Swap the person and two person
pictures, Picture 1 takes the place of the person on the left and Picture 2
the person on the right. Type who goes to change that, one line each, such
as `@1 the man in the hat` and `@2 the woman in red`.
- **New node: Load Audio.** Load a sound file and keep only the part you
want. The node shows the sound as a wave: drag the IN and OUT handles to
trim it, and press play to hear just that part. Set Max length to the
longest sound the next step takes, and anything longer shows in red as
cut off, so you see exactly what comes out before you run.
- **Resizing one node of a selection now resizes them all.** With two or more
nodes selected, pull the edge or corner of one: nodes stacked in a column
get its width, nodes side by side in a row get its height, and a grid gets
@@ -40,8 +89,8 @@ All notable changes to ComfyUI-AusBoss are documented here.
by a corner lines that edge up the same way. Hold Shift while you drag to
place it without lining up; ComfyUI then snaps it to its grid as usual. Turn
it off under Settings → 🆎 AusBoss → Canvas. In the Nodes 2.0 look, resizing
a node does not snap yet. If another pack's snapping is on, such as
Pixaroma's Align, AusBoss leaves the dragging to it.
a node does not snap yet. If another pack's snapping is on, AusBoss leaves
the dragging to it.
- **Line up nodes and groups from the selection toolbar.** Select two or more
nodes or groups and a Line up button pops out a small panel: line up edges or
+16 -1
View File
@@ -198,6 +198,11 @@ example_workflows/ # example workflows (regular workflow JSON, not API JSON)
(`tests/canvas_passthrough.test.mjs` lists the few that exist). After a
change to a node face, `scripts/dev/wheel_sweep.mjs` turns the wheel at
every point of every node and must find no dead spot, in both renderers.
- For compact panel actions and preview switches, use `compactAction` and
`panelSwitch` from `js/shared/panel_controls.mjs`. That module owns their
appearance, section caption styles, and common file and save labels. A
node styles its layout locally; leave the shared control's face to the
component. Its selectors only match explicitly named AusBoss controls.
- Every INT and FLOAT a public node exposes reaches the user as a scrub
control, Adobe-style: drag the value to scrub, click to type, chevron
arrows step, Shift is always the fine step. Use `makeScrubInput` from
@@ -340,7 +345,17 @@ before a release that follows a ComfyUI update.
A new `version` in `pyproject.toml` that lands on main publishes to the Comfy
Registry through the publish workflow (`.github/workflows/publish_action.yml`).
Contributors never change `version`.
After a successful upload, the same workflow tags that commit and creates a
GitHub Release with the full changelog section. The README badge links to the
latest GitHub Release. If only that step fails, rerun the failed jobs to retry
it without uploading the Registry version again. Existing releases are left
unchanged on a rerun. Contributors never change `version`.
For an authorized release, update both `pyproject.toml` and
`AUSBOSS_JS_VERSION`, date the changelog section, then run
`python scripts/release_badge.py`. Preflight rejects a badge that does not
match the pack version. Its SVG lives in the repository so the release
number stays visible when an external badge service is unavailable.
The Registry shows notes with each version. They are that version's section
of `CHANGELOG.md`, one line per entry: its bold opening, and for a new node
+17 -6
View File
@@ -3,10 +3,9 @@
<p>ComfyUI nodes for image and video work.</p>
<p>
<img src="https://img.shields.io/badge/license-MIT-blue?style=flat-square" alt="MIT License">
<!-- Dynamic: shields.io reads the version out of pyproject.toml on main
at view time, so this badge can never go stale. release_preflight.py
checks it stays the dynamic kind. -->
<img src="https://img.shields.io/badge/dynamic/toml?url=https%3A%2F%2Fraw.githubusercontent.com%2Fausboss%2FComfyUI-AusBoss%2Fmain%2Fpyproject.toml&query=%24.project.version&label=release&color=00b4aa&style=flat-square" alt="Release">
<!-- Generated by scripts/release_badge.py. Release preflight checks
the badge against pyproject.toml so it cannot silently go stale. -->
<a href="https://github.com/ausboss/ComfyUI-AusBoss/releases/latest"><img src="assets/readme/release.svg" alt="Latest release"></a>
<a href="https://www.youtube.com/@ausbossdev"><img src="https://img.shields.io/badge/YouTube-%40ausbossdev-00b4aa?style=flat-square&logo=youtube&logoColor=white" alt="YouTube @ausbossdev"></a>
<a href="https://discord.gg/RwVxY9Fuaj"><img src="https://img.shields.io/badge/Discord-AusBoss-00b4aa?style=flat-square&logo=discord&logoColor=white" alt="Discord: AusBoss"></a>
</p>
@@ -66,7 +65,7 @@ The pack uses the Pillow, NumPy, Torch and PyAV that come with ComfyUI. Each exa
Rotate, crop and pad a picture by dragging handles on the node. Cyan squares crop, orange diamonds pad, and the green handle rotates. It rotates first, then crops, then pads. The full-screen editor adds exact sizes, zoom and pan.
Tap a ratio under the preview to pad the picture to it, or to crop it with **Fit** set to crop. A lit ratio is the shape the canvas has right now: drag a handle to another shape and it goes dark, and the row says Custom. The padlock at the end of the row keeps the shape while you drag, and the button at the start turns the shape between portrait and landscape. **Reset crop** brings back the whole picture, and **Divisible by** makes the width and height divide evenly by a number such as 8, 16 or 32, for models that need it. Feather and output resizing are on the node and in the editor.
Open **Crop, pad & resize** under the preview and tap a ratio to pad the picture to it, or to crop it with **Fit** set to crop. A lit ratio is the shape the canvas has right now: drag a handle to another shape and it goes dark, and the row says Custom. The padlock at the end of the row keeps the shape while you drag, and the button at the start turns the shape between portrait and landscape. **Reset crop** brings back the whole picture, and **Divisible by** makes the width and height divide evenly by a number such as 8, 16 or 32, for models that need it. Feather and output resizing are on the node and in the editor.
It returns the `image`, a `mask` of everything the model paints (padding, see-through parts of the source and the corners a rotation opens up), a `stitcher`, the untouched `original`, the output `width` and `height`, and a `prompt_image`. Wire the stitcher into **Stitch Inpaint** after the sampler to put your original back. See-through parts of a PNG, such as a cutout's missing background, are filled like the padding and painted; `prompt_image` and `original` show them as white. Give `prompt_image` to whatever writes your prompt, so it describes a real backdrop instead of the gray fill. **Load Image + Pad** has more fill choices and a separate reference output.
@@ -162,6 +161,12 @@ Upload a video, or pick one from the Source list, which plays the clip under the
It returns the frames, audio, frame count, fps, width, height, duration and a core `VIDEO`. Only the part you kept is decoded, and it checks memory before a large load. When you save the frames, wire its fps into the save node.
### Load Audio
Upload a sound file, or pick one from the Source list, and the node shows it as a wave. Drag the IN and OUT handles to keep only the part you want, or type the times. Press play to hear just that part. Set **Max length** to the longest sound the next step can take, such as a video's length: anything past it turns red and is cut off, so you see what comes out before you run. Click the red length next to OUT to move OUT to the cut.
It returns the `audio` you kept and its length in `seconds`. Only that part is decoded. [Help page](js/docs/AUSBOSS_NODES_LoadAudio.md).
### Video Crop + Rotate + Pad → Frame
Picks one frame from a video, then gives you the same rotate, crop and pad controls as the image node, plus an optional megapixel resize. Scrub to the frame with the playhead on the node; the editor adds frame-by-frame stepping and playback. It returns the transformed `image`, a `mask` of the added area, a `stitcher`, the chosen `original` frame, and the output `width` and `height`. For a whole clip, use the Clip version below.
@@ -170,7 +175,7 @@ Picks one frame from a video, then gives you the same rotate, crop and pad contr
Applies one rotate, crop and pad to every frame of a trimmed clip. It has the source picker, a timeline with a playhead and frame-accurate IN and OUT handles, frame skipping, a frame limit, the transform handles and output resizing. While you drag a trim handle, the node shows the exact first or last frame the run keeps. The bright part of the selection is what gets output.
Fill, feather and the resize budget sit on the node face, and a new clip keeps them. That matters for video outpainting, because the black, hard-edged canvas the model needs survives a source swap. A fresh Clip node starts with that canvas, and the editor's **Reset transform** goes back to it. **Frames for** trims the end to the frame count the next video model takes: LTX (8n+1) or Wan (4n+1). Tap a ratio to pad the clip to it; a new clip is padded to the lit ratio too. The padlock keeps the shape while you drag a handle.
Fill, feather and the resize budget are in **Crop, pad & resize** below the timeline, and a new clip keeps them. That matters for video outpainting, because the black, hard-edged canvas the model needs survives a source swap. A fresh Clip node starts with that canvas, and the editor's **Reset transform** goes back to it. **Frames for** trims the end to the frame count the next video model takes: LTX (8n+1) or Wan (4n+1). Tap a ratio to pad the clip to it; a new clip is padded to the lit ratio too. The padlock keeps the shape while you drag a handle.
It returns the frames, mask, audio, frame count, fps, size, duration, a `stitcher`, and the chosen `original` frames before the transform. **Inpaint & Stitch** in the editor sets the protected source area and previews the blend. After a video outpaint, wire the stitcher straight into **Stitch Inpaint**, with no Crop For Inpaint in between. It works in chunks to keep memory down.
@@ -339,6 +344,8 @@ A text box that grows with the node and sends its text, unchanged, down a `STRIN
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.
**Change something** edits the named part of a video while keeping its person and sound. For a person swap, an optional `@1 looks like ...` line describes the connected replacement. Jobs that keep the source clip's length show **From the clip**; the `keeps_clip_sound` output helps a workflow choose the source audio.
### Integer
One whole number (`INT`) on a scrub control, for sharing a size, count or other whole number across nodes. Like every number box in the pack, it takes a typed sum: `1024*1.5`.
@@ -367,6 +374,10 @@ A setup card for a shared workflow: a title, instructions in Markdown, each mode
A note for the canvas whose text grows to fill it, so it reads without zooming in. Double-click to type; a blank line starts a new point and `**two stars**` stress a word. Type an arrow emoji such as ⬆️ and it turns into a teal arrow in the middle of the line. Click a node while you edit, then press an arrow, and the arrow is linked to that node: click it later and the canvas brings the node into view. It never runs and has no wires.
### Compact note and link tiles
**Callout Tile** shows a compact title or colored YouTube/Discord link button. **Workflow Note Tile** opens a full help note from a compact button. They reuse the note editors and save as distinct node types, so an older install reports a missing node instead of drawing an incompatible plain note. Install or update ComfyUI-AusBoss, restart ComfyUI and reload when either tile is missing. Existing ordinary notes and callouts keep their original types.
### Run Timer
A stopwatch for the whole run, with no wires. It starts when the queue starts running, holds the total when the run ends, and saves the last time with the workflow. Recent times are in its right-click menu. You can resize it. It only shows time and doesn't change how the graph runs.
+1
View File
@@ -36,6 +36,7 @@ NODE_MODULES = [
"node_layout_boxes",
"node_literals",
"node_load_image_pad",
"node_load_audio",
"node_load_video",
"node_lora_loader",
"node_mask_by_name",
+9
View File
@@ -0,0 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" width="105" height="20" role="img" aria-label="release: v2.21.1">
<title>release: v2.21.1</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.21.1</text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 425 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

+4 -5
View File
@@ -1,4 +1,4 @@
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import {
CUSTOM_SCHEME,
DEFAULT_SCHEME,
@@ -190,7 +190,7 @@ app.registerExtension({
});
function isTitleless(node) {
return node.constructor?.title_mode === (globalThis.LiteGraph?.NO_TITLE ?? 1);
return (node.title_mode ?? node.constructor?.title_mode) === (globalThis.LiteGraph?.NO_TITLE ?? 1);
}
function openHelpCard(node, event) {
@@ -210,9 +210,8 @@ function openHelpCard(node, event) {
function installHelpBadge(node) {
// A title-less node (Run Timer) has no bar to hang the badge on; its
// card opens from the node's context menu instead.
if (isTitleless(node)) return;
chainCallback(node, "onDrawForeground", function (ctx) {
if (!showBadge(this.size?.[0] ?? 0, this.flags?.collapsed)) return;
if (isTitleless(this) || !showBadge(this.size?.[0] ?? 0, this.flags?.collapsed)) return;
const [x, y] = badgeCenter(this.size[0]);
ctx.save();
ctx.beginPath();
@@ -228,7 +227,7 @@ function installHelpBadge(node) {
ctx.restore();
});
chainHandler(node, "onMouseDown", function (event, pos) {
if (!showBadge(this.size?.[0] ?? 0, this.flags?.collapsed)) return false;
if (isTitleless(this) || !showBadge(this.size?.[0] ?? 0, this.flags?.collapsed)) return false;
if (!pos || !hitsBadge(pos, this.size[0])) return false;
openHelpCard(this, event);
return true; // consume the click so it does not start a drag
+2 -2
View File
@@ -4,8 +4,8 @@
//
// Imports nothing from ../shared on purpose. Old cached copies of those files
// are the problem this entry has to survive.
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
const PACK_URL = new URL("../", import.meta.url).href;
const PARALLEL = 6;
+156 -10
View File
@@ -6,7 +6,9 @@
// and copy ride the default path); the panel only shows it. Decisions live in
// js/shared/callout.mjs under node:test.
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import { setTileFace, TILE_FACE_CSS } from "../shared/tile_face.mjs";
import { CALLOUT_TYPES, serializeNoteIdentity } from "../shared/note_identity.mjs";
import { BRAND, chainCallback, keepDomWidgetWidthAuto } from "../shared/index.mjs";
import {
ARROW_ANGLE,
@@ -19,6 +21,8 @@ import {
repointLinks,
targetId,
toggleSmall,
tileLinkFields,
tileLinkText,
urlLabel,
wrapLink,
} from "../shared/callout.mjs";
@@ -27,9 +31,9 @@ import { keepKeyInField } from "../shared/canvas_passthrough.mjs";
import { WIDGET_FRAME, fillNodeHeight } from "../shared/panel_layout.mjs";
import { hideInputsInDef, hideWidget } from "../shared/widget_visibility.mjs";
import { commitWidgetValue } from "../shared/widget_card_math.mjs";
import { compactAction } from "../shared/panel_controls.mjs";
import { frameBounds } from "../shared/workflow_switches.mjs";
const NODE_CLASS = "AUSBOSS_NODES_Callout";
const CSS_ID = "ausboss-callout-css";
const WIDGET_NAME = "ausboss_callout_panel";
const DEFAULT_SIZE = [380, 160];
@@ -37,6 +41,10 @@ const PANEL_MIN_WIDTH = 200;
const PANEL_MIN_HEIGHT = 64;
const SVG_NS = "http://www.w3.org/2000/svg";
const ARROW_COLOR = "#1fd3c6";
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" },
};
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';
@@ -55,6 +63,7 @@ function ensureCss() {
const style = document.createElement("style");
style.id = CSS_ID;
style.textContent = `
${TILE_FACE_CSS}
.ausboss-callout{box-sizing:border-box;width:100%;height:100%;padding:2px 4px 6px;overflow:hidden;pointer-events:none;}
.ausboss-callout-card{position:relative;box-sizing:border-box;width:100%;height:100%;overflow:hidden;border-radius:8px;background:linear-gradient(135deg,rgba(0,180,170,.07),rgba(0,0,0,.2));}
.ausboss-callout-inner{position:absolute;top:0;bottom:0;left:0;box-sizing:border-box;width:100%;height:fit-content;margin:auto 0;padding:.6em 1em .6em .85em;color:#d6e6e4;font-family:${FONT};font-weight:500;line-height:1.4;letter-spacing:.003em;overflow-wrap:anywhere;}
@@ -63,6 +72,15 @@ function ensureCss() {
.ausboss-callout-point b{color:#6fe0d6;font-weight:650;}
.ausboss-callout-small{margin-top:.3em;color:#9fb5b2;font-size:max(11px,.62em);font-weight:400;line-height:1.4;}
.ausboss-callout-small b{color:#8fd6cf;font-weight:600;}
.ausboss-callout-card[data-tile=youtube]{background:#ae2639}
.ausboss-callout-card[data-tile=discord]{background:#5146aa}
.ausboss-callout-card[data-tile=title]{background:#090909;border-left:4px solid #21c7b9}
.ausboss-callout-card[data-tile] .ausboss-callout-inner{padding-block:.15em;}
.ausboss-callout-card[data-tile] .ausboss-callout-point{border:0;padding:0;margin:0;font-weight:650;color:#fff}
.ausboss-callout-card[data-tile] .ausboss-callout-url{color:white;text-decoration:none;display:flex;align-items:center;gap:12px}
.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-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;}
@@ -75,7 +93,7 @@ function ensureCss() {
.ausboss-callout-out{display:inline-block;margin-left:.2em;font-size:.7em;font-weight:600;vertical-align:.14em;text-decoration:none;opacity:.85;}
.ausboss-callout-jump.is-gone{opacity:.45;cursor:default;text-decoration-style:dotted;}
.ausboss-callout-tools{position:absolute;top:5px;right:5px;display:flex;gap:4px;opacity:0;transition:opacity .15s;pointer-events:auto;}
.ausboss-callout-card:hover .ausboss-callout-tools,.ausboss-callout.is-selected .ausboss-callout-tools{opacity:.95;}
.ausboss-callout-card:is(:hover,:focus-within) .ausboss-callout-tools,.ausboss-callout.is-selected .ausboss-callout-tools{opacity:.95;}
.ausboss-callout-tool{height:22px;padding:0 8px;border:1px solid rgba(0,180,170,.45);border-radius:5px;background:rgba(8,14,16,.86);color:#9fd8d3;font:600 11px ${FONT};letter-spacing:.02em;cursor:pointer;}
.ausboss-callout-tool:hover{color:#fff;border-color:${BRAND};}
.ausboss-callout-editor{position:absolute;inset:0;box-sizing:border-box;display:flex;flex-direction:column;gap:6px;padding:6px;border:1px solid ${BRAND};border-radius:8px;background:rgba(5,10,11,.95);pointer-events:auto;container-type:size;}
@@ -90,6 +108,17 @@ function ensureCss() {
.ausboss-callout-pick svg{display:block;width:100%;height:100%;}
.ausboss-callout-size{flex:none;height:24px;margin-left:4px;padding:0 7px;border:1px solid rgba(0,180,170,.35);border-radius:5px;background:rgba(8,14,16,.9);color:#9fd8d3;font:600 11px ${FONT};cursor:pointer;}
.ausboss-callout-size:hover{border-color:${BRAND};background:rgba(0,180,170,.14);}
.ausboss-tile-editor{box-sizing:border-box;width:min(520px,94vw);max-height:86vh;overflow:auto;margin:auto;padding:24px;border:1px solid #365957;border-top:3px solid ${BRAND};border-radius:10px;background:#111b1c;color:#e6f4f3;box-shadow:0 18px 64px #0008;font:14px/1.5 ${FONT};}
.ausboss-tile-editor::backdrop{background:#06090ab8;}
.ausboss-tile-editor h2{margin:0 0 18px;font-size:21px;}
.ausboss-tile-editor label{display:flex;flex-direction:column;gap:7px;margin-bottom:16px;font-weight:600;}
.ausboss-tile-editor input,.ausboss-tile-editor textarea{box-sizing:border-box;width:100%;padding:10px 12px;border:1px solid #365957;border-radius:5px;background:#080e10;color:#e6f4f3;font:16px/1.5 ${FONT};user-select:text;}
.ausboss-tile-editor textarea{min-height:120px;resize:vertical;}
.ausboss-tile-editor :is(input,textarea):focus{outline:2px solid ${BRAND};outline-offset:1px;}
.ausboss-tile-editor footer{display:flex;justify-content:flex-end;align-items:center;gap:8px;}
.ausboss-tile-editor footer span{margin-right:auto;color:#99b0ad;font-size:12px;}
.ausboss-tile-editor .ausboss-compact-action{height:32px;padding:0 15px;font-size:13px;}
.ausboss-tile-editor .ausboss-tile-error{color:#ffc36d;margin:0 0 12px;}
@container (max-width:395px){.ausboss-callout-arrowbar>span:first-child,.ausboss-callout-link:not(.has-node){display:none;}}
@container (max-width:395px) and (min-height:112px){.ausboss-callout-arrowbar{flex-wrap:wrap;}.ausboss-callout-pick{flex:none;}}
`;
@@ -177,6 +206,18 @@ function arrowSpan(state, kind, piece = {}) {
function linkRun(state, first) {
if (first.url !== undefined) {
const link = el("a", "ausboss-callout-url");
const tile = state.card.dataset.tile;
if (tile === "youtube" || tile === "discord") {
const icon = svg("svg", { viewBox:"0 0 28 20", "aria-hidden":"true" });
if (tile === "youtube") {
icon.append(svg("rect",{x:0,y:1,width:28,height:18,rx:5,fill:"white"}),
svg("path",{d:"M11 5.5 19 10 11 14.5Z",fill:"#ae2639"}));
} else {
icon.append(svg("path",{d:"M4 3 10 1l1 2a15 15 0 0 1 6 0l1-2 6 2c2 4 3 8 3 12l-6 4-2-3a17 17 0 0 1-10 0l-2 3-6-4c0-4 1-8 3-12Z",fill:"white"}));
for (const cx of [9,19]) icon.append(svg("ellipse",{cx,cy:10,rx:2,ry:2.6,fill:"#5146aa"}));
}
link.append(icon);
}
link.href = first.url;
link.target = "_blank";
link.rel = "noopener noreferrer";
@@ -222,6 +263,10 @@ function bringIntoView(target) {
}
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);
state.inner.replaceChildren();
state.empty = blocks.length === 0;
@@ -319,7 +364,9 @@ function fit(state) {
inner.style.fontSize = `${px}px`;
return inner.offsetHeight <= height && inner.scrollWidth <= width + 1;
};
inner.style.fontSize = `${fitFontSize(fits)}px`;
const size = fitFontSize(fits);
const social = card.dataset.tile === "youtube" || card.dataset.tile === "discord";
inner.style.fontSize = `${social ? Math.min(size, 16) : size}px`;
}
function markChanged() {
@@ -331,8 +378,78 @@ function markChanged() {
}
}
function startTileEdit(state) {
if (state.editor) return;
const original = String(state.valueWidget.value ?? "");
const social = ["youtube", "discord"].includes(state.card.dataset.tile);
const link = social ? tileLinkFields(original) : null;
const dialog = el("dialog", "ausboss-tile-editor");
const heading = social ? "Edit link tile" : "Edit title";
dialog.setAttribute("aria-label", heading);
dialog.append(el("h2", "", heading));
const label = el("label", "", link ? "Button text" : "Text");
const text = el(link ? "input" : "textarea");
text.value = link?.label ?? original;
label.append(text);
dialog.append(label);
let address;
if (link) {
const field = el("label", "", "Link address");
address = el("input");
address.type = "url";
address.value = link.url;
field.append(address);
dialog.append(field);
}
const error = el("p", "ausboss-tile-error");
error.setAttribute("role", "alert");
const foot = el("footer");
const cancel = compactAction("Cancel");
const save = compactAction("Save");
foot.append(el("span", "", "Ctrl + Enter to save"), cancel, save);
dialog.append(error, foot);
const commit = () => {
let value = text.value;
try {
if (address) value = tileLinkText(text.value, address.value);
} catch (problem) {
error.textContent = problem.message;
return;
}
if (value !== original) {
state.node.graph?.beforeChange?.();
commitWidgetValue(state.node, state.valueWidget, value, app.canvas);
renderText(state);
state.node.graph?.afterChange?.();
markChanged();
}
dialog.close();
};
save.addEventListener("click", commit);
cancel.addEventListener("click", () => dialog.close());
dialog.addEventListener("keydown", event => {
event.stopPropagation();
if (event.key === "Enter" && (event.ctrlKey || event.metaKey)) {
event.preventDefault();
commit();
}
});
dialog.addEventListener("keyup", event => event.stopPropagation());
dialog.addEventListener("close", () => {
state.editor = null;
dialog.remove();
state.root.querySelector(".ausboss-callout-tool")?.focus();
}, { once: true });
state.editor = dialog;
document.body.append(dialog);
dialog.showModal();
text.focus();
text.select();
}
function startEdit(state) {
if (state.editor) return;
if (state.card.dataset.tile) return startTileEdit(state);
const wrap = el("div", "ausboss-callout-editor");
const area = el("textarea", "ausboss-callout-edit");
area.value = state.valueWidget.value ?? "";
@@ -499,16 +616,17 @@ function buildPanel(node) {
root.append(card);
tools.addEventListener("pointerdown", (event) => event.stopPropagation());
const panelHeight = () => (card.dataset.tile ? 36 : PANEL_MIN_HEIGHT) + WIDGET_FRAME;
const domWidget = node.addDOMWidget(WIDGET_NAME, "ausboss_callout", root, {
serialize: false,
hideOnZoom: false,
getMinHeight: () => PANEL_MIN_HEIGHT + WIDGET_FRAME,
getMinHeight: panelHeight,
});
keepDomWidgetWidthAuto(domWidget);
domWidget.serialize = false;
fillNodeHeight(domWidget, {
minWidth: PANEL_MIN_WIDTH,
minHeight: () => PANEL_MIN_HEIGHT + WIDGET_FRAME,
minHeight: panelHeight,
minNodeSize: [PANEL_MIN_WIDTH, PANEL_MIN_HEIGHT + 40],
exactMinWidth: true,
});
@@ -516,6 +634,9 @@ function buildPanel(node) {
const state = { node, valueWidget, domWidget, root, card, inner, empty: true, editor: null, frame: 0 };
node.__ausbossCallout = state;
edit.addEventListener("click", () => startEdit(state));
card.addEventListener("dblclick", (event) => {
if (card.dataset.tile && !event.target.closest("a,button,textarea,.ausboss-callout-editor")) startEdit(state);
});
state.observer = new ResizeObserver(() => {
cancelAnimationFrame(state.frame);
state.frame = requestAnimationFrame(() => fit(state));
@@ -535,7 +656,7 @@ app.registerExtension({
// A note copied with what its links name follows the copies.
onPaste(({ nodes, groups, created }) => {
for (const node of created) {
if (node?.comfyClass !== NODE_CLASS && node?.type !== NODE_CLASS) continue;
if (!CALLOUT_TYPES.has(node?.comfyClass) && !CALLOUT_TYPES.has(node?.type)) continue;
const state = buildPanel(node);
if (!state) continue;
const text = repointLinks(state.valueWidget.value, nodes, groups);
@@ -546,16 +667,29 @@ app.registerExtension({
});
},
beforeRegisterNodeDef(nodeType, nodeData) {
if (nodeData?.name !== NODE_CLASS) return;
if (!CALLOUT_TYPES.has(nodeData?.name)) return;
hideInputsInDef(nodeData, ["text"]);
chainCallback(nodeType.prototype, "onNodeCreated", function () {
if (nodeData.name === "AUSBOSS_NODES_CalloutTile") {
this.properties ??= {};
this.properties.ausbossCalloutTile ??= "title";
}
buildPanel(this);
// Keep new tiles compact without changing ordinary or saved callouts.
if (nodeData.name === "AUSBOSS_NODES_CalloutTile") this.setSize?.([380, 80]);
});
chainCallback(nodeType.prototype, "onConfigure", function () {
chainCallback(nodeType.prototype, "onSerialize", function (saved) {
serializeNoteIdentity(saved, ["youtube", "discord", "title"].includes(this.properties?.ausbossCalloutTile));
});
chainCallback(nodeType.prototype, "onConfigure", function (saved) {
// Saved values land after onNodeCreated; show them.
queueMicrotask(() => {
const state = buildPanel(this);
if (state) renderText(state);
if (!state) return;
renderText(state);
if (state.card.dataset.tile && Number.isFinite(saved?.size?.[1])) {
this.setSize?.([this.size[0], saved.size[1]]);
}
});
});
chainCallback(nodeType.prototype, "onDblClick", function () {
@@ -565,12 +699,24 @@ 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"]]) {
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);
renderText(state);
if (style !== "plain") this.setSize?.([this.size[0], style === "title" ? 86 : 78]);
markChanged();
}});
}
options.unshift({ content: "Edit callout text", callback: () => startEdit(state) }, null);
});
chainCallback(nodeType.prototype, "onRemoved", function () {
const state = this.__ausbossCallout;
if (!state) return;
state.observer?.disconnect();
state.editor?.close?.();
cancelAnimationFrame(state.frame);
this.__ausbossCallout = null;
});
+1 -1
View File
@@ -12,7 +12,7 @@
// title it loads into the node, dropped on the node's panel (the picture, the
// controls) it missed the node. The drop listeners here hand it to the node
// under the pointer.
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import {
dragCarriesFiles, graphDragStarts, panelHost, panelKeepsWheel, panelNeedsDropHelp, panelRoot,
} from "../shared/canvas_passthrough.mjs";
+2 -2
View File
@@ -1,5 +1,5 @@
import { app } from "/scripts/app.js";
import { api } from "/scripts/api.js";
import { app } from "../../../scripts/app.js";
import { api } from "../../../scripts/api.js";
import { AUSBOSS_JS_VERSION, BRAND, BRAND_BODY, chainCallback } from "../shared/index.mjs";
import { nodeByExecutionId } from "../shared/graph_ids.mjs";
import { isOwnRun, ownRuns } from "../shared/prompt_scope.mjs";
+2 -2
View File
@@ -1,5 +1,5 @@
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { isForeignRun, outputKey } from "../shared/prompt_scope.mjs";
import { BRAND, chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange } from "../shared/index.mjs";
import { lookupLink } from "../shared/graph_links.mjs";
+9 -1
View File
@@ -7,9 +7,17 @@ to point at the part you are talking about.
Use it to explain a step in a workflow you share. It never runs and has no
wires.
## Tile presets
Right-click the Callout and choose **Title tile** to give your existing text a black heading with a teal accent. **Set YouTube link tile** and **Set Discord link tile** fill in the AusBoss link and label. Click the label to open the link, or drag the tile to move it. Choose **Plain callout** to return to the standard style with the current text.
- Press **Edit** on a tile to open a larger editor. A link tile has separate **Button text** and **Link address** fields. Existing mixed text stays in a text box.
- 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
- Double-click the note, or press **Edit**, to type. Click outside the box to
- 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.
- A blank line starts a new point. Each point gets a thin teal line beside it.
- Put two stars around a word to stress it: `**Resize is on.**`
+7
View File
@@ -0,0 +1,7 @@
# Callout Tile
A compact title or colored link button for a workflow. Choose **Title tile**, **Set YouTube link tile**, or **Set Discord link tile** from its menu. Press **Edit** to change its text or link; you can also double-click a title. Drag its visible corner to resize.
It uses the same text, arrows and links as [Callout](AUSBOSS_NODES_Callout.md). **Plain callout** returns to the ordinary note face. Nothing runs and it has no outputs.
Tiles save with their own node type. If ComfyUI reports this node missing, install or update **ComfyUI-AusBoss**, restart ComfyUI, and reload the workflow. An older pack cannot draw the tile correctly. Keep the missing node so its text and settings are preserved.
+1
View File
@@ -64,6 +64,7 @@ Pick **Erase** on the switch. A row of tools opens above the picture:
away. Restore paints it back. Holding **Ctrl**, or using the right
mouse button, does the other one for as long as you hold it.
- **Size** is the brush's width, in pixels of the picture.
- The dot beside **Size** previews one brush dab. It grows with Size and its edge fades as you increase Soft.
- **Soft** is the brush's edge: 0 is a hard edge, 100 fades all the way
from the middle.
- Drag left and right on **Size** or **Soft**, on the word, the number or
+41 -4
View File
@@ -89,14 +89,42 @@ Connect a video, then pick what it is for:
`@1 dances on a rooftop at sunset.` The clothes can come from words or from an
outfit picture.
- **swap the person**: your person takes over from the one in the video. The
place, the moves and the camera stay. You can leave the box empty.
place, the moves and the camera stay. With two person pictures, the first
replaces the person on the left and the second replaces the person on the
right. To choose who goes, type one line per picture, for example
`@1 replaces the man in the hat`. Put spoken words in quotes and name
the speaker. If a voice comes from off screen, say so in the line.
- **change something**: keep the video and describe the change, for example
`She wears a red raincoat`. Be specific about what should change.
- **keep going**: more of the same clip, from where it ends. Say what happens
next, or leave the box empty and it just carries on. Connect the whole clip:
the node sends H3 only the last 2 seconds.
- **new voice**: the same clip with a new voice. Connect the voice, and type
what they say in quotes.
Swap and new voice ignore **Length** and keep the video's own length.
If your swap keeps the video's audio, connect it to **video_sound** and turn on
**More → Clip's own sound**. The writer uses the clip to estimate when each
line is spoken and keeps only the incoming people's words in the swap prompt.
Type a time such as `3.2s:` to set it yourself. This switch starts off.
With an active video, **swap the person**, **change something** and **new voice**
use the incoming clip to set the frame count. **Length** says **From the clip**;
set the clip's length upstream. The bar does not show a guessed duration or offer
retiming controls for these jobs. H3 rounds the frame count to a supported length.
Other video jobs, or turning the video off, use the editable **Length** again.
For a swap, you can optionally describe the replacement on its own line:
```
the woman with black hair walking toward the camera
@1 looks like a woman with blonde hair and a black hoodie.
```
The first line chooses who goes; the `@1 looks like` line describes the connected
replacement person in Picture 1. Use the number of that picture, with its job set
to **person** or **character sheet**. This helps describe the intended appearance;
it does not guarantee an exact identity match. The line is optional: existing
workflows and scripts keep their previous behavior when it is absent.
## What you can type
@@ -125,8 +153,10 @@ they are.
## What you can plug in
- **picture_1** to **picture_4**: your pictures.
- **video** and **video_sound**: the frames and the sound of a video. Only keep
going uses the sound.
- **video** and **video_sound**: the frames and the sound of a video. **keep
going** sends the last part of the sound to H3. A swap uses the sound to find
speech timing when **Clip's own sound** is on. To keep source audio in a swap
or **change something**, route the original loader's audio to the save node.
- **voice**: a clip of someone talking, about 10 seconds, plus words in quotes
in your script. It goes to whoever speaks first. It works with your own voice,
or one you have permission to use. Put the spoken line last: with time left
@@ -150,6 +180,12 @@ H3's width and height: the clip takes the shape of your video, or else of your
first picture. **song_under** goes into `audio2` of Audio Merge, with the clip's
sound in `audio1`.
**keeps_clip_sound** is on when a video is connected and **Clip's own sound** is
on, or the video job is **change something**. Use it to select the source audio
for the finished clip. It is the last output; the existing outputs keep their
positions. Keeping source audio still needs the workflow to pass that audio to
its save node.
Nothing plugged in means nothing is added. So a page can turn each one on and off
with [Workflow Switches](#AUSBOSS_NODES_WorkflowSwitches): a bypassed loader reads
as not plugged in.
@@ -208,6 +244,7 @@ as not plugged in.
| `song_under` | output | AUDIO | With a voice and a song, the song to mix under the finished clip. |
| `frames` | output | INT | The clip's length in frames. |
| `width`, `height` | output | INT | The shape of your video, or else of your first picture. |
| `keeps_clip_sound` | output | BOOLEAN | Whether the finished clip should use the video's own sound. |
## Technical details
+32 -32
View File
@@ -10,7 +10,7 @@ original back over the result.
## Quick start
1. Pick a picture under **Image source**, or click **Upload**. Dropping a
1. Choose a file above the preview, or click **Load**. Dropping a
picture onto the node works too.
2. Drag the handles on the picture. Cyan squares crop. Orange diamonds add space
on one side. Orange corners make the whole canvas bigger or smaller. The
@@ -28,22 +28,25 @@ uses what the node shows.
From top to bottom:
- **Image source**: the pictures in ComfyUI's input folder. The list shows the
picture under the pointer and filters as you type. **Upload** adds one. A
- **File picker**: choose **Inputs** for uploaded pictures or **Outputs** for renders, newest first. The list shows the
picture under the pointer and filters as you type. **Load** adds one. A
picture ComfyUI made, named like `photo.png [output]`, loads too, as it does
in core Load Image. The gear holds the node's display options.
- **The picture**, with its handles.
- **The size line**: each step that sets the output size, ending with the size
the run gives you.
- **The ratio row**: the orientation button, the ratios (1:1, 4:3, 3:2, 16:9,
21:9) and the padlock.
- **Fit** (crop | pad) and **Divisible by**.
- **Fill**, **Feather**, **Resize** and the two **Center** buttons.
- **Crop, pad & resize**: a collapsible group (closed to start, with the fill
swatch and a short summary on its bar) holding:
- **Aspect ratio** and **Fit to ratio** (Crop or Pad), above the orientation button, the ratios (1:1, 4:3, 3:2, 16:9,
21:9) and the padlock.
- **Align** and the two **Center** buttons.
- **Fill** and **Feather**.
- **Resize**, with **Megapixels** and **Step** alongside it when Resize is on.
- **Open editor**, **Reset crop** and **Reset**.
Crop and padding have no number boxes. You set them by dragging, and the size
line shows the result. Picking another picture starts the framing over
(rotation, crop and padding); Fill, Feather, Divisible by, Resize and a lit
(rotation, crop and padding); Fill, Feather, Align, Resize and a lit
ratio stay.
### Ratios, Fit and the padlock
@@ -51,8 +54,7 @@ ratio stay.
Tap a ratio under the picture to pad the picture to it: every pixel stays and
fill bands are added around it, centred. Set **Fit** to crop and the ratio trims
the picture instead. Tap the lit ratio again to go back to the whole picture.
**Fit** only acts on a lit ratio, so it is dimmed and says "pick a ratio first"
until you tap one.
You can set **Fit to ratio** before picking a ratio. If a ratio is already lit, switching between Crop and Pad applies it immediately.
- **A lit ratio is the shape the canvas has now.** Drag a handle to another
shape and the ratio goes dark; the row says **Custom** and the size line under
@@ -85,11 +87,11 @@ sides at once, so the picture keeps its place in the middle. You can press or le
go of Alt during the drag. A corner stops when one of its two sides has no padding
left to take away.
The two **Center** buttons next to Fill, Feather and Resize put the picture in
the middle of the canvas: one side to side, one top to bottom. They move padding from
one side to the other, so the canvas keeps its size and a lit ratio stays lit. A
button is dimmed when the picture is already in the middle or that way has no
padding to move. On a narrow node they sit on a line of their own.
**Center** moves the crop to the middle of the rotated source, side to side or
top to bottom. If there is padding on that axis, the same click also balances
the bands around the crop. The crop and output keep their sizes, and the
generated mask follows the new placement. Each button dims when its axis is
as centered as the pixels allow.
The orange diamonds move one side at a time, and the padlock works on them as
described above. The corners keep the shape with or without the padlock. The
@@ -112,9 +114,9 @@ green rotate knob moves aside when a corner handle sits where it usually goes.
**Method** (`resize_method`) is in the editor, under **Resize output**.
The edge between your picture and the fill stays one clean line at any size.
### Divisible by
### Align
**Divisible by** (`canvas_multiple`) makes the width and height divide evenly by
**Align** (`canvas_multiple`) makes the width and height divide evenly by
the number you pick. Some models need sizes divisible by 8, 16 or 32. At 1 it is
off. Its arrows go 1, 8, 16, 24 and so on; hold Shift to step by 1.
@@ -130,24 +132,23 @@ or bottom.
The line under the picture names every step that sets the output size, in the
order the run applies them, with the size the run emits last and brightest:
`crop 2080×1170 → pad 2208×1298 → round to 64 2240×1344 → resize 1344×768`. A step
that changes nothing is left out, and "round to" is **Divisible by** at work. An
that changes nothing is left out, and "round to" is **Align** at work. An
amber line warns when rounding each side to the Step stretches the picture by
more than 1% (`1.5% taller: each side rounds to 32 px`); its tooltip names a
Step that avoids it, and with Fit on pad, **Even out** adds a few pixels of
padding so nothing stretches. It also warns when the resize undoes **Divisible
by**. Hover the line for the same breakdown line by line; the editor's right
more than 1% (`Resize makes the picture 1.5% taller`); its tooltip names a
Step that avoids it, and with Fit on pad, **Pad to keep shape** adds a few pixels of
padding so nothing stretches. It also warns when the resize undoes **Align**. Hover the line for the same breakdown line by line; the editor's right
panel shows it too.
The amber line keeps still while you drag a handle or a number. If the drag
makes it untrue it goes away, and the line for the new size comes back a
moment after you let go. With Resize on its row is always on the node, with
text or empty, so the controls under it stay where they are.
moment after you let go. The space for the warning stays under the dimensions. On a narrow node, hover
over shortened text to read it in full.
### Reset crop and Reset
**Reset crop** shows the whole picture again without changing rotation or
padding. **Reset** clears rotation, crop and padding and turns the padlock off;
Fill, Feather and **Divisible by** stay.
Fill, Feather and **Align** stay.
## Drawing a mask
@@ -167,8 +168,7 @@ your picture stays under them in **image**, **original** and
the teal.
See-through parts of a PNG show in teal the same way, because the node paints
them too. To hide the teal, click the gear at the top right of the image
source box and turn off **Show the mask on the picture**. The choice applies
them too. To hide the teal, click the gear next to **Load** and turn off **Show the mask on the picture**. The choice applies
to every Image Crop + Rotate + Pad in this browser.
## Outputs
@@ -232,18 +232,18 @@ for fine steps). The editor adds a few things the node does not show:
- **Rotate → Degrees** (`rotation_degrees`): type an exact turn, clockwise.
Each step is 1°, or 0.1° with Shift. **Reset rotation** sets it back to 0.
- **Padding & mask → Reset padding** removes all padding. The same section has
Fill, Feather, Divisible by and a **Center** row.
Fill, Feather, Align and a **Center** row.
- **Resize output → Method** (`resize_method`): how the resize samples the
picture. `lanczos`, the default, is the sharp one.
- **More**: ratios you added in `ausboss_presets.json` that no button shows.
The list only appears when you have some.
- **Reset view** undoes zoom and pan. **Reset transform**
clears rotation, crop, padding, fill, feather and Divisible by; the picture,
clears rotation, crop, padding, fill, feather and Align; the picture,
resize and stitch settings stay.
- **Preview**: a small picture of the finished output while you work.
A ratio replaces the existing crop and padding and keeps rotation, fill and
resize settings. **Divisible by** and the resize **Step** can slightly change
resize settings. **Align** and the resize **Step** can slightly change
the fitted shape. The size box on the stage sits clear of the handles.
### Handles and gestures
@@ -280,8 +280,8 @@ The editor's right side holds the stitcher's settings, the same as on the clip n
- `fill_color`: `#RGB` or `#RRGGBB`, three numbers (`R, G, B`), one gray
number, or a colour name. Anything it cannot read becomes mid-gray.
- **Corners.** A corner follows the pointer along the canvas diagonal, and the
shape it keeps is the canvas before **Divisible by** rounds it. With
Divisible by on, **Center** counts the fill it adds, so the bands you see
shape it keeps is the canvas before **Align** rounds it. With
Align on, **Center** counts the fill it adds, so the bands you see
come out even.
- **Resize.** It works like core's *Scale Image to Total Pixels*: the budget is
`megapixels × 1024 × 1024`, the shape is kept, and each side rounds to a
@@ -82,7 +82,7 @@ new region can break up; the node says so in the console when it sees it,
and the cure is two passes: pad one axis, run, load the result, pad the
other. **A thin strip counts.** More than 8 px of padding on the other
axis, such as a few pixels left over from a drag, means the source no
longer spans it. **Divisible by** on the Crop + Rotate + Pad nodes and
longer spans it. **Align** on the Crop + Rotate + Pad nodes and
Load Image + Pad's **Multiple** never add a strip on a side you did not
pad. The warning reports the spare pixels on each axis.
+52
View File
@@ -0,0 +1,52 @@
# Load Audio
Loads a sound file and hands on only the part you pick. Use it for a voice
clip, a song or any sound a video model or a save node takes, when you want
one part of the file and not the whole thing.
The node shows the whole file as a wave, so you can see where the loud parts
are. The part that comes out is bright. Drag the white **IN** and **OUT**
handles to set where it starts and stops, drag the bright part to slide it,
or click somewhere else on the wave to move it there. You can also type a time
under the wave, in seconds (`12.5`) or minutes and seconds (`1:02.5`).
Press **▶** to hear only the part that comes out. **LOOP** plays it again and
again.
## Max length
Set **Max length** to the longest sound the next step can take, such as the
length of the video you are making. The start stays where it is, and anything
past the limit turns red with a dashed line where it is cut. Next to OUT,
the node shows how long the sound that comes out is, such as `15.0 s`. It
turns red when part of your pick is cut; hold the mouse over it to see how
much, and click it to move OUT to the cut. Play stops at the cut, so what you
hear is what comes out. `0` means no limit.
Max length can be wired. When the wire comes from a number node such as
Float 🆎, the wave shows the cut for that number; otherwise the length's tooltip says
`max wired` and the run still cuts the sound to the wired length.
## Controls
- **Source** (`audio`): a sound file in ComfyUI's input folder. **Upload**
adds one. Videos are listed as well, for their sound.
- **Max length** (`max_seconds`): the longest the sound may be, in seconds.
`0` means no limit.
- **IN** (`start_seconds`): where the sound starts.
- **OUT** (`end_seconds`): where the sound stops. `0` means the end of the
file.
## Outputs
- `audio`: the part you picked, for any node that takes `AUDIO`.
- `seconds`: how long that sound is.
## Technical details
- Only the picked part is decoded: decoding stops once the window is full,
so a short pick from a long recording stays quick.
- The sound keeps its own sample rate and channels.
- A start past the end of the file stops the run with a message that says so.
- The wave is drawn in the browser from the file itself; nothing extra is
stored with the workflow besides the four values above.
+2 -5
View File
@@ -35,7 +35,6 @@ all. **Remove this LoRA** is red. **Delete all LoRAs…** is a separate red, tra
with confirmation; it clears this node's rows and keeps all files on disk.
Cancel or Escape keeps the stack. Inserting keeps the existing rows and their settings in order;
the new slot uses the gear menu's default strength (initially 1).
The stack holds up to 64 rows.
One strength drives both
model and CLIP by default; the gear menu's **Separate model / CLIP
strength** switch shows a second box per row. The switch is per-node — new
@@ -189,9 +188,7 @@ their order, strengths and switches. The same filename in different folders
counts as separate LoRAs.
The choice is one undo step. Closing the picker without choosing changes
nothing. If a folder would take the stack past 64 rows, nothing is added
and a message says how much room is needed. Remove rows or pick a smaller
folder. Typing a filename and pressing Enter picks one file; use the arrow
nothing. Typing a filename and pressing Enter picks one file; use the arrow
keys to highlight a folder before Enter if you want the whole folder.
Pointing at a folder with the mouse does not choose it for Enter.
Left and Right collapse and expand a highlighted folder.
@@ -256,7 +253,7 @@ Details that keep the absorb faithful:
rows from a loader without a connected CLIP import with CLIP strength 0
- connected auxiliary outputs, such as trigger words, block absorption because
bypassing their source would break those connections
- linked LoRA settings and stacks beyond the row limit leave the sources active
- linked LoRA settings leave the sources active
- already-bypassed or muted loaders contribute no rows
- a toast summarizes what was imported, bypassed, remapped, and skipped
+8
View File
@@ -8,6 +8,14 @@ Pick a picture size by shape and megapixels, or by dragging. Use it in place of
- **Gear:** set the **Snap step**, edit the **Ratio rail**, choose the **Latent family** (`latent`) and **Batch size** (`batch_size`), and hide the **Dot grid** or **MP cost curves**. **Snap step** (8, 16, 32 or 64; starts at 32) is the grid that drags, arrow keys and chips land on. The **Ratio rail** is the list of ratio chips, typed as `1:1, 21:9`. The display options apply to every Latent Size node in this browser; latent family and batch size (1 to 64) belong to this node.
- **Node size:** drag the node's corner to make it wider or taller, so it lines up with the nodes around it. The controls stretch with it, and the canvas preview takes any extra height. It can be as narrow as 320 pixels.
## Workflow resolutions
In the gear, choose **This workflow → Workflow resolutions → Edit list**. Enter one exact width × height per line, up to 24. The list belongs to this node and travels with the saved workflow. An empty list leaves the normal editor unchanged.
- **Recommendations:** leave **Limit choices to this list** off. The Sizes row shows your quick picks, and users can still type, drag or choose another shape.
- **Strict model sizes:** turn the limit on. The Shape row shows only the exact ratios in the list. Select a ratio to see its allowed sizes. For example, 576×1024 and 720×1280 share 9:16; 480×864 is a separate 5:9 option. Landscape is available only if you list a landscape size. The canvas stays visible, but it cannot be stretched. The swap button works only if the exact reverse size is listed.
- On enabling the limit, an unlinked size stays selected if allowed; otherwise the first listed size is selected. A linked width or height is checked at run time, before the latent is allocated. An unsupported pair produces an error naming the allowed sizes. For video workflows, connect these width and height outputs to the video latent node.
## Outputs and links
Outputs are **width**, **height**, and **latent**, in that order. The node has four input sockets above the panel: width, height, latent and batch_size. Linking width or height locks the controls that would change both dimensions; the other dimension remains editable. Linking latent or batch_size sets the latent family or batch size from another node, and the gear then shows that setting as linked. A linked value is read when the workflow runs, so the preview keeps showing the size stored on the node.
+2 -2
View File
@@ -41,9 +41,9 @@ file's name. A caption on the `caption_text` input writes the paired `.txt`.
workflow in EXIF. **JXL** (`jxl lossless`, lossless JPEG XL) is the most
compact; it needs the optional `pillow-jxl-plugin` in ComfyUI's python
(also the pack's `jxl` extra) and few browsers preview it.
- **Embed workflow** (`save_metadata`): **yes** stores the prompt and
- **Embed workflow** (`save_metadata`): **On** stores the prompt and
workflow in the file (PNG text chunks, EXIF in webp and jxl) so it drags
back into ComfyUI; **no** writes a clean file for sharing or datasets.
back into ComfyUI; **Off** writes a clean file for sharing or datasets.
`--disable-metadata` on the server wins.
- **Preview** (`preview`): the small switch under the card shows the saved
image on the node. Off, the picture's box goes away and the node is
+4 -4
View File
@@ -9,9 +9,9 @@ duration, shows a tall video whole, and has a **LOOP** control. `gif` and
`webp` are shown as pictures with just the file name, since a video player
cannot play either.
**STEPS** (`step_preview`, off by default) shows the clip's first frame in
**Steps** above the player (`step_preview`, off by default) shows the clip's first frame in
the player while it is being made, one step at a time, with a **STOP**
button beside it. Stop a clip that is going wrong after the first steps
button on the player. Stop a clip that is going wrong after the first steps
instead of waiting for the end; a stopped run saves nothing. The saved
video replaces the steps. The [Step Preview](AUSBOSS_NODES_StepPreview.md)
page has the details.
@@ -37,7 +37,7 @@ page has the details.
- **Ping-pong** (`pingpong`): Plays the clip forward then backward so it loops seamlessly.
Roughly doubles the frame count and the encode time. The first and last
frames are not repeated at the turnaround, so the loop does not hitch.
- **Metadata** (`save_metadata`): On by default. Turn it off to share a file
- **Embed workflow** (`save_metadata`): On by default. Turn it off to share a file
without your prompt and node graph embedded in it. If ComfyUI was started
with `--disable-metadata`, nothing is embedded whatever this says.
- **audio** (optional): A track to mux into the file, e.g. Load Video's
@@ -83,7 +83,7 @@ metadata, so an embedded workflow is not available for them.
The node's face follows the table: widgets the chosen format ignores are
hidden rather than left to look meaningful. The CRF field leaves the
**FPS · CRF** row for `mov prores`, `mkv ffv1` and `gif` (their rows read
*ignored* above), and the **Metadata** row disappears for `gif` and `webp`,
*ignored* above), and the **Embed workflow** row disappears for `gif` and `webp`,
which cannot carry it. Hidden is not removed:
the widget keeps its position and its value, saved workflows store and restore
it exactly as before, and switching the format back brings it back with the
+9
View File
@@ -27,6 +27,15 @@ needs.
- The line underneath shows the last run's seed. The history saves with the
workflow.
## Compact look
The **gear** beside the number picks the look. **Compact** is one short
row: the number, a mode chip and a dice. Tap the chip to go Random → Fixed →
+1 → −1. The dice rolls a new seed and pins it. A long seed shrinks to fit.
Hover the number to see the last run's seed. The look is saved on the node,
and new Seed nodes start in the look you picked last. **Full** brings back
the whole card, with the seeds it ran with.
## Output
- **seed**: The seed, unchanged.
+10 -9
View File
@@ -11,21 +11,22 @@ generated-area `mask`, a `stitcher` for Stitch Inpaint, the selected
## Source and frame
- **Uploads**: Pick an input video (the list plays the clip under the pointer, muted, and filters as you type), click **Upload** in the compact source card, or
- **Inputs**: Pick an input video (the list plays the clip under the pointer, muted, and filters as you type), click **Load** in the compact source card, or
drop a video file onto the node. Picking another video keeps Fill, Feather,
**Divisible by**, the Resize settings and the lit ratio button (the new frame is
**Align**, the Resize settings and the lit ratio button (the new frame is
fitted to it the way **Fit** is set); rotation, crop, padding and the playhead
start over.
- **Canvas row** under the Fit row: fill swatch, feather amount and the Resize off | on switch on the node face; turning Resize on opens the megapixel budget and its Step. The line under the picture names each step that sets the output size, as on the image node.
- **Upload** streams to the input folder, so videos larger than the buffered image-upload limit can be selected here or dropped onto the node.
- **Uploads** / **Outputs** (`source_mode`: `input folder` / `local path`): the source card's switch. Uploads lists ComfyUI's input folder. Outputs lists the videos in ComfyUI's output folder, newest first, so a video you just rendered can be picked without uploading it again. Both lists preview the video under the pointer.
- **Load** streams to the input folder, so videos larger than the buffered image-upload limit can be selected here or dropped onto the node.
- **Inputs** / **Outputs** (`source_mode`: `input folder` / `local path`): the source card's switch. Inputs lists ComfyUI's input folder. Outputs lists the videos in ComfyUI's output folder, newest first, so a video you just rendered can be picked without uploading it again. Both lists preview the video under the pointer.
- **local_path**: The video picked in the Outputs list, named the way ComfyUI names a file
in its output folder: `clip.mp4 [output]`, `video/take 3.mov [output]`. It is read in
place, without an upload copy. A whole path such as `/home/me/ComfyUI/output/clip.mp4`
is not read, for queued runs and the editor's live preview alike.
- **Playhead**: The rail under the node's preview is the timeline: press or drag it to
- **Play / Pause** beside the scrubber previews the video. Pause on the frame you want to output.
- **Playhead**: The rail directly under the node's preview is the timeline: press or drag it to
scrub, or type a frame in the **FRAME** box; the frame on the stage is the frame the
node outputs (`frame_index`, with `frame_time` kept in step).
- **Crop, pad & resize** (collapsible group under the timeline): folds the ratio buttons, **Fit to ratio**, **Align** and **Center**, **Fill** and **Feather**, and the **Resize** off | on switch, megapixel budget and **Step** into one drawer, showing the fill swatch and a live summary on its header when closed. The line under the picture names each step that sets the output size, as on the image node.
- **seek_mode / frame_time**: Time-based seeking for graphs that drive the position by
link; the editor itself always works in frames.
@@ -33,19 +34,19 @@ The editor has the same rail full width, plus first/last, ±1, ±25, ±50, ±100
## Transform and outputs
Rotation, crop, padding, feathering, fill, **Divisible by**, the megapixel resize, gestures, `image`, and `mask` match the image node. The output batch contains one frame.
Rotation, crop, padding, feathering, fill, **Align**, the megapixel resize, gestures, `image`, and `mask` match the image node. The output batch contains one frame.
The handles work on both the node and the editor. Drag an orange corner to make
the canvas bigger or smaller in its own shape (hold **Alt**, Option on a Mac, to
change all four sides at once), and press **Center** next to Fill and Feather to
put the frame in the middle, side to side or top to bottom. Both work as on the
center the crop and balance any padding, side to side or top to bottom. Both work as on the
image node. The ratio buttons, **Fit**,
the padlock and the orientation button work as on the image node: a tap pads (or,
with Fit on crop, crops) the frame to a ratio, a lit ratio is the shape the canvas
has now, and the padlock keeps that shape while you drag (the row says **Held**).
**Reset crop** restores the full crop while keeping rotation and padding. **Reset**
clears rotation, crop and padding and turns the padlock off; fill, feather,
**Divisible by** and the playhead stay. **Divisible by** makes the width and
**Align** and the playhead stay. **Align** makes the width and
height divide evenly by the number you pick: padding grows by a few pixels, and
a side with no padding is trimmed by a few instead. Some models need sizes
divisible by 8, 16 or 32; 1 turns it off.
+29 -27
View File
@@ -11,33 +11,20 @@ model that paints black regions.
## Source and window
- **Uploads**: Pick an existing input video (the list plays the clip under the pointer, muted, and filters as you type), click **Upload**, or drop a video file
- **Inputs**: Pick an existing input video (the list plays the clip under the pointer, muted, and filters as you type), click **Load**, or drop a video file
onto the node. The old source widgets remain compatible with saved workflows, but
are now driven by this compact card. Choosing another video keeps the canvas
settings - Fill, Feather, **Divisible by**, Resize, Every nth, Frames for, Length - and
settings - Fill, Feather, **Align**, Resize, Every nth, Frames for, Length - and
fits the new clip to the lit ratio button, the way **Fit** is set. Rotation, crop,
padding, IN/OUT and the playhead start over.
- **Canvas row** (under the Fit row): the fill swatch, the feather amount and
the Resize off | on switch, right on the node; turning Resize on opens the megapixel
budget and its **Step**. These are what a video outpaint model keys on - the LTX IC-LoRA paints
**pure black** at sizes rounded to 32 - so a wrong value shows here before a
render is wasted. Feather only softens the mask and the stitch; the frames always
meet the fill with a hard edge. The line under the picture names each step that
sets the size (`576×1024 → pad 1821×1024 → resize 1280×704`) and warns in amber
when the Step stretches the picture by more than 1% (`2.2% wider: each side rounds
to 32 px`); the tooltip names a Step that avoids it, and in pad mode **Even out**
adds a few pixels of padding so nothing stretches. While you drag, that amber
line keeps still and comes back for the new size when you let go. The bands are drawn in the real
fill colour with a faint hatch, so black bands show on the black stage. A fresh clip node starts
with black and feather 0 and the editor's **Reset transform** returns to them;
the image nodes keep their grey fill and feathered mask.
- **Outputs** (`source_mode` / `local_path`): Pick a video from ComfyUI's output folder,
such as one you just rendered. The list shows the newest first and previews the video
under the pointer. The video is read in place, without an upload copy. In an API prompt
it is named the way ComfyUI names a file there: `clip.mp4 [output]`. A whole path such
as `/home/me/ComfyUI/output/clip.mp4` is not read, for queued runs and the editor's live
preview alike.
- **Timeline**: The rail on the node and in the editor is one timeline. Press or
- **Play / Pause** beside the scrubber previews the selected frames and stops at OUT. Press Play at OUT to start from IN again.
- **Timeline** (right under the preview and size line): The rail on the node and in the editor is one timeline. Press or
drag anywhere on it to scrub the **playhead**, with Length on or off; the stage shows
that frame. Drag the **IN** or **OUT** handle to trim: the playhead rides on the handle, so what you see
is the first (IN) or last (OUT) frame the run keeps, and it stays there when you let
@@ -53,6 +40,21 @@ model that paints black regions.
**Play**. Arrow keys step one frame (10 with Shift), Home and End jump to the
ends, and Space plays or pauses. **Save & close** keeps your edits; **Cancel** or
Escape puts everything back, and asks first if anything changed.
- **Crop, pad & resize** (collapsible group under the timeline): folds the ratio
buttons, **Fit to ratio**, **Align** and **Center**, **Fill** and **Feather**, and
the **Resize** switch, megapixel budget and **Step** into one drawer. While closed,
its header bar shows the fill colour swatch and a live summary of the active
ratio, feather, alignment and resize settings. These are what a video outpaint model keys on - the LTX IC-LoRA paints
**pure black** at sizes rounded to 32 - so a wrong value shows here before a
render is wasted. Feather only softens the mask and the stitch; the frames always
meet the fill with a hard edge. The line under the picture names each step that
sets the size (`576×1024 → pad 1821×1024 → resize 1280×704`) and warns in amber
when the Step stretches the picture by more than 1% (`Resize makes the picture 2.2% wider`); the tooltip names a Step that avoids it, and in pad mode **Pad to keep shape**
adds a few pixels of padding so nothing stretches. While you drag, that amber
line keeps still and comes back for the new size when you let go. The bands are drawn in the real
fill colour with a faint hatch, so black bands show on the black stage. A fresh clip node starts
with black and feather 0 and the editor's **Reset transform** returns to them;
the image nodes keep their grey fill and feathered mask.
- **Length** (`max_frames`): the one other way to set how long the clip is. **Off**
(the default): OUT ends the clip. **On**: a number of output frames from IN; OUT
sits that many frames after IN and follows it when you drag IN, and dragging OUT or
@@ -80,8 +82,8 @@ Crop squares, padding diamonds, the orange corners and the rotation handle also
work directly on the node preview. A corner makes the canvas bigger or smaller in
its own shape, for example to zoom out evenly before a video outpaint; hold **Alt**
(Option on a Mac) to change all four sides at once. **Center**, next to Fill and
Feather, puts the clip in the middle of the canvas side to side or top to bottom
without changing the canvas size. The graph still owns wheel zoom and middle-button
Feather, centers the crop on the source and balances any padding on the selected axis.
The generated mask follows the crop and padding. The graph still owns wheel zoom and middle-button
pan. Tap a ratio
to pad the clip to it (or crop it, with **Fit** on crop); tap the lit ratio again to
go back to the whole frame. A lit ratio is the shape the canvas has now: drag a
@@ -92,31 +94,31 @@ ratio or turn it"); otherwise it names the lit ratio where it acted (`pad to 16:
1821×1024`). The padlock keeps the shape while
you drag, with new bands split evenly, and the row says **Held**; Reset and tapping
the lit ratio turn it off, and it does nothing on the untouched clip. **Fit** is
dimmed until a ratio is lit. The orientation button turns the shape on its side
ready to set before picking a ratio. The orientation button turns the shape on its side
(16:9 to 9:16), and dragging the picture itself moves it inside its padding: the
cursor and small arrows show which ways it can go.
**Reset crop** restores the full crop without changing rotation, padding or trim;
with the padlock on it also takes away the bands the lock added.
**Reset** on the node clears rotation, crop and padding and turns the padlock off;
fill, feather, **Divisible by** and the timeline stay.
fill, feather, **Align** and the timeline stay.
**Reset transform** in the editor resets rotation, crop, padding, fill, feather and
**Divisible by**; it keeps the source, current frame, trim, Length, resize and stitch
settings. **Divisible by** makes the width and height divide evenly by the number
**Align**; it keeps the source, current frame, trim, Length, resize and stitch
settings. **Align** makes the width and height divide evenly by the number
you pick: padding grows by a few pixels, and a side with no padding is trimmed by
a few instead. Some models need sizes divisible by 8, 16 or 32; 1 turns it off.
Video Upload and file drop use a streaming route into ComfyUI's input folder,
The **Load** button and file drop use a streaming route into ComfyUI's input folder,
so the buffered image-upload size limit does not prevent long-video uploads.
The editor's sidebar uses the node's own ratio row, padlock and **Fit** switch, and
the rotation is a number box (Shift for 0.1°). A ratio replaces the old crop and
padding, keeping rotation and resize settings.
Pixel rounding can differ by one pixel between opposite bands. **Divisible by** and
Pixel rounding can differ by one pixel between opposite bands. **Align** and
the resize **Step** can slightly change the final aspect ratio.
## Transform and outputs
Rotation, crop, padding, feathering, fill, **Divisible by**, and the editor's handles
Rotation, crop, padding, feathering, fill, **Align**, and the editor's handles
match the image node. **Resize output** in the editor scales the finished frames to a
megapixel budget with a resolution step (32 keeps LTX and Wan sizes), the same trio as
the core Scale Image to Total Pixels node. The frames are resized by themselves and the
@@ -161,7 +163,7 @@ Five optional sockets sit on the left, above the editor:
| `start_frame` | Zero-based source start frame. Overrides timeline IN. |
| `end_frame` | Exclusive source end frame. 0 means the end of the source. Overrides timeline OUT. |
| `fixed_frames` | Exact output frames from IN; the source must be long enough. Connected, it sets the length: OUT, Length and Frames for step aside. |
| `frame_load_cap` | Maximum frames after rate conversion and Every nth, before Frames for. 0 means unlimited. Connected, it sets the length in place of Length. |
| `frame_load_cap` | Maximum frames after rate conversion and Every nth, before Frames for. 0 means unlimited. Connected, it sets the length in place of Length. When the count is known, dragging IN stops at the last start that fits the kept frames. |
| `last_seconds` | Load only this many seconds from the end of the clip, or of the part before OUT. 0 loads all of it. Use it to carry on from a clip: a long clip then costs no more memory than a short one. |
Frame bounds use the source's frame-rate grid, independent of `force_rate`.
+23
View File
@@ -18,14 +18,37 @@ Nothing runs: the node has no outputs, so ComfyUI never executes it.
- **Title / Subtitle / Author** make the banner. **Layout → Banner** shows
only that top block (the title, plus the subtitle and author if you filled
them in), so the same node doubles as a label for a stage or column.
- **Layout → Info tile** puts a single button on the canvas. Click the tile to read the full note, including models and links. A book marks a guide and a download arrow marks a model list. Click its pencil to edit, or press **Edit** inside the opened note. Drag the visible bottom-right grip to resize the tile without moving it. Focus the grip and use arrow keys for keyboard resizing; **Shift** makes smaller changes.
- **Accent color** tints the banner bar, dots and buttons; empty keeps the
pack teal. It takes a six-digit hex such as `#00b4aa`.
- **How-to** is Markdown-lite: `#`/`##`/`###` headings, `**bold**`,
`*italic*`, `` `code` ``, `[links](https://…)`, `-` and `1.` lists, `---`
rules, fenced code. Only `http(s)` links become clickable.
## Formatting a how-to
Select a phrase in the How-to field and click **Teal**, **Green**, **Amber** or **Glow**. Click **Table** to insert an editable Markdown table. Open **Preview formatting** while you write. Use headings to break up steps and a pipe table for settings or file locations. Keep each row the same length. Use `\|` for a literal pipe inside a cell.
```markdown
## Choose a size
| Size | When to use it |
| --- | --- |
| 480 × 864 | [teal]First run[/teal] |
| 576 × 1024 | A larger portrait |
[green]Ready[/green] means the model was found.
[amber]Missing[/amber] means you still need the file.
```
For a short highlight, write `[glow]Preview the result[/glow]`. The glow is static. These four tags are AusBoss additions to Markdown. They style the enclosed plain text. Headings, lists, table cells and paragraphs can all contain them. Fenced code displays the original characters.
## Models
To give downloads their own button, choose **Layout → Info tile**, set the title to **Download models**, and add files under **Models**. To keep them with your instructions, add those same rows to the **How to use** note. Switching an existing card to an info tile keeps its model rows and links.
[Download the Krea 2 model tile example](https://raw.githubusercontent.com/ausboss/ComfyUI-AusBoss/main/js/docs/examples/model-download-tile.json) and open it as a workflow. Copy the tile into your graph and edit its rows.
Each row is a file, the model folder it belongs in, an optional size, a
download URL, and an optional note that shows in grey under the file name.
Rows group under a `📂 ComfyUI/models/<folder>` heading so the
@@ -0,0 +1,7 @@
# Workflow Note Tile
A compact help button that opens a full note. Click to read the instructions and model links; click the pencil to edit. Drag its visible corner to resize.
It uses the same note content as [Workflow Note](AUSBOSS_NODES_WorkflowNote.md). Choose **Card** or **Banner** in the editor to show the note directly on the canvas. Nothing runs and it has no outputs.
Tiles save with their own node type. If ComfyUI reports this node missing, install or update **ComfyUI-AusBoss**, restart ComfyUI, and reload the workflow. An older pack cannot draw the tile correctly. Keep the missing node so its instructions and settings are preserved.
+5 -4
View File
@@ -14,8 +14,8 @@ an upscale at the end.
2. Press **+ Switch from 2 selected** on the card.
3. Type a name and press Enter.
One click on its pill now turns every node you picked off, and the next click
turns them on again.
Click **off** to skip every node you picked, or **on** to run them again.
Clicking the selected half leaves it selected.
Groups work too. Every group on the canvas gets a switch of its own, unless
you change that under **Settings**. A group can also be part of a switch you
@@ -160,8 +160,9 @@ the models only that part needs.
## The edit view
- **off | on**: click anywhere on the pill to flip the switch. Off turns off
every node of the row, on sets them all to run. It is one undo step.
- **off | on**: click **off** to turn off every node of the row, or **on** to
set them all to run. Clicking the selected half leaves it selected. A change
is one undo step.
- **Mixed**: when only some of a row's nodes run (one bypassed by hand, say)
the pill is striped and a count shows how many run, such as **1/2**. Click
the half you want, off or on, to set them all. A settings switch reads **changed** when one of
+17
View File
@@ -31,8 +31,10 @@ help panel.
| Save pictures (PNG, lossless WebP or JPEG XL) | Save Image (`AUSBOSS_NODES_SaveImage`) |
| Run a workflow on each picture in a folder | Image Folder (`AUSBOSS_NODES_ImageFolder`) |
| Apply a stack of LoRAs | LoRA Loader (`AUSBOSS_NODES_LoraLoader`) |
| Write a MiniMax H3 or Pika H3 Flex prompt from plain words | H3 Prompt Writer (`AUSBOSS_NODES_H3PromptWriter`): [node help](../AUSBOSS_NODES_H3PromptWriter.md) |
| Krea 2 prompt, and Krea 2 outpainting | Krea 2 Encode (`AUSBOSS_NODES_Krea2Encode`), Krea 2 Outpaint Model Patch (`AUSBOSS_NODES_Krea2OutpaintModelPatch`) |
| Load or save a video | Load Video (`AUSBOSS_NODES_LoadVideo`), Save Video (`AUSBOSS_NODES_SaveVideo`) |
| 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`) |
| Work with frame batches | Select Frame, Select Every Nth, Split Batch, Merge Batches (`AUSBOSS_NODES_SelectFrame`, `_SelectEveryNth`, `_SplitBatch`, `_MergeBatches`) |
@@ -43,6 +45,7 @@ help panel.
| Time the whole run | Run Timer (`AUSBOSS_NODES_RunTimer`) |
| Turn parts of a workflow off and on | Workflow Switches (`AUSBOSS_NODES_WorkflowSwitches`): [its own agent guide](workflow_switches.md) |
| Explain a shared workflow on the canvas | Workflow Note (`AUSBOSS_NODES_WorkflowNote`), Callout (`AUSBOSS_NODES_Callout`) |
| Add compact help or colored link buttons | Workflow Note Tile (`AUSBOSS_NODES_WorkflowNoteTile`), Callout Tile (`AUSBOSS_NODES_CalloutTile`) |
| Lay out boxes of things and words on a canvas | Layout Boxes (`AUSBOSS_NODES_LayoutBoxes`) |
Every node's display name ends in 🆎 and sits under `🆎 AusBoss/<group>` in
@@ -62,6 +65,20 @@ the `AUSBOSS_NODES_...` key above.
- **Media loaders start blank** in the example workflows. Put in the file the
person wants to use before you queue.
## H3 swaps and clip duration
For a swap, keep the target selector on its own line. An optional separate line,
`@1 looks like a woman with blonde hair and a black hoodie.`, describes the
connected replacement person in Picture 1; use its actual picture number. This
can help express appearance but does not guarantee identity. Do not add it to
other jobs. Existing scripts without it keep their previous behavior.
An active video sets the duration for **swap the person**, **change something**
and **new voice**. The card says **From the clip** and hides numeric timeline
retiming; trim or limit the upstream clip instead. Do not infer the final frame
count from raw source metadata: upstream processing and H3 frame rounding apply.
Other jobs and video OFF still use **Length** normally.
## Example workflows
`example_workflows/` in this pack holds complete workflows, each with a
+51
View File
@@ -0,0 +1,51 @@
{
"id": "27945e9e-3e7b-49c5-bcb7-434d5de9e689",
"revision": 0,
"last_node_id": 1,
"last_link_id": 0,
"nodes": [
{
"id": 1,
"type": "AUSBOSS_NODES_WorkflowNoteTile",
"pos": [
0,
0
],
"size": [
300,
88
],
"flags": {},
"order": 0,
"mode": 0,
"inputs": [],
"outputs": [],
"title": "Download models",
"properties": {
"Node name for S&R": "AUSBOSS_NODES_WorkflowNoteTile"
},
"widgets_values": [
"{\"v\": 1, \"title\": \"Download models\", \"subtitle\": \"Krea 2 Outpaint\", \"author\": \"\", \"layout\": \"tile\", \"accent\": \"\", \"body\": \"Get the four files below and put each one in its listed folder. Click **check files** after adding them.\", \"models\": [{\"name\": \"krea2_turbo_fp8_scaled.safetensors\", \"dir\": \"diffusion_models\", \"size\": \"13.1 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Krea-2/resolve/main/diffusion_models/krea2_turbo_fp8_scaled.safetensors\", \"note\": \"\"}, {\"name\": \"qwen3vl_4b_fp8_scaled.safetensors\", \"dir\": \"text_encoders\", \"size\": \"5.2 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Krea-2/resolve/main/text_encoders/qwen3vl_4b_fp8_scaled.safetensors\", \"note\": \"\"}, {\"name\": \"qwen_image_vae.safetensors\", \"dir\": \"vae\", \"size\": \"254 MB\", \"url\": \"https://huggingface.co/Comfy-Org/Krea-2/resolve/main/vae/qwen_image_vae.safetensors\", \"note\": \"\"}, {\"name\": \"krea2_anypaint_rank32.safetensors\", \"dir\": \"loras\", \"size\": \"229 MB\", \"url\": \"https://huggingface.co/yijunwang2/krea2-anypaint/resolve/main/krea2_anypaint_rank32.safetensors\", \"note\": \"by yijunwang2\"}], \"packs\": [], \"links\": []}"
],
"widgets_values_named": {
"note": "{\"v\": 1, \"title\": \"Download models\", \"subtitle\": \"Krea 2 Outpaint\", \"author\": \"\", \"layout\": \"tile\", \"accent\": \"\", \"body\": \"Get the four files below and put each one in its listed folder. Click **check files** after adding them.\", \"models\": [{\"name\": \"krea2_turbo_fp8_scaled.safetensors\", \"dir\": \"diffusion_models\", \"size\": \"13.1 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Krea-2/resolve/main/diffusion_models/krea2_turbo_fp8_scaled.safetensors\", \"note\": \"\"}, {\"name\": \"qwen3vl_4b_fp8_scaled.safetensors\", \"dir\": \"text_encoders\", \"size\": \"5.2 GB\", \"url\": \"https://huggingface.co/Comfy-Org/Krea-2/resolve/main/text_encoders/qwen3vl_4b_fp8_scaled.safetensors\", \"note\": \"\"}, {\"name\": \"qwen_image_vae.safetensors\", \"dir\": \"vae\", \"size\": \"254 MB\", \"url\": \"https://huggingface.co/Comfy-Org/Krea-2/resolve/main/vae/qwen_image_vae.safetensors\", \"note\": \"\"}, {\"name\": \"krea2_anypaint_rank32.safetensors\", \"dir\": \"loras\", \"size\": \"229 MB\", \"url\": \"https://huggingface.co/yijunwang2/krea2-anypaint/resolve/main/krea2_anypaint_rank32.safetensors\", \"note\": \"by yijunwang2\"}], \"packs\": [], \"links\": []}"
},
"color": "#14424d",
"bgcolor": "#161f21"
}
],
"links": [],
"groups": [],
"config": {},
"extra": {
"ds": {
"scale": 0.9,
"offset": [
150,
115
]
},
"frontendVersion": "1.53.6"
},
"version": 0.4
}
+1 -1
View File
@@ -1,4 +1,4 @@
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import { showToast } from "../shared/index.mjs";
import { openTransformEditorForNode } from "../shared/transform_editor.mjs";
+1 -1
View File
@@ -6,7 +6,7 @@
// hand-over waits one microtask, so the frontend has rebuilt the whole graph
// before any panel moves.
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import { chainCallback, isAusbossNode } from "../shared/index.mjs";
import { createFaceHandover } from "../shared/face_handover.mjs";
+1 -1
View File
@@ -33,7 +33,7 @@ function mountTransformPanel(node, panel) {
fillNodeHeight(widget, {
minWidth: PANEL_MIN_WIDTH,
minHeight: () => transformPanelFloor(node),
minNodeSize: [PANEL_MIN_WIDTH, 470],
minNodeSize: [PANEL_MIN_WIDTH, 396],
exactMinWidth: true,
});
return widget;
+2 -2
View File
@@ -16,8 +16,8 @@
// files to this site?"). A page can neither word that question nor skip it,
// so the node says what it means here while the file explorer is open.
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { BRAND, chainCallback, chainHandler, keepDomWidgetWidthAuto, notifyAusbossChange, showToast } from "../shared/index.mjs";
import { fillNodeHeight } from "../shared/panel_layout.mjs";
import { isForeignRun } from "../shared/prompt_scope.mjs";
+1 -1
View File
@@ -11,7 +11,7 @@
// last text. The labels themselves are never saved, so an older version of
// the pack shows the plain names.
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import { isForeignRun } from "../shared/prompt_scope.mjs";
import { chainCallback } from "../shared/index.mjs";
import { savedLabel, sizeLabel, sizesFromExecuted } from "../shared/image_size.mjs";
+16 -40
View File
@@ -14,8 +14,9 @@
// switch lays each sampling step over the stage, with a Stop button on the
// bar (shared/step_preview.mjs).
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { panelSwitch } from "../shared/panel_controls.mjs";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { isForeignRun } from "../shared/prompt_scope.mjs";
import { executionIdOf, nodeByExecutionId } from "../shared/graph_ids.mjs";
import { BRAND, chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange } from "../shared/index.mjs";
@@ -142,16 +143,10 @@ function ensureCss() {
.ausboss-input-preview-tool{box-sizing:border-box;height:${BAR_HEIGHT}px;min-width:24px;padding:0 6px;border:1px solid rgba(0,180,170,.52);border-radius:4px;background:rgba(0,0,0,.7);color:#c8dddd;font:700 9px/18px "Segoe UI",sans-serif;cursor:pointer;}
.ausboss-input-preview-tool:hover{border-color:${BRAND};color:#fff;background:rgba(0,79,75,.78);}
.ausboss-input-preview-tool.active{border-color:${BRAND};color:${BRAND};}
.ausboss-input-preview-toggle{display:flex;align-items:center;gap:6px;margin-left:auto;pointer-events:auto;cursor:pointer;user-select:none;}
.ausboss-input-preview:not(.preview-off) .ausboss-input-preview-toggle.steps + .ausboss-input-preview-toggle{margin-left:0;}
.ausboss-input-preview.preview-off .ausboss-input-preview-toggle.steps{display:none;}
.ausboss-input-preview:not(.preview-off) .ausboss-panel-switch.steps + .ausboss-panel-switch{margin-left:0;}
.ausboss-input-preview.preview-off .ausboss-panel-switch.steps{display:none;}
.ausboss-input-preview-tool.ausboss-steps-stop{visibility:hidden;}
.ausboss-input-preview-tool.ausboss-steps-stop.live{visibility:visible;pointer-events:auto;}
.ausboss-input-preview-toggle span{color:#5f7674;font:10px -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;letter-spacing:.08em;text-transform:uppercase;}
.ausboss-input-preview-switch{box-sizing:border-box;width:24px;height:13px;border-radius:7px;border:none;background:#3a4047;position:relative;cursor:pointer;padding:0;flex:none;pointer-events:auto}
.ausboss-input-preview-switch::after{content:"";position:absolute;top:2px;left:2px;width:9px;height:9px;border-radius:50%;background:#9ba2aa;transition:left .12s}
.ausboss-input-preview-switch.on{background:${BRAND}}
.ausboss-input-preview-switch.on::after{left:13px;background:#fff}
.ausboss-input-preview-readout{box-sizing:border-box;height:${BAR_HEIGHT}px;padding:0 7px;border:1px solid rgba(0,180,170,.5);border-radius:10px;background:rgba(0,180,170,.14);color:${BRAND};font:700 9.5px/18px "Segoe UI",sans-serif;white-space:nowrap;pointer-events:none;}
.ausboss-input-preview-readout:empty{display:none;}
.ausboss-input-preview-readout.warn{border-color:#c98a2b;background:rgba(201,138,43,.16);color:#ffd9a0;}
@@ -297,18 +292,9 @@ function previewEnabled(state) {
}
function makePreviewToggle(state, signal) {
const toggle = document.createElement("div");
toggle.className = "ausboss-input-preview-toggle";
toggle.title = state.switchTitle ?? "Show this node's result here. Off also skips writing the preview file to the temp folder.";
const caption = document.createElement("span");
caption.textContent = "preview";
const button = document.createElement("button");
button.type = "button";
button.className = "ausboss-input-preview-switch";
button.setAttribute("role", "switch");
toggle.append(caption, button);
toggle.addEventListener("pointerdown", (event) => event.stopPropagation(), { signal });
toggle.addEventListener("click", (event) => {
const button = panelSwitch("Preview", state.switchTitle ?? "Show this node's result here. Off also skips writing the preview file to the temp folder.");
button.addEventListener("pointerdown", (event) => event.stopPropagation(), { signal });
button.addEventListener("click", (event) => {
event.preventDefault(); event.stopPropagation();
const next = !previewEnabled(state);
state.previewWidget.value = next;
@@ -317,7 +303,7 @@ function makePreviewToggle(state, signal) {
notifyAusbossChange();
}, { signal });
state.switchButton = button;
return toggle;
return button;
}
function installPreviewSwitch(state, signal) {
@@ -348,18 +334,10 @@ function installStepsSwitch(state, signal) {
if (!widget) return;
state.stepsWidget = widget;
hideWidget(widget);
const toggle = document.createElement("div");
toggle.className = "ausboss-input-preview-toggle steps";
toggle.title = "Show the picture here while it is being made, one step at a time, with a Stop button. Off by default.";
const caption = document.createElement("span");
caption.textContent = "steps";
const button = document.createElement("button");
button.type = "button";
button.className = "ausboss-input-preview-switch";
button.setAttribute("role", "switch");
toggle.append(caption, button);
toggle.addEventListener("pointerdown", (event) => event.stopPropagation(), { signal });
toggle.addEventListener("click", (event) => {
const button = panelSwitch("Steps", "Show the picture here while it is being made, one step at a time, with a Stop button. Off by default.");
button.classList.add("steps");
button.addEventListener("pointerdown", (event) => event.stopPropagation(), { signal });
button.addEventListener("click", (event) => {
event.preventDefault(); event.stopPropagation();
const next = widget.value !== true;
widget.value = next;
@@ -368,9 +346,9 @@ function installStepsSwitch(state, signal) {
notifyAusbossChange();
}, { signal });
state.stepsButton = button;
const previewToggle = state.switchButton?.parentElement;
if (previewToggle?.parentElement === state.bar) state.bar.insertBefore(toggle, previewToggle);
else state.bar.append(toggle);
const previewToggle = state.switchButton;
if (previewToggle?.parentElement === state.bar) state.bar.insertBefore(button, previewToggle);
else state.bar.append(button);
// Stop sits where the node's tools go; it keeps its place while hidden so
// the bar never shifts when a run starts.
@@ -408,7 +386,6 @@ function syncSteps(state, run = stepRun()) {
if (typeof state.placeholder === "boolean") state.hint.textContent = placeholderText(state.placeholder, state.noun, runningFor(state, run));
const on = stepsEnabled(state);
if (state.stepsButton) {
state.stepsButton.classList.toggle("on", state.stepsWidget?.value === true);
state.stepsButton.setAttribute("aria-checked", String(state.stepsWidget?.value === true));
}
state.stopButton?.classList.toggle("live", on && run.status === "running");
@@ -463,7 +440,6 @@ function syncPreviewMode(state, resize) {
const enabled = previewEnabled(state);
state.root.classList.toggle("preview-off", !enabled);
if (state.switchButton) {
state.switchButton.classList.toggle("on", enabled);
state.switchButton.setAttribute("aria-checked", String(enabled));
}
if (!enabled) {
+2 -2
View File
@@ -17,8 +17,8 @@
// it. Ctrl (or Alt) while dragging leaves the grid off. The grid starts off
// over a picture on `background`; a click on Grid is saved with the node.
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { BRAND, chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange, showToast } from "../shared/index.mjs";
import { keepKeyInField } from "../shared/canvas_passthrough.mjs";
import { describeSourcePreview, outputLocatorId } from "../shared/input_preview.mjs";
+1 -1
View File
@@ -1,4 +1,4 @@
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import { BRAND, notifyAusbossChange, showToast } from "../shared/index.mjs";
import { enoughFor, lineUp, matchWidth, sameSize, sharedSides, spreadEvenly } from "../shared/line_up.mjs";
import { outlineOf } from "../shared/outline.mjs";
+84
View File
@@ -0,0 +1,84 @@
// Load Audio's window rules for the face, mirroring audio_window in
// nodes/_audio_trim_helpers.py so the wave shows exactly what one Run hands
// on. Pure: tests/load_audio_window.test.mjs runs it without a browser.
function finite(value, fallback = 0) {
const number = Number(value);
return Number.isFinite(number) ? number : fallback;
}
// The pick, and what comes out of it. `end` 0 means "to the end of the
// file". A max above 0 keeps the start and cuts off anything past
// start + max. All times in seconds; duration is the file's length.
export function outputWindow(durationValue, startValue, endValue, maxValue = 0) {
const duration = Math.max(0, finite(durationValue));
const start = Math.min(Math.max(0, finite(startValue)), duration);
const pickedEnd = finite(endValue) > 0 ? Math.min(finite(endValue), duration) : duration;
const end = Math.max(start, pickedEnd);
const max = Math.max(0, finite(maxValue));
const keepEnd = max > 0 && end - start > max ? Math.min(duration, start + max) : end;
return { start, end, keepEnd, length: keepEnd - start, cut: Math.max(0, end - keepEnd) };
}
// "0:12.0" style, the way the IN and OUT fields write a time.
export function secondsLabel(value) {
const seconds = Math.max(0, finite(value));
if (seconds < 60) return `${seconds.toFixed(1)} s`;
const minutes = Math.floor(seconds / 60);
return `${minutes}:${(seconds - minutes * 60).toFixed(1).padStart(4, "0")}`;
}
// The line between IN and OUT: what comes out, and what the max cuts off.
export function outputSummary(window, { maxFromLink = false } = {}) {
if (!window || window.length <= 0) return "";
const parts = [secondsLabel(window.length)];
if (window.cut > 0.005) parts.push(`cut ${secondsLabel(window.cut)}`);
if (maxFromLink) parts.push("max wired");
return parts.join(" · ");
}
// Loud and quiet across the file: for each of `buckets` slices, the lowest
// and highest sample of the channels mixed down. Channel data is a list of
// Float32Arrays (AudioBuffer.getChannelData). Returns a Float32Array of
// [min0, max0, min1, max1, ...].
export function wavePeaks(channels, bucketsValue = 1200) {
const list = Array.isArray(channels) ? channels.filter(Boolean) : [];
const buckets = Math.max(1, Math.floor(finite(bucketsValue, 1200)));
const peaks = new Float32Array(buckets * 2);
const length = list.length ? list[0].length : 0;
if (!length) return peaks;
const count = list.length;
for (let bucket = 0; bucket < buckets; bucket += 1) {
const from = Math.floor((bucket * length) / buckets);
const to = Math.max(from + 1, Math.floor(((bucket + 1) * length) / buckets));
let low = 0;
let high = 0;
for (let index = from; index < to && index < length; index += 1) {
let sample = 0;
for (let channel = 0; channel < count; channel += 1) sample += list[channel][index] || 0;
sample /= count;
if (sample < low) low = sample;
if (sample > high) high = sample;
}
peaks[bucket * 2] = low;
peaks[bucket * 2 + 1] = high;
}
return peaks;
}
// Which part of the wave a press at `fraction` (0..1 across it) grabs: a
// handle within `hitPixels` of it, the inside of the pick to slide it, or
// "jump" to move the pick there.
export function grabZone(window, durationValue, fraction, widthValue, hitPixels = 10) {
const duration = Math.max(0, finite(durationValue));
const width = Math.max(0, finite(widthValue));
if (duration <= 0 || width <= 0) return "none";
const x = Math.min(1, Math.max(0, finite(fraction))) * width;
const startX = (window.start / duration) * width;
const endX = (window.end / duration) * width;
const toStart = Math.abs(x - startX);
const toEnd = Math.abs(x - endX);
if (Math.min(toStart, toEnd) <= hitPixels) return toStart <= toEnd ? "start" : "end";
if (x > startX && x < endX) return "move";
return "jump";
}
+574
View File
@@ -0,0 +1,574 @@
// Load Audio 🆎 - the wave, the trim and the player.
//
// The card above (js/widget_cards) holds Source and Max length. This panel
// draws the whole file as a wave: the part that comes out is bright, the
// part a Max length cuts off is red, and the rest is dim. Drag a handle to
// move IN or OUT, drag the middle to slide the pick, or click elsewhere to
// move it there. Play plays only what comes out. The widgets underneath
// (start_seconds, end_seconds, max_seconds) stay the source of truth.
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { BRAND, chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange, showToast } from "../shared/index.mjs";
import { keepKeyInField } from "../shared/canvas_passthrough.mjs";
import { WIDGET_FRAME, fillNodeHeight } from "../shared/panel_layout.mjs";
import { formatTimecode, parseTimecode } from "../shared/timecode.mjs";
import { parseImageReference } from "../shared/pad_canvas.mjs";
import { mediaViewQuery, splitMediaName } from "../shared/video_preview.mjs";
import { ensureVideoCss, hideCanvasWidget, makeToolButton } from "../shared/video_ui.mjs";
import { MIN_TRIM_SECONDS, dragTrimHandle, slideTrimWindow } from "../load_video/trim_preview.mjs";
import { grabZone, outputSummary, outputWindow, secondsLabel, wavePeaks } from "./audio_window.mjs";
const NODE_NAME = "AUSBOSS_NODES_LoadAudio";
const PANEL_WIDGET = "ausboss_load_audio_wave";
// The frontend's own player for an audio_upload input. The wave replaces it.
const CORE_AUDIO_WIDGET = "audioUI";
const MIN_WIDTH = 280;
// 8px root padding + the wave's 28px floor + 6px gap + the 22px play, IN/OUT and loop row.
const PANEL_MIN_HEIGHT = 64;
// Opens small and neat: 300 px wide, with a wave about as tall as a field
// (32 px). Drag the corner down for a taller wave.
const DEFAULT_WIDTH = 300;
const DEFAULT_WAVE_EXTRA = 4;
const CUT_RED = "#e0525a";
const PEAK_BUCKETS = 1600;
const END_EPSILON = 0.03;
// Decoded once per file and kept small: only the peaks and the length.
const peakCache = new Map();
function findWidget(node, name) {
return node.widgets?.find((widget) => widget.name === name);
}
function roundHundredth(value) {
return Math.round(Number(value || 0) * 100) / 100;
}
function hideCoreAudio(node) {
for (const widget of node.widgets ?? []) {
if (widget?.name === CORE_AUDIO_WIDGET) hideCanvasWidget(widget, widget.element);
}
}
// A wired Max length: the number the wire carries, when the far end is a
// node that shows it (Float, Integer, a Primitive). null when it can't be known.
function wiredMax(node) {
const input = node.inputs?.find((slot) => slot?.widget?.name === "max_seconds");
if (!input || input.link == null) return { wired: false, value: null };
const graph = node.graph;
const link = graph?.getLink?.(input.link) ?? graph?.links?.get?.(input.link) ?? graph?.links?.[input.link];
const origin = link ? graph?.getNodeById?.(link.origin_id) : null;
const shown = origin?.widgets?.find((widget) => typeof widget?.value === "number");
return { wired: true, value: shown ? Number(shown.value) : null };
}
function maxSeconds(state) {
const wired = wiredMax(state.node);
if (wired.wired) return { value: wired.value ?? 0, fromLink: true, known: wired.value != null };
return { value: Number(state.maxWidget?.value) || 0, fromLink: false, known: true };
}
function currentWindow(state) {
return outputWindow(state.duration, state.startWidget.value, state.endWidget.value, maxSeconds(state).value);
}
async function loadPeaks(name, route) {
const key = name;
if (peakCache.has(key)) return peakCache.get(key);
const job = (async () => {
const response = await api.fetchApi(route, { cache: "no-store" });
if (!response.ok) throw new Error(`the file could not be read (${response.status})`);
const bytes = await response.arrayBuffer();
const Context = window.AudioContext || window.webkitAudioContext;
const context = new Context();
try {
const buffer = await context.decodeAudioData(bytes);
const channels = [];
for (let index = 0; index < buffer.numberOfChannels; index += 1) channels.push(buffer.getChannelData(index));
return { duration: buffer.duration, peaks: wavePeaks(channels, PEAK_BUCKETS) };
} finally {
context.close?.();
}
})();
peakCache.set(key, job);
job.catch(() => peakCache.delete(key));
return job;
}
function ensureAudioCss() {
ensureVideoCss();
if (document.getElementById("ausboss-load-audio-css")) return;
const style = document.createElement("style");
style.id = "ausboss-load-audio-css";
style.textContent = `
.ausboss-audio-root .ausboss-video-stage{min-height:28px;background:#050b0b;cursor:pointer;touch-action:none;}
.ausboss-audio-error{pointer-events:auto;border:0;background:transparent;color:#e6bf87;font:11px system-ui;cursor:pointer;white-space:nowrap}
.ausboss-audio-root canvas.ausboss-audio-wave{position:absolute;inset:0;width:100%;height:100%;display:block;}
.ausboss-audio-root .ausboss-video-stage:not(.is-empty) .ausboss-video-status{display:none;}
.ausboss-audio-root .ausboss-audio-row{display:flex;align-items:center;gap:6px;flex:none;padding:0 2px;}
.ausboss-audio-root .ausboss-audio-row .ausboss-video-values{flex:1 1 auto;min-width:0;}
.ausboss-audio-root .ausboss-audio-play{min-width:30px;font-size:10px;}
.ausboss-audio-root .ausboss-audio-length{flex:none;padding:0 2px;color:#7fd9d2;font-size:10px;font-variant-numeric:tabular-nums;white-space:nowrap;cursor:default;}
.ausboss-audio-root .ausboss-audio-length:empty{display:none;}
.ausboss-audio-root .ausboss-audio-length.has-cut{color:#ff9aa0;cursor:pointer;text-decoration:underline dotted rgba(224,82,90,.8);text-underline-offset:2px;}
.ausboss-audio-root .ausboss-audio-row .ausboss-video-tool{flex:none;}
.ausboss-audio-root .ausboss-video-values{display:flex;gap:8px;}
.ausboss-audio-root .ausboss-video-value input{width:48px;}
.ausboss-audio-root .ausboss-audio-length{margin-left:auto;}
`;
document.head.appendChild(style);
}
function draw(state) {
const { canvas } = state;
const rect = canvas.getBoundingClientRect();
const scale = window.devicePixelRatio || 1;
const width = Math.max(1, Math.round(rect.width * scale));
const height = Math.max(1, Math.round(rect.height * scale));
if (canvas.width !== width || canvas.height !== height) {
canvas.width = width;
canvas.height = height;
}
const ctx = canvas.getContext("2d");
ctx.clearRect(0, 0, width, height);
if (!state.peaks || state.duration <= 0) return;
const win = currentWindow(state);
const xOf = (seconds) => (seconds / state.duration) * width;
const startX = xOf(win.start);
const keepX = xOf(win.keepEnd);
const endX = xOf(win.end);
// Backdrops: the part that comes out, then the part cut off.
ctx.fillStyle = "rgba(0,180,170,0.13)";
ctx.fillRect(startX, 0, keepX - startX, height);
if (endX > keepX) {
ctx.fillStyle = "rgba(224,82,90,0.16)";
ctx.fillRect(keepX, 0, endX - keepX, height);
}
// The wave, one bar per pixel column.
const mid = height / 2;
const reach = mid * 0.92;
const buckets = state.peaks.length / 2;
for (let x = 0; x < width; x += 1) {
const from = Math.floor((x / width) * buckets);
const to = Math.max(from + 1, Math.floor(((x + 1) / width) * buckets));
let low = 0;
let high = 0;
for (let bucket = from; bucket < to && bucket < buckets; bucket += 1) {
low = Math.min(low, state.peaks[bucket * 2]);
high = Math.max(high, state.peaks[bucket * 2 + 1]);
}
if (x >= startX && x < keepX) ctx.fillStyle = BRAND;
else if (x >= keepX && x < endX) ctx.fillStyle = CUT_RED;
else ctx.fillStyle = "#3a4948";
const top = mid - high * reach;
ctx.fillRect(x, top, 1, Math.max(1, (high - low) * reach));
}
// The handles: IN and OUT, and a dashed line where the max cuts off.
// The grips stay small on a short wave so they don't hide it.
const grip = Math.round(Math.max(3, Math.min(7, rect.height * 0.12)) * scale);
const handle = (x, color) => {
ctx.fillStyle = color;
ctx.fillRect(Math.round(x) - scale, 0, 2 * scale, height);
ctx.fillRect(Math.round(x) - 4 * scale, 0, 8 * scale, grip);
ctx.fillRect(Math.round(x) - 4 * scale, height - grip, 8 * scale, grip);
};
handle(startX, "#f4ffff");
handle(endX, "#f4ffff");
if (endX > keepX + 1) {
ctx.strokeStyle = CUT_RED;
ctx.lineWidth = 2 * scale;
ctx.setLineDash([4 * scale, 3 * scale]);
ctx.beginPath();
ctx.moveTo(keepX, 0);
ctx.lineTo(keepX, height);
ctx.stroke();
ctx.setLineDash([]);
}
// The playhead while it plays, or where it paused inside the pick.
if (state.audio && !state.audio.paused) {
const x = xOf(state.audio.currentTime);
ctx.fillStyle = "#ffffff";
ctx.fillRect(x - scale / 2, 0, scale, height);
}
}
function updateFace(state) {
const win = currentWindow(state);
const max = maxSeconds(state);
if (document.activeElement !== state.startInput) state.startInput.value = formatTimecode(win.start);
if (document.activeElement !== state.endInput) state.endInput.value = formatTimecode(win.end);
if (state.duration > 0) {
const summary = outputSummary(win, { maxFromLink: max.fromLink && !max.known });
state.summary.textContent = win.length > 0 ? secondsLabel(win.length) : "";
state.summary.classList.toggle("has-cut", win.cut > 0.005);
state.summary.title = win.cut > 0.005
? `${summary}. Max length is ${max.value} s, so ${formatTimecode(win.keepEnd)} to ${formatTimecode(win.end)} is cut off (red). Click to move OUT to ${formatTimecode(win.keepEnd)}.`
: `${summary}: ${formatTimecode(win.start)} to ${formatTimecode(win.keepEnd)} comes out.`;
} else {
state.summary.textContent = "";
}
draw(state);
}
function writeWidget(widget, value) {
const next = roundHundredth(value);
if (Math.abs(Number(widget.value || 0) - next) < 0.0001) return;
widget.value = next;
widget.callback?.(next);
}
function writeTrim(state, bounds) {
state.writing = true;
try {
writeWidget(state.startWidget, bounds.start);
// OUT at the very end stays 0, the widget's own "to the end".
writeWidget(state.endWidget, bounds.end >= state.duration - 0.005 ? 0 : bounds.end);
} finally {
state.writing = false;
}
updateFace(state);
state.node.setDirtyCanvas?.(true, true);
}
function installDrag(state) {
const surface = state.stage;
const infoAt = (clientX) => {
const rect = state.canvas.getBoundingClientRect();
const fraction = rect.width ? Math.min(1, Math.max(0, (clientX - rect.left) / rect.width)) : 0;
const win = currentWindow(state);
return { fraction, win, zone: grabZone(win, state.duration, fraction, rect.width) };
};
surface.addEventListener("pointermove", (event) => {
if (state.dragging || state.duration <= 0) return;
const { zone } = infoAt(event.clientX);
surface.style.cursor = zone === "start" || zone === "end" ? "ew-resize" : zone === "move" ? "grab" : "pointer";
});
surface.addEventListener("pointerdown", (event) => {
if (event.button !== 0 || state.dragging || state.duration <= 0) return;
event.preventDefault();
event.stopPropagation();
const initial = infoAt(event.clientX);
const bounds = { start: initial.win.start, end: initial.win.end };
const anchor = initial.fraction * state.duration;
const downX = event.clientX;
let moved = false;
state.dragging = true;
try { surface.setPointerCapture(event.pointerId); } catch (_error) { /* mouse fallback */ }
const centred = (fraction) => {
const span = bounds.end - bounds.start;
return slideTrimWindow(state.duration, bounds, fraction * state.duration - span / 2 - bounds.start);
};
const apply = (clientX) => {
const next = infoAt(clientX);
if (initial.zone === "start" || initial.zone === "end") {
const now = currentWindow(state);
writeTrim(state, dragTrimHandle(state.duration, { start: now.start, end: now.end }, initial.zone, next.fraction, MIN_TRIM_SECONDS));
} else if (initial.zone === "move") {
writeTrim(state, slideTrimWindow(state.duration, bounds, next.fraction * state.duration - anchor));
} else {
writeTrim(state, centred(next.fraction));
}
};
const move = (moveEvent) => {
if (!(moveEvent.buttons & 1)) { finish(moveEvent); return; }
if (!moved && Math.abs(moveEvent.clientX - downX) < 3) return;
moved = true;
apply(moveEvent.clientX);
};
const finish = (finishEvent) => {
if (!state.dragging) return;
state.dragging = false;
surface.removeEventListener("pointermove", move);
try { surface.releasePointerCapture(event.pointerId); } catch (_error) { /* already released */ }
if (!moved && initial.zone === "jump") writeTrim(state, centred(infoAt(finishEvent?.clientX ?? downX).fraction));
if (moved || initial.zone === "jump") {
if (state.audio && !state.audio.paused) state.audio.currentTime = currentWindow(state).start;
notifyAusbossChange();
}
};
surface.addEventListener("pointermove", move);
surface.addEventListener("pointerup", finish, { once: true });
surface.addEventListener("pointercancel", finish, { once: true });
surface.addEventListener("lostpointercapture", finish, { once: true });
});
}
function loopEnabled(node) {
node.properties ??= {};
return !!node.properties.ausboss_load_audio_loop;
}
function installPlayer(state) {
const audio = state.audio;
const stop = () => {
if (state.raf) cancelAnimationFrame(state.raf);
state.raf = 0;
state.playButton.textContent = "▶";
state.playButton.classList.remove("active");
draw(state);
};
const tick = () => {
if (audio.paused) { stop(); return; }
const win = currentWindow(state);
if (audio.currentTime >= win.keepEnd - END_EPSILON || audio.currentTime < win.start - 0.25) {
if (loopEnabled(state.node)) audio.currentTime = win.start;
else { audio.pause(); audio.currentTime = win.start; stop(); return; }
}
draw(state);
state.raf = requestAnimationFrame(tick);
};
audio.addEventListener("play", () => {
state.playButton.textContent = "❚❚";
state.playButton.classList.add("active");
if (state.raf) cancelAnimationFrame(state.raf);
state.raf = requestAnimationFrame(tick);
}, { signal: state.abort.signal });
audio.addEventListener("pause", stop, { signal: state.abort.signal });
state.playButton.addEventListener("click", (event) => {
event.preventDefault();
event.stopPropagation();
if (state.duration <= 0) return;
if (!audio.paused) { audio.pause(); return; }
const win = currentWindow(state);
if (audio.currentTime < win.start || audio.currentTime >= win.keepEnd - END_EPSILON) audio.currentTime = win.start;
audio.play().catch(() => stop());
});
state.stopPlayer = () => { audio.pause(); stop(); };
}
function commitTimeInput(state, edge, input) {
if (state.duration <= 0) return;
const seconds = parseTimecode(input.value);
const win = currentWindow(state);
if (seconds === null) {
input.value = formatTimecode(edge === "start" ? win.start : win.end);
return;
}
writeTrim(state, dragTrimHandle(state.duration, { start: win.start, end: win.end }, edge, seconds / state.duration, MIN_TRIM_SECONDS));
notifyAusbossChange();
input.blur();
}
function watchWidget(state, widget) {
if (!widget || widget.__ausbossAudioWatch) return;
widget.__ausbossAudioWatch = true;
const prior = widget.callback;
widget.callback = function (...args) {
const result = prior?.apply(this, args);
if (!state.writing) updateFace(state);
return result;
};
}
function buildPanel(node) {
if (node.__ausbossLoadAudio) return node.__ausbossLoadAudio;
const audioWidget = findWidget(node, "audio");
const startWidget = findWidget(node, "start_seconds");
const endWidget = findWidget(node, "end_seconds");
if (!audioWidget || !startWidget || !endWidget) return null;
ensureAudioCss();
hideCoreAudio(node);
hideCanvasWidget(startWidget);
hideCanvasWidget(endWidget);
const root = document.createElement("div");
root.className = "ausboss-video-root ausboss-audio-root";
const stage = document.createElement("div");
stage.className = "ausboss-video-stage is-empty";
stage.title = "Drag a handle to set where the sound starts or stops. Drag the middle to slide it.";
const canvas = document.createElement("canvas");
canvas.className = "ausboss-audio-wave";
const status = document.createElement("div");
status.className = "ausboss-video-status";
status.textContent = "Choose a sound file";
const playButton = makeToolButton("▶", "Play the part that comes out");
playButton.classList.add("ausboss-audio-play");
const loopButton = makeToolButton("LOOP", "Play it again and again");
stage.append(canvas, status);
const values = document.createElement("div");
values.className = "ausboss-video-values";
const makeValue = (labelText, title) => {
const wrap = document.createElement("div");
wrap.className = "ausboss-video-value";
const label = document.createElement("label");
label.textContent = labelText;
const input = document.createElement("input");
input.type = "text";
input.inputMode = "decimal";
input.placeholder = "m:ss.s";
input.title = title;
input.addEventListener("keydown", (event) => {
keepKeyInField(event);
if (event.key === "Enter") input.dispatchEvent(new Event("change"));
});
wrap.append(label, input);
return { wrap, input };
};
const startValue = makeValue("IN", "Where the sound starts. Type seconds (12.5) or a time (0:12.5).");
const endValue = makeValue("OUT", "Where the sound stops. Type seconds (24) or a time (0:24.0).");
// How long the output is, beside OUT and off the wave. Red when Max
// length cuts the pick short; the tooltip says how much.
const summary = document.createElement("div");
summary.className = "ausboss-audio-length";
values.append(startValue.wrap, endValue.wrap);
const row = document.createElement("div");
row.className = "ausboss-audio-row";
row.append(playButton, values, summary, loopButton);
root.append(stage, row);
const widget = node.addDOMWidget(PANEL_WIDGET, "ausboss_audio", root, {
serialize: false,
hideOnZoom: false,
getMinHeight: () => PANEL_MIN_HEIGHT + WIDGET_FRAME,
});
keepDomWidgetWidthAuto(widget);
widget.serialize = false;
fillNodeHeight(widget, {
minWidth: MIN_WIDTH,
minHeight: PANEL_MIN_HEIGHT + WIDGET_FRAME,
minNodeSize: [MIN_WIDTH, 200],
exactMinWidth: true,
});
const audio = new Audio();
audio.preload = "auto";
const abort = new AbortController();
const state = node.__ausbossLoadAudio = {
node, root, stage, canvas, status, playButton, loopButton, summary, audio,
startInput: startValue.input, endInput: endValue.input,
audioWidget, startWidget, endWidget, maxWidget: findWidget(node, "max_seconds"),
duration: 0, peaks: null, abort, writing: false, dragging: false, raf: 0, loading: 0,
};
// Clicking the red length moves OUT to where the sound really ends.
summary.addEventListener("click", (event) => {
const win = currentWindow(state);
if (win.cut <= 0.005) return;
event.preventDefault();
event.stopPropagation();
writeTrim(state, { start: win.start, end: win.keepEnd });
notifyAusbossChange();
});
const updateLoop = () => loopButton.classList.toggle("active", loopEnabled(node));
updateLoop();
loopButton.addEventListener("click", (event) => {
event.preventDefault();
event.stopPropagation();
node.properties.ausboss_load_audio_loop = !loopEnabled(node);
updateLoop();
notifyAusbossChange();
});
const refresh = async () => {
state.stopPlayer?.();
const name = audioWidget.value;
const ticket = ++state.loading;
state.duration = 0;
state.peaks = null;
if (!name || typeof name !== "string") {
audio.removeAttribute("src");
stage.classList.add("is-empty");
status.textContent = "Choose a sound file";
updateFace(state);
return;
}
const parts = splitMediaName(name);
stage.classList.add("is-empty");
status.textContent = `Loading ${parts.filename}…`;
const type = parseImageReference(name)?.type ?? "input";
const route = `/view?${mediaViewQuery({ ...parts, type }, "input")}`;
audio.src = api.apiURL(route);
try {
const result = await loadPeaks(name, route);
if (ticket !== state.loading) return;
state.duration = result.duration;
state.peaks = result.peaks;
stage.classList.remove("is-empty");
updateFace(state);
} catch (error) {
if (ticket !== state.loading) return;
const info = document.createElement("button");
info.type = "button";
info.className = "ausboss-audio-error";
info.textContent = "Audio preview unavailable ⓘ";
info.title = String(error?.message || error);
info.setAttribute("aria-label", "Audio preview unavailable. Show details.");
info.onclick = event => {
event.stopPropagation();
showToast({ summary: "Audio preview unavailable", detail: info.title });
};
status.replaceChildren(info);
}
};
state.refresh = refresh;
installDrag(state);
installPlayer(state);
watchWidget(state, startWidget);
watchWidget(state, endWidget);
watchWidget(state, state.maxWidget);
startValue.input.addEventListener("change", () => commitTimeInput(state, "start", startValue.input));
endValue.input.addEventListener("change", () => commitTimeInput(state, "end", endValue.input));
const observer = new ResizeObserver(() => draw(state));
observer.observe(stage);
state.observer = observer;
const priorAudioCallback = audioWidget.callback;
audioWidget.callback = function (...args) {
const result = priorAudioCallback?.apply(this, args);
peakCache.delete(audioWidget.value);
refresh();
return result;
};
setTimeout(refresh, 0);
return state;
}
app.registerExtension({
name: "ausboss.load_audio",
beforeRegisterNodeDef(nodeType, nodeData) {
if (nodeData?.name !== NODE_NAME) return;
// The frontend's Upload button for an audio_upload input looks for its
// player widget and fails without one, and it adds that player only to
// its own audio nodes. Ask for it here, ahead of the button; the panel
// hides it, since the wave plays the sound instead.
const required = nodeData.input?.required;
if (required && !required.audioUI) {
const entries = Object.entries(required);
const at = entries.findIndex(([name]) => name === "audio") + 1;
entries.splice(at, 0, ["audioUI", ["AUDIO_UI", {}]]);
nodeData.input.required = Object.fromEntries(entries);
}
chainCallback(nodeType.prototype, "onNodeCreated", function () {
buildPanel(this);
// Only for a genuinely new node: onConfigure restores a saved size
// after this runs, so a workflow's own size still wins.
const floor = Number(this.computeSize?.()?.[1]) || 0;
if (floor > 0) this.setSize?.([DEFAULT_WIDTH, floor + DEFAULT_WAVE_EXTRA]);
});
chainCallback(nodeType.prototype, "onConfigure", function () {
queueMicrotask(() => {
const state = buildPanel(this);
if (state) {
hideCoreAudio(this);
state.refresh?.();
}
});
});
// A wire into Max length changes what comes out; redraw when one comes or goes.
chainCallback(nodeType.prototype, "onConnectionsChange", function () {
const state = this.__ausbossLoadAudio;
if (state) queueMicrotask(() => updateFace(state));
});
chainCallback(nodeType.prototype, "onRemoved", function () {
const state = this.__ausbossLoadAudio;
state?.stopPlayer?.();
state?.abort?.abort();
state?.observer?.disconnect();
if (state) state.audio.removeAttribute("src");
this.__ausbossLoadAudio = null;
});
},
});
+2 -2
View File
@@ -1,5 +1,5 @@
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { isForeignRun } from "../shared/prompt_scope.mjs";
import { BRAND, chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange } from "../shared/index.mjs";
import { fillNodeHeight } from "../shared/panel_layout.mjs";
+2 -2
View File
@@ -1,5 +1,5 @@
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange } from "../shared/index.mjs";
import { keepKeyInField } from "../shared/canvas_passthrough.mjs";
import { WIDGET_FRAME, fillNodeHeight } from "../shared/panel_layout.mjs";
+6 -28
View File
@@ -1,5 +1,5 @@
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { BRAND, chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange, showToast } from "../shared/index.mjs";
import { WIDGET_FRAME, fillNodeHeight, holdVueNodeMinWidth } from "../shared/panel_layout.mjs";
import { hideInputsInDef, hideWidget as collapseWidget } from "../shared/widget_visibility.mjs";
@@ -20,7 +20,6 @@ import {
BYPASS_MODE,
DEFAULT_STEP,
FINE_STEP,
MAX_ROWS,
MUTE_MODE,
STRENGTH_MAX,
STRENGTH_MIN,
@@ -1078,10 +1077,6 @@ function openPicker(state, index, anchor, { keyboard = false } = {}) {
const { name, kind } = entry;
if (kind === "folder") {
const result = appendFolderRows(state.rows, folders.get(name) ?? [], state.settings?.default_strength ?? 1);
if (result.needed > result.room) {
loraToast(`This folder has ${result.needed} new LoRAs, but only ${result.room} of ${MAX_ROWS} rows are free. Nothing was added. Remove rows or choose a smaller folder.`);
return;
}
if (!result.added) {
loraToast("Every LoRA in this folder is already in this stack. Nothing was added.");
return;
@@ -1095,10 +1090,6 @@ function openPicker(state, index, anchor, { keyboard = false } = {}) {
if (!pointer) backToStack(firstAdded);
return;
}
if (adding && state.rows.length >= MAX_ROWS) {
loraToast(`This stack already has ${MAX_ROWS} rows. Remove a row before adding another LoRA.`);
return;
}
closePopup();
const strength = roundStrength(state.settings?.default_strength ?? 1);
const rows = adding
@@ -1114,10 +1105,6 @@ function openPicker(state, index, anchor, { keyboard = false } = {}) {
const addTicked = ({ pointer = false } = {}) => {
const result = appendFolderRows(state.rows, ticked, state.settings?.default_strength ?? 1);
if (result.needed > result.room) {
loraToast(`You ticked ${result.needed} new LoRAs, but only ${result.room} of ${MAX_ROWS} rows are free. Nothing was added. Untick some or remove rows.`);
return;
}
if (!result.added) {
loraToast("Every ticked LoRA is already in this stack. Nothing was added.");
return;
@@ -1769,7 +1756,6 @@ function openRowMenu(state, index, event) {
}
menu.append(el("div", "ausboss-lora-menu-rule"));
const insertEmpty = (position) => {
if (state.rows.length >= MAX_ROWS) return;
const strength = roundStrength(state.settings?.default_strength ?? 1);
const rows = state.rows.slice();
// A row added next to a grouped one joins its group.
@@ -1779,8 +1765,8 @@ function openRowMenu(state, index, event) {
commitRows(state, rows, { structural: true });
fitNode(state);
};
item("Insert empty LoRA above", () => insertEmpty(index), state.rows.length >= MAX_ROWS);
item("Insert empty LoRA below", () => insertEmpty(index + 1), state.rows.length >= MAX_ROWS);
item("Insert empty LoRA above", () => insertEmpty(index));
item("Insert empty LoRA below", () => insertEmpty(index + 1));
item("Move up", () => commitGroups(state, moveRowInStack(state.rows, index, -1)),
index === 0 && !row.group);
item("Move down", () => commitGroups(state, moveRowInStack(state.rows, index, 1)),
@@ -1791,7 +1777,7 @@ function openRowMenu(state, index, event) {
rows.splice(index + 1, 0, copy);
commitRows(state, rows, { structural: true });
fitNode(state);
}, state.rows.length >= MAX_ROWS);
});
item(count > 1 ? `Remove these ${count} LoRAs` : "Remove this LoRA", () => {
commitGroups(state, state.rows.filter((entry) => !ids.includes(entry.id)));
}).classList.add("ausboss-lora-danger");
@@ -1804,7 +1790,7 @@ function openStackMenu(state, event) {
const menu = el("div", "ausboss-lora-menu");
const item = (label, action, disabled = false) => menuItem(menu, label, action, disabled);
const add = state.panel.querySelector(".ausboss-lora-add, .ausboss-lora-blank");
item("+ Add LoRAs…", () => openPicker(state, null, add), !add || state.rows.length >= MAX_ROWS);
item("+ Add LoRAs…", () => openPicker(state, null, add), !add);
const ids = state.rows.filter((row) => selectedIds(state).has(row.id)).map((row) => row.id);
if (ids.length) {
item(ids.length > 1 ? `Group the ${ids.length} selected LoRAs` : "Group the selected LoRA", () => {
@@ -2489,11 +2475,6 @@ async function runImportChain(state) {
{ position: "before", deduplicate: false });
const downMerge = mergeImportedRows(upMerge.rows, downResolved,
{ position: "after", deduplicate: false });
// Never bypass a source if any of its rows would be lost to the stack limit.
if (state.rows.length + upMerge.added + downMerge.added > MAX_ROWS) {
loraToast(`Absorb needs more than ${MAX_ROWS} rows. Free some stack rows first; source loaders remain active.`);
return;
}
// Rows that patch model and CLIP differently need both boxes visible, or
// the difference is invisible and lost on the first scrub. The flip is
// node-local (unified stays the default for new nodes) and the toast
@@ -2670,7 +2651,6 @@ function installStackKeyboard(state) {
if (action.kind === "focus") {
focusStackRow(state, visibleRowIndex(state, index, action.index));
} else if (action.kind === "pick") {
if (atAdd && state.rows.length >= MAX_ROWS) return;
openPicker(state, atAdd ? null : index,
atAdd ? state.panel.querySelector(".ausboss-lora-add") : rowElement.querySelector(".ausboss-lora-name"),
{ keyboard: true });
@@ -2708,7 +2688,6 @@ function renderRows(state) {
panel.append(body);
const addRowAndPick = (event) => {
if (state.rows.length >= MAX_ROWS) return;
// detail is 0 for a click made with Enter or Space.
openPicker(state, null, event.currentTarget, { keyboard: event.detail === 0 });
};
@@ -2936,7 +2915,6 @@ function renderRows(state) {
const actions = el("div", "ausboss-lora-actions");
const add = el("button", "ausboss-lora-add", "+ LoRA");
add.type = "button";
add.disabled = state.rows.length >= MAX_ROWS;
add.addEventListener("click", addRowAndPick);
add.title = "Pick one LoRA, or click a folder name to add all its LoRAs.";
actions.append(add);
+2 -2
View File
@@ -4,8 +4,8 @@
// node, runs the node alone when the face asks for the picture or for what
// SAM 3 finds at a click, and hands it what a run sent back.
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { chainCallback } from "../shared/index.mjs";
import { executionIdOf, isSwitchedOff, nodeByExecutionId } from "../shared/graph_ids.mjs";
import { outputLocatorId } from "../shared/input_preview.mjs";
+2 -2
View File
@@ -5,8 +5,8 @@
// setting turns it on. The chime is built once as a small WAV in memory
// and played through an ordinary audio element, so the pack ships no sound
// file and nothing is built until the first chime plays.
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { showToast } from "../shared/index.mjs";
import { noticesFromExecuted, queueRemaining, shouldChime } from "../shared/notify.mjs";
import { chimeSamples, wavBytes } from "./chime.mjs";
+2 -2
View File
@@ -17,8 +17,8 @@
// It also notes the runs a node starts for itself (Mask by Touch looking at
// its picture), so the Run Timer and the runtime badges can leave them out.
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { isAusbossNode } from "../shared/index.mjs";
import { nodeByExecutionId } from "../shared/graph_ids.mjs";
import { isNodeOwnRun, outputKey, ownRuns, runScope } from "../shared/prompt_scope.mjs";
+1 -1
View File
@@ -7,7 +7,7 @@
// position/size/title/colors/flags/mode/properties survive. Slots or
// widgets that no longer exist are skipped silently. Any failure rolls
// the graph back and keeps the original node.
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import { linkSlots, restoreOutputLinks, snapshotLinks } from "../shared/graph_links.mjs";
import { isAusbossNode } from "../shared/index.mjs";
+1 -1
View File
@@ -8,7 +8,7 @@
// node, carry translated widgets, remap links, and roll back on failure.
// This is purely a graph rewrite; no third-party class name is ever
// registered on the backend.
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import { linkSlots, restoreOutputLinks, snapshotLinks } from "../shared/graph_links.mjs";
import { BRAND, notifyAusbossChange, showToast } from "../shared/index.mjs";
import {
+179 -68
View File
@@ -21,7 +21,8 @@
// at the selected pixel budget and follow the explicit orientation toggle. Snap governs gestures only — typed
// values are never re-snapped.
import { app } from "/scripts/app.js";
import { CAPTION_TYPE, HINT_TYPE, compactAction } from "../shared/panel_controls.mjs";
import { app } from "../../../scripts/app.js";
import {
chainCallback,
keepDomWidgetWidthAuto,
@@ -29,8 +30,10 @@ import {
} from "../shared/index.mjs";
import { WIDGET_FRAME, fillNodeHeight, holdVueNodeMinWidth } from "../shared/panel_layout.mjs";
import { hideInputsInDef, hideWidget } from "../shared/widget_visibility.mjs";
import { markSocketless } from "../shared/widget_card_math.mjs";
import { makeScrubInput } from "../shared/scrub_input.mjs";
import {
closeSettingsMenu,
gearIconSvg,
loadSettings,
openSettingsMenu,
@@ -51,12 +54,16 @@ import {
offGrid,
orientRatio,
parseRail,
parseWorkflowSizes,
readWorkflowPolicy,
savedWorkflowPolicy,
workflowRatios,
quickSizes,
ratioLabel,
reduceRatio,
scrubDim,
sizeForMegapixels,
stageScale,
fitStage,
} from "../shared/resolution_math.mjs";
const NODE_CLASS = "AUSBOSS_NODES_Resolution";
@@ -132,13 +139,19 @@ function installStyles() {
.ausboss-res-panel { display: flex; flex-direction: column; gap: ${SECTION_GAP}px;
width: 100%; height: 100%; padding: ${PANEL_PADDING}px; overflow: hidden;
font: 400 11px ${MONO}; color: #d7dde2; }
.ausboss-size-dialog{color-scheme:dark;width:min(365px,88vw);border:1px solid #345554;border-radius:10px;background:#162022;color:#d7e4e3;padding:18px;font:13px system-ui}
.ausboss-size-dialog::backdrop{background:#0008}
.ausboss-size-dialog textarea{display:block;box-sizing:border-box;width:100%;margin:8px 0;padding:8px;font:13px monospace}
.ausboss-size-dialog input{accent-color:#00b4aa}
.ausboss-size-dialog [role=alert]{color:#ffd49e}
.ausboss-size-dialog p{color:#adc1be;font:12px/1.45 system-ui;margin:7px 0 12px}
.ausboss-size-dialog footer{display:flex;justify-content:flex-end;gap:8px;margin-top:12px}
.ausboss-res-sec { flex: none; background: #141515; border: 1px solid #252727;
border-radius: 8px; padding: 6px 8px 8px; }
.ausboss-res-sechead { display: flex; align-items: baseline;
justify-content: space-between; margin-bottom: 6px; gap: 8px; }
.ausboss-res-sechead .label { font: 500 9px ${MONO}; letter-spacing: .14em;
text-transform: uppercase; color: #6a7070; white-space: nowrap; }
.ausboss-res-sechead .hint { font: 400 9px ${MONO}; color: #4e5454;
.ausboss-res-sechead .label { ${CAPTION_TYPE} white-space: nowrap; }
.ausboss-res-sechead .hint { ${HINT_TYPE}
white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
.ausboss-res-shaperow { display: flex; gap: 6px; align-items: stretch; }
.ausboss-res-subbox { background: #101111; border: 1px solid #252727;
@@ -174,12 +187,12 @@ function installStyles() {
background-image: radial-gradient(#242727 1px, transparent 1px);
background-size: 22px 22px; background-position: center; opacity: .55; }
.ausboss-res-rings { position: absolute; inset: 0; pointer-events: none; }
.ausboss-res-rect { position: absolute; inset: 0; margin: auto;
border: 1.5px solid #00b4aa; background: rgba(0,180,170,.05);
.ausboss-res-rect { position: absolute; inset: var(--ausboss-res-inset,0) 0 0; margin: auto;
border: 1.5px solid #00b4aa; background: rgba(0,180,170,.10);
display: flex; flex-direction: column; align-items: center; justify-content: center;
gap: 2px; }
.ausboss-res-rect.easing { transition: width ${REFIT_MS}ms ease, height ${REFIT_MS}ms ease; }
.ausboss-res-ghost { position: absolute; inset: 0; margin: auto;
.ausboss-res-ghost { position: absolute; inset: var(--ausboss-res-inset,0) 0 0; margin: auto;
border: 1px dashed #4d5555; pointer-events: none; display: none; }
.ausboss-res-readout { position: absolute; top: 6px; left: 9px; right: 9px; z-index: 2;
display: flex; align-items: center; justify-content: space-between; gap: 8px;
@@ -207,6 +220,8 @@ function installStyles() {
height: ${CONTROL_H}px; background: #1c1e1e; border-color: #313434; font: 500 13px ${MONO}; }
.ausboss-res-field .ausboss-scrub > .ausboss-scrub-input { text-align: left;
padding-left: 8px; color: #eef1f1; }
.ausboss-res-field[inert] .ausboss-scrub,.ausboss-res-field .ausboss-scrub[inert]{border-color:transparent;background:transparent}
.ausboss-res-field[inert] .ausboss-scrub-step,.ausboss-res-field .ausboss-scrub[inert] .ausboss-scrub-step{display:none}
.ausboss-res-field.linked { opacity: .5; pointer-events: none; }
.ausboss-res-axis { flex: none; font: 400 9px ${MONO}; color: #565c5c; }
.ausboss-res-btn { width: ${CONTROL_H}px; height: ${CONTROL_H}px; flex: none;
@@ -214,7 +229,7 @@ function installStyles() {
border-radius: 5px; color: #9aa0a0; cursor: pointer; font-size: 12px; padding: 0; }
.ausboss-res-btn:hover { border-color: #00b4aa; color: #00b4aa; }
.ausboss-res-quick { display: grid; grid-template-columns: repeat(4, 1fr); gap: 5px;
min-height: ${QUICK_H * 2 + 5}px; align-content: start; }
height: ${QUICK_H * 2 + 5}px; overflow-y: auto; align-content: start; }
.ausboss-res-chip.customchip { opacity: .45; cursor: default;
pointer-events: none; border-style: dashed; grid-column: span 2; }
.ausboss-res-quick .ausboss-res-chip { height: ${QUICK_H}px; font-size: 9.5px;
@@ -256,6 +271,7 @@ function getSize(state) {
}
function commitSize(state, width, height, { gesture = false } = {}) {
if (state.strict && (!isListed(state, width, height) || axisLinked(state, "width") || axisLinked(state, "height"))) return;
if (!axisLinked(state, "width")) state.widthWidget.value = clampDim(width);
if (!axisLinked(state, "height")) state.heightWidget.value = clampDim(height);
repaint(state);
@@ -350,7 +366,7 @@ function stageBox(state) {
// Equal-cost curves, log-sampled across the plausible width range so they
// sweep the whole quadrant (the design's rendering).
function paintRings(state, scale) {
function paintRings(state, scale, shift) {
const svg = state.rings;
svg.replaceChildren();
const show = state.settings?.show_mp_rings !== false;
@@ -358,7 +374,7 @@ function paintRings(state, scale) {
const box = stageBox(state);
svg.setAttribute("viewBox", `0 0 ${box.w} ${box.h}`);
const cx = box.w / 2;
const cy = box.h / 2;
const cy = box.h / 2 + shift;
for (const mp of [0.5, 1, 2]) {
const points = [];
for (let i = 0; i <= 60; i += 1) {
@@ -396,7 +412,7 @@ function paintRings(state, scale) {
// The quick list regenerates when the ratio or snap changes; repaint only
// re-highlights it otherwise.
function rebuildQuick(state, width, height, snap, custom) {
function rebuildQuick(state, width, height, snap, custom, picks) {
const wrap = state.quickWrap;
wrap.replaceChildren();
state.quickButtons = [];
@@ -409,7 +425,8 @@ function rebuildQuick(state, width, height, snap, custom) {
wrap.append(chip);
return;
}
const list = quickSizes(width, height, snap);
const list = picks ?? quickSizes(width, height, snap);
if (state.strict && !list.length) return;
if (!list.length) {
wrap.append(el("span", "ausboss-res-noquick",
"No on-grid sizes for this ratio at this snap — try a finer snap."));
@@ -420,6 +437,7 @@ function rebuildQuick(state, width, height, snap, custom) {
chip.type = "button";
chip.title = `Apply ${size.width}×${size.height} exactly.`;
chip.addEventListener("click", () => {
if (picks && size.width !== size.height) state.node.properties.ausbossResolutionPortrait = size.height > size.width;
commitSize(state, size.width, size.height);
easeRefit(state);
});
@@ -430,26 +448,98 @@ function rebuildQuick(state, width, height, snap, custom) {
}
}
function isListed(state, width, height) {
return state.sizes.some(([w, h]) => w === width && h === height);
}
function restorePolicy(state) {
const widget = state.policyWidget;
if (!widget) return;
const legacy = state.node.properties?.ausbossWorkflowSizes;
widget.value = savedWorkflowPolicy(widget.value, legacy);
if (state.node.properties) delete state.node.properties.ausbossWorkflowSizes;
try {
Object.assign(state, readWorkflowPolicy(widget.value), { policyError: false });
} catch {
Object.assign(state, { sizes: [], strict: true, policyError: true });
}
const { width, height } = getSize(state);
if (state.strict && state.sizes.length && !isListed(state, width, height)
&& !axisLinked(state, "width") && !axisLinked(state, "height")) {
[state.widthWidget.value, state.heightWidget.value] = state.sizes[0];
}
}
function editWorkflowSizes(state) {
closeSettingsMenu();
const dialog = el("dialog", "ausboss-size-dialog");
dialog.setAttribute("aria-label", "Workflow resolutions");
const label = el("label", "", "Workflow resolutions");
const area = el("textarea");
area.rows = 6;
area.placeholder = "576 × 1024";
area.value = state.sizes.map(pair => pair.join(" × ")).join("\n");
label.append(area);
const hint = el("p", "", "One width × height per line. These quick picks are saved with this node.");
const lock = el("label");
const checkbox = el("input");
checkbox.type = "checkbox";
checkbox.checked = state.strict;
lock.append(checkbox, " Limit choices to this list");
const description = el("p", "", "Only listed sizes and their exact aspect ratios can be selected. Linked dimensions are checked when the workflow runs.");
const error = el("div");
error.setAttribute("role", "alert");
const footer = el("footer");
const cancel = compactAction("Cancel");
const save = compactAction("Save sizes");
cancel.onclick = () => dialog.close();
save.onclick = () => {
let sizes;
try {
sizes = parseWorkflowSizes(area.value);
if (checkbox.checked && !sizes.length) throw new Error("Add a resolution, or turn off the limit to allow any size.");
} catch (e) {
error.textContent = e.message;
area.focus();
return;
}
state.policyWidget.value = sizes.length ? JSON.stringify({ strict: checkbox.checked, sizes }) : "";
restorePolicy(state);
buildPanel(state);
fitNode(state);
notifyAusbossChange();
dialog.close();
};
footer.append(cancel, save);
dialog.append(label, hint, lock, description, error, footer);
document.body.append(dialog);
dialog.addEventListener("close", () => dialog.remove(), { once:true });
dialog.showModal();
}
function repaint(state) {
const { width, height } = getSize(state);
const snap = currentSnap(state);
const box = stageBox(state);
const scale = state.frozenScale ?? stageScale(width, height, box.w, box.h);
const portrait = orientation(state);
const ratio = reduceRatio(width, height);
state.rect.style.width = `${Math.max(8, width * scale)}px`;
state.rect.style.height = `${Math.max(8, height * scale)}px`;
state.dimLabel.textContent = `${width} × ${height}`;
state.subMp.textContent = `${megapixels(width, height).toFixed(2)} MP`;
state.subRatio.textContent = ratioLabel(width, height);
state.offGridDot.style.display = offGrid(width, height, snap) ? "" : "none";
state.subRatio.textContent = state.strict ? `${ratio.x}:${ratio.y}` : ratioLabel(width, height);
state.offGridDot.style.display = !state.strict && offGrid(width, height, snap) ? "" : "none";
state.dots.style.display = state.settings?.show_grid === false ? "none" : "";
paintRings(state, scale);
const box = stageBox(state);
const sideRoom = 14 + Math.max(state.dimLabel.offsetWidth, state.subMp.parentElement.offsetWidth);
const frame = state.frame = state.frozenFrame ?? fitStage(width, height, box.w, box.h, sideRoom);
const { scale, shift } = frame;
state.stage.style.setProperty("--ausboss-res-inset", `${2 * shift}px`);
state.rect.style.width = `${Math.max(8, width * scale)}px`;
state.rect.style.height = `${Math.max(8, height * scale)}px`;
paintRings(state, scale, shift);
// Section labels.
state.orientLabel.textContent = width === height
state.orientLabel.textContent = state.strict ? "Workflow ratios" : width === height
? `square · chips ${portrait ? "portrait" : "landscape"}`
: portrait ? "portrait" : "landscape";
const flipFit = portrait ? { w: 11, h: 15 } : { w: 15, h: 11 };
@@ -463,14 +553,17 @@ function repaint(state) {
// Ratio chips render in the selected orientation; filled = exact, dashed = near.
state.chipButtons.forEach(({ button, ratio: chipRatio, glyph, label }) => {
const oriented = orientRatio(chipRatio, portrait);
const oriented = state.strict ? chipRatio : orientRatio(chipRatio, portrait);
const fitted = fitRectInBox(oriented.x, oriented.y, 14, 14);
glyph.style.width = `${fitted.w.toFixed(1)}px`;
glyph.style.height = `${fitted.h.toFixed(1)}px`;
label.textContent = oriented.label;
button.title = `${oriented.label}: reshape to this ratio. The flip button on the left sets the orientation.`;
button.title = state.strict ? `Show approved ${oriented.label} sizes` : `${oriented.label}: reshape to this ratio. The flip button on the left sets the orientation.`;
const candidate = chipMatch(width, height, oriented);
const match = candidate?.flipped ? null : candidate;
const match = state.strict
? (ratio.x === chipRatio.x && ratio.y === chipRatio.y ? { state: "exact" } : null)
: candidate?.flipped ? null : candidate;
button.setAttribute("aria-pressed", String(match?.state === "exact"));
button.classList.toggle("exact", match?.state === "exact");
button.classList.toggle("near", match?.state === "near");
});
@@ -479,49 +572,52 @@ function repaint(state) {
const widthLinked = axisLinked(state, "width");
const heightLinked = axisLinked(state, "height");
const linked = widthLinked || heightLinked;
state.flipButton.disabled = linked;
state.swapButton.disabled = linked;
state.budgetControl.root.style.pointerEvents = linked ? "none" : "";
state.budgetControl.root.style.opacity = linked ? ".5" : "";
state.flipButton.disabled = linked || state.strict;
state.swapButton.disabled = linked || (state.strict && (width === height || !isListed(state, height, width)));
state.budgetControl.root.inert = linked || state.strict;
state.budgetControl.root.style.opacity = linked || state.strict ? ".65" : "";
for (const { button } of state.chipButtons) button.disabled = linked;
state.widthControl.set(width);
state.heightControl.set(height);
state.budgetControl?.set(megapixels(width, height));
state.widthField.classList.toggle("linked", widthLinked);
state.heightField.classList.toggle("linked", heightLinked);
state.widthField.title = widthLinked ? "Width is driven by its input link." : "";
state.heightField.title = heightLinked ? "Height is driven by its input link." : "";
state.budgetControl.set(megapixels(width, height));
for (const [field, wired] of [[state.widthField, widthLinked], [state.heightField, heightLinked]]) {
field.inert = wired || state.strict;
field.classList.toggle("linked", wired);
}
state.handles.e.classList.toggle("linked", widthLinked);
state.handles.s.classList.toggle("linked", heightLinked);
state.handles.se.classList.toggle("linked", widthLinked || heightLinked);
state.handles.se.classList.toggle("linked", linked);
// Quick sizes follow the CURRENT ratio - the Pixaroma behavior, but the
// list is generated on-ratio/on-grid instead of hand-curated. Frozen
// Quick sizes follow the current ratio and snap grid. Frozen
// while a gesture is live (a drag sweeps ratios; regenerating per move
// read as glitching), and a shape off the rail shows one "custom" chip.
if (!state.dragging) {
const onRail = state.railRatios?.some(
(railRatio) => chipMatch(width, height, railRatio)?.state === "exact",
);
const quickKey = onRail ? `${ratio.x}:${ratio.y}/${snap}` : `custom/${snap}`;
const group = state.strict && state.railRatios.find(r => r.x === ratio.x && r.y === ratio.y);
const picks = state.strict ? (group?.sizes ?? []) : state.sizes.length
? state.sizes.map(([w, h]) => ({ width: w, height: h })) : null;
const quickKey = picks ? JSON.stringify(picks) : onRail ? `${ratio.x}:${ratio.y}/${snap}` : `custom/${snap}`;
if (state.quickKey !== quickKey) {
state.quickKey = quickKey;
rebuildQuick(state, width, height, snap, !onRail);
state.quickHint.textContent = onRail
? `for ${ratioLabel(width, height)} · /${snap}`
: `custom · /${snap}`;
rebuildQuick(state, width, height, snap, !picks && !onRail, picks);
}
state.quickHint.textContent = state.policyError ? "Invalid list · edit in settings"
: linked && state.strict ? "Linked size checked at run"
: state.strict ? `Allowed · ${ratio.x}:${ratio.y}` : picks ? "Workflow recommendations"
: onRail ? `for ${ratioLabel(width, height)} · /${snap}` : `custom · /${snap}`;
}
state.quickButtons.forEach(({ button, size }) => {
button.disabled = widthLinked || heightLinked;
button.classList.toggle("exact", size.width === width && size.height === height);
button.disabled = linked;
const selected = size.width === width && size.height === height;
button.classList.toggle("exact", selected);
button.setAttribute("aria-pressed", String(selected));
});
}
function showGhost(state, width, height) {
const box = stageBox(state);
const { width: w, height: h } = getSize(state);
const scale = stageScale(w, h, box.w, box.h);
const { scale } = state.frame;
state.ghost.style.width = `${width * scale}px`;
state.ghost.style.height = `${height * scale}px`;
state.ghost.style.display = "";
@@ -532,7 +628,7 @@ function hideGhost(state) {
}
function easeRefit(state) {
state.frozenScale = null;
state.frozenFrame = null;
state.rect.classList.add("easing");
repaint(state);
clearTimeout(state.easeTimer);
@@ -542,15 +638,14 @@ function easeRefit(state) {
// ---------- gestures ----------
function beginHandleDrag(state, handle, event) {
if (event.button !== 0 || state.disposed) return;
if (state.strict || event.button !== 0 || state.disposed) return;
if ((handle !== "s" && axisLinked(state, "width")) || (handle !== "e" && axisLinked(state, "height"))) return;
event.preventDefault();
event.stopPropagation();
const start = getSize(state);
const box = stageBox(state);
// Frozen at pointerdown: the rect may overflow the stage mid-gesture and
// re-fits with a short ease on release - auto-fit never squirms mid-drag.
state.frozenScale = stageScale(start.width, start.height, box.w, box.h);
state.frozenFrame = state.frame;
state.dragging = true;
const origin = { x: event.clientX, y: event.clientY };
state.dragAbort?.abort();
@@ -563,7 +658,7 @@ function beginHandleDrag(state, handle, event) {
startHeight: start.height,
dx: (moveEvent.clientX - origin.x) / zoom,
dy: (moveEvent.clientY - origin.y) / zoom,
scale: state.frozenScale,
scale: state.frozenFrame.scale,
snap: currentSnap(state),
snapOn: !moveEvent.altKey,
// The corner scales at the exact locked ratio; Shift frees both axes.
@@ -644,7 +739,7 @@ function sectionHead(label, hint) {
function buildPanel(state) {
state.dragAbort?.abort();
state.dragging = false;
state.frozenScale = null;
state.frozenFrame = null;
const panel = state.panel;
panel.textContent = "";
state.quickKey = null; // force the quick list to regenerate
@@ -668,19 +763,16 @@ function buildPanel(state) {
state.flipButton = flip;
state.flipGlyph = flipGlyph;
state.chipButtons = [];
state.railRatios = parseRail(state.settings?.rail);
state.railRatios = state.strict ? workflowRatios(state.sizes) : parseRail(state.settings?.rail);
for (const ratio of state.railRatios) {
const chip = el("button", "ausboss-res-chip");
chip.type = "button";
const glyph = el("span", "glyph");
const label = el("span");
chip.append(glyph, label);
// A chip click lands on that ratio's canonical ~1MP default (the
// Pixaroma behavior, derived instead of table-driven); the gear's
// "keep current budget" toggle restores the budget-preserving mode.
// Chips only pick the shape; orientation belongs to the flip button.
const chipTarget = () => {
const size = getSize(state);
if (state.strict) return ratio.sizes.find(s => s.width === size.width && s.height === size.height) ?? ratio.sizes[0];
const portrait = orientation(state);
if (state.settings?.chips_keep_budget) {
return applyRatioAtBudget(size.width, size.height, ratio, currentSnap(state), portrait);
@@ -701,13 +793,15 @@ function buildPanel(state) {
state.chipButtons.push({ button: chip, ratio, glyph, label });
}
chipBox.append(chipGrid);
shapeRow.append(flipBox, chipBox);
if (!state.strict) shapeRow.append(flipBox);
shapeRow.append(chipBox);
shapeSec.append(shapeRow);
panel.append(shapeSec);
// (2) STAGE
const stage = el("div", "ausboss-res-stage");
stage.tabIndex = 0;
stage.tabIndex = state.strict ? -1 : 0;
if (state.strict) stage.title = "Choose from the workflow’s ratio and size buttons.";
const dots = el("div", "ausboss-res-dots");
const rings = svgEl("svg");
rings.classList.add("ausboss-res-rings");
@@ -734,14 +828,14 @@ function buildPanel(state) {
? "Drag width - Alt unsnaps, Esc cancels"
: "Drag height - Alt unsnaps, Esc cancels";
grip.addEventListener("pointerdown", (event) => beginHandleDrag(state, handle, event));
rect.append(grip);
if (!state.strict) rect.append(grip);
state.handles[handle] = grip;
}
stage.append(dots, rings, ghost, rect, readout);
stage.addEventListener("keydown", (event) => {
const keys = { ArrowLeft: [-1, 0], ArrowRight: [1, 0], ArrowUp: [0, 1], ArrowDown: [0, -1] };
const move = keys[event.key];
if (!move) return;
if (!move || state.strict) return;
event.preventDefault();
event.stopPropagation();
const step = event.shiftKey ? 8 : currentSnap(state);
@@ -803,10 +897,13 @@ function buildPanel(state) {
gear.addEventListener("click", () => {
openSettingsMenu({
scope: SETTINGS_SCOPE,
schema: SETTINGS_SCHEMA.map((entry) => {
schema: [{ section: "This workflow" }, {
key: "workflow_sizes", type: "action", label: "Workflow resolutions", button: "Edit list",
onAction: () => editWorkflowSizes(state),
}, ...SETTINGS_SCHEMA.filter(e => !state.strict || !["default_snap", "chips_keep_budget", "rail"].includes(e.key)).map((entry) => {
const input = entry.key === "latent" ? "latent" : entry.key === "batch" ? "batch_size" : null;
return input && axisLinked(state, input) ? { section: `${entry.label} is linked` } : entry;
}),
})],
anchor: gear.getBoundingClientRect(),
title: "Latent Size settings",
initial: {
@@ -869,7 +966,7 @@ function buildPanel(state) {
state.resizeObserver?.disconnect();
state.resizeObserver = new ResizeObserver(() => {
holdVueNodeMinWidth(state.panel, MIN_WIDTH);
if (!state.frozenScale) repaint(state);
if (!state.frozenFrame) repaint(state);
});
state.resizeObserver.observe(stage);
@@ -907,6 +1004,8 @@ function installResolutionNode(node) {
// the API format carries them like any other value.
const latentWidget = node.widgets?.find((widget) => widget.name === "latent");
const batchWidget = node.widgets?.find((widget) => widget.name === "batch_size");
const policyWidget = node.widgets?.find(widget => widget.name === "workflow_sizes");
hideWidget(policyWidget);
if (latentWidget) hideWidget(latentWidget);
if (batchWidget) hideWidget(batchWidget);
@@ -928,9 +1027,12 @@ function installResolutionNode(node) {
heightWidget,
latentWidget,
batchWidget,
policyWidget,
sizes: [],
strict: false,
panel,
settings: loadSettings(SETTINGS_SCOPE, SETTINGS_SCHEMA),
frozenScale: null,
frozenFrame: null,
quickKey: null,
};
node.__ausbossResolution = state;
@@ -953,6 +1055,7 @@ function installResolutionNode(node) {
exactMinWidth: true,
});
restorePolicy(state);
buildPanel(state);
for (const widget of [widthWidget, heightWidget, latentWidget, batchWidget]) {
if (widget) chainCallback(widget, "callback", () => {
@@ -980,11 +1083,18 @@ function installResolutionNode(node) {
// empty placeholder in their slots; put the defaults back.
if (latentWidget && !["16ch", "4ch", "128ch"].includes(latentWidget.value)) latentWidget.value = "16ch";
if (batchWidget && !(Number.isInteger(batchWidget.value) && batchWidget.value >= 1)) batchWidget.value = 1;
restorePolicy(state);
buildPanel(state);
requestAnimationFrame(() => { if (!state.disposed) { syncPrimitiveLinks(state); repaint(state); } });
});
chainCallback(node, "onConnectionsChange", function () {
// Convert-to-input honesty: link changes flip the read-only axes.
requestAnimationFrame(() => { if (!state.disposed) { syncPrimitiveLinks(state); repaint(state); } });
requestAnimationFrame(() => {
if (state.disposed) return;
syncPrimitiveLinks(state);
// A removed Primitive can leave its last value in the backing widget.
if (state.strict) restorePolicy(state);
repaint(state);
});
});
chainCallback(node, "onRemoved", () => {
state.disposed = true;
@@ -998,7 +1108,8 @@ app.registerExtension({
name: "AusBoss.Resolution",
beforeRegisterNodeDef(nodeType, nodeData) {
if (nodeData?.name !== NODE_CLASS) return;
hideInputsInDef(nodeData, ["width", "height", "latent", "batch_size"]);
markSocketless(nodeData, ["workflow_sizes"]);
hideInputsInDef(nodeData, ["width", "height", "latent", "batch_size", "workflow_sizes"]);
chainCallback(nodeType.prototype, "onNodeCreated", function () {
installResolutionNode(this);
});
+2 -2
View File
@@ -19,8 +19,8 @@
// check once per input the check reads, and collapseRepeatedErrors keeps
// one per message on AusBoss nodes before the frontend shows them.
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { showToast } from "../shared/index.mjs";
import { nodeByExecutionId } from "../shared/graph_ids.mjs";
import {
+2 -2
View File
@@ -12,8 +12,8 @@
// node.properties so a saved workflow reopens showing its author's time.
// Decision logic lives in js/shared/run_timer.mjs under node:test.
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { BRAND, chainCallback, keepDomWidgetWidthAuto } from "../shared/index.mjs";
import { holdNodeMinWidth } from "../shared/panel_layout.mjs";
import { isOwnRun, ownRuns } from "../shared/prompt_scope.mjs";
+5 -4
View File
@@ -8,8 +8,9 @@
// When the `filename` input is linked the name comes from upstream: the
// field shows {{filename}} and the tags fold away, since an exact name is
// never decorated.
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { PANEL_LABELS } from "../shared/panel_controls.mjs";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { isForeignRun } from "../shared/prompt_scope.mjs";
import { keepKeyInField } from "../shared/canvas_passthrough.mjs";
import { BRAND, chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange } from "../shared/index.mjs";
@@ -275,13 +276,13 @@ function buildCard(node) {
embedSeg.setAttribute("role", "radiogroup");
const embedButtons = new Map();
const embedTitle = "Embed stores the prompt and workflow in the image for drag-back. Off writes a clean image for sharing or datasets.";
for (const [on, text] of [[false, "no"], [true, "yes"]]) {
for (const [on, text] of [[false, PANEL_LABELS.off], [true, PANEL_LABELS.on]]) {
const button = el("button", "", text);
button.type = "button"; button.title = embedTitle;
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", "Embed workflow"), embedSeg);
embedRow.append(el("span", "ausboss-save-embed-label", PANEL_LABELS.embed), embedSeg);
root.append(embedRow);
root.addEventListener("pointerdown", (event) => {
+9 -8
View File
@@ -1,5 +1,6 @@
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { panelSwitch } from "../shared/panel_controls.mjs";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { isForeignRun, outputKey } from "../shared/prompt_scope.mjs";
import { chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange } from "../shared/index.mjs";
import { installNameTokens } from "../shared/name_tokens.mjs";
@@ -21,7 +22,7 @@ import {
const NODE_NAME = "AUSBOSS_NODES_SaveVideo";
const PREVIEW_WIDGET = "ausboss_save_video_viewer";
const PREVIEW_CHROME = 12;
const PREVIEW_CHROME = 38;
// Height the node opens at. It used to fall out of the panel's computeSize;
// with the panel free to follow the node, the default has to be stated. Same
// 16:9-ish stage the width-derived formula produced, plus the widget rows.
@@ -47,7 +48,7 @@ function stepsOn(state) {
function syncSteps(state, run = stepRun()) {
const on = stepsOn(state);
state.stepsButton?.classList.toggle("active", on);
state.stepsButton?.setAttribute("aria-checked", String(on));
state.stopButton?.classList.toggle("live", on && run.status === "running");
const overlay = state.stepOverlay;
if (!on) {
@@ -130,11 +131,11 @@ function buildPreview(node) {
loopButton.classList.add("ausboss-steps-loop");
const stopButton = makeToolButton("STOP", "Stop this run now. The next run in the queue still starts.");
stopButton.classList.add("ausboss-steps-stop");
const stepsButton = makeToolButton("STEPS", "Show the clip's first frame here while it is being made, one step at a time, with a Stop button. Off by default.");
const stepsButton = panelSwitch("Steps", "Show the clip's first frame here while it is being made, one step at a time, with a Stop button. Off by default.");
tools.classList.add("ausboss-steps-tools");
tools.append(stopButton, stepsButton, loopButton);
tools.append(stopButton, loopButton);
stage.append(video, image, status, tools);
root.append(stage);
root.append(stepsButton, stage);
const widget = node.addDOMWidget(PREVIEW_WIDGET, "ausboss_video", root, {
serialize: false,
@@ -147,7 +148,7 @@ function buildPreview(node) {
widget.serialize = false;
fillNodeHeight(widget, {
minWidth: VIDEO_MIN_WIDTH,
minHeight: 144,
minHeight: 158,
minNodeSize: [VIDEO_MIN_WIDTH, 270],
exactMinWidth: true,
});
+124 -13
View File
@@ -11,7 +11,7 @@
// is what "last run" shows, so it stays right even after randomize has
// already moved the box on to the next number.
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import { isForeignRun } from "../shared/prompt_scope.mjs";
import { keepKeyInField } from "../shared/canvas_passthrough.mjs";
import { BRAND, chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange } from "../shared/index.mjs";
@@ -19,6 +19,8 @@ import { copyToClipboard } from "../shared/clipboard.mjs";
import { hideInputsInDef, hideWidget } from "../shared/widget_visibility.mjs";
import { holdNodeMinWidth, pinVuePanelHeight } from "../shared/panel_layout.mjs";
import { formatSeed, pushSeed, seedFromExecuted } from "../shared/seed_history.mjs";
import { SEED_LOOK_MENU, SEED_LOOK_SCOPE, controlChip, nextControl, seedLook, setSeedLook } from "../shared/seed_look.mjs";
import { gearIconSvg, loadSettings, openSettingsMenu } from "../shared/settings_menu.mjs";
const NODE_CLASS = "AUSBOSS_NODES_Seed";
const CSS_ID = "ausboss-seed-css";
@@ -28,8 +30,19 @@ const PROPERTY = "ausboss_seed_history"; // [seed, newest first]
// in a double; a fresh seed rolled here obeys the same ceiling.
const ROLL_MAX = 0x4000000000000;
const CARD_HEIGHT = 158;
const PANEL_DECLARED_HEIGHT = CARD_HEIGHT + 20; // + the frontend's wrapper insets
// The compact look is one row: 8px card padding, a 32px row, 8px padding.
const COMPACT_CARD_HEIGHT = 50;
const PANEL_INSETS = 20; // the frontend's wrapper insets
const NODE_WIDTH = 300;
const COMPACT_NODE_WIDTH = 290;
function panelHeight(node) {
return (seedLook(node) === "compact" ? COMPACT_CARD_HEIGHT : CARD_HEIGHT) + PANEL_INSETS;
}
function nodeWidthFloor(node) {
return seedLook(node) === "compact" ? COMPACT_NODE_WIDTH : NODE_WIDTH;
}
let openMenu = null;
@@ -59,6 +72,21 @@ function ensureCss() {
.ausboss-seed-btn:disabled{opacity:.4;cursor:default;pointer-events:none;}
.ausboss-seed-hint{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color:#6f8886;font-size:10.5px;text-align:center;}
.ausboss-seed-hint b{color:#9fe3dc;font-weight:600;font-family:ui-monospace,"SF Mono",Menlo,Consolas,monospace;}
.ausboss-seed-top{display:flex;align-items:center;gap:6px;min-width:0;}
.ausboss-seed-top .ausboss-seed-field{flex:1 1 auto;min-width:0;}
.ausboss-seed-gear{display:grid;place-items:center;}
.ausboss-seed-chip,.ausboss-seed-dice{display:none;flex:none;height:32px;border:1px solid #2a3437;border-radius:7px;background:#0f1516;color:#d8ecea;font:600 11.5px/1 -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;cursor:pointer;pointer-events:auto;}
.ausboss-seed-chip{min-width:56px;padding:0 7px;}
.ausboss-seed-chip.random{border-color:rgba(0,180,170,.55);color:${BRAND};}
.ausboss-seed-dice{width:32px;font-size:15px;}
.ausboss-seed-chip:hover,.ausboss-seed-dice:hover{border-color:${BRAND};color:#fff;}
.ausboss-seed-card.compact{gap:0;}
.ausboss-seed-card.compact .ausboss-seed-seg,.ausboss-seed-card.compact .ausboss-seed-row,.ausboss-seed-card.compact .ausboss-seed-hint{display:none;}
.ausboss-seed-card.compact .ausboss-seed-chip,.ausboss-seed-card.compact .ausboss-seed-dice{display:block;}
.ausboss-seed-card.compact .ausboss-seed-field{height:32px;padding:0 3px 0 9px;}
.ausboss-seed-card.compact .ausboss-seed-field input{font-size:14px;}
.ausboss-seed-card.compact .ausboss-seed-tag,.ausboss-seed-card.compact .ausboss-seed-icon:not(.ausboss-seed-gear){display:none;}
.ausboss-seed-card.compact .ausboss-seed-field input{font-size:13.5px;letter-spacing:0;}
.ausboss-seed-menu{position:fixed;z-index:10000;min-width:230px;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 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;color:#d7dde2;}
.ausboss-seed-menu-head{padding:5px 8px 6px;border-bottom:1px solid #2c3238;color:#78908e;font:10px/1 -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;letter-spacing:.08em;text-transform:uppercase;}
.ausboss-seed-menu-item{display:block;width:100%;padding:6px 8px;border:none;border-radius:5px;background:transparent;color:inherit;font:inherit;text-align:left;cursor:pointer;}
@@ -124,6 +152,7 @@ function render(state) {
const linked = seedLinked(node);
const value = seedWidget(node)?.value;
if (document.activeElement !== state.input) state.input.value = formatSeed(Number(value));
fitCompactNumber(state);
state.input.disabled = linked;
state.field.classList.toggle("linked", linked);
state.field.title = linked ? "The seed comes from its input link" : "Click to type a seed";
@@ -136,6 +165,11 @@ function render(state) {
state.segStep.title = stepping
? "Click again to step the other way"
: "Increment the seed after each queue (click again for decrement)";
const chip = controlChip(control);
state.chip.textContent = chip.text;
state.chip.title = chip.title;
state.chip.classList.toggle("random", control === "randomize");
state.card.classList.toggle("compact", seedLook(node) === "compact");
state.useLast.disabled = !seeds.length;
state.more.disabled = seeds.length < 2;
state.hint.textContent = "";
@@ -145,6 +179,8 @@ function render(state) {
b.textContent = formatSeed(last);
state.hint.append(b);
if (control === "randomize") state.hint.append(" · rolls a new seed each queue");
// The compact look has no hint line: the last run shows on the number.
if (seedLook(node) === "compact") state.field.title = `${state.field.title}. Last run: ${formatSeed(last)}`;
} else {
state.hint.textContent = control === "randomize"
? "rolls a new seed each queue"
@@ -152,6 +188,16 @@ function render(state) {
}
}
// The compact row is narrow, so a long seed gets smaller digits instead of
// being cut off: monospace digits are about 0.6 of the font size wide.
function fitCompactNumber(state) {
const { input } = state;
if (seedLook(state.node) !== "compact") { input.style.fontSize = ""; return; }
const digits = Math.max(1, String(input.value || "").length);
const room = input.clientWidth || 100;
input.style.fontSize = `${Math.max(8, Math.min(13.5, room / (0.64 * digits))).toFixed(1)}px`;
}
function showMenu(state) {
closeMenu();
const seeds = history(state.node);
@@ -241,7 +287,9 @@ function buildPanel(node) {
input.inputMode = "numeric";
input.spellcheck = false;
const copy = button("ausboss-seed-icon", "⧉", "Copy the seed");
field.append(tag, input, copy);
const gear = button("ausboss-seed-icon ausboss-seed-gear", "", "Seed settings: full or compact look");
gear.innerHTML = gearIconSvg(12);
field.append(tag, input, copy, gear);
field.addEventListener("pointerdown", (event) => event.stopPropagation());
const seg = el("div", "ausboss-seed-seg");
@@ -257,11 +305,16 @@ function buildPanel(node) {
row.append(newSeed, useLast, more);
const hint = el("div", "ausboss-seed-hint");
card.append(field, seg, row, hint);
// Compact look: the mode chip and a dice sit on the number's row.
const chip = button("ausboss-seed-chip", "Fixed");
const dice = button("ausboss-seed-dice", "🎲", "Roll a fresh seed and pin it (Fixed)");
const top = el("div", "ausboss-seed-top");
top.append(field, chip, dice);
card.append(top, seg, row, hint);
root.append(card);
const state = (node.__ausbossSeed = {
node, root, field, tag, input, copy, segRandom, segFixed, segStep, newSeed, useLast, more, hint,
node, root, card, field, tag, input, copy, gear, chip, dice, segRandom, segFixed, segStep, newSeed, useLast, more, hint,
});
const commitTyped = () => {
@@ -304,6 +357,31 @@ function buildPanel(node) {
notifyAusbossChange();
});
newSeed.addEventListener("click", () => { setSeed(node, rollSeed()); render(state); });
dice.addEventListener("click", () => { setSeed(node, rollSeed()); render(state); });
// The chip walks the same modes as the full card's buttons, and starts a
// new run the same way: into Random rolls now, Fixed into +1 steps now.
chip.addEventListener("click", () => {
const current = controlWidget(node)?.value ?? "fixed";
const next = nextControl(current);
setControl(node, next);
if (!seedLinked(node)) {
const value = Number(seed.value) || 0;
if (next === "randomize") setSeed(node, rollSeed(), { pin: false });
else if (current === "fixed" && next === "increment") setSeed(node, value + 1, { pin: false });
}
render(state);
notifyAusbossChange();
});
gear.addEventListener("click", () => {
openSettingsMenu({
scope: SEED_LOOK_SCOPE,
schema: SEED_LOOK_MENU,
anchor: gear.getBoundingClientRect(),
title: "Seed settings",
initial: { look: seedLook(node) },
onChange: (values) => applyLook(state, values.look),
});
});
useLast.addEventListener("click", () => {
const seeds = history(node);
if (seeds.length) { setSeed(node, seeds[0]); render(state); }
@@ -318,7 +396,7 @@ function buildPanel(node) {
const widget = node.addDOMWidget(WIDGET_NAME, "ausboss_seed", root, {
serialize: false,
hideOnZoom: false,
getMinHeight: () => PANEL_DECLARED_HEIGHT,
getMinHeight: () => panelHeight(node),
});
keepDomWidgetWidthAuto(widget);
// Not saved with the workflow either: options.serialize only keeps it out
@@ -327,18 +405,20 @@ function buildPanel(node) {
// A constant-height card: pinned on purpose (see
// tests/panel_guards.test.mjs, fixedByDesign).
widget.computeSize = (width) => [
Math.max(NODE_WIDTH, Number(width || node.size?.[0] || NODE_WIDTH)),
PANEL_DECLARED_HEIGHT,
Math.max(nodeWidthFloor(node), Number(width || node.size?.[0] || nodeWidthFloor(node))),
panelHeight(node),
];
// Pinned in Nodes 2.0 as well, where a node can be made taller than its card.
pinVuePanelHeight(widget);
widget.options.minNodeSize = [NODE_WIDTH, 120];
widget.options.minNodeSize = [nodeWidthFloor(node), 60];
// The frontend skips a pinned card's width, so its floor is held here.
holdNodeMinWidth(widget, NODE_WIDTH);
holdNodeMinWidth(widget, nodeWidthFloor(node));
state.widget = widget;
new ResizeObserver(() => fitCompactNumber(state)).observe(input);
render(state);
node.setSize?.([
Math.max(node.size?.[0] ?? 0, NODE_WIDTH),
Math.max(node.size?.[0] ?? 0, nodeWidthFloor(node)),
node.computeSize?.()[1] ?? node.size?.[1],
]);
// The card is a fixed-height row: width may grow, but a corner drag
@@ -356,18 +436,49 @@ function buildPanel(node) {
return state;
}
// Switch looks: the card, the node's floor and its height follow. Going
// compact also makes the node as narrow as the compact row allows, and
// going full widens it back to the full card's floor.
function applyLook(state, look) {
const { node } = state;
const before = seedLook(node);
const after = setSeedLook(node, look);
if (before === after) return;
render(state);
if (state.widget) {
state.widget.options.minNodeSize = [nodeWidthFloor(node), 60];
holdNodeMinWidth(state.widget, nodeWidthFloor(node));
}
const width = after === "compact" ? COMPACT_NODE_WIDTH : Math.max(node.size?.[0] ?? 0, NODE_WIDTH);
node.setSize?.([width, node.computeSize?.()[1] ?? node.size?.[1]]);
node.setDirtyCanvas?.(true, true);
notifyAusbossChange();
}
app.registerExtension({
name: "AusBoss.Seed",
beforeRegisterNodeDef(nodeType, nodeData) {
if (nodeData?.name !== NODE_CLASS) return;
hideInputsInDef(nodeData, ["seed"]);
chainCallback(nodeType.prototype, "onNodeCreated", function () {
buildPanel(this);
// A new node starts in the look last picked from any Seed's gear. A
// loaded one keeps its own: onConfigure restores its properties after.
if (loadSettings(SEED_LOOK_SCOPE, SEED_LOOK_MENU).look === "compact") setSeedLook(this, "compact");
const state = buildPanel(this);
if (state && seedLook(this) === "compact") {
this.setSize?.([COMPACT_NODE_WIDTH, this.computeSize?.()[1] ?? this.size?.[1]]);
}
});
chainCallback(nodeType.prototype, "onConfigure", function () {
queueMicrotask(() => {
const state = buildPanel(this);
if (state) render(state);
if (!state) return;
render(state);
// A saved compact Seed: lower the floor to the compact row's.
if (state.widget) {
state.widget.options.minNodeSize = [nodeWidthFloor(this), 60];
holdNodeMinWidth(state.widget, nodeWidthFloor(this));
}
});
});
chainCallback(nodeType.prototype, "onConnectionsChange", function () {
+18
View File
@@ -45,6 +45,24 @@ const LINK = `#(${ID})`;
const WORDS_LINK_RE = /\[([^\[\]\n]+)\]\(([^\s()]+(?:\([^\s()]*\)[^\s()]*)*)\)/g;
const URL_MAX = 2000;
// Only a whole, ordinary web link gets the simple label/address form. Keep
// multi-paragraph or mixed-content notes in the text editor, without loss.
export function tileLinkFields(text) {
const value = String(text ?? "");
const match = /^\[([^\[\]\n]+)\]\((.+)\)$/.exec(value);
if (!match || !linkTarget(match[2])?.url) return null;
const blocks = parseBlocks(value);
if (blocks.length !== 1 || blocks[0].length !== 1
|| blocks[0][0].some(piece => piece.url !== match[2])) return null;
return { label: match[1], url: match[2] };
}
export function tileLinkText(label, url) {
const text = `[${label}](${url.trim()})`;
if (!tileLinkFields(text)) throw new Error("Enter a label without square brackets and a complete https:// or http:// address.");
return text;
}
// Where a link goes: { url }, { link } (a node's id) or { group } (a group's
// id), or null when the text is none of them. `raw` is what stands in the
// round brackets, or after an arrow's #.
+36 -7
View File
@@ -5,14 +5,14 @@
// a mask canvas holds what has been rubbed away, and the view shows the
// picture underneath with the top picture, less that mask, over it. Save
// sends the strokes to the server, which builds the mix at full size.
import { api } from "/scripts/api.js";
import { compactAction } from "./panel_controls.mjs";
import { api } from "../../../scripts/api.js";
import { BRAND, notifyAusbossChange, showToast } from "./index.mjs";
import { brushAdjusts, brushFlips, brushKey, brushWords, toolKey } from "./brush.mjs";
import { keepKeyInField } from "./canvas_passthrough.mjs";
import { makeScrubInput } from "./scrub_input.mjs";
import { makeSlideSwitch } from "./slide_switch.mjs";
import { extendStroke } from "./touch_math.mjs";
import { makeToolButton } from "./video_ui.mjs";
import {
CHECKER,
ERASE_OUTSIDE,
@@ -82,6 +82,7 @@ const CAN_FILTER = typeof CanvasRenderingContext2D !== "undefined" && "filter" i
export const ERASE_CSS = `
.ausboss-compare-erasebar{display:none;box-sizing:border-box;flex-wrap:wrap;align-items:center;gap:4px 6px;flex:none;min-height:${ERASE_BAR_HEIGHT}px;}
.ausboss-compare-root.is-erasing .ausboss-compare-erasebar{display:flex;}
.ausboss-compare-brush-swatch{box-sizing:border-box;flex:none;width:24px;height:24px;border-radius:4px;background:#0b1113;border:1px solid rgba(0,180,170,.3);}
.ausboss-compare-erasebar .ausboss-scrub{flex:none;}
.ausboss-compare-field{display:flex;align-items:center;gap:4px;flex:none;}
.ausboss-compare-label{flex:none;color:#9fb6b4;font-size:10px;line-height:22px;white-space:nowrap;user-select:none;}
@@ -247,9 +248,32 @@ function drawCheckerboard(er, ctx, fit) {
ctx.fillRect(fit.left, fit.top, fit.width, fit.height);
}
// Use the cursor's actual dab. A compressed size scale keeps both a
// two-pixel brush and a two-thousand-pixel brush legible in the toolbar.
function drawBrushSwatch(er) {
const size = brushSize(er);
const soft = brushSoft(er);
const back = er.back !== Boolean(er.flipKey);
const key = `${size}|${soft}|${back}`;
if (er.swatchKey === key) return;
er.swatchKey = key;
const swatch = er.swatch;
const side = swatch.width;
const fraction = Math.log(size / ERASE_SIZE[0]) / Math.log(ERASE_SIZE[1] / ERASE_SIZE[0]);
const diameter = side * (0.22 + 0.66 * fraction);
const dab = dabOf(er, size, soft, diameter / size, back ? BACK_TINT : RUB_TINT);
const ctx = swatch.getContext("2d");
ctx.clearRect(0, 0, side, side);
ctx.drawImage(dab.canvas, side / 2 - dab.reach, side / 2 - dab.reach);
swatch.title = `${back ? "Restore" : "Erase"} brush: ${size} px, ${soft}% soft`;
swatch.setAttribute("aria-label", swatch.title);
}
function draw(er) {
er.frame = 0;
if (!er.active || !er.refs) return;
if (!er.active) return;
drawBrushSwatch(er);
if (!er.refs) return;
sizeView(er);
const { canvas } = er;
const ctx = canvas.getContext("2d");
@@ -377,7 +401,7 @@ function syncTools(er) {
er.layersSwitch.set(layers ? "on" : "off");
const aligned = Boolean(er.refs?.aligned);
er.alignButton.disabled = !ready || er.aligning;
er.alignButton.textContent = er.aligning ? "ALIGNING" : "ALIGN";
er.alignButton.textContent = er.aligning ? "Aligning" : "Align";
er.alignButton.classList.toggle("active", aligned);
er.alignButton.title = !ready
? "Run the workflow first: Align needs the two pictures."
@@ -827,6 +851,11 @@ export function makeEraser({ node, root, stage, imageA, imageB, signal, onSaved,
return wrap;
};
const sizeField = scrubField("Size", er.sizeBox, SIZE_HELP);
er.swatch = document.createElement("canvas");
er.swatch.className = "ausboss-compare-brush-swatch";
er.swatch.width = er.swatch.height = 64;
er.swatch.setAttribute("role", "img");
sizeField.prepend(er.swatch);
const softField = scrubField("Soft", er.softBox, SOFT_HELP);
const TOP_HELP = "Which picture you start from. The brush shows the other one through it. Swapping keeps your paint.";
er.topSwitch = makeSlideSwitch({
@@ -846,7 +875,7 @@ export function makeEraser({ node, root, stage, imageA, imageB, signal, onSaved,
// Align, Undo and Clear stay together at the right end, also on a second line.
const steps = document.createElement("div");
steps.className = "ausboss-compare-steps";
er.undoButton = click(makeToolButton("UNDO", "Take back the last stroke, or a Clear."), () => {
er.undoButton = click(compactAction("Undo", "Take back the last stroke, or a Clear."), () => {
if (!er.history.length && !er.strokes.length) return;
// Paint that came with the workflow has no steps of its own to go back
// through: its last stroke is taken off.
@@ -856,13 +885,13 @@ export function makeEraser({ node, root, stage, imageA, imageB, signal, onSaved,
syncTools(er);
schedule(er);
});
er.clearButton = click(makeToolButton("CLEAR", "Take all the paint off. Undo brings it back."), () => {
er.clearButton = click(compactAction("Clear", "Take all the paint off. Undo brings it back."), () => {
if (!er.strokes.length) return;
change(er, []);
rebuildMask(er);
schedule(er);
});
er.alignButton = click(makeToolButton("ALIGN", ""), () => align(er));
er.alignButton = click(compactAction("Align", ""), () => align(er));
steps.append(er.alignButton, er.undoButton, er.clearButton);
er.bar.append(er.kindSwitch.root, sizeField, softField, topField, steps);
+1 -1
View File
@@ -2,7 +2,7 @@
// name, a small copy of it and its job, then the video and its job. A slot with nothing plugged in is a faint
// dashed chip, so it reads as optional. The widgets underneath stay the
// source of truth: a chip only changes their value.
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import { BRAND, chainCallback } from "./index.mjs";
import { liftSocket } from "./widget_card.mjs";
import { commitWidgetValue, comboValues } from "./widget_card_math.mjs";
+16
View File
@@ -0,0 +1,16 @@
// The same live-input rule used by the writer timeline: muted/bypassed
// sources do not reach this node. This inspects the wire, never media bytes.
export function linkSource(node, name) {
const slot = node.inputs?.find((input) => input?.widget?.name === name || input?.name === name);
if (slot?.link === null || slot?.link === undefined) return null;
const graph = node.graph;
const link = graph?.links?.[slot.link] ?? graph?._links?.get?.(slot.link);
const source = graph?.getNodeById?.(link?.origin_id);
return (source?.mode ?? 0) === 0 ? source ?? null : null;
}
// Keep in step with Python KEEPS_ITS_LENGTH. Other jobs use seconds normally.
export function clipSetsDuration(node, values) {
return ["swap the person", "new voice", "change something"].includes(values.video_job)
&& linkSource(node, "video") !== null;
}
+2 -2
View File
@@ -4,12 +4,12 @@
// which makes this the right home for import-only utilities. Per-node
// entry points live in js/<node>/index.js and import from here.
import { app } from "/scripts/app.js";
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.20.5";
export const AUSBOSS_JS_VERSION = "2.21.1";
export const BRAND = "#00b4aa"; // AusBoss teal — keep node accents consistent.
export const BRAND_DARK = "#007f78";
+7 -11
View File
@@ -12,7 +12,6 @@ export const FINE_STEP = 0.01;
// large enough that a shaky click cannot change the value.
export const SCRUB_PIXELS_PER_STEP = 4;
export const SCRUB_DEAD_ZONE = 3;
export const MAX_ROWS = 64;
let rowSerial = 0;
@@ -40,7 +39,7 @@ export function newRow() {
export function normalizeRows(parsed) {
if (!Array.isArray(parsed)) return [];
return tidyGroups(parsed.slice(0, MAX_ROWS).map((entry) => {
return tidyGroups(parsed.map((entry) => {
const row = newRow();
if (entry && typeof entry === "object") {
row.id = typeof entry.id === "string" && entry.id ? entry.id : row.id;
@@ -600,9 +599,8 @@ export function loraPickerEntries(names, query = "", collapsedFolders = new Set(
return visit(tree);
}
// Folder add is one append, or no change when the whole selection cannot
// fit. Existing rows (even duplicates, disabled rows and empty slots) stay
// untouched. Deduplicate by full path, never basename or moved-file guess.
// Append the folder in one step, preserving duplicates, disabled rows and
// empty slots already in the stack. Deduplicate new files by full path.
export function appendFolderRows(rows, names, defaultStrength = 1) {
const seen = new Set(rows.map((row) => loraPath(row.name)));
const pending = [];
@@ -613,12 +611,10 @@ export function appendFolderRows(rows, names, defaultStrength = 1) {
seen.add(key);
pending.push(name);
}
const room = Math.max(0, MAX_ROWS - rows.length);
const needed = pending.length;
if (needed > room || !needed) return { rows, added: 0, skipped, needed, room };
if (!pending.length) return { rows, added: 0, skipped };
const strength = roundStrength(defaultStrength);
const addedRows = pending.map((name) => ({ ...newRow(), name, strength, strength_clip: strength }));
return { rows: [...rows, ...addedRows], added: needed, skipped, needed, room };
return { rows: [...rows, ...addedRows], added: addedRows.length, skipped };
}
// A suggested range is advisory: null/absent bounds never flag.
@@ -1031,9 +1027,9 @@ export function mergeImportedRows(existing, imported,
have.add(key);
added.push({ ...makeRow(), ...item });
}
const rows = (position === "after"
const rows = position === "after"
? [...(existing ?? []), ...added]
: [...added, ...(existing ?? [])]).slice(0, MAX_ROWS);
: [...added, ...(existing ?? [])];
return { rows, added: added.length, skipped };
}
+1 -1
View File
@@ -29,7 +29,7 @@ export function filterMedia(values, query) {
export function unlistedMedia(values, value) {
const text = String(value ?? "");
if (!text || !Array.isArray(values)) return "";
const bare = text.replace(/\s+\[(input|output)\]$/, "");
const bare = text.replace(/\s+\[input\]$/, "");
return values.includes(text) || values.includes(bare) ? "" : text;
}
+27 -15
View File
@@ -2,8 +2,9 @@
// bar as long as the clip, with the cuts as marks. The server reads the script with the same code a run uses,
// so the bar shows what will happen. It also colours the script box, so the
// words the node reads as instructions (@1, 3s:, a cut) stand out.
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { clipSetsDuration, linkSource } from "./h3_duration.mjs";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { BRAND, chainCallback } from "./index.mjs";
import { dragRange, moveMoment, retime, rulerSeconds, stripCaption, stripRows, toggleCut, wiredJobs } from "./moment_strip_math.mjs";
import { attachScriptAssist } from "./script_assist.mjs";
@@ -47,16 +48,6 @@ function ensureCss() {
document.head.append(style);
}
// A bypassed or muted source doesn't reach the node when it runs, so it doesn't count.
function linkSource(node, name) {
const slot = node.inputs?.find((input) => input?.widget?.name === name || input?.name === name);
if (slot?.link === null || slot?.link === undefined) return null;
const graph = node.graph;
const link = graph?.links?.[slot.link] ?? graph?._links?.get?.(slot.link);
const source = graph?.getNodeById?.(link?.origin_id);
return (source?.mode ?? 0) === 0 ? source ?? {} : null;
}
function wired(node, name) {
return linkSource(node, name) !== null;
}
@@ -93,7 +84,7 @@ export function momentStrip(node) {
})),
cameras: choices("camera"),
looks: choices("look"),
seconds: Number(lastSeconds) || 8,
seconds: clipSetsDuration(node, lastValues) ? 0 : Number(lastSeconds) || 8,
}));
let lastValues = {};
@@ -275,17 +266,38 @@ export function momentStrip(node) {
body: JSON.stringify({ script, seconds, jobs, video }),
});
const report = response.ok ? await response.json() : null;
if (turn === asked) show(report);
if (turn === asked && !clipSetsDuration(node, lastValues)) show(report);
} catch {
if (turn === asked) show(null);
if (turn === asked && !clipSetsDuration(node, lastValues)) show(null);
}
};
let latest = null;
let fromClip = false;
const sync = (values) => {
latest = values;
lastValues = values;
const nextFromClip = clipSetsDuration(node, values);
if (fromClip !== nextFromClip) {
fromClip = nextFromClip;
// Also notice a source switched off without changing this node's wires.
queueMicrotask(() => node.__ausbossCard?.refresh?.());
}
colours.sync(values, [1, 2, 3, 4].filter((number) => wired(node, `picture_${number}`)));
if (fromClip) {
shown = null;
clearTimeout(timer);
asked += 1;
ruler.textContent = "";
track.textContent = "";
const message = el("ausboss-strip-words", "Length comes from the clip");
message.style.cssText = "display:flex;align-items:center;height:100%";
track.append(message);
note.textContent = "Set the clip's length upstream. Timing controls are unavailable here.";
note.title = note.textContent;
note.classList.remove("warn");
return;
}
if (wired(node, "script")) {
shown = null;
clearTimeout(timer);
+13
View File
@@ -0,0 +1,13 @@
// A tile needs its renderer. Give saved tiles a real node identity so an old
// install reports a missing node instead of stretching a plain note over it.
export const CALLOUT_TYPES = new Set(["AUSBOSS_NODES_Callout", "AUSBOSS_NODES_CalloutTile"]);
export const NOTE_TYPES = new Set(["AUSBOSS_NODES_WorkflowNote", "AUSBOSS_NODES_WorkflowNoteTile"]);
export function serializeNoteIdentity(saved, tile) {
const types = CALLOUT_TYPES.has(saved.type) ? [...CALLOUT_TYPES]
: NOTE_TYPES.has(saved.type) ? [...NOTE_TYPES] : null;
if (!types) return;
saved.type = types[tile ? 1 : 0];
// LiteGraph's serialized properties can still be the live object's properties.
saved.properties = { ...saved.properties, "Node name for S&R": saved.type };
}
+54
View File
@@ -0,0 +1,54 @@
// Shared controls for compact node panels. Only elements explicitly given one
// of these classes are styled; the owning panel decides where they sit.
import { BRAND } from "./index.mjs";
export const PANEL_LABELS = Object.freeze({
load: "Load", sources: { input: "Inputs", output: "Outputs" },
embed: "Embed workflow", off: "Off", on: "On",
});
const controlFont = 'system-ui, sans-serif';
export const CAPTION_TYPE = `font:600 11px/1.25 ${controlFont};color:#b2c6c3;`;
export const HINT_TYPE = `font:400 10px/1.25 ${controlFont};color:#95aba8;`;
export function ensurePanelControls() {
if (document.getElementById("ausboss-panel-controls")) return;
const style = document.createElement("style");
style.id = "ausboss-panel-controls";
style.textContent = `
.ausboss-compact-action{box-sizing:border-box;flex:none;height:22px;min-width:24px;padding:0 7px;border:1px solid #365957;border-radius:4px;background:#111b1c;color:#bdd8d5;font:600 11px/1 ${controlFont};white-space:nowrap;cursor:pointer;pointer-events:auto}
.ausboss-compact-action:hover:enabled,.ausboss-compact-action.active{color:#dbfffb;border-color:${BRAND};background:#173332}
.ausboss-compact-action:disabled{opacity:.5;cursor:default}
.ausboss-panel-switch{display:inline-flex;align-items:center;gap:6px;align-self:flex-end;flex:none;box-sizing:border-box;min-height:20px;margin-left:auto;padding:0 2px;background:transparent;border:0;color:#b2c6c3;font:600 11px/1 ${controlFont};cursor:pointer;user-select:none;pointer-events:auto}
.ausboss-panel-switch i{position:relative;width:24px;height:13px;border-radius:7px;background:#3a4445}
.ausboss-panel-switch i::after{content:"";position:absolute;top:2px;left:2px;width:9px;height:9px;border-radius:50%;background:#b6c4c3}
.ausboss-panel-switch[aria-checked=true] i{background:${BRAND}}
.ausboss-panel-switch[aria-checked=true] i::after{left:13px;background:#fff}
.ausboss-compact-action:focus-visible,.ausboss-panel-switch:focus-visible{outline:2px solid ${BRAND};outline-offset:1px}
`;
document.head.append(style);
}
export function compactAction(label, title = "") {
ensurePanelControls();
const button = document.createElement("button");
button.type = "button";
button.className = "ausboss-compact-action";
button.textContent = label;
button.title = title;
return button;
}
export function panelSwitch(label, title) {
ensurePanelControls();
const button = document.createElement("button");
button.type = "button";
button.className = "ausboss-panel-switch";
button.title = title;
button.setAttribute("role", "switch");
button.setAttribute("aria-checked", "false");
const thumb = document.createElement("i");
thumb.setAttribute("aria-hidden", "true");
button.append(label, thumb);
return button;
}
+59 -7
View File
@@ -129,13 +129,17 @@ export function ratioSizeNear(ratio, width, height, step = 1) {
// modifiers: snap (default true; false = 1px freedom),
// lockRatio (true = keep the grab-time ratio exactly).
export function stageScale(width, height, boxW, boxH) {
// Fit with fixed headroom for the handles, corner hints, and the label
// (the design's 90px horizontal / 60px vertical margins), never below a
// sliver on a tiny stage.
const usableW = Math.max(40, boxW - 90);
const usableH = Math.max(40, boxH - 60);
return Math.max(0.002, Math.min(usableW / width, usableH / height));
// Fit the selection inside its handles. If both corner readouts fit beside
// the rectangle (or already fit above it), the full stage height is usable.
export function fitStage(width, height, boxW, boxH, cornerRoom = 126) {
const pad = 10; // the outer half of an 18px handle plus a pixel of air
const fit = top => Math.min(Math.max(1, boxW - 2 * pad) / width,
Math.max(1, boxH - top - pad) / height);
const full = fit(pad);
const header = 26;
if ((boxW - width * full) / 2 >= cornerRoom || (boxH - height * full) / 2 >= header)
return { scale: full, shift: 0 };
return { scale: fit(header), shift: (header - pad) / 2 };
}
const HANDLE_AXES = {
@@ -406,3 +410,51 @@ export function sizeForMegapixels(width, height, targetMp, step = DEFAULT_SNAP)
}
return best;
}
// A workflow's list keeps the author's order and the exact orientation of each
// pair. A near match, including a reversed pair, is a different model input.
export function parseWorkflowSizes(text) {
const lines = text.trim().split(/\n/).map(line => line.trim()).filter(Boolean);
if (lines.length > 24) throw new Error("Choose up to 24 resolutions.");
const sizes = [];
for (const line of lines) {
const match = /^(\d{1,4})\s*[x×]\s*(\d{1,4})$/i.exec(line);
const pair = match?.slice(1).map(Number);
if (!pair || pair.some(n => n < DIM_MIN || n > DIM_MAX)) {
throw new Error(`Enter a width × height between ${DIM_MIN} and ${DIM_MAX} px on each line.`);
}
if (!sizes.some(([w, h]) => w === pair[0] && h === pair[1])) sizes.push(pair);
}
return sizes;
}
export function workflowRatios(sizes) {
const ratios = new Map();
for (const [width, height] of sizes) {
const { x, y } = reduceRatio(width, height);
const label = `${x}:${y}`;
if (!ratios.has(label)) ratios.set(label, { x, y, label, sizes: [] });
ratios.get(label).sizes.push({ width, height });
}
return [...ratios.values()];
}
export function readWorkflowPolicy(value) {
if (value === "") return { sizes: [], strict: false };
const invalid = () => { throw new Error("Invalid workflow resolutions."); };
if (typeof value !== "string" || value.length > 2048) invalid();
const policy = JSON.parse(value);
if (typeof policy?.strict !== "boolean" || !Array.isArray(policy.sizes)
|| !policy.sizes.length || policy.sizes.length > 24
|| !policy.sizes.every(pair => Array.isArray(pair) && pair.length === 2
&& pair.every(n => Number.isInteger(n) && n >= DIM_MIN && n <= DIM_MAX))) invalid();
return { sizes: policy.sizes, strict: policy.strict };
}
// The panel used to occupy the appended widget's position in older saves.
// Keep any other malformed value intact so strict settings cannot fail open.
export function savedWorkflowPolicy(value, legacy) {
if (value != null && value !== "" && value !== "image") return value;
return Array.isArray(legacy) && legacy.length ? JSON.stringify({ strict: true, sizes: legacy }) : "";
}
+4 -1
View File
@@ -20,6 +20,7 @@ const emptyWidget = (inputs, name) => !linked(inputs?.[name]) && blank(inputs?.[
const picture = (name) => (inputs) => (emptyWidget(inputs, name) ? { input: name, kind: "picture" } : null);
const video = (name) => (inputs) => (emptyWidget(inputs, name) ? { input: name, kind: "video" } : null);
const sound = (name) => (inputs) => (emptyWidget(inputs, name) ? { input: name, kind: "sound file" } : null);
function videoSource(inputs) {
const mode = inputs?.source_mode;
@@ -38,6 +39,7 @@ export const SOURCE_LOADERS = Object.freeze({
AUSBOSS_NODES_ImageCropRotatePad: 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"),
AUSBOSS_NODES_LoadVideo: video("video"),
AUSBOSS_NODES_VideoCropRotatePad: videoSource,
AUSBOSS_NODES_VideoCropRotatePadClip: videoSource,
@@ -110,7 +112,8 @@ export function emptySourceMessage(found) {
if (!first) return "";
const more = found.length - 1;
const tail = more > 0 ? ` (and ${more} more node${more === 1 ? "" : "s"})` : "";
return `Load a ${first.kind === "video" ? "video" : "picture"} first: ${first.title}${tail}`;
const noun = first.kind === "video" || first.kind === "sound file" ? first.kind : "picture";
return `Load a ${noun} first: ${first.title}${tail}`;
}
// "Save Image: exact_name may not ..." names the input it is about, after
+61
View File
@@ -0,0 +1,61 @@
// Seed 🆎's two looks, picked from the gear on its card: the full card
// (the default), or "compact", one short row with the number, a mode chip
// and a new-seed button. The look is kept in the node's properties, so the
// node's inputs, saved values and the prompt it sends are the same in both,
// and the last look picked is what new Seed nodes start with.
//
// Data and decisions only (tests/seed_look.test.mjs); js/seed/index.js
// draws the card.
export const SEED_LOOK_PROPERTY = "ausboss_seed_look";
export const SEED_LOOKS = ["full", "compact"];
export const SEED_LOOK_SCOPE = "seed_look";
export function seedLook(node) {
return node?.properties?.[SEED_LOOK_PROPERTY] === "compact" ? "compact" : "full";
}
// The full card leaves no property behind, so a node set back to it is
// saved exactly as one that was never changed.
export function setSeedLook(node, look) {
if (!node) return "full";
node.properties ??= {};
if (look === "compact") node.properties[SEED_LOOK_PROPERTY] = "compact";
else delete node.properties[SEED_LOOK_PROPERTY];
return seedLook(node);
}
// The gear menu (js/shared/settings_menu.mjs). The pick is also kept as the
// look new Seed nodes start with.
export const SEED_LOOK_MENU = [
{
key: "look",
label: "Look",
type: "choice",
options: SEED_LOOKS,
default: "full",
hint: "How this Seed node looks. New Seed nodes start the same way.",
optionHints: {
full: "the whole card: mode buttons, New seed, Use last run, and the seeds it ran with.",
compact: "one short row: the number, a mode chip you tap to change, and a dice for a new seed.",
},
},
];
// The compact row's chip: tap to go Random -> Fixed -> Step +1 -> Step -1
// -> Random. Values are the frontend's control_after_generate choices.
const CYCLE = ["randomize", "fixed", "increment", "decrement"];
export function nextControl(control) {
const index = CYCLE.indexOf(control);
return CYCLE[(index + 1) % CYCLE.length] ?? "fixed";
}
export function controlChip(control) {
switch (control) {
case "randomize": return { text: "Random", title: "Rolls a new seed after each run. Tap for Fixed." };
case "increment": return { text: "+1", title: "Adds 1 after each run. Tap for -1." };
case "decrement": return { text: "−1", title: "Takes 1 off after each run. Tap for Random." };
default: return { text: "Fixed", title: "Keeps this seed for every run. Tap for +1." };
}
}
+2 -2
View File
@@ -9,8 +9,8 @@
//
// Runs queued from another workflow tab are left to that tab.
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { nodeByExecutionId } from "./graph_ids.mjs";
import { BRAND } from "./index.mjs";
import { outputRecordQuery } from "./input_preview.mjs";
+207
View File
@@ -0,0 +1,207 @@
import { app } from "../../../scripts/app.js";
// Classic paints the node behind the DOM widget. Override only drawing properties
// on this instance so saved colors, titles and the node type remain usable.
const originalDescriptors = new WeakMap();
export function setTileFace(node, root, enabled, onEdit) {
root.classList.toggle("ausboss-tile-face", enabled);
const previous = originalDescriptors.get(node);
if (enabled === Boolean(previous)) return;
if (enabled) {
const properties = {
title_mode: () => globalThis.LiteGraph?.NO_TITLE ?? 1,
renderingBgColor: () => "transparent",
drawBadges: () => skipBadges,
};
const descriptors = new Map();
for (const [key, get] of Object.entries(properties)) {
const own = Object.getOwnPropertyDescriptor(node, key);
descriptors.set(key, own);
Object.defineProperty(node, key, {
configurable: true,
get() {
if (!node.flags?.collapsed) return get();
if (own) return own.get ? own.get.call(node) : own.value;
return Reflect.get(Object.getPrototypeOf(node), key, node);
},
});
}
const listeners = new AbortController();
installTileDrag(node, root, listeners.signal, onEdit);
installTileResize(node, root, listeners.signal);
originalDescriptors.set(node, { descriptors, listeners });
} else {
previous.listeners.abort();
for (const [key, descriptor] of previous.descriptors) {
if (descriptor) Object.defineProperty(node, key, descriptor);
else delete node[key];
}
originalDescriptors.delete(node);
}
node.setDirtyCanvas?.(true, true);
}
function skipBadges() {}
// A normal node moves by its header. Give the tile that gesture while
// keeping a short click on a link or the info button as its usual action.
function installTileDrag(node, root, signal, onEdit) {
let press;
let lastClick;
let suppressClick = false;
const capture = { capture: true, signal };
root.addEventListener("pointerdown", (event) => {
suppressClick = false;
if (!event.isPrimary || event.button !== 0 || node.pinned || app.canvas?.read_only) return;
if (event.target.closest(".ausboss-callout-editor,.ausboss-callout-tools,.ausboss-note-edit,.ausboss-tile-resize")) return;
if (onEdit && !event.target.closest("a,button") && lastClick
&& event.timeStamp - lastClick.time < 500
&& Math.hypot(event.clientX - lastClick.x, event.clientY - lastClick.y) < 8) {
lastClick = null;
event.preventDefault();
event.stopPropagation();
onEdit();
return;
}
press = { id: event.pointerId, x: event.clientX, y: event.clientY, moving: false };
const target = event.target.closest("a,button") || root;
target.setPointerCapture(event.pointerId);
event.stopPropagation();
}, capture);
root.addEventListener("pointermove", (event) => {
if (event.pointerId !== press?.id) return;
const dx = event.clientX - press.x;
const dy = event.clientY - press.y;
if (!press.moving) {
if (Math.hypot(dx, dy) < 5) return;
press.moving = true;
node.graph?.beforeChange?.();
if (!node.selected) app.canvas?.selectNode?.(node, event.shiftKey);
const selected = Array.from(app.canvas?.selectedItems ?? []);
press.starts = (selected.includes(node) ? selected : [node])
.filter(item => item.pos && !item.pinned)
.map(item => ({ item, x: item.pos[0], y: item.pos[1] }));
}
const zoom = app.canvas?.ds?.scale || 1;
for (const start of press.starts) start.item.pos = [start.x + dx / zoom, start.y + dy / zoom];
node.setDirtyCanvas?.(true, true);
event.stopPropagation();
}, capture);
const finish = (event) => {
if (event.pointerId !== press?.id) return;
if (press.moving) {
node.graph?.afterChange?.();
suppressClick = true;
lastClick = null;
} else {
lastClick = { time: event.timeStamp, x: event.clientX, y: event.clientY };
}
press = null;
};
root.addEventListener("pointerup", finish, capture);
root.addEventListener("lostpointercapture", finish, capture);
root.addEventListener("click", (event) => {
if (suppressClick) {
event.preventDefault();
event.stopImmediatePropagation();
suppressClick = false;
} else if (!event.target.closest("a,button,.ausboss-callout-editor")) {
app.canvas?.selectNode?.(node, event.shiftKey);
}
}, capture);
root.addEventListener("dragstart", (event) => {
if (press) event.preventDefault();
}, { signal });
root.addEventListener("contextmenu", (event) => {
if (event.target.closest("textarea,input")) return;
event.preventDefault();
event.stopPropagation();
app.canvas?.processContextMenu?.(node, event);
}, { signal });
}
// Put the resize target on the visible corner. The native node corner lies
// outside a frameless tile and is almost impossible to find without a frame.
function installTileResize(node, root, signal) {
const face = root.querySelector(".ausboss-callout-card,.ausboss-note-card") || root;
const grip = document.createElement("button");
grip.type = "button";
grip.className = "ausboss-tile-resize";
grip.setAttribute("aria-label", "Resize tile");
grip.title = "Drag to resize. Arrow keys resize; Shift makes smaller changes.";
face.append(grip);
let drag;
const minimum = () => {
// Use the same floor as the native corner, including widget margins.
// Older saved tiles can be smaller: touching their grip must not jump.
const floor = node.computeSize?.() ?? [200, 72];
return floor.map((value, axis) => Math.min(value, node.size[axis]));
};
const resize = (width, height, floor) => {
node.setSize?.([Math.max(floor[0], width), Math.max(floor[1], height)]);
node.setDirtyCanvas?.(true, true);
};
grip.addEventListener("pointerdown", event => {
event.stopPropagation();
if (event.button !== 0 || node.pinned || app.canvas?.read_only) return;
event.preventDefault();
node.graph?.beforeChange?.();
app.canvas?.selectNode?.(node);
drag = { id: event.pointerId, x: event.clientX, y: event.clientY,
size: [...node.size], floor: minimum(), zoom: app.canvas?.ds?.scale || 1 };
grip.setPointerCapture(event.pointerId);
});
grip.addEventListener("pointermove", event => {
if (event.pointerId !== drag?.id) return;
event.stopPropagation();
resize(drag.size[0] + (event.clientX - drag.x) / drag.zoom,
drag.size[1] + (event.clientY - drag.y) / drag.zoom, drag.floor);
});
const finish = event => {
if (event.pointerId !== drag?.id) return;
drag = null;
node.graph?.afterChange?.();
};
grip.addEventListener("pointerup", finish);
grip.addEventListener("pointercancel", finish);
grip.addEventListener("lostpointercapture", finish);
grip.addEventListener("click", event => { event.preventDefault(); event.stopPropagation(); });
grip.addEventListener("keydown", event => {
if (!event.key.startsWith("Arrow")) return;
event.preventDefault();
event.stopPropagation();
if (node.pinned || app.canvas?.read_only) return;
const step = event.shiftKey ? 1 : 10;
node.graph?.beforeChange?.();
resize(node.size[0] + (event.key === "ArrowRight" ? step : event.key === "ArrowLeft" ? -step : 0),
node.size[1] + (event.key === "ArrowDown" ? step : event.key === "ArrowUp" ? -step : 0), minimum());
node.graph?.afterChange?.();
});
signal.addEventListener("abort", () => { if (drag) node.graph?.afterChange?.(); grip.remove(); }, { once: true });
}
// Nodes 2.0 always adds a title's height to --node-height, even when a tile
// hides the title. Remove that unused reservation: otherwise an 88px saved
// tile gains a 30px tail and overlaps the next tile. Vue also positions the
// host at saved y minus the title height. Restore that headerless origin
// with an independent translation so faces cannot cover group headings.
// Keep the saved size and
// the native selection/resize targets, rather than changing the graph.
// Its in-body pack badges also consume 20px that Classic paints outside the
// panel. Decorative tiles and callouts use that room for their own face.
// The node-body test id and direct mt-auto badge wrapper are from the pinned
// frontend's LGraphNode.vue/NodeBadges.vue; no other node body is affected.
export const TILE_FACE_CSS = `
.ausboss-tile-face :is(.ausboss-callout-card,.ausboss-note-head){pointer-events:auto;touch-action:none;cursor:grab;}
.ausboss-tile-face{user-select:none;}
.ausboss-tile-resize{position:absolute;right:1px;bottom:1px;z-index:4;width:22px;height:22px;padding:0;border:0;border-radius:3px;background:transparent;color:#9fb9b6;opacity:.65;cursor:nwse-resize;touch-action:none;pointer-events:auto;}
.ausboss-tile-resize::after{content:"";position:absolute;right:4px;bottom:4px;width:9px;height:9px;background:repeating-linear-gradient(135deg,transparent 0 3px,currentColor 3px 4px,transparent 4px 6px);clip-path:polygon(100% 0,100% 100%,0 100%);}
.ausboss-tile-resize:hover,.ausboss-tile-resize:focus-visible{opacity:1;background:#00b4aa33;outline:1px solid #00b4aa;outline-offset:-1px;}
.lg-node:has(.ausboss-tile-face){filter:none;}
.lg-node:has(.ausboss-tile-face):not([data-collapsed]){min-height:calc(var(--node-height) - ${globalThis.LiteGraph?.NODE_TITLE_HEIGHT ?? 30}px);translate:0 ${globalThis.LiteGraph?.NODE_TITLE_HEIGHT ?? 30}px;}
.lg-node:has(.ausboss-tile-face,.ausboss-callout) [data-testid^="node-body-"]>.mt-auto{display:none;}
.lg-node:has(.ausboss-tile-face) [data-testid="node-inner-wrapper"],
.lg-node:has(.ausboss-tile-face) .bg-component-node-background{background:transparent!important;box-shadow:none;}
.lg-node:has(.ausboss-tile-face) .lg-node-header{display:none;}
`;
+21 -5
View File
@@ -128,8 +128,9 @@ export function fixedFrameWindow(info, first, frames, outputFps) {
const tooLong = seconds > duration + 1e-7;
const span = Math.max(1, Math.ceil(seconds * info.fps - 1e-7));
const latest = Math.max(0, Math.floor((duration - seconds) * info.fps + 1e-7));
const head = clamp(Math.round(finite(first)), 0, Math.min(latest, Math.max(0, info.count - span)));
return { first: head, last: Math.min(info.count - 1, head + span - 1), frames: count, seconds, tooLong };
const latestStart = Math.min(latest, Math.max(0, info.count - span));
const head = clamp(Math.round(finite(first)), 0, latestStart);
return { first: head, last: Math.min(info.count - 1, head + span - 1), frames: count, seconds, tooLong, latestStart };
}
// What a run keeps out of the window after thinning, the cap and the snap
@@ -243,13 +244,28 @@ export function clipLengthPlan(info, values = {}) {
const exact = (frames) => {
const fixed = fixedFrameWindow(info, window.first, frames, values.outputFps === undefined ? info.fps / nth : values.outputFps);
if (!fixed || fixed.unresolved) return { ...base, requested: frames };
return { ...base, first: fixed.first, last: fixed.last, windowLast: fixed.last, frames: fixed.frames, requested: frames, tooLong: fixed.tooLong };
return { ...base, first: fixed.first, last: fixed.last, windowLast: fixed.last, frames: fixed.frames, requested: frames, latestStart: fixed.latestStart, tooLong: fixed.tooLong };
};
const capped = (cap) => {
const requested = cap > 0 ? snapFrameCount(cap, snap) : null;
if (values.resampled) return { ...base, last: cap > 0 ? null : window.last, requested };
// Limit edits to IN, never the stored start. A shared workflow may
// intentionally open with a shorter tail. The whole locked count must
// fit before the source end or an earlier saved/wired OUT.
const endFrame = frameWindow(info, 0, values.end).last;
let latestStart = null;
if (requested != null) {
if (!values.resampled) {
latestStart = Math.max(0, endFrame - lastFrameFor(0, requested, nth));
} else if (values.outputFps > 0) {
const duration = info.duration || info.count / info.fps;
const end = values.end > 0 ? Math.min(values.end, duration) : duration;
const lastTick = (requested - 1) / values.outputFps;
latestStart = clamp(Math.floor((end - lastTick - TRIM_EPSILON) * info.fps), 0, endFrame);
}
}
if (values.resampled) return { ...base, last: cap > 0 ? null : window.last, requested, latestStart };
const kept = keptFrames(window, nth, cap, snap);
return { ...base, last: kept.lastKept, frames: kept.frames, requested, truncated: requested != null && kept.frames < requested };
return { ...base, last: kept.lastKept, frames: kept.frames, requested, latestStart, truncated: requested != null && kept.frames < requested };
};
const stored = Math.max(0, Math.trunc(finite(values.maxFrames)));
if (mode === "fixed") return exact(Math.trunc(finite(values.fixedFrames)));
+5 -3
View File
@@ -11,7 +11,8 @@
// Undo is instant. And the edge settings are worked out here on a small copy
// of the picture, so Grow and Soften answer while they are dragged.
import { api } from "/scripts/api.js";
import { ensurePanelControls } from "./panel_controls.mjs";
import { api } from "../../../scripts/api.js";
import {
brushAdjusts,
brushCore,
@@ -2938,8 +2939,9 @@ export function mountTouchStage(node, host) {
};
face.sizeField = field("Size", face.size, SIZE_HELP);
face.softField = field("Soft", face.softBox, SOFT_HELP);
face.undo = button("ausboss-touch-btn", "Undo", "Take back the last pick, or a Clear.", () => undo(face), signal);
face.clear = button("ausboss-touch-btn", "Clear", "Pick nothing. Undo brings it back.", () => {
ensurePanelControls();
face.undo = button("ausboss-compact-action", "Undo", "Take back the last pick, or a Clear.", () => undo(face), signal);
face.clear = button("ausboss-compact-action", "Clear", "Pick nothing. Undo brings it back.", () => {
dropPending(face);
face.active = 0;
face.fresh = 0;
File diff suppressed because it is too large Load Diff
+15 -1
View File
@@ -485,7 +485,7 @@ export function sizeChainTokens(chain) {
if (chain.resized) tokens.push({ label: "resize", text: size(chain.resized) });
const warnings = [];
if (Math.abs(chain.stretch) > STRETCH_WARNING) {
warnings.push(`${(Math.abs(chain.stretch) * 100).toFixed(1)}% ${chain.stretch > 0 ? "wider" : "taller"}: each side rounds to ${chain.steps ?? 1} px`);
warnings.push(`Resize makes the picture ${(Math.abs(chain.stretch) * 100).toFixed(1)}% ${chain.stretch > 0 ? "wider" : "taller"}`);
}
// Ahead of a resize, what Divisible by adds is only fill for the model to
// paint, and what it trims is picture lost: the Step already rounds the
@@ -762,6 +762,20 @@ export function centredPadding(values, crop, axis) {
return Math.abs(then.near - then.far) < Math.abs(now.near - now.far) ? moved : null;
}
// Center the crop within the rotated source and balance its output padding
// on the same axis. Keep the resolved extent even for an open-ended crop.
export function centredTransform(values, source, axis) {
const crop = resolveCrop(values, source);
const pads = centredPadding(values, crop, axis);
const extent = axis === "x" ? "width" : "height";
const spare = source[extent] - crop[extent];
if (Math.abs(spare - 2 * crop[axis]) <= 1) return pads;
const moved = { ...pads, [`crop_${axis}`]: Math.floor(spare / 2) };
const next = resolveCrop({ ...values, ...moved }, source);
if (next[extent] !== crop[extent]) moved[`crop_${extent}`] = crop[extent];
return moved;
}
// The bands on either side of the picture along an axis as the output has
// them (Divisible by's fill included), for the centre buttons to say
// where the picture sits.
+26 -4
View File
@@ -55,6 +55,14 @@ function installCss() {
style.id = CSS_ID;
style.textContent = `
.ausboss-transform-trim{flex:none;display:flex;flex-direction:column;gap:8px;min-width:0;padding:9px 10px 8px;border:1px solid #164b49;border-radius:8px;background:#0e1718;color:#cadddb;font:11px system-ui;box-sizing:border-box;overflow:hidden}
.ausboss-transform-trim-transport{display:flex;align-items:center;gap:6px;min-width:0}
.ausboss-transform-trim-transport .ausboss-transform-trim-rail{flex:1;min-width:0}
.ausboss-transform-trim-play{display:grid;place-items:center;flex:none;width:28px;height:24px;padding:0;border:1px solid #325151;border-radius:4px;background:#101819;color:#a6c3c0;cursor:pointer}
.ausboss-transform-trim-play::before{content:"";width:10px;height:12px;background:currentColor;clip-path:polygon(8% 0,100% 50%,8% 100%)}
.ausboss-transform-trim-play.is-playing::before{box-sizing:border-box;clip-path:none;background:transparent;border-inline:3px solid currentColor}
.ausboss-transform-trim-play:focus-visible{outline:1px solid #00b4aa;outline-offset:1px}
.ausboss-transform-trim-play:hover,.ausboss-transform-trim-play.is-playing{border-color:#00b4aa;color:#e5fffc}
.ausboss-transform-trim-play:disabled{opacity:.45;cursor:default}
.ausboss-transform-trim-rail{position:relative;height:28px;margin:0 6px;touch-action:none;cursor:pointer;user-select:none}
.ausboss-transform-trim-rail.is-disabled{opacity:.45;cursor:default}
.ausboss-transform-trim-rail:before{content:"";position:absolute;left:0;right:0;top:11px;height:6px;border-radius:4px;background:#293637}
@@ -118,7 +126,7 @@ const pct = (fraction) => `${(fraction * 100).toFixed(3)}%`;
// (the clip node) or playhead only
// onSeek(frame, settled) the playhead moved; settled on release
// onCommit() a stored value settled (undo point)
export function mountTransformTrim({ get, set, has = () => true, driven = () => false, number = (name, fallback) => get(name, fallback), outputRate, metadata, trim = true, onSeek, onCommit }) {
export function mountTransformTrim({ get, set, has = () => true, driven = () => false, number = (name, fallback) => get(name, fallback), outputRate, metadata, trim = true, isPlaying, onTogglePlayback, onSeek, onCommit }) {
installCss();
const root = el("div", "ausboss-transform-trim");
const rail = el("div", "ausboss-transform-trim-rail");
@@ -132,6 +140,11 @@ export function mountTransformTrim({ get, set, has = () => true, driven = () =>
if (trim) rail.append(span, kept, grip);
rail.append(playhead);
const transport = el("div", "ausboss-transform-trim-transport");
const play = el("button", "ausboss-transform-trim-play");
play.type = "button";
play.addEventListener("click", onTogglePlayback);
transport.append(play, rail);
const info = () => clipInfo(metadata());
const everyNth = () => Math.max(1, Math.trunc(Number(number("every_nth", get("every_nth", 1))) || 1));
const snapRule = () => String(get("frame_snap", "free"));
@@ -225,6 +238,8 @@ export function mountTransformTrim({ get, set, has = () => true, driven = () =>
// A Length drags the whole window, stopping where OUT meets the end.
parked = Math.max(0, Math.min(clampFrame(frame, clip), latestFirstFor(clip, current.requested ?? get("max_frames", 1), nth)));
set("end_seconds", 0);
} else if (current.mode === "wired" && current.latestStart != null && !countAtRunTime()) {
parked = Math.min(clampFrame(frame, clip), current.latestStart);
} else {
parked = setTrimFrame({ first: current.first, last: current.windowLast }, "start", frame, clip).first;
}
@@ -294,6 +309,11 @@ export function mountTransformTrim({ get, set, has = () => true, driven = () =>
const sync = () => {
const clip = info();
const playing = isPlaying();
play.setAttribute("aria-label", playing ? "Pause" : "Play");
play.title = playing ? "Pause on this frame" : trim ? "Play the selected clip" : "Play the video to pick a frame";
play.classList.toggle("is-playing", playing);
play.disabled = !clip.count;
const head = playheadFrame();
rail.classList.toggle("is-disabled", !clip.count);
playhead.style.left = pct(fractionOfFrame(head, clip, "center"));
@@ -343,7 +363,9 @@ export function mountTransformTrim({ get, set, has = () => true, driven = () =>
: "Drag IN to move the clip; OUT follows at the Length. Shift + arrow moves one frame."
: current.mode === "free" ? "Drag OUT to trim; it lands on the last frame the run keeps." : "Drag OUT to change the Length; IN stays.";
handle.setAttribute("aria-valuemin", "0");
handle.setAttribute("aria-valuemax", String(Math.max(0, clip.count - 1)));
const maxFrame = edge === "start" && current.mode === "wired" && !unknown
? current.latestStart ?? current.windowLast : Math.max(0, clip.count - 1);
handle.setAttribute("aria-valuemax", String(maxFrame));
handle.setAttribute("aria-valuenow", String(frame));
handle.setAttribute("aria-valuetext", `frame ${frame}, ${formatTimecode(frameTime(frame, clip))}`);
}
@@ -536,7 +558,7 @@ export function mountTransformTrim({ get, set, has = () => true, driven = () =>
label.append(controls.frame.root);
timeRow.append(label, readout);
}
root.append(rail, timeRow);
root.append(transport, timeRow);
// Length: off, OUT ends the clip; on, a frame count from IN (max_frames,
// end left open), so OUT follows IN and the count survives a new source.
@@ -581,7 +603,7 @@ export function mountTransformTrim({ get, set, has = () => true, driven = () =>
count.root.style.display = active ? "" : "none";
const step = snapStep(snapRule());
count.setStep(step, step);
count.set(blocked ? (current.frames ?? current.requested ?? 0) : (current.requested ?? get("max_frames", 1)));
count.set(blocked ? (current.requested ?? current.frames ?? 0) : (current.requested ?? get("max_frames", 1)));
disableControl(count, blocked, lockTip("end"));
const fills = lengthFillsClip(info(), current, everyNth());
hint.textContent = blocked ? `from ${wired}` : current.mode === "fixed" ? "exact (older setting)" : fills ? "= the whole clip. Shorten it to move IN" : active ? "" : "OUT ends the clip";
+1 -2
View File
@@ -45,8 +45,7 @@ export function videoSourceState(mode, video, localPath) {
};
}
// Images use the same picker card, but their backend accepts input-folder
// references only. Do not advertise a Local path mode it cannot execute.
// Images store the folder annotation in their image widget. Only video uses local_path.
export function mediaSourceState(kind, mode, selection, localPath) {
if (kind !== "image") return videoSourceState(mode, selection, localPath);
const image = String(selection ?? "");
+18 -1
View File
@@ -226,6 +226,8 @@ function isFloatWidget(widget) {
// of the card
// { group: "advanced", label: "More" } - a disclosure; later rows with
// group: "advanced" sit under it
// A numeric row may have readOnlyText(node, values): nonempty text replaces
// its control without changing its widget, socket, value or row height.
// Rows may also carry `mute: (values) => boolean` and `muteTitle`: a muted
// row stays in place but dims and stops taking input, with the title as its
// hover hint (a setting the current mode does not use).
@@ -291,13 +293,28 @@ export function mountWidgetCard(node, { rows, minWidth = 300, first = false, hid
onSettle: () => notifyAusbossChange(),
});
into.append(control.root);
if (typeof row.limits !== "function") return (vals) => control.set(Number(vals[name]) || 0);
// Display an unused setting honestly while keeping its saved value and socket.
const readOnly = row.readOnlyText ? el("span", "ausboss-card-readonly") : null;
if (readOnly) {
readOnly.title = row.readOnlyTitle ?? "";
readOnly.setAttribute("role", "status");
into.append(readOnly);
}
const syncReadOnly = (vals) => {
if (!readOnly) return;
const text = row.readOnlyText(node, vals) || "";
readOnly.textContent = text;
readOnly.style.display = text ? "" : "none";
control.root.style.display = text ? "none" : "";
};
if (typeof row.limits !== "function") return (vals) => { syncReadOnly(vals); control.set(Number(vals[name]) || 0); };
// Limits that come from somewhere else are read at every refresh: a wire
// made or cut changes them. The stored value follows the range, the way
// ComfyUI's own Primitive node follows the input it is wired to.
let shown = null;
const hint = el("span", "ausboss-card-range");
return (vals) => {
syncReadOnly(vals);
const outside = row.limits(node) ?? null;
const range = narrowedRange(widget?.options, outside);
const key = outside ? `${range.min}|${range.max}|${outside.step}` : "";
+42 -4
View File
@@ -7,7 +7,7 @@
// text, so every URL is filtered to http(s) and every string is coerced.
export const NOTE_VERSION = 1;
export const LAYOUTS = ["card", "banner"];
export const LAYOUTS = ["card", "banner", "tile"];
// The one non-model folder a row may name: sample inputs live in
// ComfyUI/input, and a shared workflow often ships one.
export const INPUT_FOLDER = "input";
@@ -166,6 +166,14 @@ export function noteIsEmpty(note) {
);
}
// A note shows its tile face when it is in tile layout and has anything to
// show. The node is then just a button: the note itself opens in a dialog,
// so there is no card inside the node whose height needs fitting.
export function noteShowsTileFace(note) {
if (!note || typeof note !== "object") return false;
return note.layout === "tile" && !noteIsEmpty(note);
}
// "ComfyUI/models/loras" - the folder hint under each group of rows.
export function folderPath(dir) {
if (!dir) return "ComfyUI/models";
@@ -244,7 +252,7 @@ export function noteFit({ natural, nodeHeight, chrome }) {
// renderer builds DOM nodes from it, so no user text ever meets innerHTML.
// ---------------------------------------------------------------------------
const INLINE_PATTERN = /(\*\*[^*\n]+?\*\*|`[^`\n]+?`|\[[^\]\n]+?\]\([^)\s]+?\)|(?<![\w*])\*[^*\n]+?\*(?![\w*]))/;
const INLINE_PATTERN = /(?:\[(teal|green|amber|glow)\]([^\n]+?)\[\/\1\]|\*\*[^*\n]+?\*\*|`[^`\n]+?`|\[[^\]\n]+?\]\([^)\s]+?\)|(?<![\w*])\*[^*\n]+?\*(?![\w*]))/;
export function parseInline(text) {
const spans = [];
@@ -257,7 +265,8 @@ export function parseInline(text) {
}
if (match.index > 0) spans.push({ type: "text", text: rest.slice(0, match.index) });
const token = match[0];
if (token.startsWith("**")) spans.push({ type: "strong", text: token.slice(2, -2) });
if (match[1]) spans.push({ type: "tone", tone: match[1], text: match[2] });
else if (token.startsWith("**")) spans.push({ type: "strong", text: token.slice(2, -2) });
else if (token.startsWith("`")) spans.push({ type: "code", text: token.slice(1, -1) });
else if (token.startsWith("[")) {
const close = token.indexOf("](");
@@ -270,6 +279,15 @@ export function parseInline(text) {
return spans;
}
// Split unescaped pipes. Optional outer pipes just frame the row.
function tableCells(line) {
let row = line.trim();
if (!row.includes("|")) return [];
if (row.startsWith("|")) row = row.slice(1);
if (row.endsWith("|") && !row.endsWith("\\|")) row = row.slice(0, -1);
return row.split(/(?<!\\)\|/).map(cell => cell.trim().replace(/\\\|/g, "|"));
}
export function parseMarkdown(text) {
const lines = str(text, TEXT_LIMIT).replace(/\r\n?/g, "\n").split("\n");
const blocks = [];
@@ -292,7 +310,8 @@ export function parseMarkdown(text) {
list = null;
};
for (const rawLine of lines) {
for (let index = 0; index < lines.length; index++) {
const rawLine = lines[index];
const line = rawLine.trimEnd();
if (code) {
if (/^```/.test(line)) {
@@ -312,6 +331,25 @@ export function parseMarkdown(text) {
flushList();
continue;
}
if (line.includes("|") && lines[index + 1]?.includes("|")) {
const divider = tableCells(lines[index + 1]);
const headers = tableCells(line);
if (headers.length && headers.length === divider.length && divider.every(cell => /^:?-{3,}:?$/.test(cell))) {
flushParagraph();
flushList();
const align = divider.map(cell => cell.endsWith(":") ? (cell.startsWith(":") ? "center" : "right") : "left");
const rows = [];
index++;
while (lines[index + 1]?.includes("|")) {
const cells = tableCells(lines[index + 1]);
if (cells.length !== headers.length) break;
rows.push(cells.map(parseInline));
index++;
}
blocks.push({ type: "table", headers: headers.map(parseInline), align, rows });
continue;
}
}
const heading = /^(#{1,3})\s+(.*)$/.exec(line);
if (heading) {
flushParagraph();
+3 -7
View File
@@ -809,13 +809,9 @@ export function listedRows(switchRows, groupRows, settings) {
// ---------- switching ----------
// What a click on a row's pill asks for. The pill is one switch: a click
// anywhere on it flips it, on the "off" half as much as on the "on" half.
// Only while the row reads mixed (neither half lit) does the half that was
// clicked decide: `side` is true for the on half.
export function flipTo(state, side) {
if (state === "on") return false;
if (state === "off") return true;
// Each half selects its named state, even when that state is already set.
// Keep the first argument for callers using the existing helper signature.
export function flipTo(_state, side) {
return Boolean(side);
}
+1 -1
View File
@@ -10,7 +10,7 @@
// pointer so it can be selected and copied, which is half the point of a
// Show Text node.
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import { isForeignRun } from "../shared/prompt_scope.mjs";
import { BRAND, chainCallback, keepDomWidgetWidthAuto } from "../shared/index.mjs";
import { copyToClipboard } from "../shared/clipboard.mjs";
+1 -1
View File
@@ -1,4 +1,4 @@
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import { BRAND, chainCallback } from "../shared/index.mjs";
import {
SNAP_SCREEN_PX,
+1 -1
View File
@@ -6,7 +6,7 @@
// The pictures and the run come from shared/step_preview.mjs; the server
// side asks for them (nodes/_step_preview_helpers.py).
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import { BRAND, chainCallback, keepDomWidgetWidthAuto } from "../shared/index.mjs";
import { WIDGET_FRAME, fillNodeHeight } from "../shared/panel_layout.mjs";
import { ensureStepCss, mountStepOverlay, queuedRuns, stopAllRuns, stopStepRun, watchSteps } from "../shared/step_preview.mjs";
+2 -2
View File
@@ -11,8 +11,8 @@
// before falling back to the canvas path, which is what keeps the two
// gestures apart.
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { notifyAusbossChange, showToast } from "../shared/index.mjs";
import {
isVideoFileName,
+22 -9
View File
@@ -4,12 +4,14 @@
// mirrors them, so the backend, saved workflows and widget-to-input links
// are untouched. Rows with `when` appear only while they mean something,
// and a `group` row folds the rarely-touched settings behind one click.
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { PANEL_LABELS } from "../shared/panel_controls.mjs";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { chainCallback, notifyAusbossChange } from "../shared/index.mjs";
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 { momentStrip } from "../shared/moment_strip.mjs";
import { mountWidgetCard } from "../shared/widget_card.mjs";
import { SOCKETLESS_CHOICE, SOCKETLESS_TEXT, commitWidgetValue, markSocketless, resetUnknownValues } from "../shared/widget_card_math.mjs";
@@ -210,7 +212,7 @@ const CARDS = {
AUSBOSS_NODES_ImageFolder: {
minWidth: 320, first: true, hide: ["pictures"], socketless: ["pictures"],
rows: [
{ widget: "source", label: "From", kind: "segment" },
{ widget: "source", label: "From", kind: "segment", labels: PANEL_LABELS.sources },
{ widget: "folder", label: "Folder", placeholder: "the folder itself",
button: { text: "Browse", title: "Choose a folder inside ComfyUI's input or output folder.",
onClick: (node, state) => node.__ausbossImageFolder?.browse(state?.root?.querySelector(".ausboss-card-btn")) } },
@@ -333,25 +335,26 @@ const CARDS = {
minWidth: 420,
hide: ["job_1", "job_2", "job_3", "job_4", "video_job"],
socketless: ["job_1", "job_2", "job_3", "job_4", "video_job"],
resetUnknown: { sound: "", music: "" },
resetUnknown: { sound: "", music: "", clip_sound: false },
rows: [
{ section: "What happens" },
{
widget: "script", kind: "textarea", height: 118, grow: true,
placeholder: "@1 walks through a crowded night market.\n\n@1 stands on a rooftop in the rain.\n\nOne line for each thing that happens. A blank line cuts to a new place. @1 is Picture 1.",
placeholder: "Type what happens, one line for each thing. Picture 1 is @1. A blank line cuts to a new place.\n\nSwap: leave empty, or name who goes. Optional new look on its own line: @1 looks like a woman with blonde hair and a black hoodie.",
},
{ panel: momentStrip, height: 76 },
{ widget: "sound", label: "Sound", placeholder: "rain on a window" },
{ widget: "music", label: "Music", placeholder: "slow piano: music makes it louder" },
{ section: "Pictures and settings" },
{ panel: castChips, height: 30 },
{ widget: "seconds", label: "Length", suffix: "s" },
{ widget: "seconds", label: "Length", suffix: "s", readOnlyText: (node, values) => clipSetsDuration(node, values) ? "From the clip" : "", readOnlyTitle: "This video job uses the incoming clip, so Length is not used." },
{ widget: "camera", label: "Camera", kind: "select" },
{ widget: "look", label: "Look", kind: "select" },
{ group: "more", label: "More" },
{ widget: "song_start", label: "Song starts at", suffix: "s", decimals: 1, trimZeros: true, group: "more" },
{ widget: "cut_on_beat", label: "Moments on the beat", group: "more" },
{ widget: "language", label: "Language", group: "more" },
{ widget: "clip_sound", label: "Clip's own sound", group: "more" },
],
},
// Saved by a 1.x release, these two hold that empty value too and open
@@ -377,18 +380,28 @@ const CARDS = {
minWidth: 320, first: true, hide: ["upload"],
rows: [
{ widget: "video", label: "Source", kind: "select", preview: { kind: "video", url: viewUrl },
button: { text: "Upload", title: "Upload a video into ComfyUI's input folder", onClick: (node) => node.widgets?.find((w) => w.name === "upload")?.callback?.() } },
button: { text: PANEL_LABELS.load, title: "Upload a video into ComfyUI's input folder", onClick: (node) => node.widgets?.find((w) => w.name === "upload")?.callback?.() } },
{ widget: "custom_width", label: "Width", suffix: "px", title: "0 keeps the source width; set one side only to keep the aspect." },
{ widget: "custom_height", label: "Height", suffix: "px", title: "0 keeps the source height; set one side only to keep the aspect." },
{ widget: "every_nth", label: "Every nth" },
{ widget: "max_frames", label: "Limit" },
],
},
AUSBOSS_NODES_LoadAudio: {
// The wave, IN and OUT live in the panel under the card (js/load_audio).
minWidth: 280, first: true, hide: ["upload"],
rows: [
{ widget: "audio", label: "Source", kind: "select",
button: { text: PANEL_LABELS.load, title: "Upload a sound file into ComfyUI's input folder", onClick: (node) => node.widgets?.find((w) => w.name === "upload")?.callback?.() } },
{ widget: "max_seconds", label: "Max length", suffix: "s", decimals: 1, trimZeros: true,
title: "The longest the sound may be. Anything past it is cut off and shows in red. 0 means no limit." },
],
},
AUSBOSS_NODES_LoadImagePad: {
minWidth: 340, first: true, hide: ["upload"],
rows: [
{ widget: "image", label: "Source", kind: "select", preview: { kind: "image", url: viewUrl }, linkedBy: ["source_image"],
button: { text: "Upload", title: "Upload an image into ComfyUI's input folder", onClick: (node) => node.widgets?.find((w) => w.name === "upload")?.callback?.() } },
button: { text: PANEL_LABELS.load, title: "Upload an image into ComfyUI's input folder", onClick: (node) => node.widgets?.find((w) => w.name === "upload")?.callback?.() } },
{ widget: "mode", label: "Fill", kind: "select" },
{ widget: "fill_color", label: "Color", kind: "color", when: isMode("mode", "color") },
{ widget: "backdrop_blur", label: "Backdrop", when: isMode("mode", "pillarbox blur") },
@@ -413,7 +426,7 @@ const CARDS = {
{ pair: ["fps", "crf"], label: "FPS · CRF", sep: "·", top: true, when: formatReads("crf") },
{ widget: "fps", label: "FPS", top: true, when: (values) => !formatReads("crf")(values) },
{ widget: "pingpong", label: "Ping-pong", onText: "forward, back", offText: "off" },
{ widget: "save_metadata", label: "Metadata", when: formatReads("save_metadata"), title: "On embeds the workflow in the video file, so dropping the file back on the canvas restores the graph that made it." },
{ widget: "save_metadata", label: PANEL_LABELS.embed, onText: PANEL_LABELS.on, offText: PANEL_LABELS.off, when: formatReads("save_metadata"), title: "On embeds the workflow in the video file, so dropping the file back on the canvas restores the graph that made it." },
],
},
};
+1 -1
View File
@@ -10,7 +10,7 @@
// The LoRA loader is deliberately absent: its single JSON widget already
// survives reordering.
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import { chainCallback } from "../shared/index.mjs";
import {
captureWidgetDefaults,
+193 -10
View File
@@ -10,8 +10,11 @@
// through innerHTML - every string becomes a text node - and only http(s)
// URLs become buttons or links (the parser already filtered them).
import { api } from "/scripts/api.js";
import { app } from "/scripts/app.js";
import { api } from "../../../scripts/api.js";
import { app } from "../../../scripts/app.js";
import { setTileFace, TILE_FACE_CSS } from "../shared/tile_face.mjs";
import { NOTE_TYPES, serializeNoteIdentity } from "../shared/note_identity.mjs";
import { compactAction } from "../shared/panel_controls.mjs";
import { BRAND, chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange } from "../shared/index.mjs";
import { collectGraphNodes } from "../shared/appearance.mjs";
import { copyToClipboard } from "../shared/clipboard.mjs";
@@ -31,6 +34,7 @@ import {
matchInstalled,
noteFit,
noteIsEmpty,
noteShowsTileFace,
normalizeNote,
packsFromGraph,
parseMarkdown,
@@ -41,7 +45,6 @@ import {
import { comboValues, commitWidgetValue } from "../shared/widget_card_math.mjs";
import { parseRows, serializeRows } from "../shared/lora_stack.mjs";
const NODE_CLASS = "AUSBOSS_NODES_WorkflowNote";
const CSS_ID = "ausboss-workflow-note-css";
const WIDGET_NAME = "ausboss_workflow_note_panel";
const PANEL_MIN_WIDTH = 300;
@@ -107,6 +110,7 @@ function ensureCss() {
const style = document.createElement("style");
style.id = CSS_ID;
style.textContent = `
${TILE_FACE_CSS}
.ausboss-note{box-sizing:border-box;width:100%;height:100%;padding:2px 6px 6px;pointer-events:none;overflow:hidden;--accent:${BRAND};}
.ausboss-note *{box-sizing:border-box;}
.ausboss-note-card{position:relative;display:flex;flex-direction:column;width:100%;height:100%;overflow:hidden;border:1px solid rgba(0,180,170,.27);border-radius:6px;background:rgba(0,0,0,.28);color:#c8dddd;font:12px/1.45 -apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;}
@@ -115,6 +119,43 @@ function ensureCss() {
.ausboss-note-title{margin:0;color:#f2f8f8;font-size:22px;font-weight:700;line-height:1.15;letter-spacing:-.01em;overflow-wrap:anywhere;}
.ausboss-note-subtitle{margin:5px 0 0;color:#a9c4c2;font-size:12.5px;line-height:1.35;overflow-wrap:anywhere;}
.ausboss-note-author{margin:6px 0 0;color:#78908e;font-size:10.5px;letter-spacing:.08em;text-transform:uppercase;}
.ausboss-note.is-tile .ausboss-note-card{background:#080e10;border-color:#344446;border-left:3px solid var(--accent);}
.ausboss-note.is-tile .ausboss-note-scroll{display:flex;padding:0;}
.ausboss-note.is-tile .ausboss-note-head{display:flex;flex:1;min-width:0;padding:0;border:0;}
.ausboss-note-read{position:relative;display:flex;align-items:center;gap:14px;width:100%;padding:8px 60px 8px 17px;border:0;background:transparent;color:#e8ebe7;text-align:left;font:600 18px/1.25 "IBM Plex Sans",system-ui,sans-serif;overflow-wrap:anywhere;cursor:pointer;}
.ausboss-note-read svg{flex:none;width:25px;height:25px;fill:none;stroke:var(--accent);stroke-width:1.8;stroke-linecap:round;stroke-linejoin:round;}
.ausboss-note-read::after{content:"";position:absolute;right:18px;width:7px;height:7px;border:solid #a2b6b6;border-width:2px 2px 0 0;transform:rotate(45deg);}
.ausboss-note-read:hover{background:#10191b;}
.ausboss-note-read:focus-visible{outline:2px solid var(--accent);outline-offset:-3px;}
.ausboss-note.is-tile .ausboss-note-edit{top:50%;right:32px;transform:translateY(-50%);opacity:.65;pointer-events:auto;}
.ausboss-note.is-tile .ausboss-note-head:is(:hover,:focus-within) .ausboss-note-edit{opacity:1;pointer-events:auto;}
.ausboss-note-reader{box-sizing:border-box;width:min(640px,94vw);max-height:86vh;overflow:auto;margin:auto;padding:0 0 24px;border:1px solid #365154;border-radius:12px;background:#161f21;color:#e8ebe7;box-shadow:0 18px 64px #0008;font:15px/1.55 "IBM Plex Sans",system-ui,sans-serif;}
.ausboss-note-reader::backdrop{background:#06090ab8;}
.ausboss-note-reader-head{padding:20px 24px 16px;border-top:3px solid var(--accent);background:#080e10;}
.ausboss-note-reader-head button{float:right;margin:0 0 6px 10px;}
.ausboss-note-reader-head .ausboss-compact-action{height:32px;padding:0 12px;font-size:13px;}
.ausboss-note-reader-head h2{margin:0;font:650 26px/1.2 "IBM Plex Sans",system-ui,sans-serif;color:#ecf4f4;overflow-wrap:anywhere;}
.ausboss-note-reader-head p{margin:6px 0 0;color:#b4c5c5;overflow-wrap:anywhere;}
.ausboss-note-reader .ausboss-note-section{padding:14px 24px 0;}
.ausboss-note-reader .ausboss-note-body h2{font-size:19px;margin:18px 0 6px;}
.ausboss-note-reader .ausboss-note-body h1{font-size:23px;}
.ausboss-note-reader .ausboss-note-body li::marker{color:#6fc0aa;}
.ausboss-note-table-scroll{max-width:100%;overflow-x:auto;margin:10px 0 14px;border:1px solid #344649;border-radius:6px;}
.ausboss-note-table-scroll table{width:100%;border-collapse:collapse;font:inherit;}
.ausboss-note-table-scroll :is(th,td){padding:6px 10px;vertical-align:top;overflow-wrap:anywhere;}
.ausboss-note-table-scroll th{background:#102327;color:#ecf4f4;font:600 .88em/1.45 "IBM Plex Mono",ui-monospace,monospace;}
.ausboss-note-table-scroll td{border-top:1px solid #344649;}
.ausboss-note-table-scroll tbody tr:nth-child(even){background:#ffffff04;}
.ausboss-note-tone-teal{color:#00b4aa;}
.ausboss-note-tone-green{color:#6fc0aa;}
.ausboss-note-tone-amber{color:#f5b53d;}
.ausboss-note-tone-glow{color:#a8fff5;text-shadow:0 0 7px #00b4aa95,0 0 15px #00b4aa45;}
.ausboss-note-mdtools{display:flex;align-items:center;flex-wrap:wrap;gap:4px;}
.ausboss-note-mdtools button{height:24px;padding:0 9px;border:1px solid #344649;border-radius:4px;background:#101819;font:600 12px/1 "IBM Plex Sans",system-ui,sans-serif;cursor:pointer;}
.ausboss-note-mdtools button:hover{border-color:#6a928e;}
.ausboss-note-mdpreview{border:1px solid #344649;border-radius:6px;padding:7px 10px;}
.ausboss-note-mdpreview summary{cursor:pointer;color:#9fcec9;}
.ausboss-note-mdpreview[open] summary{margin-bottom:10px;}
.ausboss-note.is-banner .ausboss-note-head{padding:14px 40px 14px 18px;}
.ausboss-note.is-banner .ausboss-note-title{font-size:28px;}
.ausboss-note-edit{position:absolute;top:8px;right:8px;width:24px;height:24px;border:1px solid transparent;border-radius:5px;background:transparent;color:#78908e;font-size:13px;line-height:1;cursor:pointer;pointer-events:auto;}
@@ -137,6 +178,7 @@ function ensureCss() {
.ausboss-note-body hr{margin:8px 0;border:0;border-top:1px solid rgba(255,255,255,.08);}
.ausboss-note-body code{padding:1px 4px;border-radius:3px;background:rgba(255,255,255,.08);font:11px ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;color:#e6f4f3;}
.ausboss-note-body pre{margin:0 0 7px;padding:7px 9px;overflow-x:auto;border-radius:5px;background:rgba(0,0,0,.35);font:11px/1.4 ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;color:#e6f4f3;white-space:pre;}
.ausboss-note-reader .ausboss-note-body pre,.ausboss-note-reader .ausboss-note-body pre code{white-space:pre-wrap;overflow-wrap:anywhere;}
.ausboss-note-body a,.ausboss-note-link{color:var(--accent);text-decoration:none;pointer-events:auto;}
.ausboss-note-body a:hover,.ausboss-note-link:hover{text-decoration:underline;}
.ausboss-note-folder{margin:8px 0 4px;color:#a9c4c2;font:11px ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;}
@@ -215,6 +257,23 @@ function el(tag, className, text) {
return node;
}
function tileIcon(note) {
// A how-to can include models too. Only use the download icon for a
// download title or a note whose only content is its model list.
const downloads = /^(?:download models?|model downloads?|downloads?|models?)$/i.test(note.title.trim())
|| (note.models.length > 0 && !note.body.trim() && !note.packs.length && !note.links.length);
const ns = "http://www.w3.org/2000/svg";
const icon = document.createElementNS(ns, "svg");
icon.setAttribute("viewBox", "0 0 24 24");
icon.setAttribute("aria-hidden", "true");
const path = document.createElementNS(ns, "path");
path.setAttribute("d", downloads
? "M12 3v12m-5-5 5 5 5-5M3 16v5h18v-5"
: "M2.5 4.5c3.5-1 6.5-.5 9.5 1.5 3-2 6-2.5 9.5-1.5v15c-3.5-1-6.5-.5-9.5 1.5-3-2-6-2.5-9.5-1.5zM12 6v15");
icon.append(path);
return icon;
}
function externalLink(url, className, text) {
const link = el("a", className, text);
link.href = url;
@@ -231,6 +290,7 @@ function spansInto(parent, spans) {
else if (span.type === "strong") parent.append(el("strong", "", span.text));
else if (span.type === "em") parent.append(el("em", "", span.text));
else if (span.type === "code") parent.append(el("code", "", span.text));
else if (span.type === "tone") parent.append(el("span", `ausboss-note-tone-${span.tone}`, span.text));
else if (span.type === "link") parent.append(externalLink(span.url, "", span.text));
else parent.append(document.createTextNode(span.text));
}
@@ -242,6 +302,24 @@ function markdownInto(parent, text) {
const heading = el(`h${block.level}`);
spansInto(heading, block.spans);
parent.append(heading);
} else if (block.type === "table") {
const wrap = el("div", "ausboss-note-table-scroll");
const grid = el("table");
const addRow = (group, cells, header) => {
const row = group.insertRow();
cells.forEach((spans, index) => {
const cell = el(header ? "th" : "td");
if (header) cell.scope = "col";
cell.style.textAlign = block.align[index];
spansInto(cell, spans);
row.append(cell);
});
};
addRow(grid.createTHead(), block.headers, true);
const rows = grid.createTBody();
for (const cells of block.rows) addRow(rows, cells, false);
wrap.append(grid);
parent.append(wrap);
} else if (block.type === "list") {
const list = el(block.ordered ? "ol" : "ul");
for (const item of block.items) {
@@ -424,7 +502,9 @@ function render(state) {
const { note } = state;
const root = state.root;
root.classList.toggle("is-banner", note.layout === "banner");
setBadgesHidden(state.node, note.layout === "banner" && !noteIsEmpty(note));
root.classList.toggle("is-tile", note.layout === "tile" && !noteIsEmpty(note));
setTileFace(state.node, root, root.classList.contains("is-tile"));
setBadgesHidden(state.node, note.layout !== "card" && !noteIsEmpty(note));
root.style.setProperty("--accent", note.accent || BRAND);
const scroll = state.scroll;
scroll.textContent = "";
@@ -448,12 +528,52 @@ function render(state) {
state.domWidget.options.getMinHeight = () => CARD_MIN_HEIGHT + WIDGET_FRAME;
return;
}
if (note.layout === "tile") {
const read = el("button", "ausboss-note-read");
read.append(tileIcon(note), el("span", "", note.title || "Workflow info"));
read.type = "button";
read.setAttribute("aria-haspopup", "dialog");
read.onclick = () => {
const dialog = el("dialog", "ausboss-note-reader");
dialog.setAttribute("aria-label", note.title || "Workflow info");
dialog.style.setProperty("--accent", note.accent || BRAND);
const close = compactAction("Close");
close.onclick = () => dialog.close();
const editNote = compactAction("Edit", "Edit this note");
editNote.onclick = () => {
dialog.close();
openEditor(state);
};
const header = el("header", "ausboss-note-reader-head");
header.append(close, editNote, el("h2", "", note.title || "Workflow info"));
if (note.subtitle) header.append(el("p", "", note.subtitle));
if (note.author) header.append(el("p", "", `by ${note.author}`));
dialog.append(header);
renderSections({ note, rows: [] }, dialog);
document.body.append(dialog);
state.reader = dialog;
dialog.addEventListener("close", () => {
dialog.remove();
state.reader = null;
if (!openDialog) read.focus();
}, {once:true});
dialog.showModal();
};
head.replaceChildren(read, edit);
state.domWidget.options.getMinHeight = () => 42 + WIDGET_FRAME;
return;
}
if (note.layout === "banner") {
state.domWidget.options.getMinHeight = () => BANNER_MIN_HEIGHT + WIDGET_FRAME;
return;
}
state.domWidget.options.getMinHeight = () => CARD_MIN_HEIGHT + WIDGET_FRAME;
renderSections(state, scroll);
}
function renderSections(state, scroll) {
const { note } = state;
if (note.body.trim()) {
const section = el("div", "ausboss-note-section");
const body = el("div", "ausboss-note-body");
@@ -555,7 +675,7 @@ async function checkModels(state, fresh) {
}
}
}));
if (generation === state.checkGeneration) fitNote(state);
if (state.domWidget && generation === state.checkGeneration) fitNote(state);
}
// ---------------------------------------------------------------------------
@@ -590,6 +710,12 @@ function naturalHeight(state, width) {
// empty space until someone drags it shorter.
function fitNote(state) {
if (!classicCanvas()) return;
// A tile face is a button, not a card: fitting it would measure the note
// behind the button and grow a new tile straight back to full height.
if (noteShowsTileFace(state.note)) {
state.fitHeight = undefined;
return;
}
const { node, root, domWidget } = state;
const width = node.size[0] - WIDGET_FRAME;
if (!(width > 0)) return;
@@ -768,7 +894,7 @@ async function openEditor(state) {
let layout = draft.layout;
const seg = el("div", "ausboss-note-seg");
const segButtons = LAYOUTS.map((option) => {
const button = el("button", option === layout ? "on" : "", option === "card" ? "Card" : "Banner");
const button = el("button", option === layout ? "on" : "", ({ card: "Card", banner: "Banner", tile: "Info tile" })[option]);
button.type = "button";
button.addEventListener("click", () => {
layout = option;
@@ -782,7 +908,7 @@ async function openEditor(state) {
field("Title", title),
field("Author", author),
field("Subtitle", subtitle),
field("Layout", seg, "Banner shows only the title, subtitle and author - a label for a column or stage."),
field("Layout", seg, "Banner shows the title. Info tile opens the full note when clicked."),
field("Accent color", accent, "Hex like #00b4aa; empty keeps the pack teal."),
);
form.append(grid);
@@ -790,7 +916,48 @@ async function openEditor(state) {
const bodyBox = el("textarea");
bodyBox.value = draft.body;
bodyBox.placeholder = "## How it works\n\n1. Load your image\n2. Drag the padding edges\n3. Queue\n\nMarkdown: # headings, **bold**, `code`, [links](https://...), - lists";
form.append(field("How-to (Markdown)", bodyBox));
form.append(field("How-to (Markdown)", bodyBox,
"Use pipe tables and [teal]text[/teal], [green], [amber], or [glow] with a matching closing tag."));
const formatTools = el("div", "ausboss-note-mdtools");
formatTools.setAttribute("role", "group");
formatTools.setAttribute("aria-label", "Format selected text or insert a table");
for (const label of ["Teal", "Green", "Amber", "Glow", "Table"]) {
const tone = label.toLowerCase();
const isTable = tone === "table";
const button = el("button", isTable ? "" : `ausboss-note-tone-${tone}`, label);
button.type = "button";
button.title = isTable ? "Insert a Markdown table" : `Apply ${label.toLowerCase()} to the selection`;
button.addEventListener("click", () => {
const { selectionStart: start, selectionEnd: end, value } = bodyBox;
if (isTable) {
const gap = start && !value.slice(0, start).endsWith("\n\n") ? "\n\n" : "";
bodyBox.setRangeText(gap + "| Setting | Value |\n| --- | --- |\n| Name | Value |\n\n", start, start, "end");
} else {
const selection = value.slice(start, end) || "text";
// Each tag styles one line. A selection can span multiple paragraphs.
const styled = selection.split("\n").map(line => line ? `[${tone}]${line}[/${tone}]` : "").join("\n");
bodyBox.setRangeText(styled, start, end, "end");
if (start === end) bodyBox.setSelectionRange(start + tone.length + 2, start + tone.length + 2 + selection.length);
}
bodyBox.focus();
bodyBox.dispatchEvent(new Event("input", { bubbles: true }));
});
formatTools.append(button);
}
form.append(formatTools);
const preview = el("details", "ausboss-note-mdpreview");
const sample = el("div", "ausboss-note-body");
preview.append(el("summary", "", "Preview formatting"), sample);
const updatePreview = () => {
if (!preview.open) return;
sample.style.setProperty("--accent", accent.value || BRAND);
sample.replaceChildren();
markdownInto(sample, bodyBox.value);
};
preview.addEventListener("toggle", updatePreview);
bodyBox.addEventListener("input", updatePreview);
accent.addEventListener("input", updatePreview);
form.append(preview);
const models = table("models", MODEL_COLUMNS.map((column) => column.label), draft.models, (row) =>
MODEL_COLUMNS.map(({ key, placeholder }) => (key === "dir" ? folderSelect(row.dir, folderOptions) : input(row[key], placeholder))));
@@ -891,10 +1058,15 @@ async function openEditor(state) {
return;
}
} else next = readForm();
const enteringTile = next.layout === "tile" && state.note.layout !== "tile";
state.note = next;
state.valueWidget.value = serializeNote(next);
closeEditor();
render(state);
if (enteringTile) {
state.fitHeight = undefined;
state.node.setSize?.([state.node.size[0], 80]);
}
fitNote(state);
state.node.setDirtyCanvas?.(true, true);
notifyAusbossChange();
@@ -999,12 +1171,18 @@ function buildPanel(node) {
app.registerExtension({
name: "AusBoss.WorkflowNote",
beforeRegisterNodeDef(nodeType, nodeData) {
if (nodeData?.name !== NODE_CLASS) return;
if (!NOTE_TYPES.has(nodeData?.name)) return;
hideInputsInDef(nodeData, ["note"]);
chainCallback(nodeType.prototype, "onNodeCreated", function () {
buildPanel(this);
// A new tile starts as a button; onConfigure restores saved dimensions.
if (nodeData.name === "AUSBOSS_NODES_WorkflowNoteTile") this.setSize?.([380, 80]);
});
chainCallback(nodeType.prototype, "onConfigure", function () {
chainCallback(nodeType.prototype, "onSerialize", function (saved) {
const value = this.widgets?.find(widget => widget.name === "note")?.value;
serializeNoteIdentity(saved, normalizeNote(value).layout === "tile");
});
chainCallback(nodeType.prototype, "onConfigure", function (saved) {
// Saved widget values land after onNodeCreated: re-read them, and
// keep the saved size rather than the default the panel asked for.
// The fit runs before ComfyUI snapshots the opened workflow, so
@@ -1014,6 +1192,10 @@ app.registerExtension({
if (!state) return;
state.note = normalizeNote(state.valueWidget.value);
render(state);
if (state.note.layout === "tile" && Number.isFinite(saved?.size?.[1])) {
state.fitHeight = undefined;
this.setSize?.([this.size[0], saved.size[1]]);
}
fitNote(state);
});
});
@@ -1028,6 +1210,7 @@ app.registerExtension({
});
chainCallback(nodeType.prototype, "onRemoved", function () {
closeEditor();
this.__ausbossNote?.reader?.close();
this.__ausbossNote?.resizeObserver?.disconnect();
this.__ausbossNote = null;
});
+5 -8
View File
@@ -32,7 +32,7 @@
// while the canvas is busy, and always one after the last redraw. The
// decisions live in js/shared/workflow_switches.mjs under node:test.
import { app } from "/scripts/app.js";
import { app } from "../../../scripts/app.js";
import { BRAND, chainCallback, keepDomWidgetWidthAuto, notifyAusbossChange, showToast } from "../shared/index.mjs";
import { keepKeyInField } from "../shared/canvas_passthrough.mjs";
import { holdNodeMinWidth, holdVueNodeMinWidth, pinVuePanelHeight } from "../shared/panel_layout.mjs";
@@ -349,8 +349,7 @@ function applyPlan(state, plan, values = []) {
notifyAusbossChange();
}
// A click on a row's pill. The pill is one switch, so either half flips it;
// `side` (true for the on half) only decides while the row reads mixed.
// Each half sets the state it names; clicking the selected half leaves it set.
function switchRow(state, key, side) {
const { settings, rows } = read(state);
const target = rows.find((row) => rowKey(row) === key);
@@ -835,7 +834,7 @@ function buildRow(state, key, made) {
const chip = el("span", "ausboss-ws-chip");
const title = el("span", "ausboss-ws-title");
const count = el("span", "ausboss-ws-count");
// One switch drawn as two halves: a click on either half flips it.
// Separate off and on targets, backed by the same saved switch.
const pill = el("div", "ausboss-card-seg ausboss-card-bool ausboss-ws-pill");
pill.setAttribute("role", "group");
const offButton = button("", "off");
@@ -940,10 +939,8 @@ function buildRow(state, key, made) {
offNodes.length > 0 && `${settings.off === "mute" ? "mute" : "bypass"} what runs only while it is off`,
settings.exclusive && "switch the other rows off",
]);
// Either half flips the switch, so both say what the next click does;
// a mixed row goes to the half that is clicked.
offButton.title = data.state === "off" ? `Click: ${turnOn}` : data.state === "on" ? `Click: ${turnOff}` : turnOff;
onButton.title = data.state === "off" ? `Click: ${turnOn}` : data.state === "on" ? `Click: ${turnOff}` : turnOn;
offButton.title = turnOff;
onButton.title = turnOn;
};
return { row, title, name, sync };
}
+34
View File
@@ -1557,5 +1557,39 @@
"AUSBOSS_NODES_WorkflowSwitches": {
"display_name": "工作流开关 🆎",
"description": "用一张小卡片开关工作流的各个部分。选中组成一个部分的节点,例如一个框和它的保存节点,按 + Switch:它们会得到一个 off | on 开关,名字由你定。每个组也可以有自己的开关。off 会旁路这些节点,图片仍然传到下一步(也可以设置为静音)。on 让它们重新运行。开关也可以改设置,而不是关闭节点:分别保存节点在 on 和 off 时的值,点一下就能把 Steps 设为 8 并打开一行 LoRA。按 Done,节点会缩成只有标签和开关。它从不运行,也没有连线。"
},
"AUSBOSS_NODES_LoadAudio": {
"display_name": "加载音频 🆎",
"description": "加载声音文件,只输出你选中的部分。节点把声音画成波形:拖动两个手柄设置起点和终点,按播放只听这一段。把最大长度设为下一步能接收的最长声音,超出的部分会显示为红色并被剪掉,运行前就能看到输出的内容。",
"inputs": {
"audio": {
"name": "音频"
},
"start_seconds": {
"name": "起始秒数"
},
"end_seconds": {
"name": "结束秒数"
},
"max_seconds": {
"name": "最大秒数"
}
},
"outputs": {
"0": {
"name": "音频"
},
"1": {
"name": "秒数"
}
}
},
"AUSBOSS_NODES_CalloutTile": {
"display_name": "标注卡片 🆎",
"description": "紧凑的标题或彩色链接按钮。双击编辑,拖动角落调整大小。旧版节点包会将它显示为缺失节点,请更新 ComfyUI-AusBoss。"
},
"AUSBOSS_NODES_WorkflowNoteTile": {
"display_name": "工作流说明卡片 🆎",
"description": "点击打开完整说明的小按钮。点击铅笔编辑,拖动角落调整大小。旧版节点包会将它显示为缺失节点,请更新 ComfyUI-AusBoss。"
}
}
+163
View File
@@ -0,0 +1,163 @@
"""Trimmed audio decoding for Load Audio.
The window rules live in ``audio_window`` so the node and its tests agree on
what one Run hands on; ``js/load_audio/audio_window.mjs`` mirrors them for the
face. Decoding counts samples from the start of the sound track and stops as
soon as the window is full, so a short pick from a long file never decodes
the whole file.
"""
from __future__ import annotations
import math
from pathlib import Path
import av
import numpy as np
import torch
from ._execution_helpers import raise_if_interrupted
try:
import folder_paths
except ImportError: # offline tests
folder_paths = None
AUDIO_EXTENSIONS = {
".aac",
".aif",
".aiff",
".flac",
".m4a",
".mp3",
".oga",
".ogg",
".opus",
".wav",
".webm",
".wma",
}
# Video files carry sound too: a song is often only on hand inside a clip.
SOUND_IN_VIDEO_EXTENSIONS = {".mkv", ".mov", ".mp4", ".m4v"}
FALLBACK_SAMPLE_RATE = 44100
# Shorter than this is no window at all; the face keeps its handles this far apart.
MIN_WINDOW_SECONDS = 0.1
def _number(value, default: float = 0.0) -> float:
try:
number = float(value)
except (TypeError, ValueError):
return default
return number if math.isfinite(number) else default
def list_input_audio() -> list[str]:
"""Sound files (and videos, for their sound) in ComfyUI's input folder."""
if folder_paths is None:
return [""]
from ._media_helpers import list_input_files
kinds = AUDIO_EXTENSIONS | SOUND_IN_VIDEO_EXTENSIONS
results = [
name
for name in list_input_files(folder_paths)
if Path(name).suffix.lower() in kinds
]
return results or [""]
def audio_window(start_seconds, end_seconds, max_seconds=0.0, duration=None) -> dict:
"""The part of a sound file one Run hands on.
end 0 means "to the end of the file". max_seconds above 0 caps the
window's length: the pick keeps its start and anything past
start + max_seconds is cut off. ``duration`` is the file's length when it
is known; None leaves an open end open.
Returns start, end (None when open), the end the person picked
(``picked_end``) and how many seconds the cap cut off (``cut``).
"""
start = max(0.0, _number(start_seconds))
picked_end = _number(end_seconds)
end = picked_end if picked_end > 0 else None
if duration is not None:
length = max(0.0, _number(duration))
start = min(start, length)
end = length if end is None else min(end, length)
if end is not None:
end = max(start, end)
picked = end
limit = max(0.0, _number(max_seconds))
if limit > 0 and (end is None or end - start > limit):
end = start + limit
if duration is not None:
end = min(end, max(0.0, _number(duration)))
cut = 0.0
if picked is not None and end is not None:
cut = max(0.0, picked - end)
return {"start": start, "end": end, "picked_end": picked, "cut": cut}
def decode_audio_window(path: Path, start_seconds, end_seconds, max_seconds=0.0) -> dict:
"""ComfyUI AUDIO for the window ``audio_window`` describes.
Raises a plain ValueError for a file with no sound, or a start at or past
the end of the sound.
"""
window = audio_window(start_seconds, end_seconds, max_seconds)
start = window["start"]
with av.open(str(path)) as container:
stream = next((candidate for candidate in container.streams if candidate.type == "audio"), None)
if stream is None:
raise ValueError(f"{path.name} has no sound in it.")
rate = int(stream.rate or FALLBACK_SAMPLE_RATE)
first = round(start * rate)
last = None if window["end"] is None else round(window["end"] * rate)
resampler = av.AudioResampler(format="fltp", layout=stream.layout, rate=rate)
chunks: list[np.ndarray] = []
position = 0
def take(frame) -> None:
nonlocal position
for resampled in resampler.resample(frame):
data = resampled.to_ndarray()
begin = position
position += data.shape[1]
if position <= first:
continue
low = max(0, first - begin)
high = data.shape[1] if last is None else min(data.shape[1], last - begin)
if high > low:
chunks.append(data[:, low:high])
for frame in container.decode(stream):
raise_if_interrupted()
take(frame)
if last is not None and position >= last:
break
else:
take(None) # the resampler hands back what it still holds
if not chunks:
if position == 0:
raise ValueError(f"{path.name} has no sound in it.")
raise ValueError(
f"The start ({start:.2f} s) is past the end of {path.name}, "
f"which is {position / rate:.2f} s long. Drag the start back into the sound."
)
data = np.concatenate(chunks, axis=1).astype(np.float32, copy=False)
return {
"waveform": torch.from_numpy(np.ascontiguousarray(data)).unsqueeze(0),
"sample_rate": rate,
}
__all__ = [
"AUDIO_EXTENSIONS",
"MIN_WINDOW_SECONDS",
"SOUND_IN_VIDEO_EXTENSIONS",
"audio_window",
"decode_audio_window",
"list_input_audio",
]
+2 -2
View File
@@ -40,8 +40,8 @@ def list_pack_modules(pack_dir=PACK_DIR):
def is_pack_module_path(request_path, pack_name):
"""True for /extensions/<pack_name>/.../*.mjs."""
return request_path.startswith(f"/extensions/{pack_name}/") and request_path.endswith(".mjs")
"""True for /extensions/<pack_name>/.../*.mjs (including behind a path prefix)."""
return f"/extensions/{pack_name}/" in request_path and request_path.endswith(".mjs")
def compute_module_token(js_root):
+175 -15
View File
@@ -24,8 +24,9 @@ MOVES = "copy its moves"
SWAP = "swap the person"
KEEP = "keep going"
REVOICE = "new voice"
VIDEO_JOBS = (MOVES, SWAP, KEEP, REVOICE)
KEEPS_ITS_LENGTH = (SWAP, REVOICE) # These change a clip, so the new one runs as long as the old one.
EDIT = "change something"
VIDEO_JOBS = (MOVES, SWAP, KEEP, REVOICE, EDIT)
KEEPS_ITS_LENGTH = (SWAP, REVOICE, EDIT) # These change a clip, so the new one runs as long as the old one.
NEEDS_NO_WORDS = (SWAP, KEEP)
TOKEN = re.compile(r"@(\d)\b")
@@ -37,6 +38,8 @@ NEEDS_A_PERSON = {
MOVES: "To copy the moves, connect a picture of your person and pick person for it.",
SWAP: "To swap the person, connect a picture of the new person and pick person for it.",
}
# A hat or a shirt with no person picture: the user wants the video's own person to wear it.
DRESS_THE_VIDEO_PERSON = 'To put this on the person in your video, pick the video job "change something" and type "He wears @1".'
# (what the label is, how it is kept). {picture} is H3's number for the picture.
JOB_WORDS = {
@@ -88,16 +91,77 @@ MOVES_KEPT = (
"keep the source performer's face, body, clothes, props, background and colours out of the target.\n"
"<Video 1>: attribute_transfer - apply only its camera movement to the target scene."
)
SWAP_IS = (
"<Video 1> supplies the place, the action, the timing, the camera movement and the look.\n"
"{replaced} is {who} in <Video 1>, selected for replacement."
)
SWAP_KEPT = (
SWAP_VIDEO = "<Video 1> supplies the place, the action, the timing, the camera movement and the look."
SWAP_IS = "{replaced} is {who} in <Video 1>, selected for replacement."
SWAP_VIDEO_KEPT = (
"<Video 1>: partially_preserved - keep the place, the action, the timing, the camera movement and the look; "
"change only the person.\n"
"{replaced}: removed - replace {who} with {main} throughout."
"change only the {people}."
)
SWAP_KEPT = "{replaced}: removed - replace {who} with {main} throughout."
ONE_GOES = "the original person"
APPEARANCE_LINE = re.compile(r'^\s*@([1-4])\s+looks like\s+([^"\n]+?)\s*$', re.I)
def swap_appearances(text, jobs, video):
"""An optional separate @1 looks like line describes a replacement, not who goes.
Other jobs and scripts without that exact line keep their original text.
The number is the visible picture slot, not its compact H3 ordinal.
"""
if video != SWAP:
return text, {}
kept, descriptions = [], {}
for line in str(text or "").splitlines():
match = APPEARANCE_LINE.fullmatch(line)
if match is None:
kept.append(line)
continue
slot = int(match.group(1))
if slot not in (jobs or {}):
raise ValueError(f"Picture {slot} is not connected. Connect the new person's picture or remove its looks like line.")
if jobs[slot] not in (PERSON, SHEET):
raise ValueError(f"Picture {slot} must be a person or character sheet for a swap's looks like line.")
if slot in descriptions:
raise ValueError(f"Describe Picture {slot} once, in one looks like line.")
description = match.group(2).strip().rstrip(" .")
if not description:
raise ValueError(f"Say what Picture {slot}'s person looks like, or remove its looks like line.")
descriptions[slot] = description
return ("\n".join(kept), descriptions) if descriptions else (text, {})
# Where each person stands when two or more go and the script doesn't say, from left to right like the pictures.
SPOTS = {2: ("left", "right"), 3: ("left", "centre", "right"), 4: ("far left", "left", "right", "far right")}
SAYS_WHO = re.compile(
r"^(?:is|are|replaces|takes\s+the\s+place\s+of|goes\s+in\s+for|swaps?\s+(?:in\s+)?for|in\s+place\s+of|for|as)\b\s*"
r"|^[:=\-\u2013\u2014>]+\s*",
re.I,
)
# "he replaces the person at the counter": the words after one of these are who goes, wherever they stand in the line.
REPLACES = re.compile(
r"\b(?:replaces|replacing|takes\s+the\s+place\s+of|taking\s+the\s+place\s+of|in\s+place\s+of|instead\s+of"
r"|swaps?\s+(?:in\s+)?for|goes\s+in\s+for|stands?\s+in\s+for)\s+",
re.I,
)
# "Elon is @1," names the new person, not the one who goes.
# "the man on the left, Dario is" ends where the next person's name starts.
NAMES_NEXT = re.compile(r",?\s*(?:[A-Z][\w'.-]*\s+)+(?:is|as|plays)\s*$")
NAMES_THE_NEW = re.compile(r"^[^@.;]*?\b(?:is|as|plays)\s+@\d\b[\s,.;]*", re.I)
SWAPPED = "attribute_transfer - apply the defined appearance to the original performance; the background of {picture} is not transferred."
# "keeps the outfit", "in the clip's clothes": the new person wears the clothes of the one who goes, not the picture's.
KEEP_CLOTHES = (
r"\bkeep(?:s|ing)?\s+(?:the\s+|his\s+|her\s+|their\s+)?(?:original\s+|same\s+)?(?:outfit|clothes|clothing)\b"
r"(?:\s+(?:from|of|in)\s+the\s+(?:clip|video|original))?"
r"|\b(?:in|wearing|wears)\s+the\s+(?:clip'?s|video'?s|original)\s+(?:outfit|clothes|clothing)\b"
r"|\b(?:outfit|clothes|clothing)\s+(?:from|of)\s+the\s+(?:clip|video)\b"
)
CLIP_CLOTHES = re.compile(KEEP_CLOTHES, re.I)
CLIP_CLOTHES_CUT = re.compile(rf",?\s*(?:\band\s+)?(?:{KEEP_CLOTHES})", re.I)
CLOTHED_SWAP = "{subject} is the person in {picture}, with the same face and hair, wearing the clothes of {who} in <Video 1>."
CLOTHES_STAY = (
"attribute_transfer - apply only the face and hair to the original performance; the clothes of {who} in <Video 1> "
"stay as they are; the background of {picture} is not transferred."
)
KEEP_IS = (
"<Video 1> is the video being continued, and the target video starts from its last moment.\n"
"{main} is the main subject in <Video 1>, with the same look."
@@ -108,6 +172,14 @@ KEEP_KEPT = (
)
SOUND_GOES_ON = "<Audio 1> is the soundtrack of <Video 1>, whose sound carries on in the target video."
SOUND_GOES_ON_KEPT = "<Audio 1>: reference - the sound continues without copying the source signal."
EDIT_IS = (
"<Video 1> supplies the place, the person, the action, the timing, the camera movement, the look and the sound.\n"
"{main} is the person in <Video 1>, kept as they are: the same face, hair, body and movements, with only what the script names changed."
)
EDIT_KEPT = (
"<Video 1>: partially_preserved - keep the place, the person, the action, the timing, the camera movement, the look and the sound; change only what the script names.\n"
"{main} (appears in {shots}): fully_preserved - the face, hair and every movement are retained; only what the script names changes."
)
REVOICE_IS = "<Video 1> is the source video for the target video edit.\n{main} is the person speaking in <Video 1>, with the same face, hair and clothing."
REVOICE_KEPT = (
"<Video 1> (whole video): fully_preserved - every action, lip movement and camera move is retained.\n"
@@ -115,6 +187,22 @@ REVOICE_KEPT = (
)
def who_goes_in(text):
"""Who a typed swap line says goes, without the rest of the line: "Elon is @1, he replaces the man at the
counter" is the man at the counter."""
replaces = REPLACES.search(text)
text = text[replaces.end() :] if replaces else NAMES_THE_NEW.sub("", text)
text = re.split(r"[.;!?]", text.strip(" .;!?"), maxsplit=1)[0]
text = NAMES_NEXT.sub("", text)
text = SAYS_WHO.sub("", TOKEN.sub("", text).strip(" .,;")).strip(" .,;")
return re.sub(r"\s+and$", "", text).strip(" .,;")
def lower_first(text):
first = text.split(" ", 1)[0]
return text if text[:1] == "<" or (len(first) > 1 and first.isupper()) else text[:1].lower() + text[1:]
def subject_label(number):
return f"<Subject {number}>"
@@ -135,11 +223,16 @@ class Picture:
subject: int = 0 # A picture that only marks the last frame has none.
def swapped_in(jobs):
"""How many people a swap puts in: one for each person or sheet picture."""
return max(1, sum(job in (PERSON, SHEET) for job in jobs.values()))
def number_pictures(jobs, video=""):
"""Connected pictures in order, from {number on the node: job}. In a swap
the person being replaced comes first, as <Subject 1>."""
the people being replaced come first, as <Subject 1>, <Subject 2> and on."""
pictures = []
subjects = 1 if video == SWAP else 0
subjects = swapped_in(jobs) if video == SWAP else 0
for picture, slot in enumerate(sorted(jobs), 1):
subjects += jobs[slot] != END
pictures.append(Picture(slot, jobs[slot], picture, 0 if jobs[slot] == END else subjects))
@@ -154,15 +247,63 @@ class Cast:
self.video = video
last = max((picture.subject for picture in pictures), default=0)
self.moves = subject_label(last + 1) if video == MOVES else ""
# In a swap each person or sheet picture takes one person's place in the video, in picture order. The script
# can name who goes: "the child in the seat", or "@1 the man on the left. @2 the woman in red".
self.swappers = [picture for picture in pictures if picture.job in (PERSON, SHEET)] if video == SWAP else []
goes = len(self.swappers)
self.whos = [f"the person on the {spot}" for spot in SPOTS[goes]] if goes > 1 else [ONE_GOES]
self.replaced = subject_label(1) if video == SWAP else ""
self.who = "the original person" # In a swap the script can name who goes: "the child in the seat".
self.in_video = subject_label(last + 1) if video in (KEEP, REVOICE) else ""
self.in_video = subject_label(last + 1) if video in (KEEP, REVOICE, EDIT) else ""
self.people = [picture for picture in pictures if picture.job in (PERSON, SHEET, START)]
self.subjects = {picture.slot: subject_label(picture.subject) for picture in pictures if picture.subject}
self.clip_clothes = False # A swap that keeps the clothes of whoever goes.
self.appearances = {} # Explicit looks-like lines, by the visible replacement picture slot.
self.clip_sound = False # A swap whose finished clip keeps the video's own sound.
self.speaks_as_video = False # With that sound and no words typed: the new person says what the video says.
self.typed_lines = False # The script typed words in quotes for someone to say.
def of(self, *jobs):
return [picture for picture in self.pictures if picture.job in jobs]
@property
def who(self):
return self.whos[0]
@who.setter
def who(self, words):
self.whos[0] = words
@property
def swaps(self):
"""(who goes, the words for them, who comes in) for each person a swap replaces."""
coming = [subject_label(picture.subject) for picture in self.swappers] or [self.main]
return [(subject_label(number), who, new) for number, (who, new) in enumerate(zip(self.whos, coming), 1)]
def goes_for(self, picture):
"""Who a swapping picture's person replaces, in the words of the script."""
new = subject_label(picture.subject)
return next((who for _, who, coming in self.swaps if coming == new), self.who)
def name_who_goes(self, lines):
"""Who each new person replaces, from the lines typed in a swap. With one, the words are who goes. With more,
each @ names one, or else the lines go in picture order; anything else keeps left to right."""
self.clip_clothes = any(CLIP_CLOTHES.search(line) for line in lines)
lines = [CLIP_CLOTHES_CUT.sub("", line).strip() for line in lines]
lines = [line for line in lines if line.strip(" .")]
text = ". ".join(line.rstrip(" .") for line in lines) # Each line ends where its who-goes words end.
if len(self.whos) == 1:
self.who = lower_first(who_goes_in(text) or ONE_GOES)
return
slots = [picture.slot for picture in self.swappers]
pieces = re.split(r"@(\d)\b", text)
named = {int(slot): words for slot, words in zip(pieces[1::2], pieces[2::2]) if int(slot) in slots}
if not named:
named = dict(zip(slots, lines)) if len(lines) == len(slots) else {}
for index, slot in enumerate(slots):
words = who_goes_in(named.get(slot, ""))
if words:
self.whos[index] = lower_first(words)
@property
def main(self):
"""Who a line is about when it names nobody."""
@@ -188,6 +329,8 @@ class Cast:
if not self.pictures and not self.video:
return NOTHING_IN
if self.video in NEEDS_A_PERSON and not self.people:
if self.of(OUTFIT, THING):
return DRESS_THE_VIDEO_PERSON
return NEEDS_A_PERSON[self.video]
typed = sorted({int(number) for number in TOKEN.findall(text)} - {0})
slots = {picture.slot: picture for picture in self.pictures}
@@ -221,8 +364,11 @@ class Cast:
def definitions(self, last, redraw, wearers):
ends = self.ends
lines = []
if self.video == EDIT:
lines.append(EDIT_IS.format(main=self.in_video))
if self.video == SWAP:
lines.append(SWAP_IS.format(replaced=self.replaced, who=self.who))
lines.append(SWAP_VIDEO)
lines += [SWAP_IS.format(replaced=gone, who=who) for gone, who, _ in self.swaps]
worn = set(wearers.values())
for picture in self.pictures:
if picture.job == END:
@@ -233,6 +379,15 @@ class Cast:
elif picture.job == PERSON and redraw:
lines.append(REDRAWN[0].format(**words))
continue
elif self.clip_clothes and picture in self.swappers:
lines.append(CLOTHED_SWAP.format(who=self.goes_for(picture), **words))
continue
elif picture in self.swappers and picture.slot in self.appearances:
lines.append(
f'{words["subject"]} is the person in {words["picture"]}, with the same face and this appearance: '
f'{self.appearances[picture.slot]}. The background and lighting of {words["picture"]} are not transferred.'
)
continue
elif picture.job == PERSON and words["subject"] in worn:
lines.append(DRESSED[0].format(**words))
continue
@@ -255,6 +410,8 @@ class Cast:
label = picture_label(picture.picture)
wearing = [slot for slot, wearer in wearers.items() if wearer == subject]
if self.video == SWAP and picture.job in (PERSON, SHEET):
if self.clip_clothes:
return CLOTHES_STAY.format(who=self.goes_for(picture), picture=label)
return SWAPPED.format(picture=label)
if picture.job == PERSON and redraw:
words = REDRAWN[1]
@@ -275,8 +432,11 @@ class Cast:
return [number for number, words in enumerate(shots, 1) if label in words] or everywhere[:1]
lines = []
if self.video == EDIT:
lines.append(EDIT_KEPT.format(main=self.in_video, shots=shot_list(seen(self.in_video))))
if self.video == SWAP:
lines.append(SWAP_KEPT.format(replaced=self.replaced, who=self.who, main=self.main))
lines.append(SWAP_VIDEO_KEPT.format(people="people" if len(self.swaps) > 1 else "person"))
lines += [SWAP_KEPT.format(replaced=gone, who=who, main=new) for gone, who, new in self.swaps]
for picture in self.pictures:
if picture.job == END:
continue
+350 -12
View File
@@ -12,8 +12,21 @@ import re
import numpy as np
from ._h3_cast_helpers import KEEP, NEEDS_NO_WORDS, REVOICE, SWAP, Cast, number_pictures
from ._h3_script_helpers import ACTION_GOES_ON, Moment, add_moments, add_sound, lower_first, read_script, script_parts, speakers
from ._h3_cast_helpers import EDIT, KEEP, NEEDS_NO_WORDS, ONE_GOES, REVOICE, SWAP, Cast, number_pictures, swap_appearances
from ._h3_cast_helpers import TOKEN
from ._h3_script_helpers import (
ACTION_GOES_ON,
PRONOUN,
SPEECH_VERB,
Moment,
add_moments,
add_sound,
read_script,
script_parts,
speakers,
voice_of,
without_speech,
)
SECTIONS = (
"subject_definitions",
@@ -27,6 +40,7 @@ SECTIONS = (
CUT = re.compile(r"(\bAt )(\d\d):(\d\d\.\d{3})")
NO_SCRIPT = "Type what happens first: one line for each moment."
NO_CHANGE = 'Type what changes in the video, like "He wears @1 in place of his cap."'
VOICE_NO_WORDS = (
"A voice is connected, but nobody speaks. Put what they say in quotes, or "
"turn the voice off."
@@ -81,16 +95,19 @@ def add_task(summary, task):
return "[" + " + ".join(tasks) + "]" + summary[match.end() :]
def spoken_line(speaker, words, language, voice_label, on_screen, number=1, lips=""):
def spoken_line(speaker, words, language, voice_label, on_screen, number=1, lips="", delivery=""):
"""The sentence that carries the words, with the speaker's mouth stated
the way H3 needs it: moving and then closed on screen, closed in a
voiceover. lips names a video whose lip movement the words land on."""
line = f"<d>[{language}] {words}</d>"
said = f"says {delivery}" if delivery else "says"
if not speaker.startswith("<"): # A thing off screen, like a card reader.
return f"{speaker} (S{number}) {said} from off screen, {line} Nobody on screen moves their lips to these words."
if on_screen:
how = "says,"
how = f"{said}, each word landing exactly on the lip movement of {lips}," if lips else f"{said},"
if voice_label:
landing = f", each word landing exactly on the lip movement of {lips}," if lips else ""
how = f"speaks using the voice timbre referenced from {voice_label}{landing} and says,"
how = f"speaks using the voice timbre referenced from {voice_label}{landing} and {said},"
return (
f"{speaker} (S{number}) {how} {line} The jaw and lips of {speaker} move "
f"clearly through every word. {speaker} closes the lips."
@@ -100,6 +117,101 @@ def spoken_line(speaker, words, language, voice_label, on_screen, number=1, lips
return f"{speaker} (S{number}) says in an off-screen voiceover, {line}{closed}{timbre}"
# "Altman is @1" and "@1 is Altman" give a name to a person picture, so a later "Altman says" is @1.
NAME_IS = re.compile(r"\b([A-Z][\w'.-]*(?:\s+[A-Z][\w'.-]*)*)\s+(?:is|as|plays)\s+@(\d)\b")
IS_NAME = re.compile(r"@(\d)\s+(?:is|as|plays)\s+([A-Z][\w'.-]*(?:\s+[A-Z][\w'.-]*)*)\b")
NOT_A_NAME = {"The", "A", "An", "He", "She", "They", "It", "This", "That", "Then", "And"}
DELIVERY = re.compile(r"^(?:in|with|like)\b[^\"]*$", re.I)
def names_in(moments):
"""{name: @ number} for every person a swap's lines name."""
names = {}
for moment in moments:
for name, slot in NAME_IS.findall(moment.text):
if name not in NOT_A_NAME:
names[name.lower()] = slot
for slot, name in IS_NAME.findall(moment.text):
if name not in NOT_A_NAME:
names[name.lower()] = slot
return names
LINKING_WORDS = {"the", "a", "an", "in", "on", "at", "of", "with", "by", "to", "and", "from", "into", "who", "is"}
def same_person(said_by, who):
"""Whether "The man in the car" names the person a swap's "the man in the
back of the police car" points at: every word that says who it is
appears there too. "The man in the cap" is someone else."""
def words(text):
return {word for word in re.findall(r"[a-z']+", text.lower()) if word not in LINKING_WORDS}
named = words(said_by)
return bool(named) and named <= words(who)
def only_the_words(moment, names=None, last="", goes=()):
"""A swap line's quoted words and the @ number that says them. The video
supplies the action, so the rest of the line goes. Who speaks is the @ or
the name in front of the words, else the person a he or she points back
to; a thing that is no person, like a card reader, speaks from off screen,
and so does a person the line puts off screen, like "a woman off camera"."""
before = moment.text.partition(f'"{moment.speech}"')[0]
who = TOKEN.search(before)
slot = who.group(1) if who else ""
if not slot:
lowered = before.lower()
slot = next((number for name, number in (names or {}).items() if re.search(rf"\b{re.escape(name)}\b", lowered)), "")
if not slot and PRONOUN.search(before):
slot = last
words = Moment(f'says "{moment.speech}"', at=moment.at, speech=moment.speech, voiceover=moment.voiceover)
verb = SPEECH_VERB.search(before)
if verb and DELIVERY.match(before[verb.end() :].strip(" ,:")):
words.delivery = before[verb.end() :].strip(" ,:")
said_by = "" if slot else voice_of(before, True, things=True)
if said_by and not moment.voiceover:
slot = next((number for who, number in goes if same_person(said_by, who)), "")
if slot:
words.text = f"@{slot} {words.text}"
return words, slot
words.voice = voice_of(before, moment.voiceover, things=True)
words.voiceover = words.voiceover or bool(words.voice)
words.other = bool(said_by) and not words.voice
return words, last
# A time typed inside a swap line, not at its start: "Dario, at 3.2s, says" or "(00:03.2)".
TIME_IN_LINE = re.compile(r"\b(?:(\d+):(\d\d(?:\.\d+)?)|(\d+(?:\.\d+)?)\s*(?:seconds?|secs?|s)\b)", re.I)
def time_in(text):
match = TIME_IN_LINE.search(text)
if not match:
return None
if match.group(1) is not None:
return int(match.group(1)) * 60 + float(match.group(2))
return float(match.group(3))
def swap_lines(moments, goes=()):
"""What a swap keeps of its typed lines: only the words in quotes. goes
pairs the words for each person who goes with the @ number coming in, so
a line said by "the old man" is said by whoever replaces him."""
names = names_in(moments)
kept, last = [], ""
for moment in moments:
who = TOKEN.search(moment.text)
if not moment.speech:
last = who.group(1) if who else last
continue
words, last = only_the_words(moment, names, last, goes)
if words.at is None:
words.at = time_in(moment.text.partition(f'"{moment.speech}"')[0])
kept.append(words)
return kept
def snap_cuts(detailed, beats, gap=0.4):
"""Moves every timed moment to the nearest beat, keeping them in order and
at least `gap` seconds apart."""
@@ -158,14 +270,42 @@ def add_song_under(parts, beats):
cut_on_beat(parts, beats)
# In "change something" the person comes from the video, so a picture is what
# gets put on them. Pictures open as "person", and a newcomer types plain words.
PUT_ON = r"(?:wears|wearing|wear|puts on|putting on|put on|has on|dons)"
PUT_ON_TOKEN = re.compile(r"\b" + PUT_ON + r"\s+(?:a |an |the )?@(\d)\b|@(\d)\s+(?:in place of|instead of)\b", re.IGNORECASE)
PUT_ON_WORDS = re.compile(r"\b(" + PUT_ON + r")\s+(.+?)(?=\s+(?:in place of|instead of)\b|[,.;!?\n]|\s+and\s|$)", re.IGNORECASE)
def put_on_from_pictures(script, jobs):
"""For "change something": a picture the line puts on someone is an outfit,
even if its job says person. With one picture and no @ typed, the thing the
line puts on him ("wears the propeller hat") is that picture."""
jobs = dict(jobs)
if len(jobs) == 1 and not TOKEN.search(script):
slot = next(iter(jobs))
script, found = PUT_ON_WORDS.subn(lambda m: f"{m.group(1)} @{slot}", script, count=1)
if not found:
return script, jobs
for match in PUT_ON_TOKEN.finditer(script):
slot = int(match.group(1) or match.group(2))
if jobs.get(slot) == "person":
jobs[slot] = "outfit"
return script, jobs
def write_prompt(script, seconds=15.0, camera="", look="", sound="", language="English", voice=False, song_beats=None,
ask=None, jobs=None, video="", soundtrack=False):
ask=None, jobs=None, video="", soundtrack=False, clip_sound=False, speech=None):
"""The finished prompt.
A typed scene is read and laid out over seconds; H3's own six parts go
through as they are. jobs says what each connected picture is for, as
{number on the node: job}, and video what a connected video is for.
soundtrack says a video's own sound is connected, for H3 to carry on from.
clip_sound says a swap's finished clip keeps the video's own sound, so
every voice in it is heard: lines from anyone but the people coming in are
left out, and lines with no typed time go where speech finds them in the
video's sound, as find_speech stretches.
voice says whether one is connected. song_beats is None with no song, and
otherwise the beats to land on, which may be an empty list. With a voice
too, the song goes under the finished clip and H3 hears none. ask(question,
@@ -176,16 +316,33 @@ def write_prompt(script, seconds=15.0, camera="", look="", sound="", language="E
speaker = None
if parts is None:
cast = Cast(number_pictures(jobs if jobs is not None else {1: "person"}, video), video)
jobs = jobs if jobs is not None else {1: "person"}
if video == EDIT:
script, jobs = put_on_from_pictures(script, jobs)
cast = Cast(number_pictures(jobs, video), video)
script, cast.appearances = swap_appearances(script, jobs, video)
scene = read_script(script)
problem = cast.problem(" ".join(moment.text for moment in scene.moments))
if problem:
raise ValueError(problem)
if not scene.moments and video == EDIT:
raise ValueError(NO_CHANGE)
if not scene.moments and video not in NEEDS_NO_WORDS:
raise ValueError(NO_SCRIPT)
if video == SWAP and scene.moments: # Typed words in a swap say which person goes, for a clip with two.
cast.who = lower_first(" ".join(moment.text for moment in scene.moments).rstrip(". "))
scene.moments = []
cast.name_who_goes([without_speech(moment) for moment in scene.moments])
if cast.appearances and cast.clip_clothes:
raise ValueError('Remove "keep the clip\'s clothes" or the looks like line. This appearance hint replaces the whole look.')
goes = [(who, str(picture.slot)) for who, picture in zip(cast.whos, cast.swappers) if who != ONE_GOES]
scene.moments = swap_lines(scene.moments, goes)
if video == SWAP and clip_sound:
# On real clips, leaving others' words out kept the right mouth moving; naming them as off screen did not.
cast.clip_sound = True
# With no words typed, the clip's own speech is still heard, so the new person says it as the video does.
cast.typed_lines = any(moment.speech for moment in scene.moments)
cast.speaks_as_video = bool(speech) and not cast.typed_lines
time_from_sound(scene.moments, speech)
scene.moments = [moment for moment in scene.moments if not (moment.voice or moment.other)]
if not scene.moments:
scene.moments.append(Moment(ACTION_GOES_ON if video == KEEP else ""))
if voice and not any(moment.speech for moment in scene.moments):
@@ -201,9 +358,10 @@ def write_prompt(script, seconds=15.0, camera="", look="", sound="", language="E
if parts is None:
def say(words, on_screen=True, who="<Subject 1>", number=1):
lips = "<Video 1>" if video == REVOICE else ""
return spoken_line(who, clean_words(words), language, voice_label if number == 1 else None, on_screen, number, lips)
def say(words, on_screen=True, who="<Subject 1>", number=1, delivery=""):
lips = "<Video 1>" if video in (REVOICE, SWAP, EDIT) else ""
voiced = voice_label if number == 1 else None
return spoken_line(who, clean_words(words), language, voiced, on_screen, number, lips, delivery)
keeps_song = song_beats is not None and not voice # The song is then all the sound there is.
parts = script_parts(
@@ -266,3 +424,183 @@ def find_beats(samples, rate, seconds=30.0):
step = period / per_second
count = int((len(samples) / rate - start) / step) + 1
return [round(start + index * step, 3) for index in range(max(count, 0))]
SPEECH_BAND = (250.0, 3500.0) # Where most of a voice's loudness sits, under hiss and over hum.
SPEECH_GAP = 0.06 # A shorter quiet is the dip between two syllables. place_lines tells lines apart later.
SPEECH_SHORTEST = 0.1 # A shorter sound is a click or a knock.
VOICE_PITCH = (70.0, 390.0) # A speaking voice's lowest note, in Hz, and just under where pitch reading tops out.
CLEAR_VOICE = 0.5 # How cleanly a frame repeats before its pitch counts.
PITCH_GRID = tuple(float(x) for x in np.log2(np.geomspace(100, 340, 8))) # Voices to try, in octaves.
SPEAKING_RATES = tuple(2.5 + 0.75 * step for step in range(8)) # Syllables a second, slow to fast.
LONGEST_LINE = 12 # Stretches of speech one line can take.
# Weights for place_lines, tuned on nine real clips against Whisper's times.
GAP_WEIGHT, INNER_GAP_WEIGHT, NOISE_WEIGHT, PITCH_WEIGHT = 1.0, 1.0, 1.5, 6.0
def find_speech(samples, rate):
"""[(start, end, pitch, voiced), ...]: the stretches of a mono track loud
enough in the voice band to be words, in seconds, with each stretch's
middle pitch in octaves (log2 Hz), or None where it has too little clear
voice, and how many seconds of it are clear voice.
The quiet level is the track's quietest tenth and the loud level its
loudest twentieth, so music or a crowd under the words raises the bar
with them. Returns [] for silence."""
samples = np.asarray(samples, dtype=np.float32)
hop = max(1, int(rate * 0.01))
window = hop * 2
frames = (len(samples) - window) // hop
if frames < 8 or float(np.abs(samples).max(initial=0.0)) < 1e-4:
return []
taper = np.hanning(window)
pitches = np.fft.rfftfreq(window, 1.0 / rate)
band = (pitches >= SPEECH_BAND[0]) & (pitches <= SPEECH_BAND[1])
level = np.array(
[float((np.abs(np.fft.rfft(samples[index * hop : index * hop + window] * taper))[band] ** 2).sum()) for index in range(frames)]
)
level = 10 * np.log10(level + 1e-10)
level = np.convolve(level, np.ones(5) / 5, "same")
quiet, loud = np.percentile(level, 10), np.percentile(level, 95)
if loud - quiet < 6:
return []
heard = level > max(quiet + 0.35 * (loud - quiet), quiet + 6)
stretches, start = [], None
for index, on in enumerate([*heard, False]):
if on and start is None:
start = index
elif not on and start is not None:
stretches.append([start * hop / rate, index * hop / rate])
start = None
joined = []
for stretch in stretches:
if joined and stretch[0] - joined[-1][1] < SPEECH_GAP:
joined[-1][1] = stretch[1]
else:
joined.append(stretch)
voice = voice_pitch(samples, rate, loudest=float(level.max()))
return [(round(a, 3), round(b, 3), *middle_pitch(voice, a, b)) for a, b in joined if b - a >= SPEECH_SHORTEST]
def voice_pitch(samples, rate, loudest):
"""(times, octaves, clear) every 20 ms: the pitch where a frame repeats
best, and whether it repeats cleanly and loudly enough to be a voice."""
hop = max(1, int(rate * 0.02))
window = hop * 2
frames = max(0, (len(samples) - window) // hop)
shortest, longest = int(rate / VOICE_PITCH[1]), int(rate / VOICE_PITCH[0])
taper = np.hanning(window)
pitches = np.fft.rfftfreq(window, 1.0 / rate)
band = (pitches >= SPEECH_BAND[0]) & (pitches <= SPEECH_BAND[1])
times, octaves, clear = [], [], []
for index in range(frames):
piece = samples[index * hop : index * hop + window]
loud = 10 * np.log10(float((np.abs(np.fft.rfft(piece * taper))[band] ** 2).sum()) + 1e-10)
piece = piece - piece.mean()
repeats = np.fft.irfft(np.abs(np.fft.rfft(piece, 2 * window)) ** 2)[:window]
lag = shortest + int(np.argmax(repeats[shortest:longest])) if repeats[0] > 1e-9 else 0
times.append(index * hop / rate + window / 2 / rate)
octaves.append(float(np.log2(rate / lag)) if lag else 0.0)
clear.append(bool(lag) and repeats[lag] / repeats[0] >= CLEAR_VOICE and loud >= loudest - 30 and lag > shortest)
return np.array(times), np.array(octaves), np.array(clear, dtype=bool)
def middle_pitch(voice, start, end):
"""(the middle pitch in octaves, or None, and the seconds of clear voice) between start and end."""
times, octaves, clear = voice
inside = clear & (times >= start) & (times < end)
if inside.sum() < 3:
return None, 0.0
return round(float(np.median(octaves[inside])), 3), round(float(inside.sum() * (times[1] - times[0])), 3)
def syllables(words):
"""About how many syllables the words take to say."""
count = 0
for word in re.findall(r"[a-z']+", words.lower()):
sounds = len(re.findall(r"[aeiouy]+", word))
count += max(1, sounds - (1 if word.endswith("e") and sounds > 1 else 0))
return max(1, count)
def place_lines(stretches, lines):
"""When each line starts, read from find_speech stretches. lines are
(words, voice) in order, where voice tells one speaker from another.
Each line takes a run of stretches, and a stretch may be left out as
noise. The best split gives each line about the time its syllables need,
starts lines after long quiets, keeps quiets inside a line short and
keeps one voice at one pitch. None when there are fewer stretches than
lines."""
count, found = len(lines), len(stretches)
if count < 1 or found < count:
return None
sizes = [syllables(words) for words, _ in lines]
voices = sorted({voice for _, voice in lines})
best = (np.inf, None)
for middles in _pitch_choices(len(voices)):
middle = dict(zip(voices, middles))
for speed in SPEAKING_RATES:
cost, starts = _best_split(stretches, lines, [size / speed for size in sizes], middle)
cost += 0.3 * np.log(speed / 4.5) ** 2
if starts is not None and cost < best[0]:
best = (cost, starts)
return best[1]
def _pitch_choices(voices):
choices = [()]
for _ in range(voices):
choices = [(*choice, pitch) for choice in choices for pitch in PITCH_GRID]
return choices
def _best_split(stretches, lines, needs, middle):
found, count = len(stretches), len(lines)
best = [[(np.inf, None)] * (count + 1) for _ in range(found + 1)]
best[0][0] = (0.0, [])
for first in range(found):
for done in range(count + 1):
cost, starts = best[first][done]
if cost == np.inf:
continue
start, end = stretches[first][:2]
noise = cost + NOISE_WEIGHT * (end - start) + 0.2
if noise < best[first + 1][done][0]:
best[first + 1][done] = (noise, starts)
if done == count:
continue
before = min(start - stretches[first - 1][1], 1.0) if first else 1.0
spoken = inner = off_pitch = 0.0
for last in range(first, min(found, first + LONGEST_LINE)):
a, b, pitch, voiced = stretches[last]
spoken += b - a
if last > first:
inner += max(0.0, a - stretches[last - 1][1] - 0.25)
if pitch is not None:
off_pitch += min((pitch - middle[lines[done][1]]) ** 2, 1.0) * voiced
after = min(stretches[last + 1][0] - b, 1.0) if last + 1 < found else 1.0
total = (
cost
+ np.log(spoken / needs[done]) ** 2
+ INNER_GAP_WEIGHT * inner
- GAP_WEIGHT * (before + after) / 2
+ PITCH_WEIGHT * off_pitch
)
if total < best[last + 1][done + 1][0]:
best[last + 1][done + 1] = (total, [*starts, start])
return best[found][count]
def time_from_sound(moments, stretches):
"""Puts each line with no typed time where its words start in the clip's
own sound. Every quoted line counts, whoever says it, since everyone is
heard. Returns whether the sound gave the times."""
lines = [(moment.speech, "other" if moment.voice or moment.other else "new") for moment in moments]
starts = place_lines(stretches or [], lines)
if starts is None:
return False
for moment, start in zip(moments, starts):
if moment.at is None:
moment.at = round(float(start), 3)
return True
+104 -17
View File
@@ -12,6 +12,7 @@ from dataclasses import dataclass, field
import re
from ._h3_cast_helpers import (
EDIT,
KEEP,
MAIN,
OUTFIT,
@@ -25,10 +26,14 @@ from ._h3_cast_helpers import (
SOUND_GOES_ON_KEPT,
THING,
TOKEN,
ONE_GOES,
SPOTS,
Cast,
lower_first,
number_pictures,
picture_label,
subject_label,
swap_appearances,
)
QUOTES = {"“": '"', "”": '"', "‘": "'", "’": "'", "—": " - ", "–": " - ", "…": "..."}
@@ -50,14 +55,16 @@ TIMED = re.compile(
r"(?:\s*-\s*\d+(?:\.\d+)?\s*(?:" + UNIT + r")?)?\]?\s*[:,\-]?\s*",
re.I,
)
NUMBER = re.compile(r"^\s*(?:\d+[.)]|[-*•]|(?:first|second|third|fourth|fifth|sixth)(?:ly)?\b[:,]?|step\s+\d+[:.]?)\s*", re.I)
NUMBER = re.compile(r"^\s*(?:\d+[.)](?!\d)|[-*•]|(?:first|second|third|fourth|fifth|sixth)(?:ly)?\b[:,]?|step\s+\d+[:.]?)\s*", re.I)
LABEL = re.compile(r"^(camera|style|look|sound|sounds|audio|music)\s*:\s*(.*)$", re.I)
SPEECH_CUE = re.compile(
r"\b(?:says?|said|asks?|whispers?|shouts?|yells?|screams?|mutters?|sings?|replies|answers?|tells?\s+\w+|goes)\b[^\"]{0,24}$",
r"\b(?:says?|said|asks?|whispers?|shouts?|yells?|screams?|mutters?|sings?|raps?|chants?|announces?|calls?\s+out|cries"
r"|replies|answers?|tells?\s+\w+|goes)\b[^\"]{0,24}$",
re.I,
)
SIGN_CUE = re.compile(
r"\b(?:title|titled|called|named|sign|signs|text|caption|card|poster|reads?|saying|logo|banner|headline|words?)\b[^\"]{0,24}$",
r"\b(?:title|titled|called|named|sign|signs|text|caption|card(?!\s+reader)|poster|reads?|saying|logo|banner|headline|words?)\b"
r"[^\"]{0,24}$",
re.I,
)
NO_MUSIC = re.compile(r"\b(?:no|without|skip)\s+(?:any\s+)?(?:music|soundtrack|score)\b|\bjust\s+(?:the\s+)?(?:ambien\w+|sound of|natural sound)\b", re.I)
@@ -68,7 +75,21 @@ SIDE_NOTE = re.compile(
r"|one\s+(?:long\s+)?(?:shot|take)|single\s+(?:shot|take)|continuous\s+(?:shot|take))\s*[.!]?\s*$",
re.I,
)
VOICEOVER = re.compile(r"\b(?:voice-?\s?over|narrator|off-?\s?screen|a\s+voice)\b", re.I)
VOICEOVER = re.compile(r"\b(?:voice-?\s?over|narrator|off-?\s?(?:screen|camera)|behind\s+the\s+camera|a\s+voice)\b|\((?:o\.?s|v\.?o)\.?\)", re.I)
# Where a voice comes from, said beside who it is: "A woman off screen says", "Mom (O.S.):".
FROM_OFF_SCREEN = re.compile(
r"\b(?:(?:(?:in|as)\s+(?:an?\s+)?(?:off-?\s?screen\s+)?)?voice-?\s?over|off-?\s?(?:screen|camera)|behind\s+the\s+camera)\b|\((?:o\.?s|v\.?o)\.?\)", re.I
)
PRONOUN = re.compile(r"\b(?:he|she|they|him|her|them)\b", re.I)
PERSON_WORDS = re.compile(
r"\b(?:man|men|woman|women|person|people|guy|girl|boy|kid|child|lady|gentleman|cashier|customer|clerk|waiter"
r"|waitress|driver|worker|singer|rapper|dancer|host|friend|everyone|someone|somebody)\b",
re.I,
)
# "says in a flat robot voice": how it is said, kept out of who says it.
SPEECH_VERB = re.compile(r"\b(?:says?|said|asks?|whispers?|shouts?|yells?|screams?|mutters?|sings?|raps?|chants?|announces?|calls?\s+out|cries|replies|answers?)\b", re.I)
SAID_BY = re.compile(r"^(?:(?:the|a|an)\s+[\w\s-]+|someone|somebody)$", re.I)
A_NAME = re.compile(r"^[A-Z][\w'.-]*(?:\s+[A-Z][\w'.-]*)?$")
UNSEEN = re.compile(r"\b(?:feels?|thinks?|remembers?|reali[sz]es?|decides?|wants?|hopes?|wonders?|knows?|understands?|believes?|imagines?)\b", re.I)
MOVING = re.compile(r"\b(?:pov|walks?|walking|runs?|running|forward|follows?|tracks?)\b", re.I)
FRAME_WORDS = re.compile(r"^(?:(?:an?|the)\s+(?:[\w-]+\s+){0,2}?(?:close-?up|wide|medium|shot|view|angle|overhead|profile|insert|aerial)\b|black\b)", re.I)
@@ -115,7 +136,13 @@ IN_THE_SHOT = "{main} is in the shot."
TAKES_OVER = "{main} takes the place of {who} and does the same thing at the same pace."
ONE_PERSON = "Show one person throughout."
OTHERS_STAY = "Everyone else stays as they are in <Video 1>."
# With the clip's own sound, every voice in it is heard, so the new person's lips say only their own lines.
OWN_LINES_ONLY = "{main} keeps the lips closed whenever {main} is not saying a line of {main}'s own."
SAYS_NOTHING = "{main} keeps the lips closed and says nothing the whole time."
SPEAKS_AS_VIDEO = "{main} speaks as in <Video 1>, each word landing exactly on the lip movement of <Video 1>."
CLIP_SOUND = "The original sound of <Video 1> continues throughout."
FOLLOWS_CAMERA = "The camera follows the movement of <Video 1>."
SAME_AS_VIDEO = "{main} has the same words, mouth movements and moves as in <Video 1>. Everything else stays as it is in <Video 1>."
CARRIES_ON = "The shot carries straight on from the end of <Video 1>."
ACTION_GOES_ON = "The action keeps going the way it was heading, and the camera keeps moving the same way."
FACES_US = "{main} faces the camera as in <Video 1>."
@@ -123,8 +150,8 @@ VIDEO_LOOKS = {
SWAP: "Retain the look of <Video 1>.",
KEEP: "The target video keeps the look, colours and camera of <Video 1>.",
REVOICE: "The target video keeps the look, light and camera of <Video 1>.",
EDIT: "Retain the look of <Video 1>.",
}
SPOTS = {2: ("left", "right"), 3: ("left", "centre", "right"), 4: ("far left", "left", "right", "far right")}
NAMES_A_SPOT = re.compile(r"\b(?:left|right|behind|in\s+front|foreground|background)\b", re.I)
OPENS_ON_THEM = re.compile(r"^(?:She|He)\b")
FOLLOWS_A_COMMA = re.compile(r"^(?:A|An|The|She|He|They|It|Her|His|Their|Its|This|That|These|Those|There|Someone|Everyone|Nobody)\b")
@@ -234,6 +261,9 @@ class Moment:
camera: str = "" # A camera: line typed in this shot's block.
sound: str = "" # A sound: line typed in this shot's block.
line: int | None = None # The typed line this moment opens, counted from 0.
voice: str = "" # Who says the words when it is nobody on screen: "The card reader".
delivery: str = "" # How a swap line is said: "in a flat robot voice".
other: bool = False # Said by someone who is in no picture, like the man at the counter.
@dataclass
@@ -306,6 +336,28 @@ def read_notes(text, script):
script.one_take = True
def voice_of(before, voiceover, things=False):
"""Who says a line from off screen, named by the words in front of it:
"A woman off screen says" is a woman and "a card reader off screen says"
a card reader. With things, a thing needs no "off screen": "The card
reader beeps and says" is the card reader. An @, a he or she, or no name
at all is someone on screen or the main person's own voiceover, so that
gives ""."""
if TOKEN.search(before) or PRONOUN.search(before):
return ""
verb = SPEECH_VERB.search(before)
action = FROM_OFF_SCREEN.sub("", before[: verb.start()] if verb else before)
action = re.sub(r"[\s,]*\band\s*$", "", action.strip(" ,:")).split(",")[0].strip(" ,:")
if len(action.split()) > 2 and action.endswith("s"): # "The card reader beeps": what it does goes.
action = action.rsplit(" ", 1)[0]
# "Narrator" and "a voice" name no one, so they stay the main person's voiceover.
if voiceover and (A_NAME.match(action) or SAID_BY.match(action)) and not VOICEOVER.search(action):
return action
if things and SAID_BY.match(action) and not PERSON_WORDS.search(action):
return action
return ""
def quoted_words(moment):
"""Quoted words after a sign word stay on screen, as does a bare ALL CAPS
quote. Any other quote is words someone says."""
@@ -317,6 +369,7 @@ def quoted_words(moment):
if not (SIGN_CUE.search(before) or (words.isupper() and not SPEECH_CUE.search(before))):
moment.speech = words
moment.voiceover = VOICEOVER.search(before) is not None
moment.voice = voice_of(before, moment.voiceover)
def read_moment(moment):
@@ -516,6 +569,8 @@ def script_warning(script, seconds, cast=None):
def script_report(text, seconds, jobs=None, video=""):
"""What a script will do, for the timeline on the node."""
# The optional swap description is not a second timed action.
text, _ = swap_appearances(text, jobs, video)
script = read_script(text)
starts = timeline(script, seconds)
ends = [*starts[1:], seconds]
@@ -539,9 +594,6 @@ def stamp(seconds):
return f"{int(minutes):02d}:{rest:06.3f}"
def lower_first(text):
first = text.split(" ", 1)[0]
return text if text[:1] == "<" or (len(first) > 1 and first.isupper()) else text[:1].lower() + text[1:]
def after_comma(text):
@@ -617,7 +669,9 @@ def still_true(moments):
def speaker_of(moment, cast):
"""Who says a moment's words: the first person it names, or the main person."""
"""Who says a moment's words: an off-screen voice, the first person it names, or the main person."""
if moment.voice:
return moment.voice
people = {picture.slot for picture in cast.people}
for slot in TOKEN.findall(moment.text):
if int(slot) in people:
@@ -632,7 +686,8 @@ def speakers(moments, cast):
who = speaker_of(moment, cast)
if moment.speech and who not in found:
found.append(who)
return found
# A voice from off screen, like a card reader, comes after the people, who keep the low numbers.
return [who for who in found if who.startswith("<")] + [who for who in found if not who.startswith("<")]
def with_labels(words, cast):
@@ -669,7 +724,24 @@ def before_the_action(number, text, cast, wearers):
words = OPENS_ON if cast.ends else OPENING
notes.append(words.format(subject=subject_label(opens.subject), picture=picture_label(opens.picture)))
if cast.video == SWAP:
notes += [TAKES_OVER.format(main=cast.main, who=cast.who), ONE_PERSON if cast.who == "the original person" else OTHERS_STAY]
for _, who, new in cast.swaps:
picture = next((p for p in cast.swappers if subject_label(p.subject) == new), None)
appearance = cast.appearances.get(picture.slot) if picture else None
if appearance:
notes.append(
f"{new} occupies the starting position of {who} and follows the same route, movements, timing and pace. "
f"{new} has the defined appearance from {picture_label(picture.picture)}: {appearance}. "
f"The replacement stays present throughout, ending at the original performance's final position. "
f"Do not show {who} in that role at any time; there is no transition or morph into the replacement."
)
else:
notes.append(TAKES_OVER.format(main=new, who=who))
notes.append(ONE_PERSON if cast.whos == [ONE_GOES] else OTHERS_STAY)
for _, _, new in cast.swaps if cast.clip_sound else []:
if cast.speaks_as_video:
notes.append(SPEAKS_AS_VIDEO.format(main=new))
elif cast.typed_lines:
notes.append((OWN_LINES_ONLY if f"{new} (S" in text else SAYS_NOTHING).format(main=new))
if number == 1 and cast.video == KEEP:
notes += [CARRIES_ON]
if number == 1 and cast.video == REVOICE:
@@ -678,7 +750,7 @@ def before_the_action(number, text, cast, wearers):
if places and not any(place in text for place in places):
notes.append(IN_THE_PLACE.format(place=places[0]))
people = people_in(text, cast)
if len(people) > 1 and not NAMES_A_SPOT.search(text):
if len(people) > 1 and not NAMES_A_SPOT.search(text) and cast.video != SWAP: # A swap's people stand where the video has them.
spots = [f"{person} is on the {spot}" for person, spot in zip(people, SPOTS[len(people)])]
notes.append(sentence(", ".join(spots[:-1]) + f" and {spots[-1]} of the frame"))
for slot, wearer in wearers.items():
@@ -693,7 +765,9 @@ def after_the_action(text, cast):
notes = []
if cast.moves and cast.main in text:
notes.append(THE_MOVES.format(main=cast.main, moves=cast.moves))
if cast.video == SWAP:
if cast.video == EDIT:
notes.append(SAME_AS_VIDEO.format(main=cast.main))
if cast.video in (SWAP, EDIT):
notes.append(FOLLOWS_CAMERA)
for picture in cast.of(SHEET):
subject = subject_label(picture.subject)
@@ -718,7 +792,7 @@ def shot_lines(script, seconds, say, cast, wearers, move="", hold="", sounds=Tru
say, so the moments of one take are sentences inside one shot."""
starts = timeline(script, seconds)
talking = speakers(script.moments, cast)
quiet = " ".join(QUIET.format(speaker=speaker) for speaker in talking)
quiet = " ".join(QUIET.format(speaker=speaker) for speaker in talking if speaker.startswith("<"))
kept = still_true(script.moments)
lines = []
for number, shot in enumerate(shots_of(script), 1):
@@ -731,6 +805,8 @@ def shot_lines(script, seconds, say, cast, wearers, move="", hold="", sounds=Tru
def speak(words, on_screen=True, moment=moment):
who = speaker_of(moment, cast)
if moment.delivery:
return say(words, on_screen, who, talking.index(who) + 1, delivery=moment.delivery)
return say(words, on_screen, who, talking.index(who) + 1)
words = " ".join(
@@ -746,6 +822,8 @@ def shot_lines(script, seconds, say, cast, wearers, move="", hold="", sounds=Tru
text = " ".join(said)
first = shot[0]
head, said[0] = (cut_to(said[0], text, cast) if number > 1 else ("", said[0]))
if not head and starts[first] > 0: # A swap's first words can start late in the video.
said[0] = f"At {stamp(starts[first])}, {after_comma(said[0])}"
for place, index in enumerate(shot[1:], 1):
lead = f"{STILL_MOVING} " if moving else ""
said[place] = f"At {stamp(starts[index])}, {lead}{after_comma(said[place])}"
@@ -774,7 +852,7 @@ def script_sound(script, sound, places=False):
def task_of(cast):
"""The tag a summary opens with."""
if cast.video == SWAP or cast.video == REVOICE:
if cast.video in (SWAP, REVOICE, EDIT):
return "video editing"
if cast.video == KEEP:
return "video continuation"
@@ -786,12 +864,16 @@ def task_of(cast):
def summary_of(script, cast, new_places, soundtrack):
task = task_of(cast)
if cast.video == SWAP:
return f"[{task}] Replace {cast.replaced} with {cast.main} while preserving the original action, place, camera and look of <Video 1>."
swaps = " and ".join(f"{gone} with {new}" for gone, _, new in cast.swaps)
return f"[{task}] Replace {swaps} while preserving the original action, place, camera and look of <Video 1>."
if cast.video == REVOICE:
return (
f"[{task}] The target video is an edited version of <Video 1>. The picture, the timing and the lip movement "
f"stay as they are, and {cast.main} speaks in a new voice."
)
if cast.video == EDIT:
changes = " ".join(sentence(with_labels(without_speech(moment), cast)) for moment in script.moments)
return f"[{task}] {changes} Everything else in <Video 1> is kept."
if cast.video == KEEP:
tag = f"{task} + audio reference" if soundtrack else task
return f"[{tag}] The target video continues directly from the end of <Video 1> in the same place."
@@ -830,6 +912,8 @@ def script_parts(script, seconds, camera="", look="", sound="", say=None, cast=N
moved = any(not FRAME_WORDS.match(without_speech(moment)) for moment in cuts)
new_places = last > 1 and not cast.of(PLACE) and moved and all(not FRAME_WORDS.match(without_speech(moment)) for moment in cuts)
first = next(iter(cast.of(PLACE) or cast.pictures), None)
if not style and cast.video == EDIT:
style = VIDEO_LOOKS[EDIT]
if not style and len(cast.of(PLACE)) > 1:
style = OWN_COLOURS
elif not style and not (first and first.job == THING):
@@ -849,7 +933,10 @@ def script_parts(script, seconds, camera="", look="", sound="", say=None, cast=N
ambience = OLD_SOUND
if cast.video == REVOICE and ambience == PLACE_SOUND:
ambience = ROOM_TONE
if ambience != "N/A" and any(moment.speech for moment in script.moments):
if (cast.clip_sound or cast.video == EDIT) and ambience == PLACE_SOUND: # The clip's own sound is what plays, unless the script says the sound.
ambience = CLIP_SOUND
# With the clip's own sound, words the prompt leaves out are still heard.
if ambience != "N/A" and any(moment.speech for moment in script.moments) and not cast.clip_sound and cast.video != EDIT:
ambience = f"{ambience} {ONE_LINE}"
return {
"subject_definitions": subjects,
+107 -20
View File
@@ -51,6 +51,17 @@ _SERVER_FOLDERS = {
# The Outputs list shows this many, newest first.
OUTPUT_LIST_CAP = 2000
IMAGE_EXTENSIONS = {
".avif",
".bmp",
".gif",
".jpeg",
".jpg",
".png",
".tif",
".tiff",
".webp",
}
VIDEO_EXTENSIONS = {
".avi",
".m2ts",
@@ -64,34 +75,101 @@ VIDEO_EXTENSIONS = {
".webm",
}
_INPUT_FILES_LOCK = threading.Lock()
_INPUT_FILES_CACHE: tuple[str, int, float, list[str]] | None = None
_INPUT_FILES_TTL = 5.0
def clear_input_files_cache() -> None:
global _INPUT_FILES_CACHE
with _INPUT_FILES_LOCK:
_INPUT_FILES_CACHE = None
def _scan_input_files(root: str) -> list[str]:
files: list[str] = []
resolved_root = None
stack: list[tuple[str, str]] = [(root, "")]
while stack:
folder, prefix = stack.pop()
try:
with os.scandir(folder) as entries:
for entry in entries:
name = entry.name
if name.startswith("."):
continue
try:
if entry.is_dir(follow_symlinks=False):
stack.append((entry.path, f"{prefix}{name}/"))
elif entry.is_file(follow_symlinks=False):
files.append(f"{prefix}{name}")
elif entry.is_symlink():
if resolved_root is None:
resolved_root = Path(root).resolve()
target = Path(entry.path).resolve(strict=True)
if target.is_relative_to(resolved_root) and target.is_file():
files.append(f"{prefix}{name}")
except (OSError, RuntimeError): # A broken or looping link.
continue
except OSError:
continue
files.sort(key=str.casefold)
return files
def list_input_files(paths=None) -> list[str]:
"""Every non-hidden regular file in ComfyUI's input folder, as a forward-slash
path below it, sorted case-insensitively. Shared across the input loaders so
/object_info walks the input tree once with os.scandir instead of per-file
stat calls on every node."""
global _INPUT_FILES_CACHE
if paths is None:
if folder_paths is None:
return []
input_dir = folder_paths.get_input_directory()
else:
input_dir = paths.get_input_directory()
root = os.path.normpath(str(input_dir))
try:
root_mtime = os.stat(root).st_mtime_ns
except OSError:
return []
now = time.monotonic()
with _INPUT_FILES_LOCK:
cached = _INPUT_FILES_CACHE
if (
cached is not None
and cached[0] == root
and cached[1] == root_mtime
and (now - cached[2]) < _INPUT_FILES_TTL
):
return list(cached[3])
files = _scan_input_files(root)
with _INPUT_FILES_LOCK:
_INPUT_FILES_CACHE = (root, root_mtime, time.monotonic(), files)
return list(files)
def list_input_images() -> list[str]:
if folder_paths is None:
return [""]
root = Path(folder_paths.get_input_directory())
results: list[str] = []
for path in root.rglob("*"):
if not path.is_file():
continue
try:
if folder_paths.filter_files_content_types([path.name], ["image"]):
results.append(path.relative_to(root).as_posix())
except Exception:
if path.suffix.lower() in {".png", ".jpg", ".jpeg", ".webp", ".bmp", ".gif", ".tif", ".tiff"}:
results.append(path.relative_to(root).as_posix())
return sorted(results, key=str.casefold) or [""]
files = list_input_files()
try:
results = list(folder_paths.filter_files_content_types(files, ["image"]))
except Exception:
results = [name for name in files if Path(name).suffix.lower() in IMAGE_EXTENSIONS]
return results or [""]
def list_input_videos() -> list[str]:
if folder_paths is None:
return [""]
root = Path(folder_paths.get_input_directory())
results = [
path.relative_to(root).as_posix()
for path in root.rglob("*")
if path.is_file() and path.suffix.lower() in VIDEO_EXTENSIONS
name
for name in list_input_files()
if Path(name).suffix.lower() in VIDEO_EXTENSIONS
]
return sorted(results, key=str.casefold) or [""]
return results or [""]
def resolve_input_path(selection: str) -> Path:
@@ -176,8 +254,8 @@ def _locate_comfy_file(text: str, rule: str) -> tuple[str, str, Path]:
return folder, inside, path
def list_output_videos() -> list[str]:
"""The videos in ComfyUI's output folder, newest first, each named the
def list_output_media(extensions: set[str]) -> list[str]:
"""The media in ComfyUI's output folder, newest first, each named the
way ComfyUI names a file there: "sub/clip.mp4 [output]". Hidden files and
folders and links are left out."""
root = _server_folders().get("output")
@@ -187,7 +265,7 @@ def list_output_videos() -> list[str]:
for folder, folders, files in os.walk(root): # does not follow links to folders
folders[:] = [name for name in folders if not name.startswith(".")]
for name in files:
if name.startswith(".") or Path(name).suffix.lower() not in VIDEO_EXTENSIONS:
if name.startswith(".") or Path(name).suffix.lower() not in extensions:
continue
path = Path(folder, name)
try:
@@ -200,6 +278,10 @@ def list_output_videos() -> list[str]:
return [f"{name} [output]" for _mtime, name in found[:OUTPUT_LIST_CAP]]
def list_output_videos() -> list[str]:
return list_output_media(VIDEO_EXTENSIONS)
def load_image_frames(path: Path) -> list[Image.Image]:
frames: list[Image.Image] = []
with Image.open(path) as source:
@@ -772,6 +854,11 @@ def register_video_routes() -> None:
videos = await asyncio.get_running_loop().run_in_executor(None, list_output_videos)
return web.json_response({"videos": videos})
@prompt_server.routes.get("/ausboss/transform/image/outputs")
async def ausboss_image_outputs(request):
images = await asyncio.get_running_loop().run_in_executor(None, list_output_media, IMAGE_EXTENSIONS)
return web.json_response({"images": images})
def request_path(request) -> Path:
# resolve_video_path refuses a whole path from its text, before the
# disk is touched, so a denied request can not be used to probe which
+18 -2
View File
@@ -52,7 +52,23 @@ class AusBossCallout:
return ()
NODE_CLASS_MAPPINGS = {"AUSBOSS_NODES_Callout": AusBossCallout}
NODE_DISPLAY_NAME_MAPPINGS = {"AUSBOSS_NODES_Callout": "Callout 🆎"}
class AusBossCalloutTile(AusBossCallout):
DESCRIPTION = (
"A compact title or colored link button for a workflow. "
"Double-click to edit; use its menu to choose a title, YouTube or "
"Discord tile. Saved tiles require a pack that supports tiles, "
"so an older install can report the missing node. Nothing runs."
)
SEARCH_ALIASES = ["callout tile", "link button", "youtube", "discord", "ausboss"]
NODE_CLASS_MAPPINGS = {
"AUSBOSS_NODES_Callout": AusBossCallout,
"AUSBOSS_NODES_CalloutTile": AusBossCalloutTile,
}
NODE_DISPLAY_NAME_MAPPINGS = {
"AUSBOSS_NODES_Callout": "Callout 🆎",
"AUSBOSS_NODES_CalloutTile": "Callout Tile 🆎",
}
__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS"]
+28 -7
View File
@@ -4,8 +4,8 @@ from __future__ import annotations
import sys
from ._h3_cast_helpers import JOBS, KEEP, KEEPS_ITS_LENGTH, PERSON, PLACE, START, THING, VIDEO_JOBS
from ._h3_prompt_helpers import find_beats, split_sections, write_prompt
from ._h3_cast_helpers import EDIT, JOBS, KEEP, KEEPS_ITS_LENGTH, PERSON, PLACE, START, SWAP, THING, VIDEO_JOBS
from ._h3_prompt_helpers import find_beats, find_speech, split_sections, write_prompt
from ._h3_script_helpers import CAMERAS, LOOKS, script_report
from ._route_errors import safe_route_error
@@ -252,8 +252,9 @@ class AusBossH3PromptWriter:
{
"default": VIDEO_JOBS[0],
"tooltip": (
"What the video is for: copy its moves, swap the person in it, keep it going, or "
"give it a new voice. Swap and new voice ignore Seconds and keep the video's length."
"What the video is for: copy its moves, swap the person in it, keep it going, give it "
"a new voice, or change something in it and keep the person (a hat, a shirt). Swap, "
"new voice and change something ignore Seconds and keep the video's length."
),
},
),
@@ -273,10 +274,20 @@ class AusBossH3PromptWriter:
"tooltip": "The music, like a slow lo-fi beat. A clip with music comes out louder. Empty means no music.",
},
),
"clip_sound": (
"BOOLEAN",
{
"default": False,
"tooltip": (
"Turn on when a swap keeps the video's own sound. Each line is timed from that sound, "
"and words from anyone else are left out so only the new person's mouth moves."
),
},
),
},
}
RETURN_TYPES = ("STRING", "IMAGE", "IMAGE", "IMAGE", "IMAGE", "IMAGE", "AUDIO", "AUDIO", "AUDIO", "AUDIO", "INT", "INT", "INT")
RETURN_TYPES = ("STRING", "IMAGE", "IMAGE", "IMAGE", "IMAGE", "IMAGE", "AUDIO", "AUDIO", "AUDIO", "AUDIO", "INT", "INT", "INT", "BOOLEAN")
RETURN_NAMES = (
"prompt",
"picture_1",
@@ -291,6 +302,7 @@ class AusBossH3PromptWriter:
"frames",
"width",
"height",
"keeps_clip_sound",
)
OUTPUT_TOOLTIPS = (
"The finished prompt. Wire it into H3's prompt.",
@@ -306,13 +318,17 @@ class AusBossH3PromptWriter:
"The clip's length in frames. Wire it into H3's length.",
"The width of your video, or else of your first picture. Wire it into H3's width.",
"The height of your video, or else of your first picture. Wire it into H3's height.",
"On when the finished clip should keep your video's own sound: with clip_sound on, or always for change something.",
)
FUNCTION = "write"
def write(self, script, seconds, clip=None, picture_1=None, picture_2=None, picture_3=None, picture_4=None, video=None,
video_sound=None, voice=None, song=None, camera=AS_TYPED, look=FROM_PICTURE, song_start=0.0, cut_on_beat=True,
language="English", job_1=PERSON, job_2=PERSON, job_3=PERSON, job_4=THING, video_job=VIDEO_JOBS[0],
sound="", music=""):
sound="", music="", clip_sound=False):
# A clip that keeps its own sound has no room for a score: the finished clip plays the video's sound.
if video is not None and (video_job == EDIT or (video_job == SWAP and clip_sound)):
music = ""
script = with_sound_and_music(script, sound, music)
pictures = {1: picture_1, 2: picture_2, 3: picture_3, 4: picture_4}
given = {slot: picture for slot, picture in pictures.items() if picture is not None}
@@ -324,6 +340,9 @@ class AusBossH3PromptWriter:
frames = video_frames(video.shape[0])
seconds = frames / FRAME_RATE
length = frames / FRAME_RATE
keeps_clip_sound = video is not None and (bool(clip_sound) or video_job == EDIT)
clip_sound = bool(clip_sound) and video_job == SWAP
speech = find_speech(mono_samples(video_sound), video_sound["sample_rate"]) if clip_sound and video_sound is not None else None
if video_job == KEEP:
video, video_sound = last_of_clip(video, video_sound)
else:
@@ -349,9 +368,11 @@ class AusBossH3PromptWriter:
jobs=jobs,
video=video_job,
soundtrack=video_sound is not None,
clip_sound=clip_sound,
speech=speech,
)
ordered = [*given.values(), None, None, None, None][: len(PICTURES)]
return (text, *ordered, video, video_sound, voice, song, song_under, frames, *clip_shape(video, ordered[0]))
return (text, *ordered, video, video_sound, voice, song, song_under, frames, *clip_shape(video, ordered[0]), keeps_clip_sound)
def _register_routes():

Some files were not shown because too many files have changed in this diff Show More