Commit Graph

24 Commits

Author SHA1 Message Date
Z User
68d30bd69a feat: add a tiling on/off switch to Moxie MultiTrack Project Slow
Tiling stops being a baked setting and becomes a widget: the new Boolean
tiling switch next to upscale_model (default on) turns the memory-adaptive
spatial tiles of the 2-step refine pass off, so the pass can be sampled in
one piece on machines that prefer the pre-tiling behaviour.

- OFF injects {enabled_tiling: "false", tile_count: 0}; the engine then
  builds the plain SamplerCustomAdvanced second pass instead of the tiled
  preview sampler
- ON keeps tile_count 0 (automatic): the engine picks the tile count from
  the available accelerator memory and skips tiling when the full
  evaluation fits, keeping 1920x1080 within reach of 12 GB and AMD/Intel
  GPUs
- workflows saved before the switch existed keep tiling on
- tests: schema slot order + defaults, switch ON/OFF passthrough, legacy
  fallback; docs: CHANGELOG + multitrack-schema reference
2026-10-15 00:43:30 +00:00
Z User
ce03875c69 feat: enable automatic spatial tiling on Moxie MultiTrack Project Slow
Bake enabled_tiling with tile_count 0 (automatic) into the Slow node's
second pass: the engine picks the tile count from the available
accelerator memory and bypasses tiling entirely when the full evaluation
fits. This brings 1920x1080 output within reach of 12 GB cards and
AMD/Intel GPUs - the tiling machinery only uses device-agnostic ComfyUI
memory helpers.

- _h3_tiling_config now accepts tile_count 0 (automatic) alongside 2-8
- easy h3SamplingPreviewSampler schema allows tile_count min 0
- tests: tiling config parsing, baked Slow passthrough, second-pass
  graph receives tile_count 0, sampler schema range
- docs: CHANGELOG + multitrack-schema reference
2026-10-14 23:37:47 +00:00
Z User
43d5bf9a1e feat: expose the latent upscaler as an upscale_model widget on Moxie MultiTrack Project Slow
The Slow node previously baked the upscaler checkpoint filename
(minimax_h3_latent_upscaler_3d_fp16.safetensors) into its settings with
no place on the node to choose it. The checkpoint is now a proper
upscale_model combo widget placed with the model components (after
audio_vae):

- options are None plus every file under ComfyUI/models/latent_upscale_models/
  (the bundled default is always kept selectable so the combo default is
  valid even before the checkpoint is downloaded)
- picking None (or an empty string, e.g. from a converted primitive
  socket) raises a clear error instead of silently falling back to the
  decode/RTX-resize/re-encode path this node exists to avoid
- workflows saved before the widget existed fall back to the bundled
  checkpoint, so they run unchanged
- engine untouched: the value flows through the existing
  kwargs.get('upscale_model') read; baked settings simply stop
  overriding it (base BAKED_PROJECT_SETTINGS copy pops the key)
- MoxieProject gains a _component_inputs() schema hook so subclasses can
  slot inputs in with the model components; base node schema unchanged
- tests: schema spot/ordering, folder listing without duplicates, widget
  passthrough, pre-widget fallback to the bundled checkpoint, None/empty
  rejection; CHANGELOG + multitrack-schema.md updated
