Commit Graph

19 Commits

Author SHA1 Message Date
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
fc040c1645 feat: translate all cache/task console logs to English
MultiTrack and H3 conditioning cache logging printed Chinese labels
(ProjectMedia/SegmentMedia statuses, timing and cache-size breakdowns).
Translate every console-facing string to English so the ComfyUI log is
fully English-readable:

- cache status values are now 'cache-hit' / 'first-load' (was Chinese),
  including the _all_media_caches_hit sentinel comparison and the
  _easy_media_cache_status data written into tracks_info
- cache size breakdown now reads 'file(...)=conditioning(...)+...'
  with English category labels
- timing/stage messages, video-track compositing and locked-audio
  extraction messages, and llama.cpp install errors are English
- fullwidth '|' in the media_loading timing line replaced with ASCII
- test assertions updated to the new English strings

No behavioral changes beyond the log/status wording; the Chinese
prompt-reference syntax (@图片N etc.) and LLM prompt templates are
intentionally untouched as they are functional.
2026-09-26 23:27:09 +00:00
Z User
27041a8a9f feat: scrub EasyMedia/MiniMax branding from all user-facing output
Console, errors, tooltips, descriptions and display names no longer
reveal the pack heritage or the underlying model family:

- [EasyMedia]/[Easy Media] console prefixes -> [Moxie] (11 files)
- New console privacy filter (utils/log.py, installed at pack import):
  rewrites MiniMax variants in every displayed logging record, including
  ComfyUI core lines like 'Model MiniMaxH3 prepared for dynamic VRAM
  loading', %-args and matching tracebacks. api.minimaxi.com is protected
  so cloud-API errors stay accurate.
- Node display names rebranded (node_ids untouched, workflows safe):
  'MiniMax H3 To Video' -> 'Moxie To Video', etc.
- ~40 error/tooltip/description strings reworded to Moxie terms.
- CLIP error no longer names CLIPType.MINIMAX; test match updated.

Unchanged on purpose (breaking if touched): node_ids/class names,
combo value 'MiniMax' (workflow payloads), internal dict keys
(minimax_keyframes/minimax_refs), llm_api cloud provider strings,
class-name logic checks, source-only docstrings.
2026-09-26 23:05:24 +00:00
Z User
d3ce6866a4 fix: move LoRA cache off the node class for ComfyUI locked classes
Newer ComfyUI builds lock registered v3 node classes after registration
(comfy_api internal __setattr__ guard), so _apply_lora writing
cls._loaded_lora raised: Cannot modify class attribute '_loaded_lora'
on locked class 'MoxieMultimediaLoaderClone'.

The (path, sd, metadata) cache now lives at module level, which the
locking mechanism does not touch. Test monkeypatch updated to match.
2026-09-26 22:34:21 +00:00
645897130b cleaning 2026-09-26 14:55:42 -07:00
b4090c95f0 tmp ignore models folder 2026-09-26 14:30:16 -07: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
ccf7093ad2 Merge branch 'main' of https://git.client.guacamolebox.net/butterfly/MMnode 2026-09-26 13:56:32 -07:00
02bd603739 cleanup 2026-09-26 13:56:14 -07:00
Z User
403079c4f3 fix: drop accidental executable bit on README.md 2026-09-26 20:54:42 +00:00
Z User
f26981ae4a feat: add download_models.sh to fetch and place the MiniMax H3 model set 2026-09-26 20:50:31 +00:00
Z User
9d1de37c37 chore: make pytest runnable outside ComfyUI (importlib mode + tests on pythonpath)
Some checks failed
Publish to Comfy registry / Publish Custom Node to registry (push) Has been cancelled
2026-09-26 19:26:14 +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
Z User
bec001f6f7 test: skip zh localization tests when locales bundle is absent
The upstream locales/zh/nodeDefs.json is not part of this repository,
so every test reading it failed at runtime. Guard all 16 call sites
with pytest.skip and add a tests/conftest.py that stubs folder_paths
so collection works outside a full ComfyUI installation.
2026-09-26 19:06:41 +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