Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
05667f6517 | ||
|
|
ab7cebcebc | ||
|
|
e4eabfefd5 | ||
|
|
bbe86060c6 | ||
|
|
be4bd9bb16 | ||
|
|
913cc7ba55 | ||
|
|
04dc35af00 | ||
|
|
7b1efef47e | ||
|
|
ec49b685db | ||
|
|
2ae545d64d | ||
|
|
81b7a8fe63 | ||
|
|
2fc10b0c5e | ||
|
|
e7ff15d5a7 | ||
|
|
5bc3200832 | ||
|
|
c484e9d236 | ||
|
|
dc6a0723a5 | ||
|
|
6184b74809 | ||
|
|
9948cb3433 | ||
|
|
6cb9bbe868 | ||
|
|
561b73630c | ||
|
|
51efa670e0 | ||
|
|
d188a3764b | ||
|
|
f1d0630729 | ||
|
|
0cd1032073 | ||
|
|
d01b085082 | ||
|
|
0583ba2675 | ||
|
|
dcc37d7ab6 | ||
|
|
583b22a4bf | ||
|
|
ebe01efc49 | ||
|
|
41e8a2b61c | ||
|
|
22e4a5d202 | ||
|
|
017e3fc7fe |
@@ -0,0 +1,13 @@
|
||||
.github/
|
||||
tests/
|
||||
tools/
|
||||
scripts/
|
||||
web/src/
|
||||
web/tests/
|
||||
AGENTS.md
|
||||
.releaserc.cjs
|
||||
eslint.config.js
|
||||
package-lock.json
|
||||
package.json
|
||||
tsconfig.json
|
||||
vitest.config.ts
|
||||
@@ -0,0 +1,62 @@
|
||||
name: quality gates
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
quality:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
SIMPLE_SYRUP_TEST_COMFY_CPU: "1"
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v6
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version: 22.14.0
|
||||
cache: npm
|
||||
|
||||
- name: Setup Python
|
||||
uses: actions/setup-python@v6
|
||||
with:
|
||||
python-version: "3.11"
|
||||
|
||||
- name: Install Node dependencies
|
||||
run: npm ci
|
||||
|
||||
- name: Install ComfyUI host dependencies
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
git clone --depth 1 https://github.com/comfyanonymous/ComfyUI.git "$RUNNER_TEMP/ComfyUI"
|
||||
rsync -a --exclude=".git" "$RUNNER_TEMP/ComfyUI/" "$GITHUB_WORKSPACE/../.."/
|
||||
pip install -r "$GITHUB_WORKSPACE/../../requirements.txt"
|
||||
|
||||
- name: Install Python dependencies
|
||||
run: pip install -e . pytest pytest-xdist ruff mypy
|
||||
|
||||
- name: Check architecture governance
|
||||
run: python -m tools.check_architecture
|
||||
|
||||
- name: Check test governance
|
||||
run: python -m tools.check_test_governance
|
||||
|
||||
- name: Verify Python formatting
|
||||
run: ruff format --check .
|
||||
|
||||
- name: Verify Python lint
|
||||
run: ruff check .
|
||||
|
||||
- name: Verify Python types
|
||||
run: mypy --strict simple_syrup tests
|
||||
|
||||
- name: Verify Python tests
|
||||
run: pytest -n auto -q -m "not external_artifact"
|
||||
|
||||
- name: Verify frontend
|
||||
run: npm run check:web
|
||||
@@ -50,13 +50,15 @@ jobs:
|
||||
"transformers${{ matrix.version }}"
|
||||
|
||||
- name: Verify GroundingDINO BERT compatibility
|
||||
env:
|
||||
PYTHONPATH: ${{ github.workspace }}/tests
|
||||
run: >-
|
||||
python -m pytest -q
|
||||
--noconftest
|
||||
--rootdir=tests
|
||||
--confcutdir=tests
|
||||
tests/test_grounding_dino_bert_adapter.py
|
||||
tests/test_grounding_dino_text_token_masks.py
|
||||
tests/segmentation/detection/test_grounding_dino_bert_adapter.py
|
||||
tests/segmentation/detection/test_grounding_dino_text_token_masks.py
|
||||
|
||||
release:
|
||||
if: github.event_name != 'pull_request'
|
||||
@@ -98,6 +100,12 @@ jobs:
|
||||
- name: Verify Python formatting
|
||||
run: ruff format --check .
|
||||
|
||||
- name: Check architecture governance
|
||||
run: python -m tools.check_architecture
|
||||
|
||||
- name: Check test governance
|
||||
run: python -m tools.check_test_governance
|
||||
|
||||
- name: Verify Python lint
|
||||
run: ruff check .
|
||||
|
||||
@@ -114,6 +122,10 @@ jobs:
|
||||
id: release
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
GIT_AUTHOR_NAME: Daisy
|
||||
GIT_AUTHOR_EMAIL: daisy@artificialsweetener.ai
|
||||
GIT_COMMITTER_NAME: Daisy
|
||||
GIT_COMMITTER_EMAIL: daisy@artificialsweetener.ai
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
repos:
|
||||
- repo: local
|
||||
hooks:
|
||||
- id: architecture-governance
|
||||
name: Enforce architecture governance
|
||||
entry: ..\..\venv\Scripts\python.exe -m tools.check_architecture
|
||||
language: system
|
||||
pass_filenames: false
|
||||
always_run: true
|
||||
- id: test-governance
|
||||
name: Enforce test governance
|
||||
entry: ..\..\venv\Scripts\python.exe -m tools.check_test_governance
|
||||
language: system
|
||||
pass_filenames: false
|
||||
always_run: true
|
||||
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v5.0.0
|
||||
hooks:
|
||||
- id: end-of-file-fixer
|
||||
- id: mixed-line-ending
|
||||
args: [--fix=lf]
|
||||
exclude: '(\.bat$|\.cmd$|\.ps1$)'
|
||||
- id: trailing-whitespace
|
||||
- id: check-merge-conflict
|
||||
- id: check-yaml
|
||||
- id: check-json
|
||||
exclude: '(^web/dist/|tsconfig\.json$)'
|
||||
- id: check-toml
|
||||
@@ -35,6 +35,8 @@ Engineering priority is strict architecture, strong separation of concerns, comp
|
||||
### Required Command Forms
|
||||
|
||||
- Tests: `..\..\venv\Scripts\python.exe -m pytest -n auto -q`
|
||||
- Architecture: `..\..\venv\Scripts\python.exe -m tools.check_architecture`
|
||||
- Test governance: `..\..\venv\Scripts\python.exe -m tools.check_test_governance`
|
||||
- Lint: `..\..\venv\Scripts\ruff.exe check .`
|
||||
- Format: `..\..\venv\Scripts\ruff.exe format .`
|
||||
- Type check: `..\..\venv\Scripts\mypy.exe --strict simple_syrup tests`
|
||||
@@ -94,6 +96,34 @@ If a required tool is missing from `..\..\venv`, install or update development d
|
||||
- Reorganize modules when it improves architecture.
|
||||
- Align touched modules with the ownership and dependency rules in this file.
|
||||
|
||||
## Architecture Governance
|
||||
|
||||
- Repository governance lives under `governance/`.
|
||||
- `governance/architecture/policy.toml` defines every authored-code root,
|
||||
extension, exclusion, and the 350-line soft and 500-line hard structural
|
||||
thresholds.
|
||||
- `governance/architecture/debt.toml` records exact assessed mixed ownership.
|
||||
- `governance/architecture/waivers.toml` records exact bounded hard-gate
|
||||
exceptions.
|
||||
- `governance/architecture/import_debt.toml` records exact current dependency-
|
||||
direction violations; new violations are prohibited.
|
||||
- `governance/architecture/soft_reviews.toml` records the current human
|
||||
disposition of every file between the soft and hard thresholds.
|
||||
- Every hard-gate file requires source-level ownership review.
|
||||
- Use a structural waiver only for one cohesive authoritative owner whose
|
||||
invariants would be divided by extraction.
|
||||
- Mixed ownership requires debt and a linked remediation waiver naming the
|
||||
next extraction and a lower next limit.
|
||||
- Waivers and debt are fingerprinted current state, not historical ledgers.
|
||||
- Delete resolved records; do not extend dates or limits merely to pass the
|
||||
checker.
|
||||
- `governance/testing/policy.toml` defines Python and frontend test-layout and
|
||||
reliability discovery.
|
||||
- Every test-governance candidate requires an exact classification or
|
||||
debt-remediation disposition.
|
||||
- Run both governance checkers after changing authored structure, test
|
||||
placement, isolation, timing, resources, or reviewed state.
|
||||
|
||||
## ComfyUI Node Rules
|
||||
|
||||
- Public node identifiers are compatibility-sensitive.
|
||||
|
||||
+103
@@ -1,3 +1,106 @@
|
||||
# [1.13.0](https://github.com/Artificial-Sweetener/SimpleSyrup/compare/v1.12.0...v1.13.0) (2026-10-02)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **negpip:** support Krea attention on ComfyUI 0.28 ([e4eabfe](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/e4eabfefd540f3a6066c29761cefb8f8b3c80f68))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **sampling:** add noise inversion and composable sampler options ([be4bd9b](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/be4bd9bb162f6ed4252e0c4d4ef0f3efebe8c674))
|
||||
* **sampling:** refine sampler options and inversion controls ([ab7cebc](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/ab7cebcebc4d5dfa95aa8d834456af1778fe56a6))
|
||||
|
||||
# [1.12.0](https://github.com/Artificial-Sweetener/SimpleSyrup/compare/v1.11.1...v1.12.0) (2026-09-29)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **release:** satisfy RES4LYF publication contracts ([04dc35a](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/04dc35af00163689509cace1541a8e7d33b5053e))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **sampling:** add RES4LYF sampler methods and schedules ([7b1efef](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/7b1efef47e20b9bf6f032dd57971899d99881822))
|
||||
|
||||
## [1.11.1](https://github.com/Artificial-Sweetener/SimpleSyrup/compare/v1.11.0...v1.11.1) (2026-09-25)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **release:** attribute automation to Daisy ([2ae545d](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/2ae545d64d70a454f635ee647fb7e6a1c3500b9b))
|
||||
|
||||
# [1.11.0](https://github.com/Artificial-Sweetener/SimpleSyrup/compare/v1.10.1...v1.11.0) (2026-09-25)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **sampling:** make negative conditioning optional ([0bc81dc](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/0bc81dc4d00a13d42c65440da2058e94a505e8d5))
|
||||
|
||||
## [1.10.1](https://github.com/Artificial-Sweetener/SimpleSyrup/compare/v1.10.0...v1.10.1) (2026-09-24)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **ci:** expose test support to compatibility jobs ([0517f71](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/0517f71da891414e9773c5cd47879ff748492e70))
|
||||
* **governance:** enforce SugarSubstitute quality standards ([bbaed2c](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/bbaed2c90656cd4e65e5bfcd4c0451f90ec2d7c7))
|
||||
|
||||
# [1.10.0](https://github.com/Artificial-Sweetener/SimpleSyrup/compare/v1.9.3...v1.10.0) (2026-09-21)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **loaders:** add Krea 2 model loader ([166f029](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/166f029d12e5fce019133cc38be7279d05a5ecbc))
|
||||
|
||||
## [1.9.3](https://github.com/Artificial-Sweetener/SimpleSyrup/compare/v1.9.2...v1.9.3) (2026-09-20)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **attention-coupling:** restore regional LoRA sampling ([0255a0f](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/0255a0f5044278f14452b6b2582ec6646083f756))
|
||||
|
||||
## [1.9.2](https://github.com/Artificial-Sweetener/SimpleSyrup/compare/v1.9.1...v1.9.2) (2026-09-20)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **registry:** remove flagged package content ([f3a53b5](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/f3a53b5ec6c080d98f7e9599cf55e849cf338021))
|
||||
|
||||
## [1.9.1](https://github.com/Artificial-Sweetener/SimpleSyrup/compare/v1.9.0...v1.9.1) (2026-09-20)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **contextual-diffusion:** project reference latents into views ([4cd780a](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/4cd780a2451aa472ce826834e4426b65693c46e8))
|
||||
|
||||
# [1.9.0](https://github.com/Artificial-Sweetener/SimpleSyrup/compare/v1.8.0...v1.9.0) (2026-09-19)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **prompts:** add automatic NegPiP support ([6d052e9](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/6d052e9800985696972bf431fa7dae4972a56313))
|
||||
|
||||
# [1.8.0](https://github.com/Artificial-Sweetener/SimpleSyrup/compare/v1.7.1...v1.8.0) (2026-09-19)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **downloads:** keep unknown sizes indeterminate ([a31467c](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/a31467cd3a4299e9e3929d44281018dba0322b3e))
|
||||
* **models:** hide installed catalog choices ([d887e87](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/d887e87e03eb6d0d9d5325fe43b67fbd9e47cf71))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **models:** add curated ultralytics downloads ([b907fa2](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/b907fa2a17afa30170bc22cf1134a750241e55c2))
|
||||
* **models:** prioritize installed ultralytics choices ([d30e04f](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/d30e04f229366d3e1d2388bd4d713b2b47a12a1f))
|
||||
|
||||
## [1.7.1](https://github.com/Artificial-Sweetener/SimpleSyrup/compare/v1.7.0...v1.7.1) (2026-09-11)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **regional:** preserve shared model patch ancestry ([6059a3f](https://github.com/Artificial-Sweetener/SimpleSyrup/commit/6059a3f913a9502671666e83faeb8686a7a8da27))
|
||||
|
||||
# [1.7.0](https://github.com/Artificial-Sweetener/SimpleSyrup/compare/v1.6.0...v1.7.0) (2026-09-05)
|
||||
|
||||
|
||||
|
||||
@@ -12,13 +12,13 @@ The pack now covers model loading, regional prompting and segmentation, high-res
|
||||
|
||||
## Highlights
|
||||
|
||||
- Loaders that keep checkpoints, Anima, FLUX.1, and FLUX.2 models together with the text encoders, VAE, precision, and device choices they need.
|
||||
- Loaders that keep checkpoints, Anima, FLUX.1, FLUX.2, and Krea 2 models together with the text encoders, VAE, precision, and device choices they need.
|
||||
- My original Contextual Diffusion method for coherent high-resolution edits, plus MultiDiffusion and Mixture of Diffusers tiled sampling.
|
||||
- Impact-compatible SEGS detection, segmentation, interactive preview, batching, and detailers.
|
||||
- ADetailer-style `[SEP]` prompt batches, masked conditioning, and regional samplers, with optional Prompt Control scheduling and LoRA hooks.
|
||||
- WD14 and external vision LLM tagging that stays aligned with the right regions.
|
||||
- Ordered image and mask loading, GPU Lanczos resizing, tiled VAE options, and provenance-aware latent tools.
|
||||
- WebUI-inspired sampling extras including seed variation, A1111 Euler ancestral behavior, AYS, GITS, `automatic_a1111`, and beta57.
|
||||
- WebUI-inspired sampling extras including seed variation, A1111 Euler ancestral behavior, AYS, GITS, `automatic_a1111`, and RES4LYF sampler methods and schedules.
|
||||
|
||||
## Contents
|
||||
|
||||
@@ -74,7 +74,9 @@ Loading a checkpoint used to feel like choosing one file. Newer model families c
|
||||
|
||||
**Simple Load FLUX** handles FLUX.1 with CLIP-L, T5-XXL, and its VAE. **Simple Load FLUX.2** inspects the selected diffusion model and chooses the matching text encoder family for FLUX.2 dev, Klein 4B, or Klein 9B/KV conditioning. Both loaders can find or download their known text encoders and VAEs with visible Comfy progress.
|
||||
|
||||
The FLUX loaders only download those revision-locked, checksum-pinned support files. You still install and select the diffusion model. They also expose manual component selection, diffusion weight precision, and text-encoder device placement. Moving text encoding to the CPU can save VRAM, although it will take longer.
|
||||
**Simple Load Krea 2** validates the selected Raw or Turbo diffusion model and loads the required Qwen3-VL 4B encoder with Krea's layered conditioning plus the Qwen Image VAE. Auto uses the official FP8-scaled encoder; the advanced encoder choice can download either the checksum-pinned FP8-scaled or BF16 file.
|
||||
|
||||
The FLUX and Krea 2 loaders only download those revision-locked, checksum-pinned support files. You still install and select the diffusion model. They also expose manual component selection, diffusion weight precision, and text-encoder device placement. Moving text encoding to the CPU can save VRAM, although it will take longer.
|
||||
|
||||
## Large images and high-resolution edits
|
||||
|
||||
@@ -150,7 +152,7 @@ The external LLM nodes use a configured OpenAI-compatible provider. **Tag SEGS w
|
||||
|
||||
**Simple VAE Encode** can reuse the source latent when the graph proves that its image came directly from an unmodified `VAEDecode`. **Upscale Latent From Image** uses the same provenance to find and resize the original latent. Loading, editing, cropping, detailing, or resizing the image breaks that provenance. These nodes follow the graph instead of trying to identify a latent from the finished tensor.
|
||||
|
||||
**KSampler (Extras)** adds the A1111/k-diffusion-style `euler_a_a1111` sampler, AYS SD1 and SDXL schedules, GITS, the `automatic_a1111` scheduler, and a local implementation of the RES4LYF beta57 preset. It keeps Comfy's regular seed handling, partial denoise behavior, progress callbacks, and conditioning inputs.
|
||||
**KSampler (Extras)** adds the A1111/k-diffusion-style `euler_a_a1111` sampler, AYS SD1 and SDXL schedules, GITS, `automatic_a1111`, and the RES4LYF beta57 and `bong_tangent` schedules. Its sampler dropdown includes 118 RES4LYF methods, including `exponential/ddim`. These methods are also available in the contextual, tiled, and Attention Coupling KSamplers. RES4LYF methods use their upstream default initial noise; Comfy samplers keep Comfy's normal noise path.
|
||||
|
||||
**Seed Variation** patches a MODEL so Comfy-native samplers mix their normal initial noise toward a second deterministic seed. Strength `0` keeps the sampler seed unchanged, while strength `1` uses variation-seed initial noise. Ancestral and SDE samplers continue to use the sampler seed for additional noise introduced after initialization.
|
||||
|
||||
@@ -164,7 +166,7 @@ SimpleSyrup adds three ComfyUI settings:
|
||||
- **SimpleSyrup: External LLM endpoint** stores the OpenAI-compatible base URL used to discover provider models and run the external prompt nodes.
|
||||
- **SimpleSyrup: External LLM API key** stores the provider key in OS credential storage.
|
||||
|
||||
With downloadable models enabled, selecting a known missing catalog entry lets its loader download the required files. With the setting disabled, the dropdowns contain models SimpleSyrup can verify locally. Anima, FLUX.1, and FLUX.2 support components are resolved by their own loaders and use checksum-pinned automatic choices.
|
||||
With downloadable models enabled, selecting a known missing catalog entry lets its loader download the required files. With the setting disabled, the dropdowns contain models SimpleSyrup can verify locally. Anima, FLUX.1, FLUX.2, and Krea 2 support components are resolved by their own loaders and use checksum-pinned automatic choices. Automatic resolution checks cached and official paths first, then recognizes renamed files with matching size and checksum inside the appropriate ComfyUI model category. Known local support files are represented by their automatic choice instead of appearing again as manual dropdown entries.
|
||||
|
||||
Saving the external LLM endpoint and API key refreshes the provider models available in connected SimpleSyrup nodes. Image inputs require a provider model with vision support.
|
||||
|
||||
@@ -180,6 +182,8 @@ SimpleSyrup currently interoperates with:
|
||||
|
||||
AGPL-3.0-or-later is a strong copyleft license. If you convey SimpleSyrup or a modified version, you must provide the corresponding source. If users interact with a modified version over a network, you must offer those users the corresponding source for that version.
|
||||
|
||||
The vendored RES4LYF license copy includes its upstream commercial-service paragraph before the GNU AGPL v3 text. Read the [RES4LYF license copy](third_party/licenses/res4lyf.LICENSE.txt) and [third-party notices](third_party/NOTICE.md) for the terms and provenance recorded with that code.
|
||||
|
||||
SimpleSyrup owes a lot to other projects:
|
||||
|
||||
- [ComfyUI](https://github.com/Comfy-Org/ComfyUI) provides the engine and graph ecosystem this pack runs on.
|
||||
@@ -188,7 +192,8 @@ SimpleSyrup owes a lot to other projects:
|
||||
- [ComfyUI Prompt Control](https://github.com/asagi4/comfyui-prompt-control) provides the scheduled prompt and LoRA-hook behavior used by the optional integration.
|
||||
- [ComfyUI Layer Style Advance](https://github.com/chflame163/ComfyUI_LayerStyle_Advance) provides the SAM model bundle SimpleSyrup can adapt.
|
||||
- [Tiled Diffusion & VAE for AUTOMATIC1111](https://github.com/pkuliyi2015/multidiffusion-upscaler-for-automatic1111) informed the practical tiled diffusion and Mixture of Diffusers behavior reimplemented here.
|
||||
- [RES4LYF](https://github.com/ClownsharkBatwing/RES4LYF) is the source of the beta57 scheduler preset reimplemented here.
|
||||
- [RES4LYF](https://github.com/ClownsharkBatwing/RES4LYF) by ClownsharkBatwing and contributors provides the Runge-Kutta and exponential sampler methods included here, along with the `bong_tangent` schedule and the beta57 preset.
|
||||
- [ComfyUI-ppm](https://github.com/pamparamm/ComfyUI-ppm) by pamparamm provides the ModelPatcher-based NegPiP behavior adapted here and builds on the [ComfyUI port](https://github.com/laksjdjf/cd-tuner_negpip-ComfyUI) by laksjdjf and the [original WebUI implementation](https://github.com/hako-mikan/sd-webui-negpip) by hako-mikan.
|
||||
|
||||
SimpleSyrup also vendors or reimplements selected third-party behavior for SAM-HQ, MobileSAM, GroundingDINO, AUTOMATIC1111 sampler behavior, k-diffusion, and tiled diffusion. See [third_party/NOTICE.md](third_party/NOTICE.md) for the complete notices.
|
||||
|
||||
|
||||
+12
-10
@@ -12,22 +12,24 @@ from . import simple_syrup as _simple_syrup_package
|
||||
|
||||
sys.modules.setdefault("simple_syrup", _simple_syrup_package)
|
||||
|
||||
from .simple_syrup.integration.external_llm_routes import ( # noqa: E402
|
||||
register_external_llm_routes,
|
||||
)
|
||||
from .simple_syrup.integration.mask_batch_preview_routes import ( # noqa: E402
|
||||
register_mask_batch_preview_routes,
|
||||
)
|
||||
from .simple_syrup.integration.quant_cache_routes import ( # noqa: E402
|
||||
register_quant_cache_routes,
|
||||
)
|
||||
from .simple_syrup.integration.settings_routes import ( # noqa: E402
|
||||
register_settings_routes,
|
||||
)
|
||||
from .simple_syrup.runtime.attention_region_prompt_handler import ( # noqa: E402
|
||||
register_attention_region_prompt_handler,
|
||||
)
|
||||
from .simple_syrup.runtime.comfy_safetensors_dtypes import ( # noqa: E402
|
||||
register_comfy_safetensors_dtypes,
|
||||
)
|
||||
from .simple_syrup.runtime.external_llm_routes import ( # noqa: E402
|
||||
register_external_llm_routes,
|
||||
)
|
||||
from .simple_syrup.runtime.mask_batch_preview_routes import ( # noqa: E402
|
||||
register_mask_batch_preview_routes,
|
||||
)
|
||||
from .simple_syrup.runtime.quant_cache_routes import ( # noqa: E402
|
||||
register_quant_cache_routes,
|
||||
)
|
||||
from .simple_syrup.runtime.settings_routes import register_settings_routes # noqa: E402
|
||||
|
||||
WEB_DIRECTORY = "./web/dist"
|
||||
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
schema_version = 1
|
||||
debts = []
|
||||
@@ -0,0 +1 @@
|
||||
schema_version = 1
|
||||
@@ -0,0 +1,41 @@
|
||||
schema_version = 2
|
||||
|
||||
[structure]
|
||||
soft_lines = 350
|
||||
hard_lines = 500
|
||||
source_roots = [
|
||||
"simple_syrup/domain",
|
||||
"simple_syrup/image",
|
||||
"simple_syrup/integration",
|
||||
"simple_syrup/masking",
|
||||
"simple_syrup/nodes",
|
||||
"simple_syrup/nodes_v3",
|
||||
"simple_syrup/runtime",
|
||||
"simple_syrup/services",
|
||||
"simple_syrup/shared",
|
||||
"tests",
|
||||
"tools",
|
||||
"scripts",
|
||||
"web/src",
|
||||
"web/tests",
|
||||
]
|
||||
source_files = [
|
||||
"__init__.py",
|
||||
".releaserc.cjs",
|
||||
"eslint.config.js",
|
||||
"simple_syrup/__init__.py",
|
||||
"vitest.config.ts",
|
||||
]
|
||||
source_extensions = [
|
||||
".cjs",
|
||||
".js",
|
||||
".mjs",
|
||||
".py",
|
||||
".pyi",
|
||||
".ts",
|
||||
]
|
||||
excluded_paths = []
|
||||
|
||||
[registries]
|
||||
debt = "governance/architecture/debt.toml"
|
||||
waivers = "governance/architecture/waivers.toml"
|
||||
@@ -0,0 +1,58 @@
|
||||
schema_version = 1
|
||||
review_by = 2027-03-31
|
||||
fingerprint = "sha256:a71fe87163eb7585fafbca08b585954be79abd884e3a1df38bc041c2bc934764"
|
||||
|
||||
cohesive_paths = [
|
||||
"simple_syrup/masking/prompt_segs_with_sam_service.py",
|
||||
"simple_syrup/nodes/prompt_segs_with_sam.py",
|
||||
"simple_syrup/runtime/attention_region_affinity.py",
|
||||
"simple_syrup/runtime/attention_region_capture.py",
|
||||
"simple_syrup/runtime/attention_sampler_lineage.py",
|
||||
"simple_syrup/runtime/regional_lora/anima_module_surface.py",
|
||||
"simple_syrup/runtime/spatial_model_arguments.py",
|
||||
"simple_syrup/services/concept_attention_evidence.py",
|
||||
"tests/comfy_integration/test_comfy_regional_adapter_resolver.py",
|
||||
"tests/comfy_integration/test_comfy_regional_conditioning_processing.py",
|
||||
"tests/models/loading/test_checkpoint_quantizer.py",
|
||||
"tests/models/patching/test_model_patcher_mutations.py",
|
||||
"tests/prompting/prompt_control/test_prompt_control_schedule_encode_graph.py",
|
||||
"tests/regional_generation/anima/test_anima_activation_context.py",
|
||||
"tests/regional_generation/anima/test_anima_full_tile_lora_equivalence.py",
|
||||
"tests/regional_generation/anima/test_anima_loader.py",
|
||||
"tests/regional_generation/anima/test_anima_multi_lora_composition.py",
|
||||
"tests/regional_generation/anima/test_anima_regional_diagnostics.py",
|
||||
"tests/regional_generation/anima/test_anima_regional_diagnostics_wrapper.py",
|
||||
"tests/regional_generation/anima/test_anima_regional_permutation_diagnostics.py",
|
||||
"tests/regional_generation/anima/test_anima_single_adapter_mutations.py",
|
||||
"tests/regional_generation/attention_coupling/test_attention_coupling_model_preparation_service.py",
|
||||
"tests/regional_generation/attention_regions/test_attention_region_capture.py",
|
||||
"tests/regional_generation/attention_regions/test_attention_region_completion.py",
|
||||
"tests/regional_generation/attention_regions/test_attention_region_components.py",
|
||||
"tests/regional_generation/attention_regions/test_attention_region_geometry.py",
|
||||
"tests/regional_generation/regional/test_regional_attention_batching.py",
|
||||
"tests/regional_generation/regional/test_regional_linear_execution.py",
|
||||
"tests/regional_generation/regional/test_regional_model_patch_interop.py",
|
||||
"tests/regional_generation/regional/test_regional_multidiffusion_sampling.py",
|
||||
"tests/regional_generation/spatial/test_contextual_model_wrapper.py",
|
||||
"tests/sampling/test_multidiffusion_sampling.py",
|
||||
"tests/sampling/test_sampling_scheduler_references.py",
|
||||
"tests/sampling/test_sampling_schedulers.py",
|
||||
"tests/segmentation/detection/test_ultralytics_loader.py",
|
||||
"tests/segmentation/segs/test_detail_segs_as_regions_service.py",
|
||||
"tests/segmentation/segs/test_prompt_segs_with_sam_node.py",
|
||||
"tools/architecture_governance/validation.py",
|
||||
"tools/attention_coupling_benchmark/comfy_probe/negpip_runtime.py",
|
||||
"tools/negpip_integration/run.py",
|
||||
"tools/prompt_control_attention_coupling_integration/validation.py",
|
||||
"tools/run_global_prompt_lora_proof.py",
|
||||
"tools/test_governance/semantic_patterns.py",
|
||||
"tools/test_governance/validation.py",
|
||||
"web/src/orderedMediaNode.ts",
|
||||
"web/src/orderedMediaPreviewActions.ts",
|
||||
"web/tests/media/orderedMediaPreviewActions.test.ts",
|
||||
]
|
||||
|
||||
debt_paths = [
|
||||
]
|
||||
|
||||
remediations = []
|
||||
@@ -0,0 +1,67 @@
|
||||
schema_version = 1
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-WAIVER-S001"
|
||||
owner = "model catalog"
|
||||
rule = "STRUCT003"
|
||||
path = "simple_syrup/runtime/model_catalog.py"
|
||||
kind = "structural"
|
||||
justification = "This module is the single immutable catalog authority for supported model families and artifacts. Most of its size is declarative checksums, repository identities, filenames, and URLs; its small query surface and entry constructors enforce one catalog schema and change with that same metadata contract. Splitting entries by provider would scatter uniqueness and lookup review without separating behavior or ownership."
|
||||
issue = "chore:SSY-WAIVER-S001"
|
||||
review_by = 2027-03-31
|
||||
max_lines = 687
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-WAIVER-S003"
|
||||
owner = "Anima cross-attention patch contracts"
|
||||
rule = "STRUCT003"
|
||||
path = "tests/regional_generation/anima/test_anima_cross_attention.py"
|
||||
kind = "structural"
|
||||
justification = "This module is one integration contract for AnimaRegionalCrossAttentionPatch: it installs the exact Anima module surface, supplies one deterministic attention double, drives branch/mask/context alignment, verifies failure restoration, and proves all 28 clone-local patches. The sizable builders encode a single valid execution context and are not independent production responsibilities."
|
||||
issue = "chore:SSY-WAIVER-S003"
|
||||
review_by = 2027-03-31
|
||||
max_lines = 661
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-WAIVER-S004"
|
||||
owner = "Anima multi-LoRA fidelity contracts"
|
||||
rule = "STRUCT003"
|
||||
path = "tests/regional_generation/anima/test_anima_multi_lora_fidelity.py"
|
||||
kind = "structural"
|
||||
justification = "This module owns one numerical fidelity matrix for ordered multi-LoRA composition across schedules, branches, regions, target families, and the complete Anima surface. Its execution and reference helpers intentionally remain adjacent so every permutation is compared through the same independently calculated oracle; splitting by scenario would duplicate or conceal that shared proof authority."
|
||||
issue = "chore:SSY-WAIVER-S004"
|
||||
review_by = 2027-03-31
|
||||
max_lines = 678
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-WAIVER-S005"
|
||||
owner = "regional convolution execution contracts"
|
||||
rule = "STRUCT003"
|
||||
path = "tests/regional_generation/regional/test_regional_convolution_execution.py"
|
||||
kind = "structural"
|
||||
justification = "This module is the complete numerical contract for RegionalConvolutionExecutor across direct, pointwise, LoCon, strided, grouped, tiled-batch, ordered-adapter, and low-precision execution. Its fixture builds the same execution plan and independent convolution reference for every case, so the tests share one owner, oracle, dependency surface, and change cadence."
|
||||
issue = "chore:SSY-WAIVER-S005"
|
||||
review_by = 2027-03-31
|
||||
max_lines = 556
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-WAIVER-S006"
|
||||
owner = "Ultralytics detection node contracts"
|
||||
rule = "STRUCT003"
|
||||
path = "tests/segmentation/detection/test_detect_segs_with_ultralytics_node.py"
|
||||
kind = "structural"
|
||||
justification = "This module owns the workflow-facing contract of one Comfy node, including its schema, exact input order, batch behavior, sorting/ranking limits, union mode, and output shape. The service and builder doubles are deliberately local representations of that node boundary; every test changes with the same node API and persisted workflow contract."
|
||||
issue = "chore:SSY-WAIVER-S006"
|
||||
review_by = 2027-03-31
|
||||
max_lines = 592
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-WAIVER-S007"
|
||||
owner = "scale-factor detail service contracts"
|
||||
rule = "STRUCT003"
|
||||
path = "tests/segmentation/segs/test_detail_segs_by_scale_factor_service.py"
|
||||
kind = "structural"
|
||||
justification = "This module is the end-to-end behavioral contract for DetailSEGSByScaleFactorService, whose single orchestration transaction selects per-segment conditioning, sizes and resizes crops, applies masks, samples, decodes, and pastes results. Its sampler and resizer doubles record that one transaction; splitting them would duplicate setup without creating a distinct behavior owner."
|
||||
issue = "chore:SSY-WAIVER-S007"
|
||||
review_by = 2027-03-31
|
||||
max_lines = 532
|
||||
@@ -0,0 +1,2 @@
|
||||
schema_version = 1
|
||||
debts = []
|
||||
@@ -0,0 +1,27 @@
|
||||
schema_version = 1
|
||||
|
||||
[scope]
|
||||
test_root = "tests"
|
||||
semantic_support_roots = ["tools"]
|
||||
root_source_extensions = [".py", ".pyi"]
|
||||
allowed_root_source_paths = [
|
||||
"tests/ci_test_policy.py",
|
||||
"tests/conftest.py",
|
||||
]
|
||||
|
||||
[discovery]
|
||||
serial_policy = "tests/ci_test_policy.py"
|
||||
wait_calls = ["QTest.qWait", "time.sleep"]
|
||||
wall_clock_calls = [
|
||||
"QElapsedTimer",
|
||||
"monotonic",
|
||||
"perf_counter",
|
||||
"time.monotonic",
|
||||
"time.perf_counter",
|
||||
]
|
||||
xdist_environment_name = "PYTEST_XDIST_WORKER"
|
||||
repository_scratch_name = ".pytest-tmp"
|
||||
|
||||
[registries]
|
||||
debt = "governance/testing/debt.toml"
|
||||
waivers = "governance/testing/waivers.toml"
|
||||
@@ -0,0 +1,153 @@
|
||||
schema_version = 1
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-TEST-WAIVER-C001"
|
||||
owner = "pytest CUDA isolation bootstrap"
|
||||
kind = "classification"
|
||||
disposition = "framework_infrastructure"
|
||||
rule = "ENV001"
|
||||
candidates = ["ENV001|tests/conftest.py|<module>:environment-mutation:1"]
|
||||
paths = ["tests/conftest.py"]
|
||||
fingerprint = "sha256:481069f16237eff312f817f1e4dd3213e804eee0f3341e3f6c4aa2ba73066af3"
|
||||
rationale = "The root pytest bootstrap disables CUDA visibility before Torch and ComfyUI are imported unless the maintainer explicitly enables hardware tests. Every xdist worker receives the same inherited setting before collection, so this is suite framework configuration rather than mutable test-owned state."
|
||||
issue = "chore:SSY-TEST-WAIVER-C001"
|
||||
review_by = 2027-03-31
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-TEST-WAIVER-C002"
|
||||
owner = "native checkpoint quantization proofs"
|
||||
kind = "classification"
|
||||
disposition = "platform_native"
|
||||
rule = "OPTIONAL001"
|
||||
candidates = [
|
||||
"OPTIONAL001|tests/models/loading/test_checkpoint_quantizer.py|<module>:optional-proof:1",
|
||||
"OPTIONAL001|tests/models/loading/test_checkpoint_quantizer.py|<module>:optional-proof:2",
|
||||
"OPTIONAL001|tests/models/loading/test_checkpoint_quantizer.py|<module>:optional-proof:3",
|
||||
"OPTIONAL001|tests/models/loading/test_checkpoint_quantizer.py|<module>:optional-proof:4",
|
||||
"OPTIONAL001|tests/models/loading/test_checkpoint_quantizer.py|<module>:optional-proof:5",
|
||||
]
|
||||
paths = ["tests/models/loading/test_checkpoint_quantizer.py"]
|
||||
fingerprint = "sha256:bc2bee06ddb6cf41ba66497855e7349e5aa5dd5292f732284a812a615fa65c49"
|
||||
rationale = "These proofs exercise installed ComfyUI NVFP4/MXFP8 kernels, GPU compute capability, and optional comfy-aimdo reload behavior. CPU fake-boundary tests in the same module always run; only the native serialization contracts are skipped when their external runtime or hardware capability does not exist."
|
||||
issue = "chore:SSY-TEST-WAIVER-C002"
|
||||
review_by = 2027-03-31
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-TEST-WAIVER-C003"
|
||||
owner = "CUDA Anima projection precision proof"
|
||||
kind = "classification"
|
||||
disposition = "platform_native"
|
||||
rule = "OPTIONAL001"
|
||||
candidates = ["OPTIONAL001|tests/regional_generation/anima/test_anima_projection_batch.py|<module>:optional-proof:1"]
|
||||
paths = ["tests/regional_generation/anima/test_anima_projection_batch.py"]
|
||||
fingerprint = "sha256:cb5e280524450a58144b350799129b3c27a6d4ce430867de582da19303987c33"
|
||||
rationale = "This exact comparison bounds BF16 batched projection error on CUDA tensors against independently generated projections. Its behavior depends on the installed CUDA execution path and cannot truthfully be substituted by CPU arithmetic; all device-independent projection contracts remain mandatory."
|
||||
issue = "chore:SSY-TEST-WAIVER-C003"
|
||||
review_by = 2027-03-31
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-TEST-WAIVER-C004"
|
||||
owner = "native Anima quantization workflow"
|
||||
kind = "classification"
|
||||
disposition = "platform_native"
|
||||
rule = "OPTIONAL001"
|
||||
candidates = ["OPTIONAL001|tests/regional_generation/anima/test_anima_quantization_workflow.py|<module>:optional-proof:1"]
|
||||
paths = ["tests/regional_generation/anima/test_anima_quantization_workflow.py"]
|
||||
fingerprint = "sha256:ff02416ea8c16112605b221975425a6f88013f66e2a8bc66bdc2d1a0ecfa5053"
|
||||
rationale = "The workflow proof intentionally uses the installed ComfyUI NVFP4 implementation and the active GPU's native compute support before loading the generated Anima artifact. It remains optional only where that hardware capability is absent; the portable resolver and policy tests still run everywhere."
|
||||
issue = "chore:SSY-TEST-WAIVER-C004"
|
||||
review_by = 2027-03-31
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-TEST-WAIVER-C005"
|
||||
owner = "installed Anima CUDA smoke"
|
||||
kind = "classification"
|
||||
disposition = "platform_native"
|
||||
rule = "OPTIONAL001"
|
||||
candidates = ["OPTIONAL001|tests/regional_generation/anima/test_anima_regional_model_smoke.py|<module>:optional-proof:1"]
|
||||
paths = ["tests/regional_generation/anima/test_anima_regional_model_smoke.py"]
|
||||
fingerprint = "sha256:73b3bde9d6009b71608aec73dde862d963a3a723d5ad5d57c130428a4c1511c6"
|
||||
rationale = "This smoke test constructs the installed Comfy Anima model and executes its complete patched forward on CUDA tensors. It proves the native device/runtime integration and is skipped only without CUDA; deterministic component and surface contracts cover the same code boundaries on every host."
|
||||
issue = "chore:SSY-TEST-WAIVER-C005"
|
||||
review_by = 2027-03-31
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-TEST-WAIVER-C006"
|
||||
owner = "regional convolution CUDA precision"
|
||||
kind = "classification"
|
||||
disposition = "platform_native"
|
||||
rule = "OPTIONAL001"
|
||||
candidates = ["OPTIONAL001|tests/regional_generation/regional/test_regional_convolution_execution.py|<module>:optional-proof:1"]
|
||||
paths = ["tests/regional_generation/regional/test_regional_convolution_execution.py"]
|
||||
fingerprint = "sha256:f197de881034f1c11b46ce290f3b6c515fe251d5bdef7efb419f43ad7257bf40"
|
||||
rationale = "The optional parameterized cases prove FP16 and BF16 regional convolution behavior through the installed CUDA kernels. CPU tests in the same contract cover dimensions, grouping, stride, masking, ordering, and reference math; only device-specific low-precision execution requires CUDA."
|
||||
issue = "chore:SSY-TEST-WAIVER-C006"
|
||||
review_by = 2027-03-31
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-TEST-WAIVER-C007"
|
||||
owner = "regional linear CUDA precision"
|
||||
kind = "classification"
|
||||
disposition = "platform_native"
|
||||
rule = "OPTIONAL001"
|
||||
candidates = [
|
||||
"OPTIONAL001|tests/regional_generation/regional/test_regional_linear_execution.py|<module>:optional-proof:1",
|
||||
"OPTIONAL001|tests/regional_generation/regional/test_regional_linear_execution.py|<module>:optional-proof:2",
|
||||
]
|
||||
paths = ["tests/regional_generation/regional/test_regional_linear_execution.py"]
|
||||
fingerprint = "sha256:d8a833ef160838b80db21d7240d789879deb8a4dc39f89d52145b1ebf580f765"
|
||||
rationale = "These cases validate installed CUDA FP16/BF16 projection rounding and compatible-adapter accumulation on the actual device execution path. The module's CPU contracts always prove masking, ordering, preparation, and reference deltas; the classified cases add hardware-specific numerical evidence."
|
||||
issue = "chore:SSY-TEST-WAIVER-C007"
|
||||
review_by = 2027-03-31
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-TEST-WAIVER-C008"
|
||||
owner = "fused regional LoRA CUDA kernel"
|
||||
kind = "classification"
|
||||
disposition = "platform_native"
|
||||
rule = "OPTIONAL001"
|
||||
candidates = ["OPTIONAL001|tests/regional_generation/regional/test_regional_lora_fused_active_accumulation.py|<module>:optional-proof:1"]
|
||||
paths = ["tests/regional_generation/regional/test_regional_lora_fused_active_accumulation.py"]
|
||||
fingerprint = "sha256:2053ff281c4e707c99db6424074ef3526c901ad84f0f750e044c35116981cd9c"
|
||||
rationale = "The entire module qualifies the CUDA-only fused regional LoRA accumulator across low-precision dtypes, adapter counts, and indexed paths. There is no CPU implementation to exercise, while the non-fused accumulation owner has mandatory portable reference coverage."
|
||||
issue = "chore:SSY-TEST-WAIVER-C008"
|
||||
review_by = 2027-03-31
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-TEST-WAIVER-C009"
|
||||
owner = "fused multiplier CUDA transport"
|
||||
kind = "classification"
|
||||
disposition = "platform_native"
|
||||
rule = "OPTIONAL001"
|
||||
candidates = ["OPTIONAL001|tests/regional_generation/regional/test_regional_lora_fused_multiplier_transport.py|<module>:optional-proof:1"]
|
||||
paths = ["tests/regional_generation/regional/test_regional_lora_fused_multiplier_transport.py"]
|
||||
fingerprint = "sha256:56ef4217551bdccc97fc6277bd2ade11ac10b9512ee3725c46b210044f380f21"
|
||||
rationale = "This module proves multiple adapter multipliers reach the CUDA fused kernel without an intermediate stack. The production behavior exists only for a CUDA-capable device, and portable composition tests independently cover ordering and multiplier semantics outside this native optimization."
|
||||
issue = "chore:SSY-TEST-WAIVER-C009"
|
||||
review_by = 2027-03-31
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-TEST-WAIVER-C010"
|
||||
owner = "ordered tensor CUDA accumulation"
|
||||
kind = "classification"
|
||||
disposition = "platform_native"
|
||||
rule = "OPTIONAL001"
|
||||
candidates = ["OPTIONAL001|tests/sampling/test_ordered_tensor_accumulation.py|<module>:optional-proof:1"]
|
||||
paths = ["tests/sampling/test_ordered_tensor_accumulation.py"]
|
||||
fingerprint = "sha256:b6306323fd555706f0b7525078acfa199c657f47f96432ce320da9057fc41709"
|
||||
rationale = "The parameter matrix compares stepwise CUDA accumulation and its exact low-precision rounding across one and multiple Triton launches. Mandatory CPU contracts prove ordered in-place accumulation; only the GPU kernel and device dtypes are capability-gated."
|
||||
issue = "chore:SSY-TEST-WAIVER-C010"
|
||||
review_by = 2027-03-31
|
||||
|
||||
[[waivers]]
|
||||
id = "SSY-TEST-WAIVER-C011"
|
||||
owner = "managed Windows Comfy process lifetime"
|
||||
kind = "classification"
|
||||
disposition = "platform_native"
|
||||
rule = "PROCESS001"
|
||||
candidates = ["PROCESS001|tools/comfy_integration/server_process.py|<module>:unscoped-child-process:1"]
|
||||
paths = ["tools/comfy_integration/server_process.py"]
|
||||
fingerprint = "sha256:6892815fbffe96d59bbb3f9069e44bfcdb9d6ea39e3f17f844695408af4233c0"
|
||||
rationale = "WindowsComfyProcess intentionally transfers the created Popen and log handles into an explicit long-lived owner because the integration run must use the server after start returns. Its stop method signals the exact process group, bounds both graceful and forced waits, retries bounded taskkill calls, and closes both logs in finally."
|
||||
issue = "chore:SSY-TEST-WAIVER-C011"
|
||||
review_by = 2027-03-31
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "simple-syrup-comfyui",
|
||||
"version": "1.7.0",
|
||||
"version": "1.13.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "simple-syrup-comfyui",
|
||||
"version": "1.7.0",
|
||||
"version": "1.13.0",
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.39.1",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "simple-syrup-comfyui",
|
||||
"version": "1.7.0",
|
||||
"version": "1.13.0",
|
||||
"private": true,
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"type": "module",
|
||||
|
||||
+8
-1
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
|
||||
[project]
|
||||
name = "SimpleSyrup"
|
||||
description = "Workflow-focused ComfyUI extensions for image generation."
|
||||
version = "1.7.0"
|
||||
version = "1.13.0"
|
||||
license = "AGPL-3.0-or-later"
|
||||
license-files = ["LICENSE"]
|
||||
requires-python = ">=3.11"
|
||||
@@ -36,6 +36,7 @@ line-length = 88
|
||||
target-version = "py311"
|
||||
extend-exclude = [
|
||||
"simple_syrup/third_party/groundingdino_runtime",
|
||||
"simple_syrup/third_party/res4lyf_runtime",
|
||||
"simple_syrup/third_party/sam_hq_runtime",
|
||||
]
|
||||
|
||||
@@ -59,6 +60,7 @@ explicit_package_bases = true
|
||||
mypy_path = ["tests"]
|
||||
exclude = [
|
||||
"simple_syrup/third_party/groundingdino_runtime",
|
||||
"simple_syrup/third_party/res4lyf_runtime",
|
||||
"simple_syrup/third_party/sam_hq_runtime",
|
||||
]
|
||||
|
||||
@@ -66,9 +68,14 @@ exclude = [
|
||||
module = ["comfy.*"]
|
||||
ignore_missing_imports = true
|
||||
|
||||
[[tool.mypy.overrides]]
|
||||
module = ["simple_syrup.third_party.res4lyf_runtime.*"]
|
||||
follow_imports = "skip"
|
||||
|
||||
[tool.pytest.ini_options]
|
||||
pythonpath = [".", "../.."]
|
||||
testpaths = ["tests"]
|
||||
addopts = ["--strict-markers", "--import-mode=importlib"]
|
||||
markers = [
|
||||
"external_artifact: requires a locally installed external source or generated benchmark artifact",
|
||||
]
|
||||
|
||||
@@ -7,3 +7,5 @@ addict>=2.4.0
|
||||
yapf>=0.43.0
|
||||
huggingface-hub>=0.34.0
|
||||
keyring>=25.0.0
|
||||
mpmath>=1.3.0
|
||||
PyWavelets>=1.6.0
|
||||
|
||||
@@ -6,6 +6,6 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
__version__ = "1.7.0"
|
||||
__version__ = "1.13.0"
|
||||
|
||||
__all__: list[str] = ["__version__"]
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Define validated Attention Coupling preparation data."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import dataclass
|
||||
|
||||
from .raw_regional_attention import RawRegionalAttentionPlan
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
class AttentionCouplingPreparation:
|
||||
"""Retain the full raw plan and base-only ordinary sampler inputs."""
|
||||
|
||||
plan: RawRegionalAttentionPlan
|
||||
positive: object
|
||||
negative: object
|
||||
@@ -27,16 +27,37 @@ class ContextualDiffusionControls:
|
||||
global_weight: float
|
||||
global_steps: int
|
||||
global_decay: float
|
||||
latent_tile_width: int | None = None
|
||||
latent_tile_height: int | None = None
|
||||
|
||||
@property
|
||||
def tile_width(self) -> int:
|
||||
"""Use explicit local geometry or the convenience node's context size."""
|
||||
return self.latent_tile_width or self.latent_context_size
|
||||
|
||||
@property
|
||||
def tile_height(self) -> int:
|
||||
"""Keep the global context independent of a rectangular local tile."""
|
||||
return self.latent_tile_height or self.latent_context_size
|
||||
|
||||
def validate(self) -> None:
|
||||
"""Reject controls that cannot produce a stable bounded context plan."""
|
||||
|
||||
if self.latent_context_size < 16:
|
||||
raise ValueError("latent_context_size must be at least 16 latent pixels.")
|
||||
if not 0 <= self.latent_context_overlap < self.latent_context_size:
|
||||
for value in (self.latent_tile_width, self.latent_tile_height):
|
||||
if value is not None and (type(value) is not int or value < 16):
|
||||
raise ValueError(
|
||||
"Local tile dimensions must be at least 16 latent pixels."
|
||||
)
|
||||
if (
|
||||
not 0
|
||||
<= self.latent_context_overlap
|
||||
< min(self.tile_width, self.tile_height)
|
||||
):
|
||||
raise ValueError(
|
||||
"latent_context_overlap must be non-negative and smaller than "
|
||||
"latent_context_size."
|
||||
"both local tile dimensions."
|
||||
)
|
||||
if self.latent_context_batch_size < 1:
|
||||
raise ValueError("latent_context_batch_size must be at least 1.")
|
||||
@@ -65,6 +86,7 @@ def build_contextual_diffusion_plan(
|
||||
controls: ContextualDiffusionControls,
|
||||
segs: NativeSegs | None,
|
||||
region_masks: torch.Tensor | None = None,
|
||||
segs_canvas: tuple[int, int] | None = None,
|
||||
) -> ContextualDiffusionPlan:
|
||||
"""Return a global context plus the regular or SEGS-guided context plan."""
|
||||
|
||||
@@ -89,27 +111,29 @@ def build_contextual_diffusion_plan(
|
||||
segs=segs,
|
||||
latent_width=latent_width,
|
||||
latent_height=latent_height,
|
||||
tile_width=controls.latent_context_size,
|
||||
tile_height=controls.latent_context_size,
|
||||
tile_width=controls.tile_width,
|
||||
tile_height=controls.tile_height,
|
||||
overlap=controls.latent_context_overlap,
|
||||
tile_batch_size=controls.latent_context_batch_size,
|
||||
segs_canvas=segs_canvas,
|
||||
)
|
||||
elif segs is not None:
|
||||
tile_plan = build_segs_guided_tiled_diffusion_plan(
|
||||
segs=segs,
|
||||
latent_width=latent_width,
|
||||
latent_height=latent_height,
|
||||
tile_width=controls.latent_context_size,
|
||||
tile_height=controls.latent_context_size,
|
||||
tile_width=controls.tile_width,
|
||||
tile_height=controls.tile_height,
|
||||
overlap=controls.latent_context_overlap,
|
||||
tile_batch_size=controls.latent_context_batch_size,
|
||||
segs_canvas=segs_canvas,
|
||||
)
|
||||
else:
|
||||
tile_plan = build_tiled_diffusion_plan(
|
||||
latent_width=latent_width,
|
||||
latent_height=latent_height,
|
||||
tile_width=controls.latent_context_size,
|
||||
tile_height=controls.latent_context_size,
|
||||
tile_width=controls.tile_width,
|
||||
tile_height=controls.tile_height,
|
||||
overlap=controls.latent_context_overlap,
|
||||
tile_batch_size=controls.latent_context_batch_size,
|
||||
)
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Integrate source-derived inversion states without ComfyUI dependencies."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from collections.abc import Callable
|
||||
from dataclasses import dataclass
|
||||
|
||||
import torch
|
||||
|
||||
from .noise_inversion import INVERSION_METHODS, InversionMethod
|
||||
|
||||
InversionVelocity = Callable[[torch.Tensor, torch.Tensor, int], torch.Tensor]
|
||||
SpatialResize = Callable[[torch.Tensor, int, int], torch.Tensor]
|
||||
|
||||
|
||||
@dataclass(slots=True)
|
||||
class InversionSolverEvidence:
|
||||
"""Count the actual denoiser evaluations performed by an integration stage."""
|
||||
|
||||
evaluations: int = 0
|
||||
|
||||
|
||||
def integrate_inversion(
|
||||
source: torch.Tensor,
|
||||
sigmas: torch.Tensor,
|
||||
evaluate: InversionVelocity,
|
||||
*,
|
||||
method: InversionMethod,
|
||||
evidence: InversionSolverEvidence | None = None,
|
||||
) -> torch.Tensor:
|
||||
"""Advance a finite state over strictly increasing positive inversion sigmas."""
|
||||
if method not in INVERSION_METHODS:
|
||||
raise ValueError("Inversion method must be euler or heun.")
|
||||
if sigmas.ndim != 1 or len(sigmas) < 2 or not bool(torch.isfinite(sigmas).all()):
|
||||
raise ValueError("A finite one-dimensional inversion schedule is required.")
|
||||
if not bool(torch.all(sigmas > 0)) or not bool(torch.all(sigmas[1:] > sigmas[:-1])):
|
||||
raise ValueError("Inversion sigmas must be positive and increasing.")
|
||||
if not source.is_floating_point() or not bool(torch.isfinite(source).all()):
|
||||
raise ValueError("Inversion source must contain finite floating-point values.")
|
||||
record = evidence if evidence is not None else InversionSolverEvidence()
|
||||
state = source.clone()
|
||||
|
||||
def velocity(x: torch.Tensor, sigma: torch.Tensor, index: int) -> torch.Tensor:
|
||||
"""Count every denoiser evaluation and reject corrupted predictions."""
|
||||
record.evaluations += 1
|
||||
value = evaluate(x, sigma, index)
|
||||
if value.shape != x.shape or not bool(torch.isfinite(value).all()):
|
||||
raise FloatingPointError("Invalid inversion velocity shape or values.")
|
||||
return value
|
||||
|
||||
for index in range(len(sigmas) - 1):
|
||||
current, following = sigmas[index], sigmas[index + 1]
|
||||
delta = following - current
|
||||
estimate = velocity(state, current, index)
|
||||
if method == "heun":
|
||||
corrected = velocity(state + delta * estimate, following, index)
|
||||
estimate = (estimate + corrected) / 2
|
||||
state = state + delta * estimate
|
||||
if not bool(torch.isfinite(state).all()):
|
||||
raise FloatingPointError(f"Non-finite inversion state at step {index}.")
|
||||
return state
|
||||
|
||||
|
||||
def lift_inversion_displacement(
|
||||
full_source: torch.Tensor,
|
||||
coarse_source: torch.Tensor,
|
||||
coarse_endpoint: torch.Tensor,
|
||||
*,
|
||||
resize: SpatialResize,
|
||||
) -> torch.Tensor:
|
||||
"""Lift only the inferred change so existing full-size detail survives transfer."""
|
||||
if coarse_source.shape != coarse_endpoint.shape:
|
||||
raise ValueError("Coarse inversion source and endpoint shapes must match.")
|
||||
if full_source.shape[:-2] != coarse_source.shape[:-2]:
|
||||
raise ValueError(
|
||||
"Inversion transfer must preserve batch and channel dimensions."
|
||||
)
|
||||
height, width = full_source.shape[-2:]
|
||||
lifted = resize(coarse_endpoint - coarse_source, height, width)
|
||||
if lifted.shape != full_source.shape:
|
||||
raise ValueError("Inversion displacement resize produced an invalid shape.")
|
||||
endpoint = full_source + lifted
|
||||
if not bool(torch.isfinite(endpoint).all()):
|
||||
raise FloatingPointError("Inversion transfer produced non-finite values.")
|
||||
return endpoint
|
||||
@@ -0,0 +1,89 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Detect effective negative weights in Comfy-style prompt emphasis."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import dataclass
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
class _WeightedPromptSegment:
|
||||
"""Retain one parsed prompt fragment and its effective scalar weight."""
|
||||
|
||||
text: str
|
||||
weight: float
|
||||
|
||||
|
||||
def contains_negative_prompt_weight(text: str) -> bool:
|
||||
"""Return whether valid nested emphasis gives any prompt text a negative weight."""
|
||||
|
||||
if not isinstance(text, str):
|
||||
raise TypeError("Negative prompt-weight detection requires text.")
|
||||
escaped = text.replace(r"\)", "\0\1").replace(r"\(", "\0\2")
|
||||
return any(
|
||||
segment.text and segment.weight < 0.0
|
||||
for segment in _weighted_segments(escaped, 1.0)
|
||||
)
|
||||
|
||||
|
||||
def _weighted_segments(
|
||||
text: str,
|
||||
current_weight: float,
|
||||
) -> tuple[_WeightedPromptSegment, ...]:
|
||||
"""Parse emphasis with the same nesting and final-colon rules as ComfyUI."""
|
||||
|
||||
parsed: list[_WeightedPromptSegment] = []
|
||||
for item in _parenthesized_items(text):
|
||||
weight = current_weight
|
||||
if len(item) >= 2 and item[0] == "(" and item[-1] == ")":
|
||||
inner = item[1:-1]
|
||||
delimiter = inner.rfind(":")
|
||||
weight *= 1.1
|
||||
if delimiter > 0:
|
||||
try:
|
||||
weight = float(inner[delimiter + 1 :])
|
||||
except ValueError:
|
||||
pass
|
||||
else:
|
||||
inner = inner[:delimiter]
|
||||
parsed.extend(_weighted_segments(inner, weight))
|
||||
continue
|
||||
parsed.append(
|
||||
_WeightedPromptSegment(
|
||||
item.replace("\0\1", ")").replace("\0\2", "("),
|
||||
current_weight,
|
||||
)
|
||||
)
|
||||
return tuple(parsed)
|
||||
|
||||
|
||||
def _parenthesized_items(text: str) -> tuple[str, ...]:
|
||||
"""Split top-level parenthesized regions while preserving malformed input."""
|
||||
|
||||
result: list[str] = []
|
||||
current = ""
|
||||
nesting = 0
|
||||
for character in text:
|
||||
if character == "(":
|
||||
if nesting == 0:
|
||||
if current:
|
||||
result.append(current)
|
||||
current = "("
|
||||
else:
|
||||
current += character
|
||||
nesting += 1
|
||||
elif character == ")":
|
||||
nesting -= 1
|
||||
if nesting == 0:
|
||||
result.append(f"{current})")
|
||||
current = ""
|
||||
else:
|
||||
current += character
|
||||
else:
|
||||
current += character
|
||||
if current:
|
||||
result.append(current)
|
||||
return tuple(result)
|
||||
@@ -0,0 +1,68 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Define validated source-preserving noise inversion configuration."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import math
|
||||
from dataclasses import dataclass
|
||||
from typing import Literal
|
||||
|
||||
InversionMethod = Literal["euler", "heun"]
|
||||
INVERSION_METHODS: tuple[InversionMethod, ...] = ("euler", "heun")
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
class NoiseInversionOptions:
|
||||
"""Configure reduced-resolution inversion and an optional full-size finish.
|
||||
|
||||
The transition is a fraction of the target inversion sigma, not the forward
|
||||
denoise steps. A full-size inversion uses ``steps`` and needs no transfer.
|
||||
"""
|
||||
|
||||
method: InversionMethod = "euler"
|
||||
resolution_scale: float = 0.5
|
||||
steps: int = 2
|
||||
switch_fraction: float = 0.75
|
||||
finishing_steps: int = 1
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
"""Reject invalid or internally incomplete inversion recipes."""
|
||||
if self.method not in INVERSION_METHODS:
|
||||
raise ValueError("Inversion method must be euler or heun.")
|
||||
if (
|
||||
not math.isfinite(self.resolution_scale)
|
||||
or not 0 < self.resolution_scale <= 1
|
||||
):
|
||||
raise ValueError("Inversion resolution scale must be in (0, 1].")
|
||||
if type(self.steps) is not int or not 1 <= self.steps <= 64:
|
||||
raise ValueError("Inversion steps must be an integer between 1 and 64.")
|
||||
if type(self.finishing_steps) is not int or not 0 <= self.finishing_steps <= 64:
|
||||
raise ValueError("Inversion finishing steps must be between 0 and 64.")
|
||||
if not math.isfinite(self.switch_fraction) or not 0 < self.switch_fraction <= 1:
|
||||
raise ValueError("Inversion transition must be in (0, 1].")
|
||||
if self.resolution_scale < 1 and self.finishing_steps > 0:
|
||||
if self.switch_fraction == 1:
|
||||
raise ValueError("A full-size finish requires a transition below 100%.")
|
||||
|
||||
@property
|
||||
def coarse_target_fraction(self) -> float:
|
||||
"""Reach the full target unless an enabled full-size stage follows transfer."""
|
||||
return (
|
||||
self.switch_fraction
|
||||
if self.resolution_scale < 1 and self.finishing_steps
|
||||
else 1.0
|
||||
)
|
||||
|
||||
def coarse_shape(self, height: int, width: int) -> tuple[int, int]:
|
||||
"""Preserve full dimensions or align reduced transformer grids to even sizes."""
|
||||
if height < 1 or width < 1:
|
||||
raise ValueError("Inversion source dimensions must be positive.")
|
||||
if self.resolution_scale == 1:
|
||||
return height, width
|
||||
return (
|
||||
max(2, round(height * self.resolution_scale / 2) * 2),
|
||||
max(2, round(width * self.resolution_scale / 2) * 2),
|
||||
)
|
||||
@@ -30,6 +30,7 @@ class ProcessedRegionalAttentionEntry:
|
||||
schedule: ConditioningScheduleRange
|
||||
cross_attention: torch.Tensor
|
||||
strength: float
|
||||
cross_attention_value_multiplier: torch.Tensor | None = None
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
"""Validate entry order, model context, and finite scalar strength."""
|
||||
@@ -62,6 +63,21 @@ class ProcessedRegionalAttentionEntry:
|
||||
if not math.isfinite(float(self.strength)):
|
||||
raise ValueError("Processed conditioning strength must be finite.")
|
||||
object.__setattr__(self, "strength", float(self.strength))
|
||||
multiplier = self.cross_attention_value_multiplier
|
||||
if multiplier is None:
|
||||
return
|
||||
if (
|
||||
not isinstance(multiplier, torch.Tensor)
|
||||
or multiplier.shape != (*self.cross_attention.shape[:2], 1)
|
||||
or not multiplier.is_floating_point()
|
||||
or multiplier.device != self.cross_attention.device
|
||||
or multiplier.dtype != self.cross_attention.dtype
|
||||
or not bool(torch.isfinite(multiplier).all().item())
|
||||
):
|
||||
raise ValueError(
|
||||
"Processed attention value multiplier must be a finite floating "
|
||||
"BxSx1 tensor aligned with cross_attention."
|
||||
)
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
|
||||
@@ -48,6 +48,7 @@ class BatchedRegionalAttentionEntry:
|
||||
entry_index: int
|
||||
context: torch.Tensor
|
||||
strengths: tuple[float, ...]
|
||||
cross_attention_value_multiplier: torch.Tensor | None = None
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
"""Validate entry order, aligned context, and finite sample strengths."""
|
||||
@@ -70,6 +71,11 @@ class BatchedRegionalAttentionEntry:
|
||||
)
|
||||
if not math.isfinite(float(strength)):
|
||||
raise ValueError("Regional attention entry strength must be finite.")
|
||||
_validate_value_multiplier(
|
||||
self.cross_attention_value_multiplier,
|
||||
self.context,
|
||||
name="entry",
|
||||
)
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
@@ -109,6 +115,7 @@ class BatchedRegionalAttentionContexts:
|
||||
chunks: tuple[RegionalAttentionChunkBatch, ...]
|
||||
base_context: torch.Tensor
|
||||
regions: tuple[BatchedRegionalAttentionRegion, ...]
|
||||
base_value_multiplier: torch.Tensor | None = None
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
"""Validate complete chunk and tensor alignment."""
|
||||
@@ -141,6 +148,11 @@ class BatchedRegionalAttentionContexts:
|
||||
expected_batch=expected_start,
|
||||
name="base",
|
||||
)
|
||||
_validate_value_multiplier(
|
||||
self.base_value_multiplier,
|
||||
self.base_context,
|
||||
name="base",
|
||||
)
|
||||
if not isinstance(self.regions, tuple):
|
||||
raise TypeError("Regional attention regions must be a tuple.")
|
||||
if tuple(region.region_index for region in self.regions) != tuple(
|
||||
@@ -189,3 +201,27 @@ def _validate_aligned_context(
|
||||
raise ValueError(
|
||||
f"Regional attention {name} context must contain finite floating values."
|
||||
)
|
||||
|
||||
|
||||
def _validate_value_multiplier(
|
||||
multiplier: object,
|
||||
context: torch.Tensor,
|
||||
*,
|
||||
name: str,
|
||||
) -> None:
|
||||
"""Validate one optional value multiplier against its aligned context."""
|
||||
|
||||
if multiplier is None:
|
||||
return
|
||||
if (
|
||||
not isinstance(multiplier, torch.Tensor)
|
||||
or multiplier.shape != (*context.shape[:2], 1)
|
||||
or not multiplier.is_floating_point()
|
||||
or multiplier.device != context.device
|
||||
or multiplier.dtype != context.dtype
|
||||
or not bool(torch.isfinite(multiplier).all().item())
|
||||
):
|
||||
raise ValueError(
|
||||
f"Regional attention {name} value multiplier must be a finite "
|
||||
"floating BxSx1 tensor aligned with its context."
|
||||
)
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Project semantic regional-detailing ownership into each inversion resolution."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import math
|
||||
|
||||
import torch.nn.functional as functional
|
||||
|
||||
from .regional_detailing import LatentBox, LatentRegion
|
||||
|
||||
|
||||
def project_inversion_regions(
|
||||
regions: tuple[LatentRegion, ...],
|
||||
*,
|
||||
source_width: int,
|
||||
source_height: int,
|
||||
target_width: int,
|
||||
target_height: int,
|
||||
) -> tuple[LatentRegion, ...]:
|
||||
"""Preserve region identity and conditioning while scaling masks and bounds."""
|
||||
if min(source_width, source_height, target_width, target_height) < 1:
|
||||
raise ValueError("Regional inversion canvases must have positive dimensions.")
|
||||
if (source_width, source_height) == (target_width, target_height):
|
||||
return regions
|
||||
projected: list[LatentRegion] = []
|
||||
for region in regions:
|
||||
box = region.latent_box
|
||||
if tuple(region.latent_mask.shape) != (source_height, source_width):
|
||||
raise ValueError("Regional inversion mask must match its canonical canvas.")
|
||||
if not (
|
||||
0 <= box.x < box.x + box.width <= source_width
|
||||
and 0 <= box.y < box.y + box.height <= source_height
|
||||
):
|
||||
raise ValueError("Regional inversion bounds must remain inside the canvas.")
|
||||
left = math.floor(box.x * target_width / source_width)
|
||||
top = math.floor(box.y * target_height / source_height)
|
||||
right = math.ceil((box.x + box.width) * target_width / source_width)
|
||||
bottom = math.ceil((box.y + box.height) * target_height / source_height)
|
||||
mask = functional.interpolate(
|
||||
region.latent_mask[None, None].float(),
|
||||
size=(target_height, target_width),
|
||||
mode="nearest",
|
||||
)[0, 0].to(region.latent_mask)
|
||||
projected.append(
|
||||
LatentRegion(
|
||||
region.index,
|
||||
region.label,
|
||||
LatentBox(left, top, right - left, bottom - top),
|
||||
mask,
|
||||
region.positive,
|
||||
)
|
||||
)
|
||||
return tuple(projected)
|
||||
@@ -26,6 +26,7 @@ def build_region_constrained_tiled_diffusion_plan(
|
||||
tile_height: int,
|
||||
overlap: int,
|
||||
tile_batch_size: int,
|
||||
segs_canvas: tuple[int, int] | None = None,
|
||||
) -> TiledDiffusionPlan:
|
||||
"""Build tiles split wherever regional composition or optional SEGS change."""
|
||||
|
||||
@@ -37,7 +38,8 @@ def build_region_constrained_tiled_diffusion_plan(
|
||||
ownership_masks = region_ownership
|
||||
if segs is not None:
|
||||
native_segs = coerce_segs(segs)
|
||||
validate_segs_aspect_ratio(native_segs, latent_height, latent_width)
|
||||
canvas_height, canvas_width = segs_canvas or (latent_height, latent_width)
|
||||
validate_segs_aspect_ratio(native_segs, canvas_height, canvas_width)
|
||||
semantic_ownership = segs_ownership_masks(
|
||||
native_segs,
|
||||
latent_height=latent_height,
|
||||
|
||||
@@ -0,0 +1,162 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Assemble immutable, order-independent sampler capability configuration."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import math
|
||||
from dataclasses import dataclass, replace
|
||||
from typing import TypeAlias
|
||||
|
||||
from .noise_inversion import NoiseInversionOptions
|
||||
from .regional_prompting import validate_regional_prompt_weight
|
||||
from .tiled_diffusion import validate_tiled_diffusion_mode
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
class TilingOptions:
|
||||
"""Own the single local tile layout and blending configuration."""
|
||||
|
||||
diffusion_mode: str = "multidiffusion"
|
||||
width: int = 128
|
||||
height: int = 128
|
||||
overlap: int = 32
|
||||
batch_size: int = 4
|
||||
differential_diffusion: bool = False
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
"""Reject tile settings that cannot form a bounded prediction plan."""
|
||||
validate_tiled_diffusion_mode(self.diffusion_mode)
|
||||
for name, value in (("width", self.width), ("height", self.height)):
|
||||
if type(value) is not int or not 16 <= value <= 512:
|
||||
raise ValueError(
|
||||
f"Tile {name} must be between 16 and 512 latent pixels."
|
||||
)
|
||||
if type(self.overlap) is not int or not 0 <= self.overlap < min(
|
||||
self.width, self.height
|
||||
):
|
||||
raise ValueError(
|
||||
"Tile overlap must be nonnegative and smaller than both dimensions."
|
||||
)
|
||||
if type(self.batch_size) is not int or self.batch_size < 1:
|
||||
raise ValueError("Tile batch size must be a positive integer.")
|
||||
if type(self.differential_diffusion) is not bool:
|
||||
raise TypeError("Differential diffusion must be a boolean.")
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
class ContextualDiffusionOptions:
|
||||
"""Own global context and square local sampling geometry independently of tiling."""
|
||||
|
||||
context_size: int = 96
|
||||
global_weight: float = 1.0
|
||||
global_steps: int = 1
|
||||
global_decay: float = 0.5
|
||||
diffusion_mode: str = "multidiffusion"
|
||||
overlap: int = 32
|
||||
batch_size: int = 4
|
||||
differential_diffusion: bool = False
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
"""Reject invalid global schedules and square local sampling settings."""
|
||||
if type(self.context_size) is not int or not 16 <= self.context_size <= 512:
|
||||
raise ValueError("Context size must be between 16 and 512 latent pixels.")
|
||||
if not math.isfinite(self.global_weight) or not 0 <= self.global_weight <= 2:
|
||||
raise ValueError("Global context weight must be between 0 and 2.")
|
||||
if type(self.global_steps) is not int or self.global_steps < 0:
|
||||
raise ValueError("Global context steps must be a nonnegative integer.")
|
||||
if not math.isfinite(self.global_decay) or not 0 <= self.global_decay <= 1:
|
||||
raise ValueError("Global context decay must be between 0 and 1.")
|
||||
self.local_tiling()
|
||||
|
||||
def local_tiling(self) -> TilingOptions:
|
||||
"""Use context size for both dimensions of the sole local sampling plan."""
|
||||
return TilingOptions(
|
||||
diffusion_mode=self.diffusion_mode,
|
||||
width=self.context_size,
|
||||
height=self.context_size,
|
||||
overlap=self.overlap,
|
||||
batch_size=self.batch_size,
|
||||
differential_diffusion=self.differential_diffusion,
|
||||
)
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
class AttentionCouplingOptions:
|
||||
"""Configure regional attention strength without binding masks or a model."""
|
||||
|
||||
regional_prompt_weight: float = 1.0
|
||||
region_mask_feather: int = 0
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
"""Require valid regional attention strengths and feathering controls."""
|
||||
validate_regional_prompt_weight(self.regional_prompt_weight)
|
||||
if type(self.region_mask_feather) is not int or self.region_mask_feather < 0:
|
||||
raise ValueError("Region mask feather must be a nonnegative integer.")
|
||||
|
||||
|
||||
SamplerCapability: TypeAlias = (
|
||||
TilingOptions
|
||||
| ContextualDiffusionOptions
|
||||
| NoiseInversionOptions
|
||||
| AttentionCouplingOptions
|
||||
)
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
class SamplerOptions:
|
||||
"""Own one immutable setting per capability, independent of graph order."""
|
||||
|
||||
tiling: TilingOptions | None = None
|
||||
contextual_diffusion: ContextualDiffusionOptions | None = None
|
||||
noise_inversion: NoiseInversionOptions | None = None
|
||||
attention_coupling: AttentionCouplingOptions | None = None
|
||||
|
||||
def __post_init__(self) -> None:
|
||||
"""Reject malformed connection payloads at the typed configuration boundary."""
|
||||
for name, expected in (
|
||||
("tiling", TilingOptions),
|
||||
("contextual_diffusion", ContextualDiffusionOptions),
|
||||
("noise_inversion", NoiseInversionOptions),
|
||||
("attention_coupling", AttentionCouplingOptions),
|
||||
):
|
||||
value = getattr(self, name)
|
||||
if value is not None and not isinstance(value, expected):
|
||||
raise TypeError(f"Sampler option {name} must be {expected.__name__}.")
|
||||
|
||||
def with_capability(self, capability: SamplerCapability) -> SamplerOptions:
|
||||
"""Return a fresh configuration or reject an ambiguous duplicate feature."""
|
||||
names: dict[type[object], str] = {
|
||||
TilingOptions: "tiling",
|
||||
ContextualDiffusionOptions: "contextual_diffusion",
|
||||
NoiseInversionOptions: "noise_inversion",
|
||||
AttentionCouplingOptions: "attention_coupling",
|
||||
}
|
||||
name = names.get(type(capability))
|
||||
if name is None:
|
||||
raise TypeError("Unsupported sampler capability configuration.")
|
||||
if getattr(self, name) is not None:
|
||||
raise ValueError(
|
||||
f"Duplicate sampler capability: {name}. Bypass or remove one node."
|
||||
)
|
||||
if isinstance(capability, TilingOptions):
|
||||
return replace(self, tiling=capability)
|
||||
if isinstance(capability, ContextualDiffusionOptions):
|
||||
return replace(self, contextual_diffusion=capability)
|
||||
if isinstance(capability, NoiseInversionOptions):
|
||||
return replace(self, noise_inversion=capability)
|
||||
return replace(self, attention_coupling=capability)
|
||||
|
||||
|
||||
def append_sampler_capability(
|
||||
options: SamplerOptions | None, capability: SamplerCapability | None
|
||||
) -> SamplerOptions:
|
||||
"""Append a capability or pass through a disabled contribution after validation."""
|
||||
if options is not None and not isinstance(options, SamplerOptions):
|
||||
raise TypeError(
|
||||
"Options input must be a SimpleSyrup sampler options connection."
|
||||
)
|
||||
current = options if options is not None else SamplerOptions()
|
||||
return current if capability is None else current.with_capability(capability)
|
||||
@@ -0,0 +1,51 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Define renderer-neutral SEG preview documents."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import dataclass
|
||||
|
||||
import torch
|
||||
|
||||
from .segs import CropRegion
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class AtlasPlacement:
|
||||
"""Locate one region mask inside the packed mask atlas."""
|
||||
|
||||
left: int
|
||||
top: int
|
||||
width: int
|
||||
height: int
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SegPreviewRegion:
|
||||
"""Describe one interactive region and its packed mask geometry."""
|
||||
|
||||
region_id: str
|
||||
index: int
|
||||
label: str
|
||||
confidence: float
|
||||
active_area: int
|
||||
color: str
|
||||
crop: CropRegion
|
||||
atlas: AtlasPlacement
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SegPreviewDocument:
|
||||
"""Carry bounded image assets and interaction metadata to a UI adapter."""
|
||||
|
||||
source_width: int
|
||||
source_height: int
|
||||
preview_width: int
|
||||
preview_height: int
|
||||
image: torch.Tensor
|
||||
atlas: torch.Tensor
|
||||
region_images: tuple[torch.Tensor, ...]
|
||||
regions: tuple[SegPreviewRegion, ...]
|
||||
@@ -9,7 +9,7 @@ from __future__ import annotations
|
||||
import torch
|
||||
import torch.nn.functional as F
|
||||
|
||||
from ..domain.segs import BoundingBox, CropRegion
|
||||
from .segs import BoundingBox, CropRegion
|
||||
|
||||
|
||||
def validate_single_image(image: object, operation: str) -> torch.Tensor:
|
||||
@@ -22,16 +22,20 @@ def build_segs_guided_tiled_diffusion_plan(
|
||||
tile_height: int,
|
||||
overlap: int,
|
||||
tile_batch_size: int,
|
||||
segs_canvas: tuple[int, int] | None = None,
|
||||
) -> TiledDiffusionPlan:
|
||||
"""Build bounded sampling windows whose irregular cores follow supplied SEGS.
|
||||
|
||||
Every latent pixel receives exactly one ownership core. Each core is sampled
|
||||
through a rectangular window, while its local blend mask retains the irregular
|
||||
boundary and shares a feathered overlap with neighboring cores.
|
||||
A reduced inversion stage validates proportions against its original canvas
|
||||
because rounding the reduced dimensions can change their aspect ratio.
|
||||
"""
|
||||
|
||||
native_segs = coerce_segs(segs)
|
||||
validate_segs_aspect_ratio(native_segs, latent_height, latent_width)
|
||||
canvas_height, canvas_width = segs_canvas or (latent_height, latent_width)
|
||||
validate_segs_aspect_ratio(native_segs, canvas_height, canvas_width)
|
||||
ownership_masks = segs_ownership_masks(
|
||||
native_segs,
|
||||
latent_height=latent_height,
|
||||
|
||||
@@ -11,11 +11,6 @@ from dataclasses import dataclass
|
||||
|
||||
import torch
|
||||
|
||||
from ..masking.segs_mask_ops import (
|
||||
crop_region_for_bbox,
|
||||
resize_mask,
|
||||
validate_single_image,
|
||||
)
|
||||
from ..shared.logging import get_logger
|
||||
from .segs import (
|
||||
BoundingBox,
|
||||
@@ -23,6 +18,11 @@ from .segs import (
|
||||
NativeSegs,
|
||||
Segment,
|
||||
)
|
||||
from .segs_mask_ops import (
|
||||
crop_region_for_bbox,
|
||||
resize_mask,
|
||||
validate_single_image,
|
||||
)
|
||||
|
||||
LOGGER = get_logger(__name__)
|
||||
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Own inbound ComfyUI integration and transport composition."""
|
||||
+1
-1
@@ -14,9 +14,9 @@ from typing import Any, Protocol, cast
|
||||
from aiohttp import web
|
||||
|
||||
from ..domain.external_llm import ExternalLLMConfigError, ExternalLLMProviderError
|
||||
from ..runtime.external_llm_keyring import ExternalLLMKeyringError
|
||||
from ..services.external_llm_prompt_service import ExternalLLMPromptService
|
||||
from ..shared.logging import get_logger
|
||||
from .external_llm_keyring import ExternalLLMKeyringError
|
||||
|
||||
LOGGER = get_logger(__name__)
|
||||
EXTERNAL_LLM_SETTINGS_ROUTE = "/simple-syrup/external-llm/settings"
|
||||
+1
-1
@@ -12,13 +12,13 @@ from typing import Any, Protocol, cast
|
||||
|
||||
from aiohttp import web
|
||||
|
||||
from ..runtime.quant_cache_settings import SettingsQuantCacheLimitProvider
|
||||
from ..services.quant_cache_service import (
|
||||
QuantCacheEvictionResult,
|
||||
QuantCacheService,
|
||||
QuantCacheStatus,
|
||||
)
|
||||
from ..services.quantized_model_boundaries import QuantCacheLimitProvider
|
||||
from .quant_cache_settings import SettingsQuantCacheLimitProvider
|
||||
|
||||
QUANT_CACHE_ROUTE = "/simple-syrup/quant-cache"
|
||||
Handler = Callable[[Any], Coroutine[Any, Any, web.Response]]
|
||||
+3
-3
@@ -12,12 +12,12 @@ from typing import Any, Protocol, cast
|
||||
|
||||
from aiohttp import web
|
||||
|
||||
from ..shared.logging import get_logger
|
||||
from .settings import (
|
||||
from ..runtime.settings import (
|
||||
SimpleSyrupSettings,
|
||||
SimpleSyrupSettingsError,
|
||||
)
|
||||
from .settings_repository import SimpleSyrupSettingsRepository
|
||||
from ..runtime.settings_repository import SimpleSyrupSettingsRepository
|
||||
from ..shared.logging import get_logger
|
||||
|
||||
LOGGER = get_logger(__name__)
|
||||
SETTINGS_ROUTE = "/simple-syrup/settings"
|
||||
@@ -15,8 +15,7 @@ from ..domain.segs import (
|
||||
NativeSegs,
|
||||
Segment,
|
||||
)
|
||||
from ..masking.mask_ops import MaskRefinementSettings, refine_prompt_mask
|
||||
from ..masking.segs_mask_ops import (
|
||||
from ..domain.segs_mask_ops import (
|
||||
crop_image,
|
||||
crop_mask,
|
||||
crop_region_for_bbox,
|
||||
@@ -24,6 +23,7 @@ from ..masking.segs_mask_ops import (
|
||||
normalize_mask,
|
||||
validate_single_image,
|
||||
)
|
||||
from ..masking.mask_ops import MaskRefinementSettings, refine_prompt_mask
|
||||
from ..runtime.sam_segmenter import SAMBoxSegmenter, SAMModelSegmenter
|
||||
from ..runtime.text_box_detector import (
|
||||
GroundingDINOTextBoxDetector,
|
||||
|
||||
@@ -21,8 +21,8 @@ from ..domain.regional_detailing import (
|
||||
SegmentConditioningPair,
|
||||
)
|
||||
from ..domain.segs import CropRegion
|
||||
from ..domain.segs_mask_ops import feather_mask, resize_mask
|
||||
from .detailer_masks import gaussian_feather_mask
|
||||
from .segs_mask_ops import feather_mask, resize_mask
|
||||
|
||||
OPERATION = "Detail SEGS as Regions"
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ from typing import Any, ClassVar
|
||||
|
||||
import torch
|
||||
|
||||
from ..domain.noise_inversion import NoiseInversionOptions
|
||||
from ..domain.segs import coerce_segs_group
|
||||
from ..nodes import tooltips
|
||||
from ..nodes.detailer_input_adapters import (
|
||||
@@ -64,10 +65,6 @@ class DetailSEGSAsRegions:
|
||||
"image": ("IMAGE", {"tooltip": tooltips.DETAIL_IMAGE}),
|
||||
"model": ("MODEL", {"tooltip": tooltips.DETAIL_MODEL}),
|
||||
"vae": ("VAE", {"tooltip": tooltips.DETAIL_VAE}),
|
||||
"negative": (
|
||||
"CONDITIONING",
|
||||
{"tooltip": tooltips.REGIONAL_GLOBAL_NEGATIVE},
|
||||
),
|
||||
"positive": (
|
||||
"CONDITIONING",
|
||||
{"tooltip": tooltips.REGIONAL_GLOBAL_POSITIVE},
|
||||
@@ -187,7 +184,13 @@ class DetailSEGSAsRegions:
|
||||
"tooltip": tooltips.DETAIL_TILED_DECODE,
|
||||
},
|
||||
),
|
||||
}
|
||||
},
|
||||
"optional": {
|
||||
"negative": (
|
||||
"CONDITIONING",
|
||||
{"tooltip": tooltips.REGIONAL_GLOBAL_NEGATIVE},
|
||||
),
|
||||
},
|
||||
}
|
||||
|
||||
def detail(
|
||||
@@ -195,24 +198,25 @@ class DetailSEGSAsRegions:
|
||||
image: object,
|
||||
model: Any,
|
||||
vae: Any,
|
||||
negative: Any,
|
||||
positive: Any,
|
||||
segs: object,
|
||||
region_positive: object,
|
||||
global_prompt_weight: object,
|
||||
scale_factor: object,
|
||||
upscale_method: object,
|
||||
seed: object,
|
||||
steps: object,
|
||||
cfg: object,
|
||||
sampler_name: object,
|
||||
scheduler: object,
|
||||
denoise: object,
|
||||
feather: object,
|
||||
noise_mask: object,
|
||||
noise_mask_feather: object,
|
||||
tiled_encode: object,
|
||||
tiled_decode: object,
|
||||
negative: Any | None = None,
|
||||
positive: Any = None,
|
||||
segs: object = None,
|
||||
region_positive: object = None,
|
||||
global_prompt_weight: object = 0.25,
|
||||
scale_factor: object = 1.0,
|
||||
upscale_method: object = "lanczos",
|
||||
seed: object = 0,
|
||||
steps: object = 20,
|
||||
cfg: object = 8.0,
|
||||
sampler_name: object = "euler",
|
||||
scheduler: object = "normal",
|
||||
denoise: object = 0.5,
|
||||
feather: object = 5,
|
||||
noise_mask: object = True,
|
||||
noise_mask_feather: object = 20,
|
||||
tiled_encode: object = False,
|
||||
tiled_decode: object = False,
|
||||
noise_inversion: NoiseInversionOptions | None = None,
|
||||
) -> tuple[object]:
|
||||
"""Run regional detailing and return the detailed image."""
|
||||
|
||||
@@ -235,6 +239,7 @@ class DetailSEGSAsRegions:
|
||||
strict=True,
|
||||
):
|
||||
result = service.detail(
|
||||
noise_inversion=noise_inversion,
|
||||
image=single_image,
|
||||
segs=single_segs,
|
||||
model=single_input(model, "model", list_mode, OPERATION),
|
||||
|
||||
@@ -61,10 +61,6 @@ class DetailSEGSByScaleFactor:
|
||||
"CONDITIONING,CONDITIONING_BATCH",
|
||||
{"tooltip": tooltips.DETAIL_POSITIVE},
|
||||
),
|
||||
"negative": (
|
||||
"CONDITIONING,CONDITIONING_BATCH",
|
||||
{"tooltip": tooltips.DETAIL_NEGATIVE},
|
||||
),
|
||||
"scale_factor": (
|
||||
"FLOAT",
|
||||
scale_factor_options(default=1.5),
|
||||
@@ -171,7 +167,13 @@ class DetailSEGSByScaleFactor:
|
||||
"tooltip": tooltips.DETAIL_TILED_DECODE,
|
||||
},
|
||||
),
|
||||
}
|
||||
},
|
||||
"optional": {
|
||||
"negative": (
|
||||
"CONDITIONING,CONDITIONING_BATCH",
|
||||
{"tooltip": tooltips.DETAIL_NEGATIVE},
|
||||
),
|
||||
},
|
||||
}
|
||||
|
||||
def detail(
|
||||
@@ -181,21 +183,21 @@ class DetailSEGSByScaleFactor:
|
||||
model: Any,
|
||||
vae: Any,
|
||||
positive: Any,
|
||||
negative: Any,
|
||||
scale_factor: object,
|
||||
upscale_method: object,
|
||||
clamp_size: object,
|
||||
seed: object,
|
||||
steps: object,
|
||||
cfg: object,
|
||||
sampler_name: object,
|
||||
scheduler: object,
|
||||
denoise: object,
|
||||
feather: object,
|
||||
noise_mask: object,
|
||||
noise_mask_feather: object,
|
||||
tiled_encode: object,
|
||||
tiled_decode: object,
|
||||
negative: Any | None = None,
|
||||
scale_factor: object = 1.5,
|
||||
upscale_method: object = "lanczos",
|
||||
clamp_size: object = 0,
|
||||
seed: object = 0,
|
||||
steps: object = 20,
|
||||
cfg: object = 8.0,
|
||||
sampler_name: object = "euler",
|
||||
scheduler: object = "normal",
|
||||
denoise: object = 0.5,
|
||||
feather: object = 5,
|
||||
noise_mask: object = True,
|
||||
noise_mask_feather: object = 20,
|
||||
tiled_encode: object = False,
|
||||
tiled_decode: object = False,
|
||||
) -> tuple[object]:
|
||||
"""Run scale-factor detailing and return the detailed image."""
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ from typing import Any, ClassVar
|
||||
|
||||
import torch
|
||||
|
||||
from ..domain.noise_inversion import NoiseInversionOptions
|
||||
from ..domain.segs import coerce_segs_group
|
||||
from ..domain.tiled_diffusion import TILED_DIFFUSION_MODES
|
||||
from ..nodes import tooltips
|
||||
@@ -70,10 +71,6 @@ class DetailSEGSByScaleFactorTiledDiffusion:
|
||||
"CONDITIONING,CONDITIONING_BATCH",
|
||||
{"tooltip": tooltips.DETAIL_POSITIVE},
|
||||
),
|
||||
"negative": (
|
||||
"CONDITIONING,CONDITIONING_BATCH",
|
||||
{"tooltip": tooltips.DETAIL_NEGATIVE},
|
||||
),
|
||||
"scale_factor": (
|
||||
"FLOAT",
|
||||
scale_factor_options(default=1.5),
|
||||
@@ -231,7 +228,13 @@ class DetailSEGSByScaleFactorTiledDiffusion:
|
||||
"tooltip": tooltips.LATENT_TILE_BATCH_SIZE,
|
||||
},
|
||||
),
|
||||
}
|
||||
},
|
||||
"optional": {
|
||||
"negative": (
|
||||
"CONDITIONING,CONDITIONING_BATCH",
|
||||
{"tooltip": tooltips.DETAIL_NEGATIVE},
|
||||
),
|
||||
},
|
||||
}
|
||||
|
||||
def detail(
|
||||
@@ -241,26 +244,27 @@ class DetailSEGSByScaleFactorTiledDiffusion:
|
||||
model: Any,
|
||||
vae: Any,
|
||||
positive: Any,
|
||||
negative: Any,
|
||||
scale_factor: object,
|
||||
upscale_method: object,
|
||||
clamp_size: object,
|
||||
seed: object,
|
||||
steps: object,
|
||||
cfg: object,
|
||||
sampler_name: object,
|
||||
scheduler: object,
|
||||
denoise: object,
|
||||
feather: object,
|
||||
noise_mask: object,
|
||||
noise_mask_feather: object,
|
||||
tiled_encode: object,
|
||||
tiled_decode: object,
|
||||
diffusion_mode: object,
|
||||
latent_tile_width: object,
|
||||
latent_tile_height: object,
|
||||
latent_tile_overlap: object,
|
||||
latent_tile_batch_size: object,
|
||||
negative: Any | None = None,
|
||||
scale_factor: object = 1.5,
|
||||
upscale_method: object = "lanczos",
|
||||
clamp_size: object = 0,
|
||||
seed: object = 0,
|
||||
steps: object = 20,
|
||||
cfg: object = 8.0,
|
||||
sampler_name: object = "euler",
|
||||
scheduler: object = "normal",
|
||||
denoise: object = 0.5,
|
||||
feather: object = 5,
|
||||
noise_mask: object = True,
|
||||
noise_mask_feather: object = 20,
|
||||
tiled_encode: object = False,
|
||||
tiled_decode: object = False,
|
||||
diffusion_mode: object = "multidiffusion",
|
||||
latent_tile_width: object = 128,
|
||||
latent_tile_height: object = 128,
|
||||
latent_tile_overlap: object = 16,
|
||||
latent_tile_batch_size: object = 4,
|
||||
noise_inversion: NoiseInversionOptions | None = None,
|
||||
) -> tuple[object]:
|
||||
"""Run tiled diffusion scale-factor detailing and return the image."""
|
||||
|
||||
@@ -273,6 +277,7 @@ class DetailSEGSByScaleFactorTiledDiffusion:
|
||||
outputs: list[torch.Tensor] = []
|
||||
for single_image, single_segs in zip(images, segs_group, strict=True):
|
||||
result = service.detail(
|
||||
noise_inversion=noise_inversion,
|
||||
image=single_image,
|
||||
segs=single_segs,
|
||||
model=single_input(model, "model", list_mode, OPERATION),
|
||||
|
||||
@@ -12,7 +12,7 @@ import torch
|
||||
|
||||
from ..domain.conditioning_batch import ConditioningBatch
|
||||
from ..domain.segs import NativeSegs
|
||||
from ..masking.segs_mask_ops import iter_single_images, validate_image_batch
|
||||
from ..domain.segs_mask_ops import iter_single_images, validate_image_batch
|
||||
|
||||
|
||||
def image_inputs(image: object, operation_name: str) -> tuple[torch.Tensor, ...]:
|
||||
|
||||
@@ -16,8 +16,8 @@ from ..domain.segs import (
|
||||
SORT_ORDER_OPTIONS,
|
||||
NativeSegs,
|
||||
)
|
||||
from ..masking.segs_mask_ops import iter_single_images, validate_image_batch
|
||||
from ..runtime.ultralytics_loader import UltralyticsDetectorModel
|
||||
from ..domain.segs_mask_ops import iter_single_images, validate_image_batch
|
||||
from ..runtime.ultralytics_model_adapter import UltralyticsDetectorModel
|
||||
from ..services.segs_detection_service import (
|
||||
SegsDetectionService,
|
||||
)
|
||||
|
||||
@@ -8,7 +8,7 @@ from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
from ..runtime.model_catalog import grounding_dino_choices, sam_choices
|
||||
from ..runtime.model_choices import ModelChoiceService, default_choice
|
||||
from ..runtime.model_metadata import GroundedSAMModelMetadata
|
||||
from . import tooltips
|
||||
|
||||
@@ -17,6 +17,7 @@ class GroundedSAMModelInfo:
|
||||
"""Expose selected grounded SAM source and local path metadata."""
|
||||
|
||||
_metadata = GroundedSAMModelMetadata()
|
||||
_choices = ModelChoiceService()
|
||||
|
||||
RETURN_TYPES = ("STRING",)
|
||||
RETURN_NAMES = ("model_info",)
|
||||
@@ -31,19 +32,27 @@ class GroundedSAMModelInfo:
|
||||
def INPUT_TYPES(cls) -> dict[str, dict[str, tuple[Any, ...]]]:
|
||||
"""Declare deterministic model metadata inputs."""
|
||||
|
||||
sam_model_choices = cls._choices.sam_choices()
|
||||
grounding_dino_model_choices = cls._choices.grounding_dino_choices()
|
||||
return {
|
||||
"required": {
|
||||
"sam_model": (
|
||||
sam_choices(),
|
||||
sam_model_choices,
|
||||
{
|
||||
"default": "sam_hq_vit_b (379MB)",
|
||||
"default": default_choice(
|
||||
sam_model_choices,
|
||||
"sam_hq_vit_b (379MB)",
|
||||
),
|
||||
"tooltip": tooltips.SAM_MODEL_INPUT,
|
||||
},
|
||||
),
|
||||
"grounding_dino_model": (
|
||||
grounding_dino_choices(),
|
||||
grounding_dino_model_choices,
|
||||
{
|
||||
"default": "GroundingDINO_SwinT_OGC (694MB)",
|
||||
"default": default_choice(
|
||||
grounding_dino_model_choices,
|
||||
"GroundingDINO_SwinT_OGC (694MB)",
|
||||
),
|
||||
"tooltip": tooltips.GROUNDING_DINO_MODEL_INPUT,
|
||||
},
|
||||
),
|
||||
@@ -53,4 +62,6 @@ class GroundedSAMModelInfo:
|
||||
def describe(self, sam_model: str, grounding_dino_model: str) -> tuple[str]:
|
||||
"""Return JSON metadata for selected model entries."""
|
||||
|
||||
self._choices.reject_sentinel(sam_model)
|
||||
self._choices.reject_sentinel(grounding_dino_model)
|
||||
return (self._metadata.describe_selection(sam_model, grounding_dino_model),)
|
||||
|
||||
@@ -78,10 +78,6 @@ class KSamplerExtras:
|
||||
"CONDITIONING,CONDITIONING_BATCH",
|
||||
{"tooltip": tooltips.POSITIVE_CONDITIONING},
|
||||
),
|
||||
"negative": (
|
||||
"CONDITIONING,CONDITIONING_BATCH",
|
||||
{"tooltip": tooltips.NEGATIVE_CONDITIONING},
|
||||
),
|
||||
"latent_image": ("LATENT", {"tooltip": tooltips.LATENT_IMAGE}),
|
||||
"denoise": (
|
||||
"FLOAT",
|
||||
@@ -93,7 +89,13 @@ class KSamplerExtras:
|
||||
"tooltip": tooltips.DENOISE_STRENGTH,
|
||||
},
|
||||
),
|
||||
}
|
||||
},
|
||||
"optional": {
|
||||
"negative": (
|
||||
"CONDITIONING,CONDITIONING_BATCH",
|
||||
{"tooltip": tooltips.NEGATIVE_CONDITIONING},
|
||||
),
|
||||
},
|
||||
}
|
||||
|
||||
def sample(
|
||||
@@ -105,12 +107,14 @@ class KSamplerExtras:
|
||||
sampler_name: str,
|
||||
scheduler: str,
|
||||
positive: Any,
|
||||
negative: Any,
|
||||
latent_image: Latent,
|
||||
negative: Any | None = None,
|
||||
latent_image: Latent | None = None,
|
||||
denoise: float = 1.0,
|
||||
) -> tuple[Latent]:
|
||||
"""Sample a latent with ComfyUI samplers and extra scheduler sigmas."""
|
||||
|
||||
if latent_image is None:
|
||||
raise TypeError("KSampler Extras requires a latent_image input.")
|
||||
output = self.service_class().sample(
|
||||
model=model,
|
||||
seed=seed,
|
||||
|
||||
@@ -8,7 +8,8 @@ from __future__ import annotations
|
||||
|
||||
from typing import Any, ClassVar
|
||||
|
||||
from ..runtime.ultralytics_loader import UltralyticsLoaderService
|
||||
from ..runtime.model_downloads import ComfyProgressReporter
|
||||
from ..services.ultralytics_loader_service import UltralyticsLoaderService
|
||||
|
||||
|
||||
class LoadUltralyticsModel:
|
||||
@@ -40,7 +41,8 @@ class LoadUltralyticsModel:
|
||||
{
|
||||
"default": choices[0],
|
||||
"tooltip": (
|
||||
"Ultralytics model file in the ComfyUI models folder."
|
||||
"A local Ultralytics model or a curated model that "
|
||||
"downloads to ComfyUI's Impact Pack-compatible folders."
|
||||
),
|
||||
},
|
||||
)
|
||||
@@ -50,5 +52,8 @@ class LoadUltralyticsModel:
|
||||
def load(self, model_name: str) -> tuple[object, object, object]:
|
||||
"""Load the selected detector and paired compatibility facades."""
|
||||
|
||||
loaded = self.service_class().load(model_name)
|
||||
loaded = self.service_class().load(
|
||||
model_name,
|
||||
progress=ComfyProgressReporter(),
|
||||
)
|
||||
return loaded.detector_model, loaded.bbox_detector, loaded.segm_detector
|
||||
|
||||
@@ -16,9 +16,9 @@ from ..domain.segs import (
|
||||
SORT_ORDER_OPTIONS,
|
||||
NativeSegs,
|
||||
)
|
||||
from ..domain.segs_mask_ops import iter_single_images, validate_image_batch
|
||||
from ..masking.mask_ops import DETAIL_METHODS
|
||||
from ..masking.prompt_segs_with_sam_service import PromptSEGSWithSAMService
|
||||
from ..masking.segs_mask_ops import iter_single_images, validate_image_batch
|
||||
from ..services.segs_output_service import (
|
||||
CombinedSegsResult,
|
||||
build_combined_segs_result,
|
||||
|
||||
@@ -8,7 +8,7 @@ from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
from ..runtime.prompt_control_schedule_encode_graph import (
|
||||
from ..services.prompt_control_schedule_encode_graph import (
|
||||
PromptControlScheduleEncodeGraphBuilder,
|
||||
)
|
||||
|
||||
@@ -74,20 +74,21 @@ class ScheduleAndEncodePromptsWithPromptControl:
|
||||
),
|
||||
},
|
||||
),
|
||||
},
|
||||
"optional": {
|
||||
"negative_prompt": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "",
|
||||
"multiline": False,
|
||||
"tooltip": (
|
||||
"Negative Prompt-Control text; [SEP] or [SEP|name] "
|
||||
"creates ordered entries, and global text fills missing "
|
||||
"negative regions."
|
||||
"Optional negative Prompt-Control text; [SEP] or "
|
||||
"[SEP|name] creates ordered entries, and global text "
|
||||
"fills missing negative regions. Leave disconnected "
|
||||
"to encode an empty negative prompt."
|
||||
),
|
||||
},
|
||||
),
|
||||
},
|
||||
"optional": {
|
||||
"encode_style": (
|
||||
"STRING",
|
||||
{
|
||||
@@ -107,7 +108,7 @@ class ScheduleAndEncodePromptsWithPromptControl:
|
||||
model: Any,
|
||||
clip: Any,
|
||||
positive_prompt: str,
|
||||
negative_prompt: str,
|
||||
negative_prompt: str = "",
|
||||
encode_style: str = "",
|
||||
) -> Any:
|
||||
"""Build lazy Prompt-Control graph expansion for prompts."""
|
||||
|
||||
@@ -11,7 +11,7 @@ from typing import Any, ClassVar
|
||||
|
||||
import torch
|
||||
|
||||
from ..masking.segs_mask_ops import iter_single_images, validate_image_batch
|
||||
from ..domain.segs_mask_ops import iter_single_images, validate_image_batch
|
||||
from ..runtime.progress import PhaseProgressReporter, create_comfy_phase_progress
|
||||
from ..services.segs_from_sam_output_service import SEGSFromSAMOutputService
|
||||
|
||||
|
||||
@@ -11,10 +11,13 @@ from types import ModuleType
|
||||
from typing import Any
|
||||
|
||||
from ..domain.anima_quantization import AnimaQuantizationRecipe
|
||||
from ..runtime.anima_artifacts import ANIMA_QWEN_TEXT_ENCODER
|
||||
from ..runtime.auto_model_choices import automatic_component_choices
|
||||
from ..runtime.diffusion_model_loader import DIFFUSION_WEIGHT_DTYPES
|
||||
from ..runtime.model_downloads import ComfyProgressReporter
|
||||
from ..runtime.quantization_capabilities import QuantizationCapabilityCatalog
|
||||
from ..runtime.quantization_progress import ComfyQuantizationProgressReporter
|
||||
from ..runtime.qwen_artifacts import QWEN_IMAGE_VAE
|
||||
from ..runtime.vae_loader import vae_choices
|
||||
from ..services.anima_loader_service import (
|
||||
AUTO_CHOICE,
|
||||
@@ -84,7 +87,12 @@ class SimpleLoadAnima:
|
||||
},
|
||||
),
|
||||
"text_encoder": (
|
||||
_choices_with_auto(folder_paths.get_filename_list("text_encoders")),
|
||||
automatic_component_choices(
|
||||
installed=folder_paths.get_filename_list("text_encoders"),
|
||||
artifacts=(ANIMA_QWEN_TEXT_ENCODER,),
|
||||
leading_choices=(AUTO_CHOICE,),
|
||||
folder_paths_module=folder_paths,
|
||||
),
|
||||
{
|
||||
"default": AUTO_CHOICE,
|
||||
"advanced": True,
|
||||
@@ -106,7 +114,12 @@ class SimpleLoadAnima:
|
||||
},
|
||||
),
|
||||
"vae": (
|
||||
_choices_with_auto(vae_choices(folder_paths)),
|
||||
automatic_component_choices(
|
||||
installed=vae_choices(folder_paths),
|
||||
artifacts=(QWEN_IMAGE_VAE,),
|
||||
leading_choices=(AUTO_CHOICE,),
|
||||
folder_paths_module=folder_paths,
|
||||
),
|
||||
{
|
||||
"default": AUTO_CHOICE,
|
||||
"advanced": True,
|
||||
@@ -142,12 +155,6 @@ class SimpleLoadAnima:
|
||||
)
|
||||
|
||||
|
||||
def _choices_with_auto(choices: list[str]) -> list[str]:
|
||||
"""Return choices with the automatic selection first and deduplicated."""
|
||||
|
||||
return [AUTO_CHOICE, *(choice for choice in choices if choice != AUTO_CHOICE)]
|
||||
|
||||
|
||||
def _folder_paths() -> ModuleType:
|
||||
"""Import ComfyUI folder paths lazily."""
|
||||
|
||||
|
||||
@@ -143,7 +143,8 @@ SCHEDULER = (
|
||||
)
|
||||
POSITIVE_CONDITIONING = "Positive conditioning that guides what the sampler should add."
|
||||
NEGATIVE_CONDITIONING = (
|
||||
"Negative conditioning that guides what the sampler should avoid."
|
||||
"Optional conditioning that guides what the sampler should avoid. Leave "
|
||||
"disconnected for positive-only sampling without CFG."
|
||||
)
|
||||
LATENT_IMAGE = "Latent input whose samples will be denoised."
|
||||
DENOISE_STRENGTH = (
|
||||
@@ -226,8 +227,8 @@ DETAIL_POSITIVE = (
|
||||
"order."
|
||||
)
|
||||
DETAIL_NEGATIVE = (
|
||||
"Negative conditioning for detailing. A conditioning batch is matched to SEGS "
|
||||
"order."
|
||||
"Optional negative conditioning for detailing; leave disconnected for "
|
||||
"positive-only sampling. A conditioning batch is matched to SEGS order."
|
||||
)
|
||||
DETAIL_SCALE_FACTOR = (
|
||||
"Crop enlargement multiplier. Larger values give the sampler more detail room "
|
||||
@@ -266,7 +267,8 @@ DETAIL_IMAGE_OUTPUT = "Image with the detailed regions blended back into place."
|
||||
SCALE_FACTOR_OUTPUT = "Multiplier used to scale a connected target."
|
||||
|
||||
REGIONAL_GLOBAL_NEGATIVE = (
|
||||
"Negative conditioning applied across the full regional pass."
|
||||
"Optional negative conditioning applied across the full regional pass; leave "
|
||||
"disconnected for positive-only sampling."
|
||||
)
|
||||
REGIONAL_GLOBAL_POSITIVE = (
|
||||
"Positive conditioning that gives full-image context to the regional pass."
|
||||
|
||||
@@ -14,13 +14,16 @@ def get_nodes() -> list[type[object]]:
|
||||
|
||||
from .all_prompt_attention_segs import AllPromptAttentionSEGSV3
|
||||
from .attention_capture_model import AttentionCaptureModelV3
|
||||
from .attention_coupling_options import AttentionCouplingOptionsV3
|
||||
from .attention_masked_conditioning import AttentionMaskedConditioningV3
|
||||
from .attention_region_mask import AttentionRegionMaskV3
|
||||
from .batch_region_conditioning import BatchRegionConditioningV3
|
||||
from .batch_segs import BatchSEGSV3
|
||||
from .compose_regional_conditioning import ComposeRegionalConditioningV3
|
||||
from .concept_attention_segs import ConceptAttentionSEGSV3
|
||||
from .contextual_diffusion_options import ContextualDiffusionOptionsV3
|
||||
from .external_llm_prompt import ExternalLLMPromptV3
|
||||
from .ksampler import KSamplerV3
|
||||
from .ksampler_attention_coupling import KSamplerAttentionCouplingV3
|
||||
from .ksampler_contextual_attention_coupling import (
|
||||
KSamplerContextualAttentionCouplingV3,
|
||||
@@ -62,20 +65,28 @@ def get_nodes() -> list[type[object]]:
|
||||
from .load_image_list import LoadImageListV3
|
||||
from .load_mask_batch import LoadMaskBatchV3
|
||||
from .mask_to_segs import MaskToSEGSV3
|
||||
from .noise_inversion_options import NoiseInversionOptionsV3
|
||||
from .scale_factor import ScaleFactorV3
|
||||
from .seed_variation import SeedVariationV3
|
||||
from .simple_load_checkpoint import SimpleLoadCheckpointV3
|
||||
from .simple_load_flux import SimpleLoadFluxV3
|
||||
from .simple_load_flux2 import SimpleLoadFlux2V3
|
||||
from .simple_load_krea2 import SimpleLoadKrea2V3
|
||||
from .tag_segs_with_external_llm import TagSEGSWithExternalLLMV3
|
||||
from .tag_segs_with_wd14 import TagSEGSWithWD14V3
|
||||
from .tile_and_tag_segs import TileAndTagSEGSV3
|
||||
from .tiling_options import TilingOptionsV3
|
||||
from .vae_decode_options import VAEDecodeOptionsV3
|
||||
from .vae_encode_options import VAEEncodeOptionsV3
|
||||
from .wd14_tagger_loader import WD14TaggerLoaderV3
|
||||
|
||||
nodes: list[type[object]] = [
|
||||
AllPromptAttentionSEGSV3,
|
||||
AttentionCouplingOptionsV3,
|
||||
ContextualDiffusionOptionsV3,
|
||||
NoiseInversionOptionsV3,
|
||||
TilingOptionsV3,
|
||||
KSamplerV3,
|
||||
AttentionCaptureModelV3,
|
||||
AttentionMaskedConditioningV3,
|
||||
AttentionRegionMaskV3,
|
||||
@@ -121,6 +132,7 @@ def get_nodes() -> list[type[object]]:
|
||||
SimpleLoadCheckpointV3,
|
||||
SimpleLoadFluxV3,
|
||||
SimpleLoadFlux2V3,
|
||||
SimpleLoadKrea2V3,
|
||||
SimpleVAEEncodeV3,
|
||||
TagSEGSWithExternalLLMV3,
|
||||
TagSEGSWithWD14V3,
|
||||
@@ -135,6 +147,7 @@ def get_nodes() -> list[type[object]]:
|
||||
if not prompt_control_is_available():
|
||||
return nodes
|
||||
|
||||
from .apply_automatic_negpip import ApplyAutomaticNegpipV3
|
||||
from .attach_regional_global_conditioning import (
|
||||
AttachRegionalGlobalConditioningV3,
|
||||
)
|
||||
@@ -149,6 +162,7 @@ def get_nodes() -> list[type[object]]:
|
||||
|
||||
return [
|
||||
*nodes,
|
||||
ApplyAutomaticNegpipV3,
|
||||
AttachRegionalGlobalConditioningV3,
|
||||
EncodePromptBatchWithPromptControl,
|
||||
LabelRegionalLoraHooksV3,
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Internal Comfy v3 node for model-family automatic NegPiP preparation."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from importlib import import_module
|
||||
from typing import TYPE_CHECKING, Any
|
||||
|
||||
from ..services.negpip_model_service import NEGPIP_MODEL_SERVICE
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
class _ComfyNodeBase:
|
||||
"""Type-checking base for Comfy v3 nodes."""
|
||||
|
||||
pass
|
||||
|
||||
else:
|
||||
_ComfyNodeBase = import_module("comfy_api.latest").io.ComfyNode
|
||||
|
||||
_comfy_io: Any = None if TYPE_CHECKING else import_module("comfy_api.latest").io
|
||||
|
||||
|
||||
class ApplyAutomaticNegpipV3(_ComfyNodeBase):
|
||||
"""Patch supported MODEL/CLIP pairs after a negative prompt-weight trigger."""
|
||||
|
||||
@classmethod
|
||||
def define_schema(cls) -> Any:
|
||||
"""Declare the internal runtime patch boundary."""
|
||||
|
||||
return _comfy_io.Schema(
|
||||
node_id="SimpleSyrup.ApplyAutomaticNegpip",
|
||||
display_name="Apply Automatic NegPiP (Internal)",
|
||||
category="SimpleSyrup/Internal",
|
||||
description=(
|
||||
"Internal model-family NegPiP preparation injected by Schedule & "
|
||||
"Encode Prompts after detecting a negative prompt weight."
|
||||
),
|
||||
is_dev_only=True,
|
||||
inputs=[
|
||||
_comfy_io.Model.Input(
|
||||
"model",
|
||||
tooltip="MODEL inspected and cloned only when NegPiP is supported.",
|
||||
),
|
||||
_comfy_io.Clip.Input(
|
||||
"clip",
|
||||
tooltip="CLIP cloned with the matching NegPiP encoder behavior.",
|
||||
),
|
||||
],
|
||||
outputs=[
|
||||
_comfy_io.Model.Output(
|
||||
"model",
|
||||
tooltip="MODEL carrying one supported NegPiP attention patch set.",
|
||||
),
|
||||
_comfy_io.Clip.Output(
|
||||
"clip",
|
||||
tooltip="CLIP carrying matching negative-weight encoding behavior.",
|
||||
),
|
||||
],
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def execute(cls, model: object, clip: object) -> tuple[object, object]:
|
||||
"""Return the supported patched pair or the original unsupported pair."""
|
||||
|
||||
return NEGPIP_MODEL_SERVICE.prepare(model, clip)
|
||||
@@ -0,0 +1,67 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Configure regional attention without applying MODEL patches in the options graph."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
from ..domain.sampler_options import (
|
||||
AttentionCouplingOptions,
|
||||
SamplerOptions,
|
||||
append_sampler_capability,
|
||||
)
|
||||
from .ksampler_schema import attention_coupling_ksampler_inputs
|
||||
from .sampler_options_schema import (
|
||||
COMFY_IO,
|
||||
OptionsNodeBase,
|
||||
options_input,
|
||||
options_output,
|
||||
)
|
||||
|
||||
|
||||
class AttentionCouplingOptionsV3(OptionsNodeBase):
|
||||
"""Configure the sampler's regional attention strength and mask feathering."""
|
||||
|
||||
@classmethod
|
||||
def define_schema(cls) -> Any:
|
||||
"""Expose strength and feathering without binding region payloads."""
|
||||
controls = attention_coupling_ksampler_inputs(COMFY_IO)
|
||||
return COMFY_IO.Schema(
|
||||
node_id="SimpleSyrup.AttentionCouplingOptions",
|
||||
display_name="Attention Coupling Options",
|
||||
category="SimpleSyrup/Sampling/Options",
|
||||
description=(
|
||||
"Routes global-first sampler conditioning to ordered image "
|
||||
"regions through regional attention and LoRA hooks."
|
||||
),
|
||||
inputs=[
|
||||
options_input(COMFY_IO),
|
||||
*[
|
||||
control
|
||||
for control in controls
|
||||
if control.id in {"regional_prompt_weight", "region_mask_feather"}
|
||||
],
|
||||
],
|
||||
outputs=[options_output(COMFY_IO)],
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def execute(
|
||||
cls,
|
||||
regional_prompt_weight: float = 1.0,
|
||||
region_mask_feather: int = 0,
|
||||
options: SamplerOptions | None = None,
|
||||
) -> tuple[SamplerOptions]:
|
||||
"""Append regional attention controls while deferring model preparation."""
|
||||
return (
|
||||
append_sampler_capability(
|
||||
options,
|
||||
AttentionCouplingOptions(
|
||||
regional_prompt_weight=regional_prompt_weight,
|
||||
region_mask_feather=region_mask_feather,
|
||||
),
|
||||
),
|
||||
)
|
||||
@@ -0,0 +1,91 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Configure complete contextual sampling with one square local context plan."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
from ..domain.sampler_options import (
|
||||
ContextualDiffusionOptions,
|
||||
SamplerOptions,
|
||||
append_sampler_capability,
|
||||
)
|
||||
from .ksampler_schema import contextual_diffusion_inputs
|
||||
from .sampler_options_schema import (
|
||||
COMFY_IO,
|
||||
OptionsNodeBase,
|
||||
options_input,
|
||||
options_output,
|
||||
)
|
||||
|
||||
|
||||
class ContextualDiffusionOptionsV3(OptionsNodeBase):
|
||||
"""Schedule global scene authority over one local tile prediction."""
|
||||
|
||||
@classmethod
|
||||
def define_schema(cls) -> Any:
|
||||
"""Append local controls after existing widgets to preserve saved values."""
|
||||
controls = {
|
||||
control.id: control for control in contextual_diffusion_inputs(COMFY_IO)
|
||||
}
|
||||
return COMFY_IO.Schema(
|
||||
node_id="SimpleSyrup.ContextualDiffusionOptions",
|
||||
display_name="Contextual Diffusion Options",
|
||||
category="SimpleSyrup/Sampling/Options",
|
||||
description=(
|
||||
"Samples local contexts with global scene guidance; "
|
||||
"takes precedence over connected Tiling Options."
|
||||
),
|
||||
inputs=[
|
||||
options_input(COMFY_IO),
|
||||
controls["latent_context_size"],
|
||||
controls["global_weight"],
|
||||
controls["global_steps"],
|
||||
controls["global_decay"],
|
||||
controls["diffusion_mode"],
|
||||
controls["latent_context_overlap"],
|
||||
controls["latent_context_batch_size"],
|
||||
COMFY_IO.Boolean.Input(
|
||||
"differential_diffusion",
|
||||
default=False,
|
||||
tooltip=(
|
||||
"Uses the noise mask to vary denoising strength spatially; "
|
||||
"preserves existing model mask behavior."
|
||||
),
|
||||
),
|
||||
],
|
||||
outputs=[options_output(COMFY_IO)],
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def execute(
|
||||
cls,
|
||||
latent_context_size: int = 96,
|
||||
global_weight: float = 1.0,
|
||||
global_steps: int = 1,
|
||||
global_decay: float = 0.5,
|
||||
options: SamplerOptions | None = None,
|
||||
diffusion_mode: str = "multidiffusion",
|
||||
latent_context_overlap: int = 32,
|
||||
latent_context_batch_size: int = 4,
|
||||
differential_diffusion: bool = False,
|
||||
) -> tuple[SamplerOptions]:
|
||||
"""Append complete context settings without inheriting a Tiling contribution."""
|
||||
return (
|
||||
append_sampler_capability(
|
||||
options,
|
||||
ContextualDiffusionOptions(
|
||||
context_size=latent_context_size,
|
||||
global_weight=global_weight,
|
||||
global_steps=global_steps,
|
||||
global_decay=global_decay,
|
||||
diffusion_mode=diffusion_mode,
|
||||
overlap=latent_context_overlap,
|
||||
batch_size=latent_context_batch_size,
|
||||
differential_diffusion=differential_diffusion,
|
||||
),
|
||||
),
|
||||
)
|
||||
@@ -10,7 +10,7 @@ from importlib import import_module
|
||||
from typing import TYPE_CHECKING, Any, ClassVar
|
||||
|
||||
from ..domain.prompt_batch_parser import DEFAULT_PROMPT_BATCH_SEPARATOR
|
||||
from ..runtime.prompt_control_batch_graph import PromptControlBatchGraphBuilder
|
||||
from ..services.prompt_control_batch_graph import PromptControlBatchGraphBuilder
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Expose one native KSampler consuming a composable capability configuration."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any, ClassVar
|
||||
|
||||
from ..domain.sampler_options import SamplerOptions
|
||||
from ..nodes import tooltips
|
||||
from ..services.sampler_options_sampling_service import SamplerOptionsSamplingService
|
||||
from .ksampler_schema import ksampler_inputs
|
||||
from .sampler_options_schema import COMFY_IO, OptionsNodeBase, options_input
|
||||
|
||||
|
||||
class KSamplerV3(OptionsNodeBase):
|
||||
"""Execute tiling, context, inversion and attention through shared authorities."""
|
||||
|
||||
service_class: ClassVar[type[SamplerOptionsSamplingService]] = (
|
||||
SamplerOptionsSamplingService
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def define_schema(cls) -> Any:
|
||||
"""Declare sampling controls, capabilities and optional spatial regions."""
|
||||
return COMFY_IO.Schema(
|
||||
node_id="SimpleSyrup.KSampler",
|
||||
display_name="KSampler (SimpleSyrup)",
|
||||
category="SimpleSyrup/Sampling",
|
||||
description=(
|
||||
"Samples latents with connected sampler options for tiling, "
|
||||
"Contextual Diffusion, noise inversion and Attention Coupling."
|
||||
),
|
||||
inputs=[
|
||||
*ksampler_inputs(COMFY_IO, steps_default=20, cfg_default=8.0),
|
||||
options_input(COMFY_IO),
|
||||
COMFY_IO.SEGS.Input(
|
||||
"segs",
|
||||
optional=True,
|
||||
tooltip=(
|
||||
"Guides local sampling regions when Tiling or Contextual "
|
||||
"Diffusion options are connected; ignored otherwise."
|
||||
),
|
||||
),
|
||||
COMFY_IO.Mask.Input(
|
||||
"region_masks",
|
||||
optional=True,
|
||||
tooltip=(
|
||||
"Ordered masks paired with global-first conditioning batches "
|
||||
"when Attention Coupling options are connected; "
|
||||
"ignored otherwise."
|
||||
),
|
||||
),
|
||||
],
|
||||
outputs=[
|
||||
COMFY_IO.Latent.Output(
|
||||
"latent", tooltip=tooltips.DENOISED_LATENT_OUTPUT
|
||||
)
|
||||
],
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def execute(
|
||||
cls,
|
||||
model: Any,
|
||||
seed: int,
|
||||
steps: int,
|
||||
cfg: float,
|
||||
sampler_name: str,
|
||||
scheduler: str,
|
||||
positive: object,
|
||||
negative: object | None = None,
|
||||
latent_image: dict[str, Any] | None = None,
|
||||
denoise: float = 1.0,
|
||||
options: SamplerOptions | None = None,
|
||||
segs: object | None = None,
|
||||
region_masks: object | None = None,
|
||||
) -> tuple[dict[str, Any]]:
|
||||
"""Delegate sampling without mutating capability configuration."""
|
||||
if latent_image is None:
|
||||
raise TypeError("KSampler requires latent_image.")
|
||||
return (
|
||||
cls.service_class().sample(
|
||||
model=model,
|
||||
seed=seed,
|
||||
steps=steps,
|
||||
cfg=cfg,
|
||||
sampler_name=sampler_name,
|
||||
scheduler=scheduler,
|
||||
positive=positive,
|
||||
negative=negative,
|
||||
latent_image=latent_image,
|
||||
denoise=denoise,
|
||||
options=options,
|
||||
segs=segs,
|
||||
region_masks=region_masks,
|
||||
),
|
||||
)
|
||||
@@ -17,6 +17,7 @@ from .ksampler_schema import (
|
||||
ATTENTION_COUPLING_REGIONAL_PROMPT_WEIGHT_DEFAULT,
|
||||
attention_coupling_ksampler_inputs,
|
||||
)
|
||||
from .sampler_options_schema import inversion_from_controls, noise_inversion_inputs
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
@@ -53,12 +54,14 @@ class KSamplerAttentionCouplingV3(_ComfyNodeBase):
|
||||
"With conditioning batches and masks, denoises supported Anima "
|
||||
"and standard SD/SDXL models through one "
|
||||
"shared trajectory while coupling global and masked regional "
|
||||
"cross-attention. The input MODEL may carry a global LoRA. Anima "
|
||||
"regions may also carry ordered, independently scheduled Prompt "
|
||||
"Control model LoRAs whose overlapping deltas compose in declared "
|
||||
"order. Runtime scales with active adapters, ranks, and targets. "
|
||||
"Standard SD/SDXL regional model-side hooks and unsupported Anima "
|
||||
"adapter targets fail before sampling."
|
||||
"cross-attention. LoRAs on the input MODEL and Prompt Control model "
|
||||
"LoRAs on global conditioning entry 0 apply across the image. Regions "
|
||||
"may also carry ordered, independently scheduled model LoRAs "
|
||||
"whose overlapping deltas compose in declared order. Runtime scales "
|
||||
"with active adapters, ranks, and targets. "
|
||||
"Global LoRA and regional LoRA retain independent schedules; "
|
||||
"regional model-side hooks are supported on admitted model families. "
|
||||
"Unsupported adapter targets fail before sampling."
|
||||
),
|
||||
search_aliases=[
|
||||
"attention coupling",
|
||||
@@ -66,10 +69,13 @@ class KSamplerAttentionCouplingV3(_ComfyNodeBase):
|
||||
"anima regional prompt",
|
||||
"sdxl regional prompt",
|
||||
],
|
||||
inputs=attention_coupling_ksampler_inputs(
|
||||
_comfy_io,
|
||||
region_masks_optional=True,
|
||||
),
|
||||
inputs=[
|
||||
*attention_coupling_ksampler_inputs(
|
||||
_comfy_io,
|
||||
region_masks_optional=True,
|
||||
),
|
||||
*noise_inversion_inputs(_comfy_io, convenience=True),
|
||||
],
|
||||
outputs=[
|
||||
_comfy_io.Latent.Output(
|
||||
"latent",
|
||||
@@ -88,18 +94,32 @@ class KSamplerAttentionCouplingV3(_ComfyNodeBase):
|
||||
sampler_name: str,
|
||||
scheduler: str,
|
||||
positive: object,
|
||||
negative: object,
|
||||
latent_image: dict[str, Any],
|
||||
denoise: float,
|
||||
negative: object | None = None,
|
||||
latent_image: dict[str, Any] | None = None,
|
||||
denoise: float = 1.0,
|
||||
region_masks: object | None = None,
|
||||
regional_prompt_weight: float = (
|
||||
ATTENTION_COUPLING_REGIONAL_PROMPT_WEIGHT_DEFAULT
|
||||
),
|
||||
region_mask_feather: int = 0,
|
||||
inversion_method: str = "euler",
|
||||
inversion_resolution_scale: float = 0.5,
|
||||
inversion_steps: int = 2,
|
||||
inversion_switch_fraction: float = 0.75,
|
||||
inversion_finishing_steps: int = 1,
|
||||
) -> tuple[dict[str, Any]]:
|
||||
"""Delegate ordinary or regional sampling to the routing service."""
|
||||
|
||||
if latent_image is None:
|
||||
raise TypeError("KSampler Attention Coupling requires latent_image.")
|
||||
output = cls.sampling_service_class().sample(
|
||||
noise_inversion=inversion_from_controls(
|
||||
inversion_method=inversion_method,
|
||||
inversion_resolution_scale=inversion_resolution_scale,
|
||||
inversion_steps=inversion_steps,
|
||||
inversion_switch_fraction=inversion_switch_fraction,
|
||||
inversion_finishing_steps=inversion_finishing_steps,
|
||||
),
|
||||
model=model,
|
||||
seed=seed,
|
||||
steps=steps,
|
||||
|
||||
@@ -17,6 +17,7 @@ from .ksampler_schema import (
|
||||
attention_coupling_ksampler_inputs,
|
||||
contextual_diffusion_inputs,
|
||||
)
|
||||
from .sampler_options_schema import inversion_from_controls, noise_inversion_inputs
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
@@ -50,12 +51,14 @@ class KSamplerContextualAttentionCouplingV3(_ComfyNodeBase):
|
||||
description=(
|
||||
"Preserves large-image composition through Contextual Diffusion "
|
||||
"while coupling regional attention in every local and reduced-global "
|
||||
"Anima or standard SD/SDXL view. Global LoRAs remain on the input "
|
||||
"model. Anima regional LoRA stacks are prepared once, retain "
|
||||
"Anima or standard SD/SDXL view. LoRAs on the input MODEL and Prompt "
|
||||
"Control model LoRAs on global conditioning entry 0 apply in every "
|
||||
"view. Regional LoRA stacks are prepared once, retain "
|
||||
"independent schedules and full quality, and skip inactive work. "
|
||||
"Optional SEGS guide the shared local tile plan. Standard SD/SDXL "
|
||||
"regional model-side hooks and unsupported Anima targets fail before "
|
||||
"sampling."
|
||||
"Global LoRA and regional LoRA stacks remain independently scheduled; "
|
||||
"regional model-side hooks are supported on admitted model families. "
|
||||
"Optional SEGS guide the shared local tile plan. Unsupported adapter "
|
||||
"targets fail before sampling."
|
||||
),
|
||||
search_aliases=[
|
||||
"contextual attention coupling",
|
||||
@@ -73,6 +76,7 @@ class KSamplerContextualAttentionCouplingV3(_ComfyNodeBase):
|
||||
optional=True,
|
||||
tooltip=tooltips.CONTEXTUAL_DIFFUSION_SEGS,
|
||||
),
|
||||
*noise_inversion_inputs(_comfy_io, convenience=True),
|
||||
],
|
||||
outputs=[
|
||||
_comfy_io.Latent.Output(
|
||||
@@ -96,11 +100,11 @@ class KSamplerContextualAttentionCouplingV3(_ComfyNodeBase):
|
||||
sampler_name: str,
|
||||
scheduler: str,
|
||||
positive: object,
|
||||
negative: object,
|
||||
region_masks: object,
|
||||
regional_prompt_weight: float,
|
||||
region_mask_feather: int,
|
||||
latent_image: dict[str, Any],
|
||||
negative: object | None = None,
|
||||
region_masks: object | None = None,
|
||||
regional_prompt_weight: float = 1.0,
|
||||
region_mask_feather: int = 0,
|
||||
latent_image: dict[str, Any] | None = None,
|
||||
denoise: float = 1.0,
|
||||
diffusion_mode: str = "multidiffusion",
|
||||
latent_context_size: int = 96,
|
||||
@@ -110,9 +114,22 @@ class KSamplerContextualAttentionCouplingV3(_ComfyNodeBase):
|
||||
global_steps: int = 1,
|
||||
global_decay: float = 0.5,
|
||||
segs: object | None = None,
|
||||
inversion_method: str = "euler",
|
||||
inversion_resolution_scale: float = 0.5,
|
||||
inversion_steps: int = 2,
|
||||
inversion_switch_fraction: float = 0.75,
|
||||
inversion_finishing_steps: int = 1,
|
||||
) -> tuple[dict[str, Any], object]:
|
||||
"""Delegate the complete request to the combined application service."""
|
||||
|
||||
if latent_image is None:
|
||||
raise TypeError(
|
||||
"KSampler Contextual Attention Coupling requires latent_image."
|
||||
)
|
||||
if region_masks is None:
|
||||
raise TypeError(
|
||||
"KSampler Contextual Attention Coupling requires region_masks."
|
||||
)
|
||||
result = cls.sampling_service_class().sample(
|
||||
model=model,
|
||||
seed=seed,
|
||||
@@ -135,5 +152,12 @@ class KSamplerContextualAttentionCouplingV3(_ComfyNodeBase):
|
||||
global_steps=global_steps,
|
||||
global_decay=global_decay,
|
||||
segs=segs,
|
||||
noise_inversion=inversion_from_controls(
|
||||
inversion_method=inversion_method,
|
||||
inversion_resolution_scale=inversion_resolution_scale,
|
||||
inversion_steps=inversion_steps,
|
||||
inversion_switch_fraction=inversion_switch_fraction,
|
||||
inversion_finishing_steps=inversion_finishing_steps,
|
||||
),
|
||||
)
|
||||
return result.latent, result.contexts
|
||||
|
||||
@@ -18,6 +18,7 @@ from .ksampler_schema import (
|
||||
ksampler_inputs,
|
||||
optional_regional_sampling_inputs,
|
||||
)
|
||||
from .sampler_options_schema import inversion_from_controls, noise_inversion_inputs
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
@@ -67,6 +68,7 @@ class KSamplerContextualDiffusionV3(_ComfyNodeBase):
|
||||
_comfy_io,
|
||||
segs_tooltip=tooltips.CONTEXTUAL_DIFFUSION_SEGS,
|
||||
),
|
||||
*noise_inversion_inputs(_comfy_io, convenience=True),
|
||||
],
|
||||
outputs=[
|
||||
_comfy_io.Latent.Output(
|
||||
@@ -90,8 +92,8 @@ class KSamplerContextualDiffusionV3(_ComfyNodeBase):
|
||||
sampler_name: str,
|
||||
scheduler: str,
|
||||
positive: Any,
|
||||
negative: Any,
|
||||
latent_image: dict[str, Any],
|
||||
negative: Any | None = None,
|
||||
latent_image: dict[str, Any] | None = None,
|
||||
denoise: float = 1.0,
|
||||
diffusion_mode: str = "multidiffusion",
|
||||
latent_context_size: int = 96,
|
||||
@@ -104,9 +106,16 @@ class KSamplerContextualDiffusionV3(_ComfyNodeBase):
|
||||
region_masks: object | None = None,
|
||||
regional_prompt_weight: float = 0.5,
|
||||
region_mask_feather: int = 0,
|
||||
inversion_method: str = "euler",
|
||||
inversion_resolution_scale: float = 0.5,
|
||||
inversion_steps: int = 2,
|
||||
inversion_switch_fraction: float = 0.75,
|
||||
inversion_finishing_steps: int = 1,
|
||||
) -> tuple[dict[str, Any], object]:
|
||||
"""Delegate Contextual Diffusion sampling to its application service."""
|
||||
|
||||
if latent_image is None:
|
||||
raise TypeError("KSampler Contextual Diffusion requires latent_image.")
|
||||
result = cls.service_class().sample(
|
||||
model=model,
|
||||
seed=seed,
|
||||
@@ -129,5 +138,12 @@ class KSamplerContextualDiffusionV3(_ComfyNodeBase):
|
||||
region_masks=region_masks,
|
||||
regional_prompt_weight=regional_prompt_weight,
|
||||
region_mask_feather=region_mask_feather,
|
||||
noise_inversion=inversion_from_controls(
|
||||
inversion_method=inversion_method,
|
||||
inversion_resolution_scale=inversion_resolution_scale,
|
||||
inversion_steps=inversion_steps,
|
||||
inversion_switch_fraction=inversion_switch_fraction,
|
||||
inversion_finishing_steps=inversion_finishing_steps,
|
||||
),
|
||||
)
|
||||
return result.latent, result.contexts
|
||||
|
||||
@@ -13,6 +13,7 @@ from ..nodes import tooltips
|
||||
from ..services.ksampler_sampling_service import KSamplerSamplingService
|
||||
from ..services.regional_conditioning_service import RegionalConditioningService
|
||||
from .ksampler_schema import regional_ksampler_inputs
|
||||
from .sampler_options_schema import inversion_from_controls, noise_inversion_inputs
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
@@ -51,7 +52,10 @@ class KSamplerPromptByRegionV3(_ComfyNodeBase):
|
||||
"mask-bound regional prompts."
|
||||
),
|
||||
search_aliases=["ksampler", "regional prompt", "masked prompt"],
|
||||
inputs=regional_ksampler_inputs(_comfy_io),
|
||||
inputs=[
|
||||
*regional_ksampler_inputs(_comfy_io),
|
||||
*noise_inversion_inputs(_comfy_io, convenience=True),
|
||||
],
|
||||
outputs=[
|
||||
_comfy_io.Latent.Output(
|
||||
"latent",
|
||||
@@ -70,15 +74,24 @@ class KSamplerPromptByRegionV3(_ComfyNodeBase):
|
||||
sampler_name: str,
|
||||
scheduler: str,
|
||||
positive: object,
|
||||
negative: object,
|
||||
region_masks: object,
|
||||
regional_prompt_weight: float,
|
||||
region_mask_feather: int,
|
||||
latent_image: dict[str, Any],
|
||||
denoise: float,
|
||||
negative: object | None = None,
|
||||
region_masks: object | None = None,
|
||||
regional_prompt_weight: float = 0.5,
|
||||
region_mask_feather: int = 0,
|
||||
latent_image: dict[str, Any] | None = None,
|
||||
denoise: float = 1.0,
|
||||
inversion_method: str = "euler",
|
||||
inversion_resolution_scale: float = 0.5,
|
||||
inversion_steps: int = 2,
|
||||
inversion_switch_fraction: float = 0.75,
|
||||
inversion_finishing_steps: int = 1,
|
||||
) -> tuple[dict[str, Any]]:
|
||||
"""Assemble regional conditioning and sample the full latent."""
|
||||
|
||||
if region_masks is None:
|
||||
raise TypeError("KSampler Prompt by Region requires region_masks.")
|
||||
if latent_image is None:
|
||||
raise TypeError("KSampler Prompt by Region requires latent_image.")
|
||||
assembled_positive, assembled_negative = (
|
||||
cls.conditioning_service_class().assemble(
|
||||
positive=positive,
|
||||
@@ -89,6 +102,13 @@ class KSamplerPromptByRegionV3(_ComfyNodeBase):
|
||||
)
|
||||
)
|
||||
output = cls.sampling_service_class().sample(
|
||||
noise_inversion=inversion_from_controls(
|
||||
inversion_method=inversion_method,
|
||||
inversion_resolution_scale=inversion_resolution_scale,
|
||||
inversion_steps=inversion_steps,
|
||||
inversion_switch_fraction=inversion_switch_fraction,
|
||||
inversion_finishing_steps=inversion_finishing_steps,
|
||||
),
|
||||
model=model,
|
||||
seed=seed,
|
||||
steps=steps,
|
||||
|
||||
@@ -14,6 +14,7 @@ from ..nodes import tooltips
|
||||
from ..services.regional_conditioning_service import RegionalConditioningService
|
||||
from ..services.tiled_diffusion_sampling_service import TiledDiffusionSamplingService
|
||||
from .ksampler_schema import regional_ksampler_inputs, tiled_diffusion_inputs
|
||||
from .sampler_options_schema import inversion_from_controls, noise_inversion_inputs
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
@@ -60,6 +61,7 @@ class KSamplerPromptByTiledRegionV3(_ComfyNodeBase):
|
||||
inputs=[
|
||||
*regional_ksampler_inputs(_comfy_io),
|
||||
*tiled_diffusion_inputs(_comfy_io),
|
||||
*noise_inversion_inputs(_comfy_io, convenience=True),
|
||||
],
|
||||
outputs=[
|
||||
_comfy_io.Latent.Output(
|
||||
@@ -79,20 +81,29 @@ class KSamplerPromptByTiledRegionV3(_ComfyNodeBase):
|
||||
sampler_name: str,
|
||||
scheduler: str,
|
||||
positive: object,
|
||||
negative: object,
|
||||
region_masks: object,
|
||||
regional_prompt_weight: float,
|
||||
region_mask_feather: int,
|
||||
latent_image: dict[str, Any],
|
||||
denoise: float,
|
||||
diffusion_mode: str,
|
||||
latent_tile_width: int,
|
||||
latent_tile_height: int,
|
||||
latent_tile_overlap: int,
|
||||
latent_tile_batch_size: int,
|
||||
negative: object | None = None,
|
||||
region_masks: object | None = None,
|
||||
regional_prompt_weight: float = 0.5,
|
||||
region_mask_feather: int = 0,
|
||||
latent_image: dict[str, Any] | None = None,
|
||||
denoise: float = 1.0,
|
||||
diffusion_mode: str = "multidiffusion",
|
||||
latent_tile_width: int = 128,
|
||||
latent_tile_height: int = 128,
|
||||
latent_tile_overlap: int = 16,
|
||||
latent_tile_batch_size: int = 4,
|
||||
inversion_method: str = "euler",
|
||||
inversion_resolution_scale: float = 0.5,
|
||||
inversion_steps: int = 2,
|
||||
inversion_switch_fraction: float = 0.75,
|
||||
inversion_finishing_steps: int = 1,
|
||||
) -> tuple[dict[str, Any]]:
|
||||
"""Assemble regional conditioning and sample overlapping latent tiles."""
|
||||
|
||||
if region_masks is None:
|
||||
raise TypeError("KSampler Prompt by Tiled Region requires region_masks.")
|
||||
if latent_image is None:
|
||||
raise TypeError("KSampler Prompt by Tiled Region requires latent_image.")
|
||||
assembled_positive, assembled_negative = (
|
||||
cls.conditioning_service_class().assemble(
|
||||
positive=positive,
|
||||
@@ -103,6 +114,13 @@ class KSamplerPromptByTiledRegionV3(_ComfyNodeBase):
|
||||
)
|
||||
)
|
||||
output = cls.sampling_service_class().sample(
|
||||
noise_inversion=inversion_from_controls(
|
||||
inversion_method=inversion_method,
|
||||
inversion_resolution_scale=inversion_resolution_scale,
|
||||
inversion_steps=inversion_steps,
|
||||
inversion_switch_fraction=inversion_switch_fraction,
|
||||
inversion_finishing_steps=inversion_finishing_steps,
|
||||
),
|
||||
diffusion_mode=diffusion_mode,
|
||||
model=model,
|
||||
seed=seed,
|
||||
|
||||
@@ -64,7 +64,11 @@ def ksampler_inputs(
|
||||
tooltip=tooltips.SCHEDULER,
|
||||
),
|
||||
conditioning.Input("positive", tooltip=tooltips.POSITIVE_CONDITIONING),
|
||||
conditioning.Input("negative", tooltip=tooltips.NEGATIVE_CONDITIONING),
|
||||
conditioning.Input(
|
||||
"negative",
|
||||
optional=True,
|
||||
tooltip=tooltips.NEGATIVE_CONDITIONING,
|
||||
),
|
||||
comfy_io.Latent.Input("latent_image", tooltip=tooltips.LATENT_IMAGE),
|
||||
comfy_io.Float.Input(
|
||||
"denoise",
|
||||
@@ -248,7 +252,8 @@ def attention_coupling_ksampler_inputs(
|
||||
"model",
|
||||
tooltip=(
|
||||
"Supported Anima or standard SD/SDXL model used for one shared "
|
||||
"denoiser trajectory; apply global model LoRAs before connecting it."
|
||||
"denoiser trajectory. LoRAs patched on this model and Prompt Control "
|
||||
"model LoRAs on conditioning entry 0 apply globally."
|
||||
),
|
||||
),
|
||||
*base[1:6],
|
||||
@@ -258,17 +263,20 @@ def attention_coupling_ksampler_inputs(
|
||||
tooltip=(
|
||||
"Global-first positive conditioning: entry 0 is global and later "
|
||||
"entries pair with masks. Regional Prompt Control WeightHooks may "
|
||||
"contain ordered full-rank Anima LoRA stacks with independent "
|
||||
"schedules; standard SD/SDXL rejects regional model-side hooks."
|
||||
"contain ordered regional LoRA stacks with independent schedules. "
|
||||
"Model LoRA hooks on entry 0 apply across the image."
|
||||
),
|
||||
),
|
||||
comfy_io.MultiType.Input(
|
||||
"negative",
|
||||
[comfy_io.Conditioning, conditioning_batch],
|
||||
optional=True,
|
||||
tooltip=(
|
||||
"Global-first negative conditioning aligned to the same masks; "
|
||||
"Anima regional LoRA hooks retain their negative-branch ownership "
|
||||
"and independent schedules."
|
||||
"Optional global-first negative conditioning aligned to the same "
|
||||
"masks; leave disconnected for positive-only sampling. When used, "
|
||||
"its global model hooks must match the positive global entry. "
|
||||
"Regional LoRA hooks retain their negative-branch ownership and "
|
||||
"independent schedules."
|
||||
),
|
||||
),
|
||||
comfy_io.Mask.Input(
|
||||
@@ -278,7 +286,7 @@ def attention_coupling_ksampler_inputs(
|
||||
"Optional ordered masks paired with conditioning entries 1 onward. "
|
||||
"Leave disconnected with ordinary conditioning to bypass Attention "
|
||||
"Coupling. In overlaps, prompt contributions are normalized while "
|
||||
"Anima regional LoRA deltas add in declared adapter and region order."
|
||||
"regional LoRA deltas add in declared adapter and region order."
|
||||
),
|
||||
),
|
||||
comfy_io.Float.Input(
|
||||
@@ -291,7 +299,7 @@ def attention_coupling_ksampler_inputs(
|
||||
tooltip=(
|
||||
"Balances regional cross-attention against the global prompt from "
|
||||
"0 (global only) to 1 (regional only inside solid masks); regional "
|
||||
"Anima LoRA strength remains controlled by each hook."
|
||||
"LoRA strength remains controlled by each hook."
|
||||
),
|
||||
),
|
||||
comfy_io.Int.Input(
|
||||
@@ -301,7 +309,7 @@ def attention_coupling_ksampler_inputs(
|
||||
max=512,
|
||||
step=1,
|
||||
tooltip=(
|
||||
"Softens Attention Coupling and Anima regional LoRA boundaries by "
|
||||
"Softens Attention Coupling and regional LoRA boundaries by "
|
||||
"this many image pixels; 0 preserves authored mask values."
|
||||
),
|
||||
),
|
||||
@@ -325,9 +333,11 @@ def regional_conditioning_inputs(comfy_io: Any) -> list[Any]:
|
||||
comfy_io.MultiType.Input(
|
||||
"negative",
|
||||
[comfy_io.Conditioning, conditioning_batch],
|
||||
optional=True,
|
||||
tooltip=(
|
||||
"Negative conditioning whose first batch entry is global and "
|
||||
"later entries pair with masks in order."
|
||||
"Optional negative conditioning whose first batch entry is global "
|
||||
"and later entries pair with masks in order; leave disconnected "
|
||||
"for positive-only sampling."
|
||||
),
|
||||
),
|
||||
comfy_io.Mask.Input(
|
||||
|
||||
@@ -18,6 +18,7 @@ from .ksampler_schema import (
|
||||
attention_coupling_ksampler_inputs,
|
||||
tiled_diffusion_inputs,
|
||||
)
|
||||
from .sampler_options_schema import inversion_from_controls, noise_inversion_inputs
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
@@ -54,12 +55,15 @@ class KSamplerTiledAttentionCouplingV3(_ComfyNodeBase):
|
||||
"batches and masks, denoises large Anima and standard SD/SDXL "
|
||||
"latents in tiles through "
|
||||
"one shared model trajectory per tile batch while coupling global "
|
||||
"and masked regional cross-attention. The input MODEL may carry "
|
||||
"global LoRAs. Anima regions may carry independently scheduled "
|
||||
"and masked regional cross-attention. LoRAs on the input MODEL and "
|
||||
"Prompt Control model LoRAs on global conditioning entry 0 apply "
|
||||
"across every tile. Regions may carry independently scheduled "
|
||||
"regional LoRA stacks; inactive attention and LoRA work is pruned "
|
||||
"without changing quality. MultiDiffusion or Mixture of Diffusers "
|
||||
"fuses restored tile predictions. Standard SD/SDXL regional "
|
||||
"model-side hooks and unsupported Anima targets fail before sampling."
|
||||
"fuses restored tile predictions. Global LoRA and regional LoRA "
|
||||
"stacks retain independent schedules; regional model-side hooks are "
|
||||
"supported on admitted model families. Unsupported adapter targets "
|
||||
"fail before sampling."
|
||||
),
|
||||
search_aliases=[
|
||||
"attention coupling tiled",
|
||||
@@ -75,6 +79,7 @@ class KSamplerTiledAttentionCouplingV3(_ComfyNodeBase):
|
||||
region_masks_optional=True,
|
||||
),
|
||||
*tiled_diffusion_inputs(_comfy_io),
|
||||
*noise_inversion_inputs(_comfy_io, convenience=True),
|
||||
],
|
||||
outputs=[
|
||||
_comfy_io.Latent.Output(
|
||||
@@ -94,14 +99,19 @@ class KSamplerTiledAttentionCouplingV3(_ComfyNodeBase):
|
||||
sampler_name: str,
|
||||
scheduler: str,
|
||||
positive: object,
|
||||
negative: object,
|
||||
latent_image: dict[str, Any],
|
||||
negative: object | None = None,
|
||||
latent_image: dict[str, Any] | None = None,
|
||||
denoise: float = 1.0,
|
||||
diffusion_mode: str = "multidiffusion",
|
||||
latent_tile_width: int = 128,
|
||||
latent_tile_height: int = 128,
|
||||
latent_tile_overlap: int = 16,
|
||||
latent_tile_batch_size: int = 4,
|
||||
inversion_method: str = "euler",
|
||||
inversion_resolution_scale: float = 0.5,
|
||||
inversion_steps: int = 2,
|
||||
inversion_switch_fraction: float = 0.75,
|
||||
inversion_finishing_steps: int = 1,
|
||||
region_masks: object | None = None,
|
||||
regional_prompt_weight: float = (
|
||||
ATTENTION_COUPLING_REGIONAL_PROMPT_WEIGHT_DEFAULT
|
||||
@@ -110,7 +120,16 @@ class KSamplerTiledAttentionCouplingV3(_ComfyNodeBase):
|
||||
) -> tuple[dict[str, Any]]:
|
||||
"""Delegate ordinary or regional tiled sampling to the routing service."""
|
||||
|
||||
if latent_image is None:
|
||||
raise TypeError("KSampler Tiled Attention Coupling requires latent_image.")
|
||||
output = cls.sampling_service_class().sample(
|
||||
noise_inversion=inversion_from_controls(
|
||||
inversion_method=inversion_method,
|
||||
inversion_resolution_scale=inversion_resolution_scale,
|
||||
inversion_steps=inversion_steps,
|
||||
inversion_switch_fraction=inversion_switch_fraction,
|
||||
inversion_finishing_steps=inversion_finishing_steps,
|
||||
),
|
||||
diffusion_mode=diffusion_mode,
|
||||
model=model,
|
||||
seed=seed,
|
||||
|
||||
@@ -16,6 +16,7 @@ from .ksampler_schema import (
|
||||
optional_regional_sampling_inputs,
|
||||
tiled_diffusion_inputs,
|
||||
)
|
||||
from .sampler_options_schema import inversion_from_controls, noise_inversion_inputs
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
@@ -65,6 +66,7 @@ class KSamplerTiledDiffusionV3(_ComfyNodeBase):
|
||||
"boundaries while preserving the configured overlap."
|
||||
),
|
||||
),
|
||||
*noise_inversion_inputs(_comfy_io, convenience=True),
|
||||
],
|
||||
outputs=[
|
||||
_comfy_io.Latent.Output(
|
||||
@@ -84,8 +86,8 @@ class KSamplerTiledDiffusionV3(_ComfyNodeBase):
|
||||
sampler_name: str,
|
||||
scheduler: str,
|
||||
positive: Any,
|
||||
negative: Any,
|
||||
latent_image: dict[str, Any],
|
||||
negative: Any | None = None,
|
||||
latent_image: dict[str, Any] | None = None,
|
||||
denoise: float = 1.0,
|
||||
diffusion_mode: str = "multidiffusion",
|
||||
latent_tile_width: int = 128,
|
||||
@@ -96,9 +98,16 @@ class KSamplerTiledDiffusionV3(_ComfyNodeBase):
|
||||
region_masks: object | None = None,
|
||||
regional_prompt_weight: float = 0.5,
|
||||
region_mask_feather: int = 0,
|
||||
inversion_method: str = "euler",
|
||||
inversion_resolution_scale: float = 0.5,
|
||||
inversion_steps: int = 2,
|
||||
inversion_switch_fraction: float = 0.75,
|
||||
inversion_finishing_steps: int = 1,
|
||||
) -> tuple[dict[str, Any]]:
|
||||
"""Delegate tiled diffusion sampling to its application service."""
|
||||
|
||||
if latent_image is None:
|
||||
raise TypeError("KSampler Tiled Diffusion requires latent_image.")
|
||||
output = cls.service_class().sample(
|
||||
diffusion_mode=diffusion_mode,
|
||||
model=model,
|
||||
@@ -120,5 +129,12 @@ class KSamplerTiledDiffusionV3(_ComfyNodeBase):
|
||||
region_masks=region_masks,
|
||||
regional_prompt_weight=regional_prompt_weight,
|
||||
region_mask_feather=region_mask_feather,
|
||||
noise_inversion=inversion_from_controls(
|
||||
inversion_method=inversion_method,
|
||||
inversion_resolution_scale=inversion_resolution_scale,
|
||||
inversion_steps=inversion_steps,
|
||||
inversion_switch_fraction=inversion_switch_fraction,
|
||||
inversion_finishing_steps=inversion_finishing_steps,
|
||||
),
|
||||
)
|
||||
return (output,)
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Expose shared inversion controls on maintained implementation-backed samplers."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
from ..nodes.detailer_input_adapters import (
|
||||
float_input,
|
||||
int_input,
|
||||
str_input,
|
||||
)
|
||||
from .legacy_node_adapter import LegacyNodeV3Adapter
|
||||
from .sampler_options_schema import (
|
||||
COMFY_IO,
|
||||
inversion_from_controls,
|
||||
noise_inversion_inputs,
|
||||
)
|
||||
|
||||
|
||||
class LegacyInversionNodeV3Adapter(LegacyNodeV3Adapter):
|
||||
"""Normalize direct or list-mode widgets into the shared inversion domain value."""
|
||||
|
||||
@classmethod
|
||||
def define_schema(cls) -> Any:
|
||||
"""Append the shared five inversion controls after the sampler inputs."""
|
||||
schema = super().define_schema()
|
||||
schema.inputs.extend(noise_inversion_inputs(COMFY_IO, convenience=True))
|
||||
return schema
|
||||
|
||||
@classmethod
|
||||
def execute(cls, **kwargs: object) -> Any:
|
||||
"""Narrow inversion widgets before delegating normal implementation inputs."""
|
||||
values = dict(kwargs)
|
||||
list_mode = bool(getattr(cls.LEGACY_NODE_CLASS, "INPUT_IS_LIST", False))
|
||||
operation = cls.DISPLAY_NAME
|
||||
inversion = inversion_from_controls(
|
||||
inversion_method=str_input(
|
||||
values.pop("inversion_method", "euler"),
|
||||
"inversion_method",
|
||||
list_mode,
|
||||
operation,
|
||||
),
|
||||
inversion_resolution_scale=float_input(
|
||||
values.pop("inversion_resolution_scale", 0.5),
|
||||
"inversion_resolution_scale",
|
||||
list_mode,
|
||||
operation,
|
||||
),
|
||||
inversion_steps=int_input(
|
||||
values.pop("inversion_steps", 2),
|
||||
"inversion_steps",
|
||||
list_mode,
|
||||
operation,
|
||||
),
|
||||
inversion_switch_fraction=float_input(
|
||||
values.pop("inversion_switch_fraction", 0.75),
|
||||
"inversion_switch_fraction",
|
||||
list_mode,
|
||||
operation,
|
||||
),
|
||||
inversion_finishing_steps=int_input(
|
||||
values.pop("inversion_finishing_steps", 1),
|
||||
"inversion_finishing_steps",
|
||||
list_mode,
|
||||
operation,
|
||||
),
|
||||
)
|
||||
values["noise_inversion"] = inversion
|
||||
return super().execute(**values)
|
||||
@@ -0,0 +1,275 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Translate maintained implementation contracts into native Comfy v3 schemas."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from collections.abc import Mapping
|
||||
from importlib import import_module
|
||||
from typing import TYPE_CHECKING, Any, ClassVar
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
class _ComfyNodeBase:
|
||||
"""Type-checking base for Comfy v3 nodes."""
|
||||
|
||||
hidden: ClassVar[Any]
|
||||
RETURN_TYPES: ClassVar[list[str]]
|
||||
RETURN_NAMES: ClassVar[list[str]]
|
||||
|
||||
else:
|
||||
_ComfyNodeBase = import_module("comfy_api.latest").io.ComfyNode
|
||||
|
||||
_comfy_io: Any = None if TYPE_CHECKING else import_module("comfy_api.latest").io
|
||||
|
||||
_HIDDEN_INPUTS = {
|
||||
"PROMPT": "prompt",
|
||||
"DYNPROMPT": "dynprompt",
|
||||
"EXTRA_PNGINFO": "extra_pnginfo",
|
||||
"UNIQUE_ID": "unique_id",
|
||||
}
|
||||
|
||||
|
||||
class LegacyNodeV3Adapter(_ComfyNodeBase):
|
||||
"""Build a v3 schema and execution bridge for a legacy implementation class."""
|
||||
|
||||
LEGACY_NODE_CLASS: ClassVar[type[Any]]
|
||||
NODE_ID: ClassVar[str]
|
||||
DISPLAY_NAME: ClassVar[str]
|
||||
ENABLE_EXPAND: ClassVar[bool] = False
|
||||
WORKFLOW_INPUT_ORDER: ClassVar[tuple[str, ...] | None] = None
|
||||
|
||||
@classmethod
|
||||
def define_schema(cls) -> Any:
|
||||
"""Declare a v3 schema from the implementation class contract."""
|
||||
|
||||
legacy = cls.LEGACY_NODE_CLASS
|
||||
return _comfy_io.Schema(
|
||||
node_id=cls.NODE_ID,
|
||||
display_name=cls.DISPLAY_NAME,
|
||||
category=str(getattr(legacy, "CATEGORY", "SimpleSyrup")),
|
||||
description=str(getattr(legacy, "DESCRIPTION", "")),
|
||||
search_aliases=list(getattr(legacy, "SEARCH_ALIASES", [])),
|
||||
inputs=_v3_inputs(
|
||||
legacy.INPUT_TYPES(),
|
||||
workflow_order=cls.WORKFLOW_INPUT_ORDER,
|
||||
),
|
||||
outputs=_v3_outputs(legacy),
|
||||
hidden=_v3_hidden_inputs(legacy.INPUT_TYPES()),
|
||||
is_input_list=bool(getattr(legacy, "INPUT_IS_LIST", False)),
|
||||
is_output_node=bool(getattr(legacy, "OUTPUT_NODE", False)),
|
||||
enable_expand=cls.ENABLE_EXPAND,
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def execute(cls, **kwargs: object) -> Any:
|
||||
"""Run the wrapped implementation with v3-provided inputs."""
|
||||
|
||||
values = dict(kwargs)
|
||||
for name, hidden_attr in _legacy_hidden_inputs(
|
||||
cls.LEGACY_NODE_CLASS.INPUT_TYPES()
|
||||
).items():
|
||||
if name not in values:
|
||||
values[name] = getattr(cls.hidden, hidden_attr)
|
||||
|
||||
function_name = str(cls.LEGACY_NODE_CLASS.FUNCTION)
|
||||
implementation = cls.LEGACY_NODE_CLASS()
|
||||
function = getattr(implementation, function_name)
|
||||
return function(**values)
|
||||
|
||||
|
||||
def _v3_inputs(
|
||||
input_types: Mapping[str, Mapping[str, object]],
|
||||
*,
|
||||
workflow_order: tuple[str, ...] | None = None,
|
||||
) -> list[Any]:
|
||||
"""Return v3 inputs while preserving any explicit persisted socket order."""
|
||||
|
||||
declarations: dict[str, tuple[object, bool]] = {}
|
||||
for section_name, optional in (("required", False), ("optional", True)):
|
||||
section = input_types.get(section_name, {})
|
||||
for name, declaration in section.items():
|
||||
if name in declarations:
|
||||
raise ValueError(f"legacy input {name} is declared more than once.")
|
||||
declarations[name] = (declaration, optional)
|
||||
order = tuple(declarations) if workflow_order is None else workflow_order
|
||||
if len(order) != len(set(order)) or set(order) != set(declarations):
|
||||
raise ValueError("legacy workflow input order must name every input once.")
|
||||
return [
|
||||
_v3_input(name, declarations[name][0], optional=declarations[name][1])
|
||||
for name in order
|
||||
]
|
||||
|
||||
|
||||
def _v3_input(name: str, declaration: object, *, optional: bool) -> Any:
|
||||
"""Return one v3 input declaration from a legacy field declaration."""
|
||||
|
||||
if not isinstance(declaration, tuple) or not declaration:
|
||||
raise TypeError(f"legacy input {name} declaration must be a tuple.")
|
||||
|
||||
io_declaration = declaration[0]
|
||||
options = _input_options(declaration)
|
||||
tooltip = _string_option(options, "tooltip")
|
||||
advanced = _bool_option(options, "advanced")
|
||||
raw_link = _bool_option(options, "rawLink") or _bool_option(options, "raw_link")
|
||||
force_input = _bool_option(options, "forceInput") or _bool_option(
|
||||
options, "force_input"
|
||||
)
|
||||
|
||||
if isinstance(io_declaration, (list, tuple)):
|
||||
return _comfy_io.Combo.Input(
|
||||
name,
|
||||
options=list(io_declaration),
|
||||
optional=optional,
|
||||
default=options.get("default"),
|
||||
control_after_generate=options.get("control_after_generate"),
|
||||
tooltip=tooltip,
|
||||
raw_link=raw_link,
|
||||
advanced=advanced,
|
||||
)
|
||||
|
||||
if not isinstance(io_declaration, str):
|
||||
raise TypeError(f"legacy input {name} type must be a string or options list.")
|
||||
|
||||
input_type = io_declaration
|
||||
input_class = _io_class(input_type)
|
||||
common_options = {
|
||||
"optional": optional,
|
||||
"tooltip": tooltip,
|
||||
"raw_link": raw_link,
|
||||
"advanced": advanced,
|
||||
}
|
||||
|
||||
if input_type == "INT":
|
||||
return input_class.Input(
|
||||
name,
|
||||
default=options.get("default"),
|
||||
min=options.get("min"),
|
||||
max=options.get("max"),
|
||||
step=options.get("step"),
|
||||
control_after_generate=options.get("control_after_generate"),
|
||||
**common_options,
|
||||
)
|
||||
if input_type == "FLOAT":
|
||||
return input_class.Input(
|
||||
name,
|
||||
default=options.get("default"),
|
||||
min=options.get("min"),
|
||||
max=options.get("max"),
|
||||
step=options.get("step"),
|
||||
round=options.get("round"),
|
||||
**common_options,
|
||||
)
|
||||
if input_type == "STRING":
|
||||
return input_class.Input(
|
||||
name,
|
||||
default=options.get("default"),
|
||||
multiline=bool(options.get("multiline", False)),
|
||||
force_input=force_input,
|
||||
**common_options,
|
||||
)
|
||||
if input_type == "BOOLEAN":
|
||||
return input_class.Input(
|
||||
name,
|
||||
default=options.get("default"),
|
||||
label_on=options.get("label_on"),
|
||||
label_off=options.get("label_off"),
|
||||
**common_options,
|
||||
)
|
||||
|
||||
return input_class.Input(name, **common_options)
|
||||
|
||||
|
||||
def _v3_outputs(legacy: type[Any]) -> list[Any]:
|
||||
"""Return v3 output declarations from legacy return metadata."""
|
||||
|
||||
return_types = tuple(getattr(legacy, "RETURN_TYPES", ()))
|
||||
return_names = getattr(legacy, "RETURN_NAMES", None)
|
||||
output_tooltips = tuple(getattr(legacy, "OUTPUT_TOOLTIPS", ()))
|
||||
output_is_list = tuple(
|
||||
getattr(legacy, "OUTPUT_IS_LIST", (False,) * len(return_types))
|
||||
)
|
||||
outputs: list[Any] = []
|
||||
for index, io_type in enumerate(return_types):
|
||||
output_name = None
|
||||
if isinstance(return_names, tuple) and index < len(return_names):
|
||||
output_name = str(return_names[index])
|
||||
tooltip = None
|
||||
if index < len(output_tooltips):
|
||||
tooltip = str(output_tooltips[index])
|
||||
is_output_list = index < len(output_is_list) and bool(output_is_list[index])
|
||||
outputs.append(
|
||||
_io_class(str(io_type)).Output(
|
||||
output_name,
|
||||
tooltip=tooltip,
|
||||
is_output_list=is_output_list,
|
||||
)
|
||||
)
|
||||
return outputs
|
||||
|
||||
|
||||
def _v3_hidden_inputs(input_types: Mapping[str, Mapping[str, object]]) -> list[Any]:
|
||||
"""Return v3 hidden declarations requested by legacy hidden inputs."""
|
||||
|
||||
hidden_values = set(_legacy_hidden_inputs(input_types).values())
|
||||
return [getattr(_comfy_io.Hidden, value) for value in sorted(hidden_values)]
|
||||
|
||||
|
||||
def _legacy_hidden_inputs(
|
||||
input_types: Mapping[str, Mapping[str, object]],
|
||||
) -> dict[str, str]:
|
||||
"""Return legacy hidden input names mapped to v3 hidden holder attributes."""
|
||||
|
||||
hidden_inputs: dict[str, str] = {}
|
||||
for name, sentinel in input_types.get("hidden", {}).items():
|
||||
if isinstance(sentinel, str) and sentinel in _HIDDEN_INPUTS:
|
||||
hidden_inputs[name] = _HIDDEN_INPUTS[sentinel]
|
||||
return hidden_inputs
|
||||
|
||||
|
||||
def _io_class(io_type: str) -> Any:
|
||||
"""Return the v3 IO class for a legacy Comfy type string."""
|
||||
|
||||
known_types = {
|
||||
"BOOLEAN": _comfy_io.Boolean,
|
||||
"INT": _comfy_io.Int,
|
||||
"FLOAT": _comfy_io.Float,
|
||||
"STRING": _comfy_io.String,
|
||||
"IMAGE": _comfy_io.Image,
|
||||
"MASK": _comfy_io.Mask,
|
||||
"LATENT": _comfy_io.Latent,
|
||||
"MODEL": _comfy_io.Model,
|
||||
"CLIP": _comfy_io.Clip,
|
||||
"VAE": _comfy_io.Vae,
|
||||
"CONDITIONING": _comfy_io.Conditioning,
|
||||
"SEGS": _comfy_io.SEGS,
|
||||
}
|
||||
return known_types.get(io_type, _comfy_io.Custom(io_type))
|
||||
|
||||
|
||||
def _input_options(declaration: tuple[object, ...]) -> dict[str, object]:
|
||||
"""Return an input options dictionary from a legacy declaration."""
|
||||
|
||||
if len(declaration) < 2 or not isinstance(declaration[1], dict):
|
||||
return {}
|
||||
return dict(declaration[1])
|
||||
|
||||
|
||||
def _string_option(options: Mapping[str, object], name: str) -> str | None:
|
||||
"""Return a string option when present."""
|
||||
|
||||
value = options.get(name)
|
||||
if isinstance(value, str):
|
||||
return value
|
||||
return None
|
||||
|
||||
|
||||
def _bool_option(options: Mapping[str, object], name: str) -> bool | None:
|
||||
"""Return a boolean option when present."""
|
||||
|
||||
value = options.get(name)
|
||||
if isinstance(value, bool):
|
||||
return value
|
||||
return None
|
||||
@@ -6,10 +6,6 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from collections.abc import Mapping
|
||||
from importlib import import_module
|
||||
from typing import TYPE_CHECKING, Any, ClassVar
|
||||
|
||||
from ..nodes.conditioning_batch_pack import (
|
||||
ConditioningBatchAppend,
|
||||
ConditioningBatchStart,
|
||||
@@ -40,73 +36,14 @@ from ..nodes.segs_from_sam_output import SEGSFromSAMOutput
|
||||
from ..nodes.simple_load_anima import SimpleLoadAnima
|
||||
from ..nodes.simple_preview_segs import SimplePreviewSEGS
|
||||
from ..nodes.vitmatte_model_loader import ViTMatteModelLoader
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
class _ComfyNodeBase:
|
||||
"""Type-checking base for Comfy v3 nodes."""
|
||||
|
||||
hidden: ClassVar[Any]
|
||||
RETURN_TYPES: ClassVar[list[str]]
|
||||
RETURN_NAMES: ClassVar[list[str]]
|
||||
|
||||
else:
|
||||
_ComfyNodeBase = import_module("comfy_api.latest").io.ComfyNode
|
||||
|
||||
_comfy_io: Any = None if TYPE_CHECKING else import_module("comfy_api.latest").io
|
||||
|
||||
_HIDDEN_INPUTS = {
|
||||
"PROMPT": "prompt",
|
||||
"DYNPROMPT": "dynprompt",
|
||||
"EXTRA_PNGINFO": "extra_pnginfo",
|
||||
"UNIQUE_ID": "unique_id",
|
||||
"AUTH_TOKEN_COMFY_ORG": "auth_token_comfy_org",
|
||||
"API_KEY_COMFY_ORG": "api_key_comfy_org",
|
||||
}
|
||||
|
||||
|
||||
class LegacyNodeV3Adapter(_ComfyNodeBase):
|
||||
"""Build a v3 schema and execution bridge for a legacy implementation class."""
|
||||
|
||||
LEGACY_NODE_CLASS: ClassVar[type[Any]]
|
||||
NODE_ID: ClassVar[str]
|
||||
DISPLAY_NAME: ClassVar[str]
|
||||
ENABLE_EXPAND: ClassVar[bool] = False
|
||||
|
||||
@classmethod
|
||||
def define_schema(cls) -> Any:
|
||||
"""Declare a v3 schema from the implementation class contract."""
|
||||
|
||||
legacy = cls.LEGACY_NODE_CLASS
|
||||
return _comfy_io.Schema(
|
||||
node_id=cls.NODE_ID,
|
||||
display_name=cls.DISPLAY_NAME,
|
||||
category=str(getattr(legacy, "CATEGORY", "SimpleSyrup")),
|
||||
description=str(getattr(legacy, "DESCRIPTION", "")),
|
||||
search_aliases=list(getattr(legacy, "SEARCH_ALIASES", [])),
|
||||
inputs=_v3_inputs(legacy.INPUT_TYPES()),
|
||||
outputs=_v3_outputs(legacy),
|
||||
hidden=_v3_hidden_inputs(legacy.INPUT_TYPES()),
|
||||
is_input_list=bool(getattr(legacy, "INPUT_IS_LIST", False)),
|
||||
is_output_node=bool(getattr(legacy, "OUTPUT_NODE", False)),
|
||||
enable_expand=cls.ENABLE_EXPAND,
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def execute(cls, **kwargs: object) -> Any:
|
||||
"""Run the wrapped implementation with v3-provided inputs."""
|
||||
|
||||
values = dict(kwargs)
|
||||
for name, hidden_attr in _legacy_hidden_inputs(
|
||||
cls.LEGACY_NODE_CLASS.INPUT_TYPES()
|
||||
).items():
|
||||
if name not in values:
|
||||
values[name] = getattr(cls.hidden, hidden_attr)
|
||||
|
||||
function_name = str(cls.LEGACY_NODE_CLASS.FUNCTION)
|
||||
implementation = cls.LEGACY_NODE_CLASS()
|
||||
function = getattr(implementation, function_name)
|
||||
return function(**values)
|
||||
from .legacy_inversion_node_adapter import LegacyInversionNodeV3Adapter
|
||||
from .legacy_node_adapter import LegacyNodeV3Adapter
|
||||
from .legacy_workflow_input_order import (
|
||||
DETAIL_SEGS_AS_REGIONS_INPUT_ORDER,
|
||||
DETAIL_SEGS_BY_SCALE_FACTOR_INPUT_ORDER,
|
||||
DETAIL_SEGS_BY_SCALE_FACTOR_TILED_INPUT_ORDER,
|
||||
KSAMPLER_EXTRAS_INPUT_ORDER,
|
||||
)
|
||||
|
||||
|
||||
class ConditioningBatchStartV3(LegacyNodeV3Adapter):
|
||||
@@ -147,6 +84,7 @@ class KSamplerExtrasV3(LegacyNodeV3Adapter):
|
||||
LEGACY_NODE_CLASS = KSamplerExtras
|
||||
NODE_ID = "SimpleSyrup.KSamplerExtras"
|
||||
DISPLAY_NAME = "KSampler (Extras)"
|
||||
WORKFLOW_INPUT_ORDER = KSAMPLER_EXTRAS_INPUT_ORDER
|
||||
|
||||
|
||||
class LayerStyleSAMModelsAdapterV3(LegacyNodeV3Adapter):
|
||||
@@ -215,12 +153,13 @@ class ResizeImageToTargetV3(LegacyNodeV3Adapter):
|
||||
DISPLAY_NAME = "Resize Image to Target"
|
||||
|
||||
|
||||
class DetailSEGSAsRegionsV3(LegacyNodeV3Adapter):
|
||||
class DetailSEGSAsRegionsV3(LegacyInversionNodeV3Adapter):
|
||||
"""Expose Detail SEGS as Regions through Comfy v3 only."""
|
||||
|
||||
LEGACY_NODE_CLASS = DetailSEGSAsRegions
|
||||
NODE_ID = "SimpleSyrup.DetailSEGSAsRegions"
|
||||
DISPLAY_NAME = "Detail SEGS as Regions"
|
||||
WORKFLOW_INPUT_ORDER = DETAIL_SEGS_AS_REGIONS_INPUT_ORDER
|
||||
|
||||
|
||||
class DetailSEGSByScaleFactorV3(LegacyNodeV3Adapter):
|
||||
@@ -229,14 +168,16 @@ class DetailSEGSByScaleFactorV3(LegacyNodeV3Adapter):
|
||||
LEGACY_NODE_CLASS = DetailSEGSByScaleFactor
|
||||
NODE_ID = "SimpleSyrup.DetailSEGSByScaleFactor"
|
||||
DISPLAY_NAME = "Detail SEGS by Scale Factor"
|
||||
WORKFLOW_INPUT_ORDER = DETAIL_SEGS_BY_SCALE_FACTOR_INPUT_ORDER
|
||||
|
||||
|
||||
class DetailSEGSByScaleFactorTiledDiffusionV3(LegacyNodeV3Adapter):
|
||||
class DetailSEGSByScaleFactorTiledDiffusionV3(LegacyInversionNodeV3Adapter):
|
||||
"""Expose Detail SEGS by Scale Factor with Tiled Diffusion through Comfy v3."""
|
||||
|
||||
LEGACY_NODE_CLASS = DetailSEGSByScaleFactorTiledDiffusion
|
||||
NODE_ID = "SimpleSyrup.DetailSEGSByScaleFactorTiledDiffusion"
|
||||
DISPLAY_NAME = "Detail SEGS by Scale Factor w/ Tiled Diffusion"
|
||||
WORKFLOW_INPUT_ORDER = DETAIL_SEGS_BY_SCALE_FACTOR_TILED_INPUT_ORDER
|
||||
|
||||
|
||||
class SAMModelLoaderV3(LegacyNodeV3Adapter):
|
||||
@@ -311,189 +252,6 @@ class ViTMatteModelLoaderV3(LegacyNodeV3Adapter):
|
||||
DISPLAY_NAME = "ViTMatte Model Loader"
|
||||
|
||||
|
||||
def _v3_inputs(input_types: Mapping[str, Mapping[str, object]]) -> list[Any]:
|
||||
"""Return v3 input declarations from legacy required and optional inputs."""
|
||||
|
||||
inputs: list[Any] = []
|
||||
for section_name, optional in (("required", False), ("optional", True)):
|
||||
section = input_types.get(section_name, {})
|
||||
for name, declaration in section.items():
|
||||
inputs.append(_v3_input(name, declaration, optional=optional))
|
||||
return inputs
|
||||
|
||||
|
||||
def _v3_input(name: str, declaration: object, *, optional: bool) -> Any:
|
||||
"""Return one v3 input declaration from a legacy field declaration."""
|
||||
|
||||
if not isinstance(declaration, tuple) or not declaration:
|
||||
raise TypeError(f"legacy input {name} declaration must be a tuple.")
|
||||
|
||||
io_declaration = declaration[0]
|
||||
options = _input_options(declaration)
|
||||
tooltip = _string_option(options, "tooltip")
|
||||
advanced = _bool_option(options, "advanced")
|
||||
raw_link = _bool_option(options, "rawLink") or _bool_option(options, "raw_link")
|
||||
force_input = _bool_option(options, "forceInput") or _bool_option(
|
||||
options, "force_input"
|
||||
)
|
||||
|
||||
if isinstance(io_declaration, (list, tuple)):
|
||||
return _comfy_io.Combo.Input(
|
||||
name,
|
||||
options=list(io_declaration),
|
||||
optional=optional,
|
||||
default=options.get("default"),
|
||||
control_after_generate=options.get("control_after_generate"),
|
||||
tooltip=tooltip,
|
||||
raw_link=raw_link,
|
||||
advanced=advanced,
|
||||
)
|
||||
|
||||
if not isinstance(io_declaration, str):
|
||||
raise TypeError(f"legacy input {name} type must be a string or options list.")
|
||||
|
||||
input_type = io_declaration
|
||||
input_class = _io_class(input_type)
|
||||
common_options = {
|
||||
"optional": optional,
|
||||
"tooltip": tooltip,
|
||||
"raw_link": raw_link,
|
||||
"advanced": advanced,
|
||||
}
|
||||
|
||||
if input_type == "INT":
|
||||
return input_class.Input(
|
||||
name,
|
||||
default=options.get("default"),
|
||||
min=options.get("min"),
|
||||
max=options.get("max"),
|
||||
step=options.get("step"),
|
||||
control_after_generate=options.get("control_after_generate"),
|
||||
**common_options,
|
||||
)
|
||||
if input_type == "FLOAT":
|
||||
return input_class.Input(
|
||||
name,
|
||||
default=options.get("default"),
|
||||
min=options.get("min"),
|
||||
max=options.get("max"),
|
||||
step=options.get("step"),
|
||||
round=options.get("round"),
|
||||
**common_options,
|
||||
)
|
||||
if input_type == "STRING":
|
||||
return input_class.Input(
|
||||
name,
|
||||
default=options.get("default"),
|
||||
multiline=bool(options.get("multiline", False)),
|
||||
force_input=force_input,
|
||||
**common_options,
|
||||
)
|
||||
if input_type == "BOOLEAN":
|
||||
return input_class.Input(
|
||||
name,
|
||||
default=options.get("default"),
|
||||
label_on=options.get("label_on"),
|
||||
label_off=options.get("label_off"),
|
||||
**common_options,
|
||||
)
|
||||
|
||||
return input_class.Input(name, **common_options)
|
||||
|
||||
|
||||
def _v3_outputs(legacy: type[Any]) -> list[Any]:
|
||||
"""Return v3 output declarations from legacy return metadata."""
|
||||
|
||||
return_types = tuple(getattr(legacy, "RETURN_TYPES", ()))
|
||||
return_names = getattr(legacy, "RETURN_NAMES", None)
|
||||
output_tooltips = tuple(getattr(legacy, "OUTPUT_TOOLTIPS", ()))
|
||||
output_is_list = tuple(
|
||||
getattr(legacy, "OUTPUT_IS_LIST", (False,) * len(return_types))
|
||||
)
|
||||
outputs: list[Any] = []
|
||||
for index, io_type in enumerate(return_types):
|
||||
output_name = None
|
||||
if isinstance(return_names, tuple) and index < len(return_names):
|
||||
output_name = str(return_names[index])
|
||||
tooltip = None
|
||||
if index < len(output_tooltips):
|
||||
tooltip = str(output_tooltips[index])
|
||||
is_output_list = index < len(output_is_list) and bool(output_is_list[index])
|
||||
outputs.append(
|
||||
_io_class(str(io_type)).Output(
|
||||
output_name,
|
||||
tooltip=tooltip,
|
||||
is_output_list=is_output_list,
|
||||
)
|
||||
)
|
||||
return outputs
|
||||
|
||||
|
||||
def _v3_hidden_inputs(input_types: Mapping[str, Mapping[str, object]]) -> list[Any]:
|
||||
"""Return v3 hidden declarations requested by legacy hidden inputs."""
|
||||
|
||||
hidden_values = set(_legacy_hidden_inputs(input_types).values())
|
||||
return [getattr(_comfy_io.Hidden, value) for value in sorted(hidden_values)]
|
||||
|
||||
|
||||
def _legacy_hidden_inputs(
|
||||
input_types: Mapping[str, Mapping[str, object]],
|
||||
) -> dict[str, str]:
|
||||
"""Return legacy hidden input names mapped to v3 hidden holder attributes."""
|
||||
|
||||
hidden_inputs: dict[str, str] = {}
|
||||
for name, sentinel in input_types.get("hidden", {}).items():
|
||||
if isinstance(sentinel, str) and sentinel in _HIDDEN_INPUTS:
|
||||
hidden_inputs[name] = _HIDDEN_INPUTS[sentinel]
|
||||
return hidden_inputs
|
||||
|
||||
|
||||
def _io_class(io_type: str) -> Any:
|
||||
"""Return the v3 IO class for a legacy Comfy type string."""
|
||||
|
||||
known_types = {
|
||||
"BOOLEAN": _comfy_io.Boolean,
|
||||
"INT": _comfy_io.Int,
|
||||
"FLOAT": _comfy_io.Float,
|
||||
"STRING": _comfy_io.String,
|
||||
"IMAGE": _comfy_io.Image,
|
||||
"MASK": _comfy_io.Mask,
|
||||
"LATENT": _comfy_io.Latent,
|
||||
"MODEL": _comfy_io.Model,
|
||||
"CLIP": _comfy_io.Clip,
|
||||
"VAE": _comfy_io.Vae,
|
||||
"CONDITIONING": _comfy_io.Conditioning,
|
||||
"SEGS": _comfy_io.SEGS,
|
||||
}
|
||||
return known_types.get(io_type, _comfy_io.Custom(io_type))
|
||||
|
||||
|
||||
def _input_options(declaration: tuple[object, ...]) -> dict[str, object]:
|
||||
"""Return an input options dictionary from a legacy declaration."""
|
||||
|
||||
if len(declaration) < 2 or not isinstance(declaration[1], dict):
|
||||
return {}
|
||||
return dict(declaration[1])
|
||||
|
||||
|
||||
def _string_option(options: Mapping[str, object], name: str) -> str | None:
|
||||
"""Return a string option when present."""
|
||||
|
||||
value = options.get(name)
|
||||
if isinstance(value, str):
|
||||
return value
|
||||
return None
|
||||
|
||||
|
||||
def _bool_option(options: Mapping[str, object], name: str) -> bool | None:
|
||||
"""Return a boolean option when present."""
|
||||
|
||||
value = options.get(name)
|
||||
if isinstance(value, bool):
|
||||
return value
|
||||
return None
|
||||
|
||||
|
||||
__all__ = [
|
||||
"ConditioningBatchAppendV3",
|
||||
"ConditioningBatchStartV3",
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Retain persisted socket order for legacy-backed Comfy v3 nodes."""
|
||||
|
||||
KSAMPLER_EXTRAS_INPUT_ORDER = (
|
||||
"model",
|
||||
"seed",
|
||||
"steps",
|
||||
"cfg",
|
||||
"sampler_name",
|
||||
"scheduler",
|
||||
"positive",
|
||||
"negative",
|
||||
"latent_image",
|
||||
"denoise",
|
||||
)
|
||||
|
||||
DETAIL_SEGS_AS_REGIONS_INPUT_ORDER = (
|
||||
"image",
|
||||
"model",
|
||||
"vae",
|
||||
"negative",
|
||||
"positive",
|
||||
"segs",
|
||||
"region_positive",
|
||||
"global_prompt_weight",
|
||||
"scale_factor",
|
||||
"upscale_method",
|
||||
"seed",
|
||||
"steps",
|
||||
"cfg",
|
||||
"sampler_name",
|
||||
"scheduler",
|
||||
"denoise",
|
||||
"feather",
|
||||
"noise_mask",
|
||||
"noise_mask_feather",
|
||||
"tiled_encode",
|
||||
"tiled_decode",
|
||||
)
|
||||
|
||||
DETAIL_SEGS_BY_SCALE_FACTOR_INPUT_ORDER = (
|
||||
"image",
|
||||
"segs",
|
||||
"model",
|
||||
"vae",
|
||||
"positive",
|
||||
"negative",
|
||||
"scale_factor",
|
||||
"upscale_method",
|
||||
"clamp_size",
|
||||
"seed",
|
||||
"steps",
|
||||
"cfg",
|
||||
"sampler_name",
|
||||
"scheduler",
|
||||
"denoise",
|
||||
"feather",
|
||||
"noise_mask",
|
||||
"noise_mask_feather",
|
||||
"tiled_encode",
|
||||
"tiled_decode",
|
||||
)
|
||||
|
||||
DETAIL_SEGS_BY_SCALE_FACTOR_TILED_INPUT_ORDER = (
|
||||
*DETAIL_SEGS_BY_SCALE_FACTOR_INPUT_ORDER,
|
||||
"diffusion_mode",
|
||||
"latent_tile_width",
|
||||
"latent_tile_height",
|
||||
"latent_tile_overlap",
|
||||
"latent_tile_batch_size",
|
||||
)
|
||||
@@ -13,7 +13,7 @@ from typing import TYPE_CHECKING, Any, ClassVar
|
||||
import torch
|
||||
|
||||
from ..domain.segs import SORT_ORDER_OPTIONS, NativeSegs
|
||||
from ..masking.segs_mask_ops import iter_single_images, validate_image_batch
|
||||
from ..domain.segs_mask_ops import iter_single_images, validate_image_batch
|
||||
from ..services.mask_to_segs_service import MaskToSEGSService
|
||||
from ..services.segs_output_service import (
|
||||
CombinedSegsResult,
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Expose inversion resolution and integration controls as sampler options."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
from ..domain.sampler_options import SamplerOptions, append_sampler_capability
|
||||
from .sampler_options_schema import (
|
||||
COMFY_IO,
|
||||
OptionsNodeBase,
|
||||
inversion_from_controls,
|
||||
noise_inversion_inputs,
|
||||
options_input,
|
||||
options_output,
|
||||
)
|
||||
|
||||
|
||||
class NoiseInversionOptionsV3(OptionsNodeBase):
|
||||
"""Add source-derived starting noise to an immutable sampler options chain."""
|
||||
|
||||
@classmethod
|
||||
def define_schema(cls) -> Any:
|
||||
"""Declare the accepted recipe with independently editable controls."""
|
||||
return COMFY_IO.Schema(
|
||||
node_id="SimpleSyrup.NoiseInversionOptions",
|
||||
display_name="Noise Inversion Options",
|
||||
category="SimpleSyrup/Sampling/Options",
|
||||
description=(
|
||||
"Derives starting noise from an input image before sampling; "
|
||||
"control inversion quality and cost independently."
|
||||
),
|
||||
inputs=[options_input(COMFY_IO), *noise_inversion_inputs(COMFY_IO)],
|
||||
outputs=[options_output(COMFY_IO)],
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def execute(
|
||||
cls,
|
||||
inversion_method: str = "euler",
|
||||
inversion_resolution_scale: float = 0.5,
|
||||
inversion_steps: int = 2,
|
||||
inversion_switch_fraction: float = 0.75,
|
||||
inversion_finishing_steps: int = 1,
|
||||
options: SamplerOptions | None = None,
|
||||
) -> tuple[SamplerOptions]:
|
||||
"""Append inversion or pass through at zero steps without preparing a model."""
|
||||
inversion = inversion_from_controls(
|
||||
inversion_method=inversion_method,
|
||||
inversion_resolution_scale=inversion_resolution_scale,
|
||||
inversion_steps=inversion_steps,
|
||||
inversion_switch_fraction=inversion_switch_fraction,
|
||||
inversion_finishing_steps=inversion_finishing_steps,
|
||||
)
|
||||
return (append_sampler_capability(options, inversion),)
|
||||
@@ -0,0 +1,134 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Declare bypass-compatible sampler options sockets and inversion controls."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from importlib import import_module
|
||||
from typing import TYPE_CHECKING, Any, ClassVar, cast
|
||||
|
||||
from ..domain.noise_inversion import (
|
||||
INVERSION_METHODS,
|
||||
InversionMethod,
|
||||
NoiseInversionOptions,
|
||||
)
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
class OptionsNodeBase:
|
||||
"""Describe Comfy's host-facing node metadata for strict type checking."""
|
||||
|
||||
RETURN_TYPES: ClassVar[list[str]]
|
||||
RETURN_NAMES: ClassVar[list[str]]
|
||||
|
||||
else:
|
||||
OptionsNodeBase = import_module("comfy_api.latest").io.ComfyNode
|
||||
|
||||
COMFY_IO: Any = None if TYPE_CHECKING else import_module("comfy_api.latest").io
|
||||
OPTIONS_TYPE = "SIMPLE_SYRUP_SAMPLER_OPTIONS"
|
||||
|
||||
|
||||
def options_input(comfy_io: Any) -> Any:
|
||||
"""Allow any capability to start a chain or consume a preceding capability."""
|
||||
return comfy_io.Custom(OPTIONS_TYPE).Input(
|
||||
"options",
|
||||
optional=True,
|
||||
tooltip=(
|
||||
"Optional preceding sampler options; bypass this node "
|
||||
"to omit its contribution."
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
def options_output(comfy_io: Any) -> Any:
|
||||
"""Match the input type so Comfy can bypass capability nodes natively."""
|
||||
return comfy_io.Custom(OPTIONS_TYPE).Output(
|
||||
"options",
|
||||
tooltip="Combined sampler options; connect another options node or KSampler.",
|
||||
)
|
||||
|
||||
|
||||
def noise_inversion_inputs(comfy_io: Any, *, convenience: bool = False) -> list[Any]:
|
||||
"""Default to the accepted recipe and use zero steps to disable inversion."""
|
||||
return [
|
||||
comfy_io.Combo.Input(
|
||||
"inversion_method",
|
||||
options=list(INVERSION_METHODS),
|
||||
default="euler",
|
||||
optional=convenience,
|
||||
tooltip=(
|
||||
"Applies to both inversion stages; Euler uses one evaluation per step, "
|
||||
"Heun uses two for greater accuracy."
|
||||
),
|
||||
),
|
||||
comfy_io.Float.Input(
|
||||
"inversion_resolution_scale",
|
||||
default=0.5,
|
||||
min=0.01,
|
||||
max=1.0,
|
||||
step=0.05,
|
||||
optional=convenience,
|
||||
tooltip=(
|
||||
"Scales inversion width and height; "
|
||||
"0.5 uses half-sized dimensions for lower cost."
|
||||
),
|
||||
),
|
||||
comfy_io.Int.Input(
|
||||
"inversion_steps",
|
||||
default=2,
|
||||
min=0,
|
||||
max=64,
|
||||
optional=convenience,
|
||||
tooltip=(
|
||||
"Steps at the selected inversion resolution; 0 disables all inversion, "
|
||||
"including finishing. More steps cost more model evaluations."
|
||||
),
|
||||
),
|
||||
comfy_io.Float.Input(
|
||||
"inversion_switch_fraction",
|
||||
default=0.75,
|
||||
min=0.01,
|
||||
max=1.0,
|
||||
step=0.05,
|
||||
optional=convenience,
|
||||
tooltip=(
|
||||
"Noise-level fraction reached before the full-resolution finish; "
|
||||
"0.75 means 75%."
|
||||
),
|
||||
),
|
||||
comfy_io.Int.Input(
|
||||
"inversion_finishing_steps",
|
||||
default=1,
|
||||
min=0,
|
||||
max=64,
|
||||
optional=convenience,
|
||||
tooltip=(
|
||||
"Full-resolution inversion steps after a reduced stage; "
|
||||
"0 finishes entirely at reduced size."
|
||||
),
|
||||
),
|
||||
]
|
||||
|
||||
|
||||
def inversion_from_controls(
|
||||
*,
|
||||
inversion_method: str = "euler",
|
||||
inversion_resolution_scale: float = 0.5,
|
||||
inversion_steps: int = 2,
|
||||
inversion_switch_fraction: float = 0.75,
|
||||
inversion_finishing_steps: int = 1,
|
||||
) -> NoiseInversionOptions | None:
|
||||
"""Disable all stages at zero steps or construct a shared-method recipe."""
|
||||
if type(inversion_steps) is not int or not 0 <= inversion_steps <= 64:
|
||||
raise ValueError("Inversion steps must be an integer between 0 and 64.")
|
||||
if inversion_steps == 0:
|
||||
return None
|
||||
return NoiseInversionOptions(
|
||||
method=cast(InversionMethod, inversion_method),
|
||||
resolution_scale=inversion_resolution_scale,
|
||||
steps=inversion_steps,
|
||||
switch_fraction=inversion_switch_fraction,
|
||||
finishing_steps=inversion_finishing_steps,
|
||||
)
|
||||
@@ -9,7 +9,7 @@ from __future__ import annotations
|
||||
from importlib import import_module
|
||||
from typing import TYPE_CHECKING, Any, ClassVar
|
||||
|
||||
from ..runtime.prompt_control_schedule_encode_graph import (
|
||||
from ..services.prompt_control_schedule_encode_graph import (
|
||||
PromptControlScheduleEncodeGraphBuilder,
|
||||
)
|
||||
|
||||
@@ -94,10 +94,12 @@ class ScheduleAndEncodePromptsWithPromptControl(_ComfyNodeBase):
|
||||
"negative_prompt",
|
||||
multiline=False,
|
||||
default="",
|
||||
optional=True,
|
||||
tooltip=(
|
||||
"Negative Prompt-Control text; [SEP] or [SEP|name] creates "
|
||||
"ordered conditioning entries, and global text fills "
|
||||
"missing negative regions."
|
||||
"Optional negative Prompt-Control text; [SEP] or [SEP|name] "
|
||||
"creates ordered conditioning entries, and global text fills "
|
||||
"missing negative regions. Leave disconnected to encode an "
|
||||
"empty negative prompt."
|
||||
),
|
||||
),
|
||||
],
|
||||
@@ -126,7 +128,7 @@ class ScheduleAndEncodePromptsWithPromptControl(_ComfyNodeBase):
|
||||
model: Any,
|
||||
clip: Any,
|
||||
positive_prompt: str,
|
||||
negative_prompt: str,
|
||||
negative_prompt: str = "",
|
||||
encode_style: str = "",
|
||||
) -> Any:
|
||||
"""Build lazy Prompt-Control graph expansion for prompts."""
|
||||
|
||||
@@ -11,7 +11,9 @@ from types import ModuleType
|
||||
from typing import TYPE_CHECKING, Any, ClassVar
|
||||
|
||||
from ..nodes import tooltips
|
||||
from ..runtime.auto_model_choices import automatic_component_choices
|
||||
from ..runtime.diffusion_model_loader import DIFFUSION_WEIGHT_DTYPES
|
||||
from ..runtime.flux_artifacts import FLUX_CLIP_L, FLUX_T5_XXL, FLUX_VAE
|
||||
from ..runtime.model_downloads import ComfyProgressReporter
|
||||
from ..runtime.text_encoder_loader import TEXT_ENCODER_DEVICES
|
||||
from ..runtime.vae_loader import vae_choices
|
||||
@@ -44,9 +46,7 @@ class SimpleLoadFluxV3(_ComfyNodeBase):
|
||||
"""Declare the separate FLUX.1 loader schema."""
|
||||
|
||||
folder_paths = _folder_paths()
|
||||
text_encoder_choices = _choices_with_auto(
|
||||
list(folder_paths.get_filename_list("text_encoders"))
|
||||
)
|
||||
installed_text_encoders = list(folder_paths.get_filename_list("text_encoders"))
|
||||
return _comfy_io.Schema(
|
||||
node_id="SimpleSyrup.SimpleLoadFlux",
|
||||
display_name="Simple Load FLUX",
|
||||
@@ -77,7 +77,12 @@ class SimpleLoadFluxV3(_ComfyNodeBase):
|
||||
),
|
||||
_comfy_io.Combo.Input(
|
||||
"clip_l",
|
||||
options=text_encoder_choices,
|
||||
options=automatic_component_choices(
|
||||
installed=installed_text_encoders,
|
||||
artifacts=(FLUX_CLIP_L,),
|
||||
leading_choices=(AUTO_CHOICE,),
|
||||
folder_paths_module=folder_paths,
|
||||
),
|
||||
default=AUTO_CHOICE,
|
||||
advanced=True,
|
||||
tooltip=(
|
||||
@@ -87,7 +92,12 @@ class SimpleLoadFluxV3(_ComfyNodeBase):
|
||||
),
|
||||
_comfy_io.Combo.Input(
|
||||
"t5_xxl",
|
||||
options=text_encoder_choices,
|
||||
options=automatic_component_choices(
|
||||
installed=installed_text_encoders,
|
||||
artifacts=(FLUX_T5_XXL,),
|
||||
leading_choices=(AUTO_CHOICE,),
|
||||
folder_paths_module=folder_paths,
|
||||
),
|
||||
default=AUTO_CHOICE,
|
||||
advanced=True,
|
||||
tooltip=(
|
||||
@@ -107,7 +117,12 @@ class SimpleLoadFluxV3(_ComfyNodeBase):
|
||||
),
|
||||
_comfy_io.Combo.Input(
|
||||
"vae",
|
||||
options=_choices_with_auto(vae_choices(folder_paths)),
|
||||
options=automatic_component_choices(
|
||||
installed=vae_choices(folder_paths),
|
||||
artifacts=(FLUX_VAE,),
|
||||
leading_choices=(AUTO_CHOICE,),
|
||||
folder_paths_module=folder_paths,
|
||||
),
|
||||
default=AUTO_CHOICE,
|
||||
advanced=True,
|
||||
tooltip=(
|
||||
@@ -146,12 +161,6 @@ class SimpleLoadFluxV3(_ComfyNodeBase):
|
||||
)
|
||||
|
||||
|
||||
def _choices_with_auto(choices: list[str]) -> list[str]:
|
||||
"""Return deduplicated choices with automatic selection first."""
|
||||
|
||||
return [AUTO_CHOICE, *(choice for choice in choices if choice != AUTO_CHOICE)]
|
||||
|
||||
|
||||
def _folder_paths() -> ModuleType:
|
||||
"""Import ComfyUI folder paths lazily for schema declaration."""
|
||||
|
||||
|
||||
@@ -11,7 +11,9 @@ from types import ModuleType
|
||||
from typing import TYPE_CHECKING, Any, ClassVar
|
||||
|
||||
from ..nodes import tooltips
|
||||
from ..runtime.auto_model_choices import automatic_component_choices
|
||||
from ..runtime.diffusion_model_loader import DIFFUSION_WEIGHT_DTYPES
|
||||
from ..runtime.flux_artifacts import FLUX2_TEXT_ENCODERS, FLUX2_VAE
|
||||
from ..runtime.model_downloads import ComfyProgressReporter
|
||||
from ..runtime.text_encoder_loader import TEXT_ENCODER_DEVICES
|
||||
from ..runtime.vae_loader import vae_choices
|
||||
@@ -75,8 +77,11 @@ class SimpleLoadFlux2V3(_ComfyNodeBase):
|
||||
),
|
||||
_comfy_io.Combo.Input(
|
||||
"text_encoder",
|
||||
options=_choices_with_auto(
|
||||
list(folder_paths.get_filename_list("text_encoders"))
|
||||
options=automatic_component_choices(
|
||||
installed=list(folder_paths.get_filename_list("text_encoders")),
|
||||
artifacts=tuple(FLUX2_TEXT_ENCODERS.values()),
|
||||
leading_choices=(AUTO_CHOICE,),
|
||||
folder_paths_module=folder_paths,
|
||||
),
|
||||
default=AUTO_CHOICE,
|
||||
advanced=True,
|
||||
@@ -98,7 +103,12 @@ class SimpleLoadFlux2V3(_ComfyNodeBase):
|
||||
),
|
||||
_comfy_io.Combo.Input(
|
||||
"vae",
|
||||
options=_choices_with_auto(vae_choices(folder_paths)),
|
||||
options=automatic_component_choices(
|
||||
installed=vae_choices(folder_paths),
|
||||
artifacts=(FLUX2_VAE,),
|
||||
leading_choices=(AUTO_CHOICE,),
|
||||
folder_paths_module=folder_paths,
|
||||
),
|
||||
default=AUTO_CHOICE,
|
||||
advanced=True,
|
||||
tooltip=(
|
||||
@@ -135,12 +145,6 @@ class SimpleLoadFlux2V3(_ComfyNodeBase):
|
||||
)
|
||||
|
||||
|
||||
def _choices_with_auto(choices: list[str]) -> list[str]:
|
||||
"""Return deduplicated choices with automatic selection first."""
|
||||
|
||||
return [AUTO_CHOICE, *(choice for choice in choices if choice != AUTO_CHOICE)]
|
||||
|
||||
|
||||
def _folder_paths() -> ModuleType:
|
||||
"""Import ComfyUI folder paths lazily for schema declaration."""
|
||||
|
||||
|
||||
@@ -0,0 +1,166 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Expose cohesive Krea 2 component loading through Comfy's v3 API."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import importlib
|
||||
from types import ModuleType
|
||||
from typing import TYPE_CHECKING, Any, ClassVar
|
||||
|
||||
from ..nodes import tooltips
|
||||
from ..runtime.auto_model_choices import automatic_component_choices
|
||||
from ..runtime.diffusion_model_loader import DIFFUSION_WEIGHT_DTYPES
|
||||
from ..runtime.krea2_artifacts import (
|
||||
KREA2_AUTO_TEXT_ENCODER,
|
||||
KREA2_QWEN3_VL_4B_BF16,
|
||||
KREA2_QWEN3_VL_4B_FP8,
|
||||
)
|
||||
from ..runtime.model_downloads import ComfyProgressReporter
|
||||
from ..runtime.qwen_artifacts import QWEN_IMAGE_VAE
|
||||
from ..runtime.text_encoder_loader import TEXT_ENCODER_DEVICES
|
||||
from ..runtime.vae_loader import vae_choices
|
||||
from ..services.krea2_loader_service import AUTO_CHOICE, Krea2LoaderService
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
||||
class _ComfyNodeBase:
|
||||
"""Type-checking base for Comfy v3 nodes."""
|
||||
|
||||
RETURN_TYPES: ClassVar[list[str]]
|
||||
RETURN_NAMES: ClassVar[list[str]]
|
||||
|
||||
else:
|
||||
_ComfyNodeBase = importlib.import_module("comfy_api.latest").io.ComfyNode
|
||||
|
||||
_comfy_io: Any = (
|
||||
None if TYPE_CHECKING else importlib.import_module("comfy_api.latest").io
|
||||
)
|
||||
|
||||
|
||||
class SimpleLoadKrea2V3(_ComfyNodeBase):
|
||||
"""Load a Krea 2 diffusion model with its Qwen encoder and image VAE."""
|
||||
|
||||
_service = Krea2LoaderService()
|
||||
|
||||
@classmethod
|
||||
def define_schema(cls) -> Any:
|
||||
"""Declare the Krea 2 loader schema and downloadable component choices."""
|
||||
|
||||
folder_paths = _folder_paths()
|
||||
return _comfy_io.Schema(
|
||||
node_id="SimpleSyrup.SimpleLoadKrea2",
|
||||
display_name="Simple Load Krea 2",
|
||||
category="SimpleSyrup/Loaders",
|
||||
description=(
|
||||
"Loads Krea 2 with its Qwen3-VL 4B encoder and Qwen Image VAE; "
|
||||
"automatic components are downloaded from checksum-pinned "
|
||||
"Hugging Face files."
|
||||
),
|
||||
search_aliases=["krea", "krea 2", "k2", "load krea"],
|
||||
inputs=[
|
||||
_comfy_io.Combo.Input(
|
||||
"diffusion_model",
|
||||
options=list(folder_paths.get_filename_list("diffusion_models")),
|
||||
tooltip=(
|
||||
"Krea 2 Raw or Turbo diffusion model to load. This node "
|
||||
"validates the architecture and never downloads this file."
|
||||
),
|
||||
),
|
||||
_comfy_io.Combo.Input(
|
||||
"diffusion_weight_dtype",
|
||||
options=list(DIFFUSION_WEIGHT_DTYPES),
|
||||
default="default",
|
||||
advanced=True,
|
||||
tooltip=(
|
||||
"Load-time diffusion precision; default preserves the "
|
||||
"selected file's stored BF16, FP8, INT8, MXFP8, or NVFP4 "
|
||||
"format."
|
||||
),
|
||||
),
|
||||
_comfy_io.Combo.Input(
|
||||
"text_encoder",
|
||||
options=automatic_component_choices(
|
||||
installed=list(folder_paths.get_filename_list("text_encoders")),
|
||||
artifacts=(
|
||||
KREA2_QWEN3_VL_4B_FP8,
|
||||
KREA2_QWEN3_VL_4B_BF16,
|
||||
),
|
||||
leading_choices=(
|
||||
KREA2_AUTO_TEXT_ENCODER,
|
||||
KREA2_QWEN3_VL_4B_FP8.filename,
|
||||
KREA2_QWEN3_VL_4B_BF16.filename,
|
||||
),
|
||||
folder_paths_module=folder_paths,
|
||||
),
|
||||
default=KREA2_AUTO_TEXT_ENCODER,
|
||||
advanced=True,
|
||||
tooltip=(
|
||||
"Qwen3-VL 4B encoder loaded with Krea 2's required 12-layer "
|
||||
"conditioning. Auto uses FP8; selecting official FP8 or BF16 "
|
||||
"downloads that checksum-pinned file when missing."
|
||||
),
|
||||
),
|
||||
_comfy_io.Combo.Input(
|
||||
"text_encoder_device",
|
||||
options=list(TEXT_ENCODER_DEVICES),
|
||||
default="default",
|
||||
advanced=True,
|
||||
tooltip=(
|
||||
"Device for Qwen3-VL; CPU saves GPU memory but makes prompt "
|
||||
"encoding slower."
|
||||
),
|
||||
),
|
||||
_comfy_io.Combo.Input(
|
||||
"vae",
|
||||
options=automatic_component_choices(
|
||||
installed=vae_choices(folder_paths),
|
||||
artifacts=(QWEN_IMAGE_VAE,),
|
||||
leading_choices=(AUTO_CHOICE,),
|
||||
folder_paths_module=folder_paths,
|
||||
),
|
||||
default=AUTO_CHOICE,
|
||||
advanced=True,
|
||||
tooltip=(
|
||||
"VAE used to decode Krea 2 latents. Auto finds or downloads "
|
||||
"the checksum-pinned Qwen Image VAE with visible progress."
|
||||
),
|
||||
),
|
||||
],
|
||||
outputs=[
|
||||
_comfy_io.Model.Output("model", tooltip=tooltips.MODEL_OUTPUT),
|
||||
_comfy_io.Clip.Output("clip", tooltip=tooltips.CLIP_OUTPUT),
|
||||
_comfy_io.Vae.Output("vae", tooltip=tooltips.VAE_OUTPUT),
|
||||
],
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def execute(
|
||||
cls,
|
||||
diffusion_model: str,
|
||||
diffusion_weight_dtype: str,
|
||||
text_encoder: str,
|
||||
text_encoder_device: str,
|
||||
vae: str,
|
||||
) -> tuple[object, object, object]:
|
||||
"""Load and return validated Krea 2 MODEL, CLIP, and VAE objects."""
|
||||
|
||||
return cls._service.load_models(
|
||||
diffusion_model=diffusion_model,
|
||||
diffusion_weight_dtype=diffusion_weight_dtype,
|
||||
text_encoder=text_encoder,
|
||||
text_encoder_device=text_encoder_device,
|
||||
vae=vae,
|
||||
progress=ComfyProgressReporter(),
|
||||
)
|
||||
|
||||
|
||||
def _folder_paths() -> ModuleType:
|
||||
"""Import ComfyUI folder paths lazily for schema declaration."""
|
||||
|
||||
module: Any = importlib.import_module("folder_paths")
|
||||
if not isinstance(module, ModuleType):
|
||||
raise TypeError("folder_paths import did not return a module.")
|
||||
return module
|
||||
@@ -0,0 +1,78 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Configure the single local tiling authority for a sampler options chain."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any
|
||||
|
||||
from ..domain.sampler_options import (
|
||||
SamplerOptions,
|
||||
TilingOptions,
|
||||
append_sampler_capability,
|
||||
)
|
||||
from .ksampler_schema import tiled_diffusion_inputs
|
||||
from .sampler_options_schema import (
|
||||
COMFY_IO,
|
||||
OptionsNodeBase,
|
||||
options_input,
|
||||
options_output,
|
||||
)
|
||||
|
||||
|
||||
class TilingOptionsV3(OptionsNodeBase):
|
||||
"""Add bounded local tiles, blend policy and mask-dependent denoising."""
|
||||
|
||||
@classmethod
|
||||
def define_schema(cls) -> Any:
|
||||
"""Share tiled controls and expose mask-dependent denoising."""
|
||||
return COMFY_IO.Schema(
|
||||
node_id="SimpleSyrup.TilingOptions",
|
||||
display_name="Tiling Options",
|
||||
category="SimpleSyrup/Sampling/Options",
|
||||
description=(
|
||||
"Samples bounded local tiles; ignored when "
|
||||
"Contextual Diffusion Options is connected."
|
||||
),
|
||||
inputs=[
|
||||
options_input(COMFY_IO),
|
||||
*tiled_diffusion_inputs(COMFY_IO),
|
||||
COMFY_IO.Boolean.Input(
|
||||
"differential_diffusion",
|
||||
default=False,
|
||||
tooltip=(
|
||||
"Uses the noise mask to vary denoising strength spatially; "
|
||||
"preserves existing model mask behavior."
|
||||
),
|
||||
),
|
||||
],
|
||||
outputs=[options_output(COMFY_IO)],
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def execute(
|
||||
cls,
|
||||
diffusion_mode: str = "multidiffusion",
|
||||
latent_tile_width: int = 128,
|
||||
latent_tile_height: int = 128,
|
||||
latent_tile_overlap: int = 16,
|
||||
latent_tile_batch_size: int = 4,
|
||||
differential_diffusion: bool = False,
|
||||
options: SamplerOptions | None = None,
|
||||
) -> tuple[SamplerOptions]:
|
||||
"""Append validated tiling without changing the incoming chain."""
|
||||
return (
|
||||
append_sampler_capability(
|
||||
options,
|
||||
TilingOptions(
|
||||
diffusion_mode=diffusion_mode,
|
||||
width=latent_tile_width,
|
||||
height=latent_tile_height,
|
||||
overlap=latent_tile_overlap,
|
||||
batch_size=latent_tile_batch_size,
|
||||
differential_diffusion=differential_diffusion,
|
||||
),
|
||||
),
|
||||
)
|
||||
@@ -7,6 +7,7 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from .auto_model_artifact import AutoModelArtifact
|
||||
from .qwen_artifacts import QWEN_IMAGE_VAE
|
||||
|
||||
ANIMA_QWEN_TEXT_ENCODER = AutoModelArtifact(
|
||||
cache_id="anima_qwen_text_encoder",
|
||||
@@ -20,20 +21,7 @@ ANIMA_QWEN_TEXT_ENCODER = AutoModelArtifact(
|
||||
source_repo="circlestone-labs/Anima",
|
||||
description="Anima Qwen3 0.6B text encoder",
|
||||
sha256="cd2a512003e2f9f3cd3c32a9c3573f820bb28c940f73c57b1ddaa983d9223eba",
|
||||
file_size_bytes=1_192_135_096,
|
||||
)
|
||||
|
||||
ANIMA_QWEN_VAE = AutoModelArtifact(
|
||||
cache_id="anima_qwen_vae",
|
||||
filename="qwen_image_vae.safetensors",
|
||||
folder_name="vae",
|
||||
canonical_subfolder="qwen",
|
||||
source_url=(
|
||||
"https://huggingface.co/circlestone-labs/Anima/resolve/main/"
|
||||
"split_files/vae/qwen_image_vae.safetensors"
|
||||
),
|
||||
source_repo="circlestone-labs/Anima",
|
||||
description="Anima Qwen Image VAE",
|
||||
sha256="a70580f0213e67967ee9c95f05bb400e8fb08307e017a924bf3441223e023d1f",
|
||||
)
|
||||
|
||||
ANIMA_AUTO_ARTIFACTS = (ANIMA_QWEN_TEXT_ENCODER, ANIMA_QWEN_VAE)
|
||||
ANIMA_AUTO_ARTIFACTS = (ANIMA_QWEN_TEXT_ENCODER, QWEN_IMAGE_VAE)
|
||||
|
||||
@@ -8,16 +8,19 @@ from __future__ import annotations
|
||||
|
||||
from dataclasses import dataclass
|
||||
|
||||
import comfy.model_patcher
|
||||
from comfy.patcher_extension import CallbacksMP
|
||||
|
||||
from ..model_attention_patch_mutations import ModelAttn2PatchesMutation
|
||||
from ..model_patcher_mutations import ModelKeyedCallbackMutation
|
||||
from ..patcher_lifecycle import PATCHER_LIFECYCLE, ModelMutation
|
||||
from ..regional_lora.standard_unet_native_admission import (
|
||||
StandardUnetNativeLoraAdmission,
|
||||
from ..ppm_negpip_interop import PpmNegpipInterop
|
||||
from ..regional_lora.operation_assembly import REGIONAL_OPERATION_ASSEMBLER
|
||||
from ..regional_lora.standard_unet_operation_preparation import (
|
||||
StandardUnetOperationAdmission,
|
||||
)
|
||||
from ..regional_lora.standard_unet_variant_runtime import (
|
||||
StandardUnetVariantRuntimeMutation,
|
||||
)
|
||||
from ..regional_lora.standard_unet_variant_template import (
|
||||
STANDARD_UNET_VARIANT_TEMPLATE_CACHE,
|
||||
from ..regional_lora.standard_unet_operation_session import (
|
||||
StandardUnetRegionalOperationSession,
|
||||
)
|
||||
from .unet_attention_context_wrapper import unet_attention_context_wrapper_mutation
|
||||
from .unet_attention_phase_session import StandardUnetAttentionPhaseSession
|
||||
@@ -42,60 +45,72 @@ class StandardUnetAttentionBackend:
|
||||
*,
|
||||
model: object,
|
||||
state: StandardUnetAttentionState,
|
||||
admission: StandardUnetNativeLoraAdmission,
|
||||
admission: StandardUnetOperationAdmission,
|
||||
negpip: PpmNegpipInterop | None = None,
|
||||
) -> StandardUnetAttentionModel:
|
||||
"""Return a direct MODEL child containing only the paired UNet patches."""
|
||||
|
||||
if not isinstance(state, StandardUnetAttentionState):
|
||||
raise TypeError("Standard UNet backend requires attention state.")
|
||||
if not isinstance(admission, StandardUnetNativeLoraAdmission):
|
||||
raise TypeError("Standard UNet backend requires native admission.")
|
||||
if not isinstance(admission, StandardUnetOperationAdmission):
|
||||
raise TypeError("Standard UNet backend requires operation admission.")
|
||||
if admission.adaptation.plan != state.plan.lora_plan:
|
||||
raise ValueError(
|
||||
"Standard UNet admission and processed conditioning must share "
|
||||
"the same regional LoRA plan."
|
||||
)
|
||||
if negpip is not None and not isinstance(negpip, PpmNegpipInterop):
|
||||
raise TypeError("Standard UNet backend NegPiP state has an invalid type.")
|
||||
attention_phase = StandardUnetAttentionPhaseSession()
|
||||
template = (
|
||||
STANDARD_UNET_VARIANT_TEMPLATE_CACHE.resolve(model, admission)
|
||||
if admission.adaptation.plan.adapters
|
||||
else None
|
||||
)
|
||||
variant_mutations = (
|
||||
(
|
||||
StandardUnetVariantRuntimeMutation(
|
||||
state,
|
||||
admission,
|
||||
attention_phase,
|
||||
template,
|
||||
operation_session: StandardUnetRegionalOperationSession | None = None
|
||||
operation_mutations: tuple[ModelMutation, ...] = ()
|
||||
if admission.adaptation.plan.adapters:
|
||||
if (
|
||||
not isinstance(model, comfy.model_patcher.ModelPatcher)
|
||||
or admission.binding is None
|
||||
or admission.cache is None
|
||||
):
|
||||
raise TypeError(
|
||||
"Standard UNet regional operations require complete MODEL "
|
||||
"admission."
|
||||
)
|
||||
assembly = REGIONAL_OPERATION_ASSEMBLER.assemble(
|
||||
admission.binding,
|
||||
model=model,
|
||||
cache=admission.cache,
|
||||
)
|
||||
operation_session = StandardUnetRegionalOperationSession(
|
||||
admission.adaptation.plan,
|
||||
state.plan.mask_bank,
|
||||
admission.module_roles,
|
||||
assembly.call_scope,
|
||||
)
|
||||
operation_mutations = (
|
||||
assembly.cache_lifecycle.mutation(),
|
||||
ModelKeyedCallbackMutation(
|
||||
CallbacksMP.ON_DETACH,
|
||||
"simple_syrup.standard_unet_regional_operation_schedule",
|
||||
operation_session.clear,
|
||||
),
|
||||
)
|
||||
if template is not None
|
||||
else ()
|
||||
patches = UnetAttn2PatchPair(
|
||||
StandardUnetAttn2ExecutionResolver(state),
|
||||
operation_scope=operation_session,
|
||||
)
|
||||
derivation_source = (
|
||||
template.bind_request(model) if template is not None else model
|
||||
)
|
||||
attention_mutations: tuple[ModelMutation, ...] = ()
|
||||
if template is None:
|
||||
patches = UnetAttn2PatchPair(
|
||||
StandardUnetAttn2ExecutionResolver(state),
|
||||
)
|
||||
attention_mutations = (
|
||||
ModelAttn2PatchesMutation(
|
||||
patches.input_patch,
|
||||
patches.output_patch,
|
||||
),
|
||||
)
|
||||
derived = PATCHER_LIFECYCLE.derive_model(
|
||||
derivation_source,
|
||||
model,
|
||||
(
|
||||
unet_attention_context_wrapper_mutation(
|
||||
state,
|
||||
attention_phase,
|
||||
operation_session,
|
||||
),
|
||||
*attention_mutations,
|
||||
*variant_mutations,
|
||||
ModelAttn2PatchesMutation(
|
||||
patches.input_patch,
|
||||
patches.output_patch,
|
||||
(() if negpip is None else (negpip.attention_patch,)),
|
||||
),
|
||||
*operation_mutations,
|
||||
),
|
||||
operation="standard UNet Attention Coupling",
|
||||
)
|
||||
|
||||
@@ -6,12 +6,17 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from contextlib import ExitStack
|
||||
|
||||
import torch
|
||||
|
||||
from ..diffusion_wrapper_executor import DiffusionWrapperExecutor
|
||||
from ..diffusion_wrapper_invocation import DIFFUSION_WRAPPER_INVOCATION_VALIDATOR
|
||||
from ..model_patcher_mutations import ModelDiffusionWrapperMutation
|
||||
from ..regional_attention_model_call import RegionalAttentionModelCallResolver
|
||||
from ..regional_lora.standard_unet_operation_session import (
|
||||
StandardUnetRegionalOperationSession,
|
||||
)
|
||||
from .standard_unet_model_output_validation import (
|
||||
STANDARD_UNET_MODEL_OUTPUT_VALIDATOR,
|
||||
StandardUnetModelOutputValidator,
|
||||
@@ -32,6 +37,7 @@ class StandardUnetAttentionContextDiffusionWrapper:
|
||||
self,
|
||||
state: StandardUnetAttentionState,
|
||||
attention_phase: StandardUnetAttentionPhaseSession,
|
||||
operation_session: StandardUnetRegionalOperationSession | None = None,
|
||||
*,
|
||||
model_call_resolver: RegionalAttentionModelCallResolver = (
|
||||
STANDARD_UNET_MODEL_CALL_RESOLVER
|
||||
@@ -46,12 +52,18 @@ class StandardUnetAttentionContextDiffusionWrapper:
|
||||
raise TypeError("Standard UNet context wrapper requires attention state.")
|
||||
if not isinstance(attention_phase, StandardUnetAttentionPhaseSession):
|
||||
raise TypeError("Standard UNet context wrapper requires phase state.")
|
||||
if operation_session is not None and not isinstance(
|
||||
operation_session,
|
||||
StandardUnetRegionalOperationSession,
|
||||
):
|
||||
raise TypeError("Standard UNet operation session has an invalid type.")
|
||||
if not isinstance(model_call_resolver, RegionalAttentionModelCallResolver):
|
||||
raise TypeError(
|
||||
"Standard UNet context wrapper requires a model-call resolver."
|
||||
)
|
||||
self._state = state
|
||||
self._attention_phase = attention_phase
|
||||
self._operation_session = operation_session
|
||||
self._model_call_resolver = model_call_resolver
|
||||
if not isinstance(output_validator, StandardUnetModelOutputValidator):
|
||||
raise TypeError("Standard UNet output validator has an invalid type.")
|
||||
@@ -90,11 +102,14 @@ class StandardUnetAttentionContextDiffusionWrapper:
|
||||
transformer_options=args[5],
|
||||
)
|
||||
forwarded_args = (*args[:2], contexts.base_context, *args[3:])
|
||||
with (
|
||||
self._attention_phase.activate(args[5]),
|
||||
self._state.execution_context.activate(contexts),
|
||||
self._state.resolution_cache.activate(),
|
||||
):
|
||||
with ExitStack() as scopes:
|
||||
scopes.enter_context(self._attention_phase.activate(args[5]))
|
||||
scopes.enter_context(self._state.execution_context.activate(contexts))
|
||||
scopes.enter_context(self._state.resolution_cache.activate())
|
||||
if self._operation_session is not None:
|
||||
scopes.enter_context(
|
||||
self._operation_session.activate(contexts, args[5])
|
||||
)
|
||||
output = executor(*forwarded_args, **kwargs)
|
||||
return self._output_validator.validate(output, model_input=args[0])
|
||||
|
||||
@@ -102,6 +117,7 @@ class StandardUnetAttentionContextDiffusionWrapper:
|
||||
def unet_attention_context_wrapper_mutation(
|
||||
state: StandardUnetAttentionState,
|
||||
attention_phase: StandardUnetAttentionPhaseSession,
|
||||
operation_session: StandardUnetRegionalOperationSession | None = None,
|
||||
) -> ModelDiffusionWrapperMutation:
|
||||
"""Return the clone-local standard-UNet context wrapper mutation."""
|
||||
|
||||
@@ -110,5 +126,6 @@ def unet_attention_context_wrapper_mutation(
|
||||
StandardUnetAttentionContextDiffusionWrapper(
|
||||
state,
|
||||
attention_phase,
|
||||
operation_session,
|
||||
),
|
||||
)
|
||||
|
||||
@@ -21,3 +21,4 @@ class AutoModelArtifact:
|
||||
source_repo: str
|
||||
description: str
|
||||
sha256: str
|
||||
file_size_bytes: int
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Build component choices without duplicating automatic local artifacts."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from collections.abc import Sequence
|
||||
from pathlib import Path
|
||||
from types import ModuleType
|
||||
from typing import Any
|
||||
|
||||
from .auto_model_artifact import AutoModelArtifact
|
||||
|
||||
|
||||
def automatic_component_choices(
|
||||
installed: Sequence[str],
|
||||
artifacts: Sequence[AutoModelArtifact],
|
||||
leading_choices: Sequence[str],
|
||||
folder_paths_module: ModuleType,
|
||||
) -> list[str]:
|
||||
"""Return leading choices plus local files not represented automatically."""
|
||||
|
||||
if not artifacts:
|
||||
raise ValueError("Automatic component choices require at least one artifact.")
|
||||
folder_names = {artifact.folder_name for artifact in artifacts}
|
||||
if len(folder_names) != 1:
|
||||
raise ValueError("Automatic component artifacts must share one model category.")
|
||||
|
||||
folder_name = next(iter(folder_names))
|
||||
automatic_names = {artifact.filename for artifact in artifacts}
|
||||
automatic_sizes = {artifact.file_size_bytes for artifact in artifacts}
|
||||
choices = list(dict.fromkeys(leading_choices))
|
||||
seen = set(choices)
|
||||
for choice in installed:
|
||||
if choice in seen or choice in automatic_names:
|
||||
continue
|
||||
if _installed_file_has_known_size(
|
||||
folder_paths_module,
|
||||
folder_name,
|
||||
choice,
|
||||
automatic_sizes,
|
||||
):
|
||||
continue
|
||||
choices.append(choice)
|
||||
seen.add(choice)
|
||||
return choices
|
||||
|
||||
|
||||
def _installed_file_has_known_size(
|
||||
folder_paths_module: ModuleType,
|
||||
folder_name: str,
|
||||
choice: str,
|
||||
automatic_sizes: set[int],
|
||||
) -> bool:
|
||||
"""Identify a likely automatic artifact without hashing during schema creation."""
|
||||
|
||||
get_full_path: Any = getattr(folder_paths_module, "get_full_path", None)
|
||||
if not callable(get_full_path):
|
||||
return False
|
||||
path_value: Any = get_full_path(folder_name, choice)
|
||||
if path_value is None:
|
||||
return False
|
||||
try:
|
||||
path = Path(str(path_value))
|
||||
return path.is_file() and path.stat().st_size in automatic_sizes
|
||||
except OSError:
|
||||
return False
|
||||
|
||||
|
||||
__all__ = ["automatic_component_choices"]
|
||||
@@ -150,8 +150,6 @@ class AutoModelResolver:
|
||||
return False
|
||||
if entry.sha256 != artifact.sha256:
|
||||
return False
|
||||
if entry.path.name != artifact.filename:
|
||||
return False
|
||||
if not entry.path.is_file():
|
||||
return False
|
||||
try:
|
||||
@@ -163,6 +161,8 @@ class AutoModelResolver:
|
||||
except ValueError:
|
||||
return False
|
||||
stat = entry.path.stat()
|
||||
if stat.st_size != artifact.file_size_bytes:
|
||||
return False
|
||||
if entry.file_size is not None and entry.modified_time_ns is not None:
|
||||
return (
|
||||
entry.file_size == stat.st_size
|
||||
@@ -175,19 +175,33 @@ def find_model_artifact(
|
||||
artifact: AutoModelArtifact,
|
||||
folder_paths_module: ModuleType | None = None,
|
||||
) -> Path | None:
|
||||
"""Return the first same-named local file matching the catalog checksum."""
|
||||
"""Find an artifact by the cheapest reliable checks within its model category."""
|
||||
|
||||
_validate_basename(artifact.filename)
|
||||
for root in get_model_folder_paths(artifact.folder_name, folder_paths_module):
|
||||
roots = get_model_folder_paths(artifact.folder_name, folder_paths_module)
|
||||
canonical = canonical_auto_destination(artifact, folder_paths_module)
|
||||
if _candidate_matches_artifact(canonical, artifact):
|
||||
return canonical
|
||||
|
||||
checked: set[Path] = {canonical.resolve()}
|
||||
for root in roots:
|
||||
if not root.is_dir():
|
||||
continue
|
||||
matches = sorted(
|
||||
path for path in root.rglob(artifact.filename) if path.is_file()
|
||||
)
|
||||
for match in matches:
|
||||
if match.name != artifact.filename or not _path_is_under(match, root):
|
||||
if not _candidate_has_expected_size(match, artifact):
|
||||
continue
|
||||
if sha256_file(match).lower() == artifact.sha256.lower():
|
||||
resolved_match = match.resolve()
|
||||
if (
|
||||
resolved_match in checked
|
||||
or match.name != artifact.filename
|
||||
or not _path_is_under(match, root)
|
||||
):
|
||||
continue
|
||||
checked.add(resolved_match)
|
||||
if _candidate_checksum_matches(match, artifact):
|
||||
return match
|
||||
LOGGER.warning(
|
||||
"same-named auto model artifact has a different checksum",
|
||||
@@ -197,9 +211,63 @@ def find_model_artifact(
|
||||
"artifact_filename": artifact.filename,
|
||||
},
|
||||
)
|
||||
|
||||
for root in roots:
|
||||
if not root.is_dir():
|
||||
continue
|
||||
for candidate in root.rglob("*"):
|
||||
if not _candidate_has_expected_size(candidate, artifact):
|
||||
continue
|
||||
if not _path_is_under(candidate, root):
|
||||
continue
|
||||
resolved_candidate = candidate.resolve()
|
||||
if resolved_candidate in checked:
|
||||
continue
|
||||
checked.add(resolved_candidate)
|
||||
if not _candidate_checksum_matches(candidate, artifact):
|
||||
continue
|
||||
LOGGER.info(
|
||||
"auto model artifact found under alternate filename",
|
||||
extra={
|
||||
"cache_id": artifact.cache_id,
|
||||
"path": str(candidate),
|
||||
"artifact_filename": artifact.filename,
|
||||
},
|
||||
)
|
||||
return candidate
|
||||
return None
|
||||
|
||||
|
||||
def _candidate_matches_artifact(
|
||||
candidate: Path,
|
||||
artifact: AutoModelArtifact,
|
||||
) -> bool:
|
||||
"""Verify a candidate only when its inexpensive file checks match first."""
|
||||
|
||||
return _candidate_has_expected_size(
|
||||
candidate,
|
||||
artifact,
|
||||
) and _candidate_checksum_matches(candidate, artifact)
|
||||
|
||||
|
||||
def _candidate_has_expected_size(
|
||||
candidate: Path,
|
||||
artifact: AutoModelArtifact,
|
||||
) -> bool:
|
||||
"""Return whether a regular file has the artifact's exact byte size."""
|
||||
|
||||
return candidate.is_file() and candidate.stat().st_size == artifact.file_size_bytes
|
||||
|
||||
|
||||
def _candidate_checksum_matches(
|
||||
candidate: Path,
|
||||
artifact: AutoModelArtifact,
|
||||
) -> bool:
|
||||
"""Return whether an already size-matched candidate has the trusted digest."""
|
||||
|
||||
return sha256_file(candidate).lower() == artifact.sha256.lower()
|
||||
|
||||
|
||||
def find_model_by_basename(
|
||||
folder_name: str,
|
||||
basename: str,
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from collections.abc import Callable
|
||||
from dataclasses import dataclass
|
||||
from typing import Any, cast
|
||||
|
||||
@@ -50,6 +51,79 @@ class ClipHookScheduleMutation:
|
||||
register_hooks(self.hooks, self.target)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ClipCallableObjectPatchMutation:
|
||||
"""Patch one callable text-encoder object on a derived CLIP patcher."""
|
||||
|
||||
path: str
|
||||
replacement: Callable[..., object]
|
||||
|
||||
def apply(self, clip: object) -> None:
|
||||
"""Validate the path and collision state before installing the callback."""
|
||||
|
||||
if (
|
||||
not isinstance(self.path, str)
|
||||
or not self.path
|
||||
or any(not segment for segment in self.path.split("."))
|
||||
):
|
||||
raise ValueError("CLIP callable patch path must be a dotted path.")
|
||||
if not callable(self.replacement):
|
||||
raise TypeError("CLIP callable object replacement must be callable.")
|
||||
patcher = _required_attribute(clip, "patcher", value_name="CLIP")
|
||||
getter = getattr(patcher, "get_model_object", None)
|
||||
adder = getattr(patcher, "add_object_patch", None)
|
||||
object_patches = getattr(patcher, "object_patches", None)
|
||||
if (
|
||||
not callable(getter)
|
||||
or not callable(adder)
|
||||
or not isinstance(object_patches, dict)
|
||||
):
|
||||
raise TypeError("CLIP patcher does not expose callable object patches.")
|
||||
if self.path in object_patches:
|
||||
raise ValueError(f"CLIP object path '{self.path}' already has a patch.")
|
||||
if not callable(getter(self.path)):
|
||||
raise TypeError(f"CLIP object path '{self.path}' must be callable.")
|
||||
adder(self.path, self.replacement)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ClipTokenizerMutation:
|
||||
"""Replace the tokenizer on a derived CLIP after exact source validation."""
|
||||
|
||||
expected_source: object
|
||||
replacement: object
|
||||
|
||||
def apply(self, clip: object) -> None:
|
||||
"""Install one tokenizer proxy only on the expected cloned source value."""
|
||||
|
||||
if getattr(clip, "tokenizer", None) is not self.expected_source:
|
||||
raise ValueError("Derived CLIP tokenizer does not match its source.")
|
||||
cast(Any, clip).tokenizer = self.replacement
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ClipBooleanOptionMutation:
|
||||
"""Publish one collision-safe boolean option on a derived CLIP patcher."""
|
||||
|
||||
key: str
|
||||
value: bool
|
||||
|
||||
def apply(self, clip: object) -> None:
|
||||
"""Set an approved ownership marker after validating the option mapping."""
|
||||
|
||||
if self.key not in {"ppm_negpip", "simple_syrup_negpip"}:
|
||||
raise ValueError("Unsupported CLIP boolean option marker.")
|
||||
if not isinstance(self.value, bool):
|
||||
raise TypeError("CLIP option marker value must be boolean.")
|
||||
patcher = _required_attribute(clip, "patcher", value_name="CLIP")
|
||||
options = getattr(patcher, "model_options", None)
|
||||
if not isinstance(options, dict):
|
||||
raise TypeError("CLIP patcher model_options must be a dictionary.")
|
||||
if self.key in options:
|
||||
raise ValueError(f"CLIP option '{self.key}' is already present.")
|
||||
options[self.key] = self.value
|
||||
|
||||
|
||||
def _required_attribute(value: object, name: str, *, value_name: str) -> object:
|
||||
"""Return a required dynamic ComfyUI boundary attribute."""
|
||||
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Validate ComfyUI text-encoder type availability before model downloads."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import importlib
|
||||
from typing import Any
|
||||
|
||||
|
||||
class ComfyClipTypeSupport:
|
||||
"""Validate named ComfyUI CLIP types at the runtime boundary."""
|
||||
|
||||
def require(self, clip_type_name: str) -> None:
|
||||
"""Raise an actionable error when ComfyUI lacks a required CLIP type."""
|
||||
|
||||
comfy_sd: Any = importlib.import_module("comfy.sd")
|
||||
if hasattr(comfy_sd.CLIPType, clip_type_name):
|
||||
return
|
||||
raise RuntimeError(
|
||||
f"This loader requires ComfyUI CLIP type '{clip_type_name}'. "
|
||||
"Update ComfyUI before using this node."
|
||||
)
|
||||
@@ -13,6 +13,7 @@ from uuid import UUID
|
||||
import torch
|
||||
from comfy import sampler_helpers, samplers
|
||||
|
||||
from ..domain.attention_coupling_preparation import AttentionCouplingPreparation
|
||||
from ..domain.conditioning_schedule import ConditioningScheduleRange
|
||||
from ..domain.processed_regional_attention import (
|
||||
ProcessedRegionalAttentionBranch,
|
||||
@@ -23,10 +24,8 @@ from ..domain.processed_regional_attention import (
|
||||
from ..domain.raw_regional_attention import (
|
||||
RawRegionalAttentionBranch,
|
||||
)
|
||||
from ..services.attention_coupling_preparation_service import (
|
||||
AttentionCouplingPreparation,
|
||||
)
|
||||
from .attention_coupling.context_validation import RegionalContextValidator
|
||||
from .ppm_negpip_interop import PpmNegpipInterop
|
||||
|
||||
|
||||
class ComfyRegionalConditioningProcessor:
|
||||
@@ -40,6 +39,7 @@ class ComfyRegionalConditioningProcessor:
|
||||
noise: torch.Tensor,
|
||||
device: torch.device,
|
||||
context_validator: RegionalContextValidator,
|
||||
negpip: PpmNegpipInterop | None = None,
|
||||
) -> ProcessedRegionalAttentionPlan:
|
||||
"""Return model-ready positive and negative context banks."""
|
||||
|
||||
@@ -57,6 +57,8 @@ class ComfyRegionalConditioningProcessor:
|
||||
raise TypeError("Regional context processing device must be torch.device.")
|
||||
if not isinstance(context_validator, RegionalContextValidator):
|
||||
raise TypeError("Regional context validator has an invalid type.")
|
||||
if negpip is not None and not isinstance(negpip, PpmNegpipInterop):
|
||||
raise TypeError("Regional conditioning NegPiP state has an invalid type.")
|
||||
base_model = getattr(model, "model", None)
|
||||
extra_conds = getattr(base_model, "extra_conds", None)
|
||||
if not callable(extra_conds):
|
||||
@@ -75,6 +77,7 @@ class ComfyRegionalConditioningProcessor:
|
||||
noise=noise,
|
||||
device=device,
|
||||
context_validator=context_validator,
|
||||
negpip=negpip,
|
||||
)
|
||||
negative = self._process_branch(
|
||||
preparation.plan.negative,
|
||||
@@ -84,6 +87,7 @@ class ComfyRegionalConditioningProcessor:
|
||||
noise=noise,
|
||||
device=device,
|
||||
context_validator=context_validator,
|
||||
negpip=negpip,
|
||||
)
|
||||
return ProcessedRegionalAttentionPlan(
|
||||
positive=positive,
|
||||
@@ -102,6 +106,7 @@ class ComfyRegionalConditioningProcessor:
|
||||
noise: torch.Tensor,
|
||||
device: torch.device,
|
||||
context_validator: RegionalContextValidator,
|
||||
negpip: PpmNegpipInterop | None,
|
||||
) -> ProcessedRegionalAttentionBranch:
|
||||
"""Process one base plus its ordered regional context bank."""
|
||||
|
||||
@@ -115,6 +120,7 @@ class ComfyRegionalConditioningProcessor:
|
||||
noise=noise,
|
||||
device=device,
|
||||
context_validator=context_validator,
|
||||
negpip=negpip,
|
||||
)
|
||||
regional = tuple(
|
||||
self._process_context(
|
||||
@@ -127,6 +133,7 @@ class ComfyRegionalConditioningProcessor:
|
||||
noise=noise,
|
||||
device=device,
|
||||
context_validator=context_validator,
|
||||
negpip=negpip,
|
||||
)
|
||||
for context in branch.regional_contexts
|
||||
)
|
||||
@@ -144,6 +151,7 @@ class ComfyRegionalConditioningProcessor:
|
||||
noise: torch.Tensor,
|
||||
device: torch.device,
|
||||
context_validator: RegionalContextValidator,
|
||||
negpip: PpmNegpipInterop | None,
|
||||
) -> ProcessedRegionalAttentionContext:
|
||||
"""Convert and extract one exact post-adapter Anima context tensor."""
|
||||
|
||||
@@ -168,6 +176,7 @@ class ComfyRegionalConditioningProcessor:
|
||||
conditioning_index=conditioning_index,
|
||||
prompt_type=prompt_type,
|
||||
context_validator=context_validator,
|
||||
negpip=negpip,
|
||||
)
|
||||
for entry_index, encoded_item in enumerate(encoded)
|
||||
)
|
||||
@@ -185,6 +194,7 @@ class ComfyRegionalConditioningProcessor:
|
||||
conditioning_index: int,
|
||||
prompt_type: str,
|
||||
context_validator: RegionalContextValidator,
|
||||
negpip: PpmNegpipInterop | None,
|
||||
) -> ProcessedRegionalAttentionEntry:
|
||||
"""Extract one exact post-adapter Anima context and Comfy strength."""
|
||||
|
||||
@@ -233,6 +243,11 @@ class ComfyRegionalConditioningProcessor:
|
||||
),
|
||||
cross_attention=context,
|
||||
strength=float(strength),
|
||||
cross_attention_value_multiplier=(
|
||||
None
|
||||
if negpip is None
|
||||
else negpip.extract_value_multiplier(model_conds, context)
|
||||
),
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
|
||||
@@ -16,15 +16,24 @@ from ..domain.contextual_diffusion import (
|
||||
ContextualDiffusionControls,
|
||||
ContextualDiffusionPlan,
|
||||
)
|
||||
from ..domain.noise_inversion import NoiseInversionOptions
|
||||
from ..domain.regional_features import (
|
||||
EMPTY_REGIONAL_CAPABILITY_ADMISSION,
|
||||
RegionalCapabilityAdmission,
|
||||
)
|
||||
from ..domain.sampler_options import TilingOptions
|
||||
from ..domain.segs import NativeSegs
|
||||
from ..shared.logging import get_logger
|
||||
from . import sampling_samplers, sampling_schedulers
|
||||
from . import sampling_noise, sampling_samplers, sampling_schedulers
|
||||
from .contextual_model_wrapper import ContextualDiffusionModelWrapper
|
||||
from .differential_diffusion import (
|
||||
differential_diffusion_mutation,
|
||||
has_denoise_mask_function,
|
||||
)
|
||||
from .guided_sampling import sample_with_optional_negative
|
||||
from .inversion_model_factory import InversionModelFactory
|
||||
from .model_patcher_mutations import ModelUnetWrapperMutation
|
||||
from .patcher_lifecycle import PATCHER_LIFECYCLE
|
||||
from .patcher_lifecycle import PATCHER_LIFECYCLE, ModelMutation
|
||||
from .sampling_model_types import ModelFunctionWrapper
|
||||
from .tiled_sampling_validation import (
|
||||
Latent,
|
||||
@@ -57,14 +66,18 @@ def sample_contextual_diffusion(
|
||||
capability_admission: RegionalCapabilityAdmission = (
|
||||
EMPTY_REGIONAL_CAPABILITY_ADMISSION
|
||||
),
|
||||
noise_inversion: NoiseInversionOptions | None = None,
|
||||
inversion_segs: NativeSegs | None = None,
|
||||
inversion_region_masks: torch.Tensor | None = None,
|
||||
differential_diffusion: bool = False,
|
||||
) -> Latent:
|
||||
"""Sample one latent through global context and one tiled prediction plan."""
|
||||
|
||||
validate_sampling_controls(
|
||||
steps=steps,
|
||||
denoise=denoise,
|
||||
latent_tile_width=controls.latent_context_size,
|
||||
latent_tile_height=controls.latent_context_size,
|
||||
latent_tile_width=controls.tile_width,
|
||||
latent_tile_height=controls.tile_height,
|
||||
latent_tile_batch_size=controls.latent_context_batch_size,
|
||||
)
|
||||
controls.validate()
|
||||
@@ -89,8 +102,8 @@ def sample_contextual_diffusion(
|
||||
steps=steps,
|
||||
denoise=denoise,
|
||||
view=sampling_schedulers.SchedulerView(
|
||||
latent_width=controls.latent_context_size,
|
||||
latent_height=controls.latent_context_size,
|
||||
latent_width=controls.tile_width,
|
||||
latent_height=controls.tile_height,
|
||||
),
|
||||
).to(model.load_device)
|
||||
latent_samples = validate_latent_samples(latent_image, sampler_label=SAMPLER_LABEL)
|
||||
@@ -113,23 +126,55 @@ def sample_contextual_diffusion(
|
||||
controls=controls,
|
||||
sigmas=sigmas,
|
||||
diffusion_mode=diffusion_mode,
|
||||
differential_diffusion=differential_diffusion,
|
||||
)
|
||||
batch_inds = latent_image.get("batch_index")
|
||||
noise = comfy_sample.prepare_noise(latent_samples, seed, batch_inds)
|
||||
inversion_factory = (
|
||||
InversionModelFactory(
|
||||
model=model,
|
||||
canvas_width=plan.latent_width,
|
||||
canvas_height=plan.latent_height,
|
||||
tiling=TilingOptions(
|
||||
diffusion_mode=diffusion_mode,
|
||||
width=controls.tile_width,
|
||||
height=controls.tile_height,
|
||||
overlap=controls.latent_context_overlap,
|
||||
batch_size=controls.latent_context_batch_size,
|
||||
differential_diffusion=differential_diffusion,
|
||||
),
|
||||
context=controls,
|
||||
forward_sigmas=sigmas,
|
||||
segs=inversion_segs,
|
||||
region_masks=inversion_region_masks,
|
||||
)
|
||||
if noise_inversion is not None
|
||||
else None
|
||||
)
|
||||
noise = sampling_noise.prepare_sampling_noise(
|
||||
comfy_sample=comfy_sample,
|
||||
sampler_name=sampler_name,
|
||||
samples=latent_samples,
|
||||
seed=seed,
|
||||
batch_indices=batch_inds,
|
||||
model=sampling_model,
|
||||
)
|
||||
callback = _latent_preview().prepare_callback(sampling_model, steps)
|
||||
samples = comfy_sample.sample_custom(
|
||||
sampling_model,
|
||||
noise,
|
||||
cfg,
|
||||
sampler,
|
||||
sigmas,
|
||||
positive,
|
||||
negative,
|
||||
latent_samples,
|
||||
samples = sample_with_optional_negative(
|
||||
comfy_sample=comfy_sample,
|
||||
model=sampling_model,
|
||||
noise=noise,
|
||||
cfg=cfg,
|
||||
sampler=sampler,
|
||||
sigmas=sigmas,
|
||||
positive=positive,
|
||||
negative=negative,
|
||||
latent_image=latent_samples,
|
||||
noise_mask=latent_image.get("noise_mask"),
|
||||
callback=callback,
|
||||
disable_pbar=not comfy_utils.PROGRESS_BAR_ENABLED,
|
||||
seed=seed,
|
||||
noise_inversion=noise_inversion,
|
||||
inversion_model_factory=inversion_factory,
|
||||
)
|
||||
|
||||
LOGGER.info(
|
||||
@@ -169,10 +214,12 @@ def clone_model_with_contextual_diffusion(
|
||||
controls: ContextualDiffusionControls,
|
||||
sigmas: torch.Tensor,
|
||||
diffusion_mode: str,
|
||||
differential_diffusion: bool = False,
|
||||
existing_wrapper: ModelFunctionWrapper | None = None,
|
||||
) -> Any:
|
||||
"""Derive a model with one pre-CFG contextual prediction wrapper."""
|
||||
|
||||
old_wrapper = model.model_options.get("model_function_wrapper")
|
||||
old_wrapper = existing_wrapper or model.model_options.get("model_function_wrapper")
|
||||
if old_wrapper is not None and not callable(old_wrapper):
|
||||
raise ValueError("Existing model_function_wrapper is not callable.")
|
||||
wrapper = ContextualDiffusionModelWrapper(
|
||||
@@ -182,9 +229,13 @@ def clone_model_with_contextual_diffusion(
|
||||
diffusion_mode=diffusion_mode,
|
||||
existing_wrapper=cast(ModelFunctionWrapper | None, old_wrapper),
|
||||
)
|
||||
mutations: list[ModelMutation] = []
|
||||
if differential_diffusion and not has_denoise_mask_function(model):
|
||||
mutations.append(differential_diffusion_mutation())
|
||||
mutations.append(ModelUnetWrapperMutation(wrapper))
|
||||
return PATCHER_LIFECYCLE.derive_model(
|
||||
model,
|
||||
(ModelUnetWrapperMutation(wrapper),),
|
||||
mutations,
|
||||
operation="SimpleSyrup contextual diffusion",
|
||||
)
|
||||
|
||||
|
||||
@@ -49,6 +49,7 @@ class ContextualDiffusionModelWrapper:
|
||||
self._tile_predictions = TilePredictionAccumulator(
|
||||
plan.tile_plan,
|
||||
diffusion_mode=diffusion_mode,
|
||||
project_canvas_reference_latents=True,
|
||||
)
|
||||
|
||||
@property
|
||||
@@ -110,6 +111,7 @@ class ContextualDiffusionModelWrapper:
|
||||
global_args = make_spatial_view_model_args(
|
||||
args=args,
|
||||
layout=global_layout,
|
||||
project_canvas_reference_latents=True,
|
||||
)
|
||||
global_prediction = self._call_original(apply_model, global_args)
|
||||
global_view = self._plan.global_view
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Convert and align image assets used by detail sampling previews."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import numpy as np
|
||||
import torch
|
||||
from PIL import Image
|
||||
|
||||
from ..domain.segs import CropRegion
|
||||
|
||||
CropBox = tuple[int, int, int, int]
|
||||
|
||||
|
||||
def image_tensor_to_rgb_pil(image: torch.Tensor) -> Image.Image:
|
||||
"""Convert a single-image BHWC tensor to an RGB PIL image."""
|
||||
|
||||
if image.ndim != 4:
|
||||
raise ValueError("detail preview image must be a BHWC tensor.")
|
||||
if int(image.shape[0]) != 1:
|
||||
raise ValueError("detail preview image must contain exactly one image.")
|
||||
if int(image.shape[-1]) < 1:
|
||||
raise ValueError("detail preview image must contain at least one channel.")
|
||||
array = image[0].detach().cpu().float().clamp(0.0, 1.0).numpy()
|
||||
if array.shape[-1] == 1:
|
||||
array = np.repeat(array, 3, axis=-1)
|
||||
elif array.shape[-1] >= 3:
|
||||
array = array[..., :3]
|
||||
else:
|
||||
array = np.repeat(array[..., :1], 3, axis=-1)
|
||||
return Image.fromarray((array * 255.0).round().astype(np.uint8))
|
||||
|
||||
|
||||
def normalize_mask_tensor(mask: torch.Tensor) -> torch.Tensor:
|
||||
"""Normalize an HW or single-item BHW mask tensor to HW float."""
|
||||
|
||||
working = mask.detach().float()
|
||||
if working.ndim == 3 and int(working.shape[0]) == 1:
|
||||
working = working[0]
|
||||
if working.ndim != 2:
|
||||
raise ValueError("detail preview work mask must be an HW tensor.")
|
||||
return working
|
||||
|
||||
|
||||
def detail_alpha_mask(
|
||||
mask: torch.Tensor,
|
||||
*,
|
||||
source_size: tuple[int, int],
|
||||
preview_size: tuple[int, int],
|
||||
sampled_box: CropBox,
|
||||
target_size: tuple[int, int],
|
||||
) -> Image.Image:
|
||||
"""Return an alpha mask aligned to the sampled preview paste box."""
|
||||
|
||||
working = normalize_mask_tensor(mask).detach().cpu().clamp(0.0, 1.0)
|
||||
mask_image = Image.fromarray((working.numpy() * 255.0).round().astype(np.uint8))
|
||||
if mask_image.size == source_size:
|
||||
preview_mask = mask_image.resize(preview_size, Image.Resampling.BILINEAR)
|
||||
return preview_mask.crop(sampled_box).resize(
|
||||
target_size,
|
||||
Image.Resampling.BILINEAR,
|
||||
)
|
||||
return mask_image.resize(target_size, Image.Resampling.BILINEAR)
|
||||
|
||||
|
||||
def validate_crop_region(
|
||||
crop_region: CropRegion,
|
||||
source_width: int,
|
||||
source_height: int,
|
||||
) -> None:
|
||||
"""Reject crop regions that cannot be mapped into the source image."""
|
||||
|
||||
if crop_region.left < 0 or crop_region.top < 0:
|
||||
raise ValueError("crop_region left and top must be non-negative.")
|
||||
if crop_region.right <= crop_region.left or crop_region.bottom <= crop_region.top:
|
||||
raise ValueError("crop_region right/bottom must be greater than left/top.")
|
||||
if crop_region.right > source_width or crop_region.bottom > source_height:
|
||||
raise ValueError("crop_region must fit within the source image.")
|
||||
@@ -15,6 +15,12 @@ import torch
|
||||
from PIL import Image, ImageDraw
|
||||
|
||||
from ..domain.segs import CropRegion
|
||||
from .detail_preview_images import (
|
||||
detail_alpha_mask,
|
||||
image_tensor_to_rgb_pil,
|
||||
normalize_mask_tensor,
|
||||
validate_crop_region,
|
||||
)
|
||||
|
||||
DETAIL_PREVIEW_WASH_OPACITY = 0.55
|
||||
DETAIL_PREVIEW_OUTLINE_RGB = (255, 0, 0)
|
||||
@@ -126,7 +132,7 @@ class DetailPreviewCompositor:
|
||||
) -> DetailPreviewCompositor:
|
||||
"""Create a compositor with detailer background work precomputed."""
|
||||
|
||||
source_image = _image_tensor_to_rgb_pil(context.image)
|
||||
source_image = image_tensor_to_rgb_pil(context.image)
|
||||
sampled_region = context.sampled_region or context.work_region
|
||||
geometry = build_detail_preview_geometry(
|
||||
source_width=source_image.width,
|
||||
@@ -147,7 +153,7 @@ class DetailPreviewCompositor:
|
||||
)
|
||||
left, top, right, bottom = geometry.crop_box
|
||||
crop_size = (max(1, right - left), max(1, bottom - top))
|
||||
detail_alpha_mask = _detail_alpha_mask(
|
||||
detail_alpha = detail_alpha_mask(
|
||||
context.work_mask,
|
||||
source_size=(source_image.width, source_image.height),
|
||||
preview_size=geometry.preview_size,
|
||||
@@ -157,7 +163,7 @@ class DetailPreviewCompositor:
|
||||
return cls(
|
||||
geometry=geometry,
|
||||
washed_background=washed_background,
|
||||
detail_alpha_mask=detail_alpha_mask,
|
||||
detail_alpha_mask=detail_alpha,
|
||||
)
|
||||
|
||||
def compose(self, crop_preview: Image.Image) -> Image.Image:
|
||||
@@ -211,9 +217,9 @@ def build_detail_preview_geometry(
|
||||
source_height,
|
||||
max_preview_resolution,
|
||||
)
|
||||
_validate_crop_region(crop_region, source_width, source_height)
|
||||
validate_crop_region(crop_region, source_width, source_height)
|
||||
resolved_outline_region = outline_region or crop_region
|
||||
_validate_crop_region(resolved_outline_region, source_width, source_height)
|
||||
validate_crop_region(resolved_outline_region, source_width, source_height)
|
||||
|
||||
preview_width, preview_height = preview_size
|
||||
scale_x = float(preview_width) / float(source_width)
|
||||
@@ -238,7 +244,7 @@ def build_detail_preview_geometry(
|
||||
def work_region_from_mask(mask: torch.Tensor) -> CropRegion:
|
||||
"""Return the tight work region around a non-empty HW or single-item BHW mask."""
|
||||
|
||||
working = _normalize_mask_tensor(mask)
|
||||
working = normalize_mask_tensor(mask)
|
||||
coordinates = torch.nonzero(working > 0, as_tuple=False)
|
||||
if coordinates.numel() == 0:
|
||||
raise ValueError("detail preview work mask must contain at least one pixel.")
|
||||
@@ -367,83 +373,6 @@ def _source_outline_box(
|
||||
)
|
||||
|
||||
|
||||
def _image_tensor_to_rgb_pil(image: torch.Tensor) -> Image.Image:
|
||||
"""Convert a single-image BHWC tensor to an RGB PIL image."""
|
||||
|
||||
import numpy as np
|
||||
|
||||
if image.ndim != 4:
|
||||
raise ValueError("detail preview image must be a BHWC tensor.")
|
||||
if int(image.shape[0]) != 1:
|
||||
raise ValueError("detail preview image must contain exactly one image.")
|
||||
if int(image.shape[-1]) < 1:
|
||||
raise ValueError("detail preview image must contain at least one channel.")
|
||||
|
||||
array = image[0].detach().cpu().float().clamp(0.0, 1.0).numpy()
|
||||
if array.shape[-1] == 1:
|
||||
array = np.repeat(array, 3, axis=-1)
|
||||
elif array.shape[-1] >= 3:
|
||||
array = array[..., :3]
|
||||
else:
|
||||
array = np.repeat(array[..., :1], 3, axis=-1)
|
||||
return Image.fromarray((array * 255.0).round().astype(np.uint8))
|
||||
|
||||
|
||||
def _mask_tensor_to_l_pil(mask: torch.Tensor) -> Image.Image:
|
||||
"""Convert an HW or single-item BHW mask tensor to a grayscale alpha image."""
|
||||
|
||||
import numpy as np
|
||||
|
||||
working = _normalize_mask_tensor(mask).detach().cpu().clamp(0.0, 1.0)
|
||||
return Image.fromarray((working.numpy() * 255.0).round().astype(np.uint8))
|
||||
|
||||
|
||||
def _normalize_mask_tensor(mask: torch.Tensor) -> torch.Tensor:
|
||||
"""Normalize an HW or single-item BHW mask tensor to HW float."""
|
||||
|
||||
working = mask.detach().float()
|
||||
if working.ndim == 3 and int(working.shape[0]) == 1:
|
||||
working = working[0]
|
||||
if working.ndim != 2:
|
||||
raise ValueError("detail preview work mask must be an HW tensor.")
|
||||
return working
|
||||
|
||||
|
||||
def _detail_alpha_mask(
|
||||
mask: torch.Tensor,
|
||||
*,
|
||||
source_size: tuple[int, int],
|
||||
preview_size: tuple[int, int],
|
||||
sampled_box: CropBox,
|
||||
target_size: tuple[int, int],
|
||||
) -> Image.Image:
|
||||
"""Return an alpha mask aligned to the sampled preview paste box."""
|
||||
|
||||
mask_image = _mask_tensor_to_l_pil(mask)
|
||||
if mask_image.size == source_size:
|
||||
preview_mask = mask_image.resize(preview_size, Image.Resampling.BILINEAR)
|
||||
return preview_mask.crop(sampled_box).resize(
|
||||
target_size,
|
||||
Image.Resampling.BILINEAR,
|
||||
)
|
||||
return mask_image.resize(target_size, Image.Resampling.BILINEAR)
|
||||
|
||||
|
||||
def _validate_crop_region(
|
||||
crop_region: CropRegion,
|
||||
source_width: int,
|
||||
source_height: int,
|
||||
) -> None:
|
||||
"""Reject crop regions that cannot be mapped into the source image."""
|
||||
|
||||
if crop_region.left < 0 or crop_region.top < 0:
|
||||
raise ValueError("crop_region left and top must be non-negative.")
|
||||
if crop_region.right <= crop_region.left or crop_region.bottom <= crop_region.top:
|
||||
raise ValueError("crop_region right/bottom must be greater than left/top.")
|
||||
if crop_region.right > source_width or crop_region.bottom > source_height:
|
||||
raise ValueError("crop_region must fit within the source image.")
|
||||
|
||||
|
||||
def _validate_positive_int(name: str, value: int) -> None:
|
||||
"""Reject non-positive integer values."""
|
||||
|
||||
|
||||
@@ -11,9 +11,10 @@ from typing import Any, TypeAlias, cast
|
||||
|
||||
import torch
|
||||
|
||||
from . import sampling_samplers, sampling_schedulers
|
||||
from . import sampling_noise, sampling_samplers, sampling_schedulers
|
||||
from .detail_previews import DetailPreviewContext, prepare_detail_preview_callback
|
||||
from .differential_diffusion import clone_with_differential_diffusion
|
||||
from .guided_sampling import sample_with_optional_negative
|
||||
|
||||
Latent: TypeAlias = dict[str, Any]
|
||||
|
||||
@@ -80,21 +81,29 @@ class DetailSampler:
|
||||
batch_inds = (
|
||||
latent_image["batch_index"] if "batch_index" in latent_image else None
|
||||
)
|
||||
noise = comfy_sample.prepare_noise(latent_samples, seed, batch_inds)
|
||||
noise = sampling_noise.prepare_sampling_noise(
|
||||
comfy_sample=comfy_sample,
|
||||
sampler_name=sampler_name,
|
||||
samples=latent_samples,
|
||||
seed=seed,
|
||||
batch_indices=batch_inds,
|
||||
model=model,
|
||||
)
|
||||
noise_mask = latent_image.get("noise_mask", None)
|
||||
if preview_context is None:
|
||||
callback = _latent_preview().prepare_callback(model, steps)
|
||||
else:
|
||||
callback = prepare_detail_preview_callback(model, steps, preview_context)
|
||||
samples = comfy_sample.sample_custom(
|
||||
model,
|
||||
noise,
|
||||
cfg,
|
||||
sampler,
|
||||
sigmas,
|
||||
positive,
|
||||
negative,
|
||||
latent_samples,
|
||||
samples = sample_with_optional_negative(
|
||||
comfy_sample=comfy_sample,
|
||||
model=model,
|
||||
noise=noise,
|
||||
cfg=cfg,
|
||||
sampler=sampler,
|
||||
sigmas=sigmas,
|
||||
positive=positive,
|
||||
negative=negative,
|
||||
latent_image=latent_samples,
|
||||
noise_mask=noise_mask,
|
||||
callback=callback,
|
||||
disable_pbar=not comfy_utils.PROGRESS_BAR_ENABLED,
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Inspect tensor-derived metadata exposed by loaded ComfyUI diffusion models."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from collections.abc import Mapping
|
||||
from dataclasses import dataclass
|
||||
from typing import Protocol, runtime_checkable
|
||||
|
||||
from ..shared.logging import get_logger
|
||||
|
||||
LOGGER = get_logger(__name__)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class DiffusionModelMetadata:
|
||||
"""Describe architecture fields relevant to component selection."""
|
||||
|
||||
image_model: str | None
|
||||
context_input_dimension: int | None
|
||||
|
||||
|
||||
@runtime_checkable
|
||||
class ModelPatcherBoundary(Protocol):
|
||||
"""Expose the loaded model objects required for architecture inspection."""
|
||||
|
||||
def get_model_object(self, name: str) -> object:
|
||||
"""Return a named object owned by ComfyUI's model patcher."""
|
||||
|
||||
|
||||
class DiffusionModelMetadataInspector:
|
||||
"""Read normalized architecture metadata from a loaded model patcher."""
|
||||
|
||||
def inspect(self, model: object) -> DiffusionModelMetadata | None:
|
||||
"""Return narrowed model metadata or None when it is unavailable."""
|
||||
|
||||
if not isinstance(model, ModelPatcherBoundary):
|
||||
return None
|
||||
try:
|
||||
model_config = model.get_model_object("model_config")
|
||||
except (AttributeError, KeyError, TypeError, ValueError):
|
||||
LOGGER.warning(
|
||||
"loaded model does not expose inspectable model configuration"
|
||||
)
|
||||
return None
|
||||
|
||||
unet_config = getattr(model_config, "unet_config", None)
|
||||
if not isinstance(unet_config, Mapping):
|
||||
return None
|
||||
image_model_value = unet_config.get("image_model")
|
||||
context_dimension_value = unet_config.get("context_in_dim")
|
||||
return DiffusionModelMetadata(
|
||||
image_model=(
|
||||
image_model_value if isinstance(image_model_value, str) else None
|
||||
),
|
||||
context_input_dimension=(
|
||||
context_dimension_value
|
||||
if isinstance(context_dimension_value, int)
|
||||
and not isinstance(context_dimension_value, bool)
|
||||
else None
|
||||
),
|
||||
)
|
||||
@@ -13,7 +13,7 @@ import torch
|
||||
from PIL import Image
|
||||
|
||||
from ..domain.segs import Segment
|
||||
from ..masking.segs_mask_ops import crop_image, crop_mask, resize_mask
|
||||
from ..domain.segs_mask_ops import crop_image, crop_mask, resize_mask
|
||||
from ..shared.tensor_validation import validate_image_tensor
|
||||
|
||||
SEG_IMAGE_MODES = ("transparent mask", "black mask", "full crop")
|
||||
|
||||
@@ -21,6 +21,7 @@ FLUX_CLIP_L = AutoModelArtifact(
|
||||
source_repo="comfyanonymous/flux_text_encoders",
|
||||
description="FLUX CLIP-L text encoder",
|
||||
sha256="660c6f5b1abae9dc498ac2d21e1347d2abdb0cf6c0c0c8576cd796491d9a6cdd",
|
||||
file_size_bytes=246_144_152,
|
||||
)
|
||||
|
||||
FLUX_T5_XXL = AutoModelArtifact(
|
||||
@@ -35,6 +36,7 @@ FLUX_T5_XXL = AutoModelArtifact(
|
||||
source_repo="comfyanonymous/flux_text_encoders",
|
||||
description="FLUX T5-XXL FP16 text encoder",
|
||||
sha256="6e480b09fae049a72d2a8c5fbccb8d3e92febeb233bbe9dfe7256958a9167635",
|
||||
file_size_bytes=9_787_841_024,
|
||||
)
|
||||
|
||||
FLUX_VAE = AutoModelArtifact(
|
||||
@@ -50,6 +52,7 @@ FLUX_VAE = AutoModelArtifact(
|
||||
source_repo="Comfy-Org/Lumina_Image_2.0_Repackaged",
|
||||
description="FLUX autoencoder VAE",
|
||||
sha256="afc8e28272cd15db3919bacdb6918ce9c1ed22e96cb12c4d5ed0fba823529e38",
|
||||
file_size_bytes=335_304_388,
|
||||
)
|
||||
|
||||
FLUX2_DEV_TEXT_ENCODER = AutoModelArtifact(
|
||||
@@ -65,6 +68,7 @@ FLUX2_DEV_TEXT_ENCODER = AutoModelArtifact(
|
||||
source_repo="Comfy-Org/flux2-dev",
|
||||
description="FLUX.2 dev Mistral 3 Small text encoder",
|
||||
sha256="7d79902f60b1aeb3a6de2cfad02f4367b5e300a1387de3d03ac717cfa3df117c",
|
||||
file_size_bytes=35_584_897_447,
|
||||
)
|
||||
|
||||
FLUX2_KLEIN_4B_TEXT_ENCODER = AutoModelArtifact(
|
||||
@@ -80,6 +84,7 @@ FLUX2_KLEIN_4B_TEXT_ENCODER = AutoModelArtifact(
|
||||
source_repo="Comfy-Org/vae-text-encorder-for-flux-klein-4b",
|
||||
description="FLUX.2 Klein 4B Qwen3 text encoder",
|
||||
sha256="6c671498573ac2f7a5501502ccce8d2b08ea6ca2f661c458e708f36b36edfc5a",
|
||||
file_size_bytes=8_044_982_048,
|
||||
)
|
||||
|
||||
FLUX2_KLEIN_9B_TEXT_ENCODER = AutoModelArtifact(
|
||||
@@ -95,6 +100,7 @@ FLUX2_KLEIN_9B_TEXT_ENCODER = AutoModelArtifact(
|
||||
source_repo="Comfy-Org/vae-text-encorder-for-flux-klein-9b",
|
||||
description="FLUX.2 Klein 9B Qwen3 8B FP8-mixed text encoder",
|
||||
sha256="abad16806e0cbabc54e0325d6565847443fe396d5f0be38bb3cd3fe75a1201d6",
|
||||
file_size_bytes=8_664_848_742,
|
||||
)
|
||||
|
||||
FLUX2_VAE = AutoModelArtifact(
|
||||
@@ -110,6 +116,7 @@ FLUX2_VAE = AutoModelArtifact(
|
||||
source_repo="Comfy-Org/flux2-dev",
|
||||
description="FLUX.2 VAE",
|
||||
sha256="d64f3a68e1cc4f9f4e29b6e0da38a0204fe9a49f2d4053f0ec1fa1ca02f9c4b5",
|
||||
file_size_bytes=336_213_556,
|
||||
)
|
||||
|
||||
FLUX2_TEXT_ENCODERS: dict[Flux2TextEncoderProfile, AutoModelArtifact] = {
|
||||
|
||||
@@ -6,49 +6,42 @@
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from collections.abc import Mapping
|
||||
from typing import Protocol, runtime_checkable
|
||||
from typing import Protocol
|
||||
|
||||
from ..domain.flux_profiles import FluxModelProfile, classify_flux_profile
|
||||
from ..shared.logging import get_logger
|
||||
|
||||
LOGGER = get_logger(__name__)
|
||||
|
||||
|
||||
@runtime_checkable
|
||||
class ModelPatcherBoundary(Protocol):
|
||||
"""Expose the loaded model objects required for architecture inspection."""
|
||||
|
||||
def get_model_object(self, name: str) -> object:
|
||||
"""Return a named object owned by ComfyUI's model patcher."""
|
||||
from .diffusion_model_metadata import (
|
||||
DiffusionModelMetadata,
|
||||
DiffusionModelMetadataInspector,
|
||||
)
|
||||
|
||||
|
||||
class FluxModelInspector:
|
||||
"""Read ComfyUI's tensor-derived model configuration after model loading."""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
metadata_inspector: DiffusionModelMetadataInspectorBoundary | None = None,
|
||||
) -> None:
|
||||
"""Create a FLUX classifier over shared metadata inspection."""
|
||||
|
||||
self._metadata_inspector = (
|
||||
metadata_inspector or DiffusionModelMetadataInspector()
|
||||
)
|
||||
|
||||
def inspect(self, model: object) -> FluxModelProfile | None:
|
||||
"""Return a detected FLUX profile or None for unavailable metadata."""
|
||||
|
||||
if not isinstance(model, ModelPatcherBoundary):
|
||||
metadata = self._metadata_inspector.inspect(model)
|
||||
if metadata is None:
|
||||
return None
|
||||
try:
|
||||
model_config = model.get_model_object("model_config")
|
||||
except (AttributeError, KeyError, TypeError, ValueError):
|
||||
LOGGER.warning(
|
||||
"loaded model does not expose inspectable model configuration"
|
||||
)
|
||||
return None
|
||||
|
||||
unet_config = getattr(model_config, "unet_config", None)
|
||||
if not isinstance(unet_config, Mapping):
|
||||
return None
|
||||
image_model_value = unet_config.get("image_model")
|
||||
context_dimension_value = unet_config.get("context_in_dim")
|
||||
image_model = image_model_value if isinstance(image_model_value, str) else None
|
||||
context_dimension = (
|
||||
context_dimension_value
|
||||
if isinstance(context_dimension_value, int)
|
||||
and not isinstance(context_dimension_value, bool)
|
||||
else None
|
||||
return classify_flux_profile(
|
||||
metadata.image_model,
|
||||
metadata.context_input_dimension,
|
||||
)
|
||||
return classify_flux_profile(image_model, context_dimension)
|
||||
|
||||
|
||||
class DiffusionModelMetadataInspectorBoundary(Protocol):
|
||||
"""Expose normalized loaded diffusion-model metadata."""
|
||||
|
||||
def inspect(self, model: object) -> DiffusionModelMetadata | None:
|
||||
"""Return normalized metadata when available."""
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
# SimpleSyrup - workflow-focused ComfyUI extensions for image generation
|
||||
# Copyright (C) 2026 Artificial Sweetener and contributors
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
"""Compose global-first conditioning hooks for conventional regional sampling."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any, TypeAlias
|
||||
|
||||
from comfy.hooks import HookGroup
|
||||
|
||||
from .regional_lora_conditioning_sources import conditioning_hook_groups
|
||||
|
||||
Conditioning: TypeAlias = list[list[Any]]
|
||||
|
||||
|
||||
class GlobalFirstConditioningHookComposer:
|
||||
"""Apply one global HookGroup to every regional conditioning model state."""
|
||||
|
||||
def global_hooks(
|
||||
self,
|
||||
conditioning: Conditioning,
|
||||
*,
|
||||
source_label: str,
|
||||
) -> HookGroup | None:
|
||||
"""Return the single uniform HookGroup carried by global conditioning."""
|
||||
|
||||
groups = conditioning_hook_groups(conditioning)
|
||||
if not groups:
|
||||
return None
|
||||
authority = groups[0]
|
||||
if any(group is not authority for group in groups[1:]):
|
||||
raise ValueError(
|
||||
f"{source_label} uses different HookGroups across conditioning "
|
||||
"entries. Keep one shared Prompt Control hook schedule on the "
|
||||
"global segment."
|
||||
)
|
||||
return authority
|
||||
|
||||
def compose(
|
||||
self,
|
||||
conditioning: Conditioning,
|
||||
global_hooks: HookGroup | None,
|
||||
*,
|
||||
source_label: str,
|
||||
cache: dict[tuple[HookGroup, HookGroup], HookGroup],
|
||||
) -> Conditioning:
|
||||
"""Prepend global hooks to every local HookGroup without mutating inputs."""
|
||||
|
||||
if global_hooks is None:
|
||||
return [[item[0], dict(item[1])] for item in conditioning]
|
||||
composed: Conditioning = []
|
||||
for item_index, item in enumerate(conditioning):
|
||||
metadata = dict(item[1])
|
||||
local_hooks = metadata.get("hooks")
|
||||
if local_hooks is None:
|
||||
metadata["hooks"] = global_hooks
|
||||
elif not isinstance(local_hooks, HookGroup):
|
||||
raise TypeError(
|
||||
f"{source_label} item {item_index} hooks must be a Comfy HookGroup."
|
||||
)
|
||||
else:
|
||||
key = (global_hooks, local_hooks)
|
||||
combined = cache.get(key)
|
||||
if combined is None:
|
||||
combined = global_hooks.clone_and_combine(local_hooks)
|
||||
cache[key] = combined
|
||||
metadata["hooks"] = combined
|
||||
composed.append([item[0], metadata])
|
||||
return composed
|
||||
|
||||
|
||||
GLOBAL_FIRST_CONDITIONING_HOOK_COMPOSER = GlobalFirstConditioningHookComposer()
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user