2026-10-14 22:37:59 +00:00
Z User
5a3b03ef61 feat: add Moxie MultiTrack Project Slow with latent-upscale refine pass
New project node variant (MoxieProjectSlow, display name 'Moxie
MultiTrack Project Slow') that replaces the RTX VSR pixel restore with
a latent upscaler plus a short refine pass:

- identical UX to MoxieProject: end users only set steps and seed (plus
  the shared context_frames overlap); schema mirrors the base node via
  a shared _project_inputs() helper
- first pass stays at the hidden half resolution (engine gains a
  _h3_first_pass_resolution_scale class hook, overriding the previous
  sampling_mode == 'single' hardcode; MoxieProjectSlow returns 0.5
  under dual mode)
- the half-res latent is upscaled to the final (editor) size by the H3
  latent upscaler (minimax_h3_latent_upscaler_3d_fp16.safetensors,
  models/latent_upscale_models) and refined with a hidden 2-step euler
  pass at 0.33 denoise; the schedule replicates KSampler.set_steps
  (int(steps/denoise) total steps, last steps+1 sigmas) without relying
  on the denoise kwarg that newer comfy.samplers builds dropped
- baked settings: sampling_mode dual, upscale_by 1.0 (final size IS the
  editor size), upscale_model as above; the engine's upscale-skip
  condition now compares actual first-pass vs target dimensions instead
  of upscale_by <= 1, which is behavior-identical for every existing
  configuration
- segments are saved at the project resolution, so the Video Combine
  restore passes through untouched - no RTX VSR anywhere
- MoxieProject refactor: component check and baked settings moved into
  reusable helpers (_require_moxie_components, _baked_project_settings
  classmethod) so the subclass composes cleanly; messages unchanged
- tests: Slow schema mirror, execute passthrough (sigma schedule math,
  baked settings, context_frames forwarding, first-pass schedule), the
  resolution-scale hook, and the denoise truncation helper
- docs: CHANGELOG entry, multitrack-schema.md note
2026-10-14 22:14:07 +00:00
Z User
0a9416b91a feat: expose context_frames on Moxie MultiTrack Project
MoxieProject subclasses EasyMultiTrackProject and runs the same
continuation engine, but its consolidated schema hid the new
context_frames widget added to the parent node in 724da63 - so the
overlap stayed locked at 22 for the node end users actually see.

- add the same context_frames combo (5/22/39/56, default 22) between
  steps and seed on Moxie MultiTrack Project; execute() already
  forwards kwargs through to the base engine untouched
- baked euler/beta sampling stack unchanged: sampling_plan stays
  'custom', sampling_mode stays 'single'
- tests: MoxieProject schema order/options, execute passthrough proof
  (widget reaches the base engine, baked settings never clobber it),
  and the moxie_nodes schema assert updated for the new widget; test
  harness gains a comfy.samplers stub and ControlAfterGenerate.randomize
- docs: multitrack-schema.md notes the widget on MoxieProject;
  CHANGELOG updated

Default 22 keeps every existing MoxieProject workflow identical.
2026-10-14 05:12:39 +00:00
Z User
724da63f7f feat: expose context_frames on the MultiTrack Project node
The number of frames copied from the previous segment as continuation
context (Context / Context Swap continuity) was hardcoded at 22. The
H3 context sampler nodes already accept 5 / 22 / 39 / 56, so the
project node now exposes the same choices as a context_frames combo:

- resolve the widget once in execute() and thread it through every
  continuation site: the ContextSwap / MotionContextHard / HiResContinuity
  graph nodes, the audio-lock prepend, the runtime latent trims, the
  passthrough context encode, and the hires/low context re-encodes
- the context continuation now generates context_frames + 12 grid-tail
  frames (was a hardcoded 34) so every supported value stays on the
  H3 temporal grid; off-grid values raise a clear error up front
- tests: widget propagation at 5 frames end-to-end in the built graph,
  off-grid rejection, schema order/options; existing 22-frame asserts
  unchanged
- docs: multitrack-schema.md documents the widget; CHANGELOG entry

Default 22 keeps every existing workflow byte-identical.
2026-10-13 16:45:41 +00:00
Z User
88849ced65 refactor: remove the LoRA pipeline; distill weights ship baked into the model
The 3-step distill (speedup) LoRA is now baked into the diffusion model
itself, so the Moxie Multimedia Loader no longer applies any LoRA:

- moxie_loader.py: drop the models/loras scan, _auto_lora(), the module
  level LoRA cache and _apply_lora(); the load chain is now
  diffusion model -> attention backend -> CLIP -> VAEs. A leftover file
  in models/loras is silently ignored and the folder can be deleted.
- moxie_project.py / moxie_preview.py: tooltips reference the baked-in
  distill instead of the LoRA.
- tests + standalone loader script: assert no load_lora_for_models call
  happens (the comfy.sd stub now raises if the loader tries), and fix
  the pre-existing MMnode.tiny_vae stub gap (missing pack_vae_approx_files)
  that broke the whole test module at fixture setup.
- README: models table drops the Turbo LoRA row; CHANGELOG entry added.

Node schema, outputs and sampling behavior are unchanged; workflows
saved before this change keep working.
2026-10-13 03:34:47 +00:00
Z User
d26e3297a6 fix: find FFmpeg in more Windows locations and explain compose failures
Windows PATH edits only reach processes started afterwards, so a freshly
installed FFmpeg stays invisible to a running ComfyUI, and portable users
often drop ffmpeg.exe next to the run bat without any PATH entry at all.

get_ffmpeg_path now probes, after which() fails: the classic C:\ffmpeg\bin
and %LOCALAPPDATA% locations, winget Links / scoop shims / chocolatey bin,
the ComfyUI base folder and portable root (root, bin/, ffmpeg/bin/), and
finally the ffmpeg binary bundled with ComfyUI's own imageio-ffmpeg
dependency (ffmpeg only - imageio-ffmpeg bundles no ffprobe).

The H3 compose failure message now also points at concrete remedies
instead of only listing search locations.

Verified with scripts/test_merge_failure_reason.py: 19/19 stubbed checks
(portable-layout resolution, imageio-ffmpeg last resort, ffprobe exclusion,
and every compose failure reason).
2026-09-29 06:41:26 +00:00
Z User
bc534da34f docs: record the editor loader protocol-relative URL hotfix 2026-09-29 04:57:52 +00:00
Z User
0a6a5d6aa9 fix: install nvidia-vfx from NVIDIA's index, never build the PyPI stub
PyPI only hosts a stub sdist for nvidia-vfx whose wheel_stub build
backend aborts the entire 'pip install -r requirements.txt' run
(BackendUnavailable: Cannot import 'wheel_stub.buildapi'). The real
prebuilt wheels (win_amd64 cp310/cp311/cp312-abi3 + manylinux) live on
pypi.nvidia.com. Route nvidia-vfx there with file-level pip options
(--extra-index-url + --only-binary=nvidia-vfx) so pip always picks the
wheel and the stub is never built. Validated in a clean venv: the
wheel installs and provides the nvvfx module rtx_vsr.py imports.
2026-09-29 02:37:56 +00:00
Z User
e7a288de1a feat: make feature dependencies mandatory (RTX 3060+ audience)
The pack targets NVIDIA RTX 3060+ GPUs only, so speech (voxcpm),
subtitle recognition (openai-whisper, qwen-asr) and the RTX VSR
upscale (nvidia-vfx) move from on-demand extras into requirements.txt.
Verified on PyPI: all four resolve, torchcodec ships Windows wheels
for python 3.10-3.14, and the qwen-asr transformers==4.57.6 pin is
compatible with the rest of the set. requirements.txt is ordered
light -> heavy so re-running the install resumes cleanly.
2026-09-28 22:23:54 +00:00
Z User
84b02cf8ac docs: drop download_models.sh, point Models section at the HF repo
The downloader script is removed; all model files live in the Hugging
Face version of the repository, so cloning it is the only step needed.
CHANGELOG also records the new requirements.txt from the previous
commit.
2026-09-28 22:19:29 +00:00
Z User
8ede97ab11 feat: revert editor to pristine upstream, drop format label mapping and T2V==R2V, fix editor delivery
- frontend/src + messages restored byte-identical to upstream v1.3.3:
  format normalization shims, isMoxieEditorFormat gates, bundle marker,
  tooltip reword, and their tests all removed; editor bundle rebuilt from
  that pristine source so the editor behaves exactly like upstream
- format combo shows 'MiniMax' again (options=[MiniMax]); legacy queued
  'Moxie Multimedia' values still normalized to MiniMax at execution
- T2V resolves natively again: t2v stays t2v in h3_task_type,
  _multitrack_task_type and getMultiTrackTaskType; generation-mode t2v
  mapping and the zero-media cloud fallback removed (upstream behavior);
  Python tests and stub scripts updated accordingly
- editor delivery fix: core lets WEB_DIRECTORY overwrite the pack's
  EXTENSION_WEB_DIRS entry, so the /extensions listing never contained
  dist/release and a fresh browser never imported the editor (it only
  ever appeared from stale browser cache). web/js/editor-loader.js now
  imports the editor entry from the pack's own static mount, which
  serves index.js with no-cache (chunks stay cacheable); the
  /extensions/<pack>/index.js route was removed as a 404 trap
- shipped Moxie*.json templates carry format value MiniMax

Verified: frontend diff vs upstream = 0; bundle string checks + chunk
refs; vitest 565/566 (same pre-existing jsdom URL.revokeObjectURL env
failure); py_compile; test_t2v_r2v_and_loader.py ALL PASS;
test_rtx_upscale_integration.py ALL PASS
2026-09-27 21:24:56 +00:00
Z User
0c4987d090 T2V resolves to the same value as R2V; loader shows a single model
- T2V selections (editor default mode, explicit [start-end,t2v] override
  tags, raw t2v values) now resolve to r2v in every task-type resolver
  (h3_task_type, _multitrack_task_type, frontend getMultiTrackTaskType);
  h3_generation_mode maps raw t2v to reference conditioning as belt and
  braces. Reference-mode with zero reference media renders text-only
  locally; the cloud path falls back to its native t2va request instead
  of raising. i2v/l2v/v2v/edit flows unchanged.
- MoxieMultimediaLoader now presents a single model picker: LoRA, video
  VAE, audio VAE, and CLIP widgets removed and auto-selected from the
  pack's models/ folders (first sorted file, loud error when missing,
  LoRA applied at strength 1.0 when bundled). Outputs and load order
  unchanged; saved workflows keep working (extra widget values ignored).

