Commit Graph

11 Commits

Author SHA1 Message Date
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