Verified: py_compile; scripts/test_t2v_r2v_and_loader.py 50/50;
frontend vitest 566/567 (one pre-existing env failure on HEAD);
bun run build; scripts/test_rtx_upscale_integration.py all pass.
2026-09-27 05:50:35 +00:00
Z User
5ad3859bf7 feat: slim Moxie Project Video Combine to GetVideoComponents-style outputs
MoxieCombine now exposes exactly images / audio / fps - the leftover
VIDEO and FILENAME_PREFIX outputs are gone, so the output file name is
chosen on easy saveVideo itself. The base easy multitrackProjectVideoCombine
keeps its VIDEO and FILENAME_PREFIX outputs for legacy workflows.

The shipped Moxie-consolidated template is rewired accordingly: fps/images
links follow the new slot indices (2/0), the filename_prefix link is replaced
by the same project-scoped literal the removed output produced, and the
TEMPLATE's save location is unchanged.

pytest: new schema/execute/blocker coverage for MoxieCombine via a
_load_moxie_combine helper; base-combine assertions untouched.
2026-09-27 04:16:02 +00:00
Z User
aded93b411 feat: display Moxie Multimedia on the format combo, keep MiniMax internally; silence the upscale console line
- the format combo on MultiTrack Editor and MultiTrack Project now
  shows 'Moxie Multimedia' (FORMAT_DISPLAY_LABEL); every queued value
  is normalized back to the internal 'MiniMax' value at both execute
  entries and check_lazy_status, so tracks_info, conditioning caches,
  saved manifests and frontend lookups are unchanged
- frontend: normalizeFormatValue() maps the display label back at the
  format-widget read point so MiniMax-specific editor features keep
  working; shipped templates carry the new label
- removed the per-run 'Output upscale' console line; the restore now
  happens silently (one-shot fallback diagnostics kept)

Note: workflows saved before this change need the format re-picked
once, since 'MiniMax' is no longer a combo option.
2026-09-27 03:52:43 +00:00
Z User
22310bef00 fix: compose the project timeline at its native size and restore full resolution before any combine output
The compose step previously built the timeline at the manifest
resolution while staging segments are written at the (hidden) half-res
sampling size, so ffmpeg's overlay pasted the smaller segments into the
top-left quarter of a black full-res canvas and the combine's restore
gate saw frames already at the manifest size and never fired.

- compose_h3_project_video now probes the timeline segments and composes
  at the size they all share (_uniform_probed_size; manifest dims remain
  the fallback for mixed/unknown sizes)
- restore_project_video_resolution (utils/rtx_vsr.py) fast-probes the
  composed file, and when it differs from the manifest decodes once,
  upscales (RTX VSR, Lanczos fallback, exact size) and rebuilds the
  video so VIDEO, images, audio and fps all carry the editor-selected
  resolution; any failure keeps the original video
- the restore lives in the base combine so MoxieCombine (images slot)
  and the legacy GetVideoComponents wiring are both covered; the
  duplicated images gate in MoxieCombine is gone
2026-09-27 02:18:11 +00:00
Z User
563322a3e2 feat: simple hidden half-res sampling, restored at the video combine
Single-pass projects condition and sample at exactly half the
editor-selected resolution (plain integer halving, no dimension
policies). Moxie Project Video Combine restores the exact editor
resolution on the combined frames right before its images output,
driven by the fresh project manifest so a stale frontend widget can
never misgate it.

- utils/rtx_vsr.py: RTX VSR core (Apache 2.0, from
  Comfy-Org/Nvidia_RTX_Nodes_ComfyUI) + Lanczos fallback; the gate is
  simply 'frames differ from the manifest resolution'
- nodes/project.py: halve first-pass dims for single mode only;
  dual-pass, SelfLift, passthrough and audio-only keep the editor size
- moxie_combine.py: restore before the images output
- scripts/test_rtx_upscale_integration.py: 17 standalone checks
2026-09-27 01:18:33 +00:00
Z User
f94ee3e40b Revert "feat: hidden half-res sampling with RTX VSR output restore"
This reverts commit bd26656732.
2026-09-27 01:13:26 +00:00
Z User
bd26656732 feat: hidden half-res sampling with RTX VSR output restore
Single-pass MultiTrack projects now condition and sample at half the
editor-selected resolution; Moxie Project Video Combine restores the
exact editor resolution on the combined frames before export, so the
editor resolution remains what the user sees and gets.

- utils/rtx_vsr.py (new): RTX Video Super Resolution core adapted from
  Comfy-Org/Nvidia_RTX_Nodes_ComfyUI (Apache 2.0) driving the optional
  nvidia-vfx package per frame, with automatic Lanczos fallback and
  exact-size correction; owns the sampling-dimension policy and the
  project_data gating so only half-res signatures are upscaled
- nodes/project.py: gate half-res conditioning/sampling to single-pass
  mode (dual-pass, SelfLift, passthrough, audio-only unchanged)
- moxie_combine.py: restore editor resolution right before the images
  output; VIDEO preview output passthrough unchanged
- scripts/test_rtx_upscale_integration.py: standalone sanity checks
  (no ComfyUI/torch needed) for the dimension policy and gating
2026-09-27 00:27:37 +00:00
Z User
a1c7f6786e feat: default lora_name to the bundled turbo LoRA for clone-and-go installs 2026-09-26 21:14:29 +00:00
Z User
659778c38c feat: Moxie Preview Override reads tiny VAEs from the pack's models/vae_approx 2026-09-26 21:06:27 +00:00
Z User
e2ae630ec2 feat: lock Moxie loader to MiniMax H3 and drop model_loader bundle
The Moxie model set is MiniMax H3-only, so no other model choices are
exposed in the editor:

- Moxie Multimedia Loader: removed the clip_type dropdown (which listed
  every CLIPType recipe in ComfyUI). The H3 Qwen3-VL text encoder is now
  always loaded with CLIPType.MINIMAX; older ComfyUI builds raise a
  clear error instead of silently loading the wrong encoder.
- Moxie Multimedia Loader: outputs are now exactly model, clip,
  video_vae, audio_vae - the legacy FAST_MODEL_LOADER (model_loader)
  bundle output is removed. The model output keeps the attention
  backend and LoRA applied.
- Moxie MultiTrack Project: takes model, clip, video_vae and audio_vae
  as required direct inputs instead of a bundled model_loader; the
  fallback plumbing is removed while EasyMultiTrackProject keeps its
  model_loader input for non-Moxie workflows.
- Moxie Preview Override: dropped the model_loader pass-through slots
  and patches the model input directly.
- Moxie-consolidated.json reference workflow updated to the new slots.
- Added tests/test_moxie_nodes.py covering the schema contracts, the
  attention -> LoRA -> output chain, the MINIMAX lock and the project
  loader synthesis.
2026-09-26 19:06:50 +00:00
4ea8431cd0 init
Some checks are pending
Publish to Comfy registry / Publish Custom Node to registry (push) Waiting to run
2026-09-26 11:11:23 -07:00