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.
This commit is contained in:
parent
aded93b411
commit
5ad3859bf7
@ -6,7 +6,8 @@
|
|||||||
|
|
||||||
### ⚡ Improvements
|
### ⚡ Improvements
|
||||||
|
|
||||||
- **MultiTrack Project / Moxie Project Video Combine**: Single-pass projects now condition and sample at half the editor-selected resolution internally. The project timeline is composed at the segments' own size, and Moxie Project Video Combine restores the exact editor-selected resolution in pixel space before any output leaves the node (RTX Video Super Resolution via the optional `nvidia-vfx` package when available, with an automatic Lanczos fallback otherwise) — so both the `VIDEO` output and the `images`/`audio`/`fps` outputs carry the full editor resolution regardless of template wiring. The editor resolution therefore stays the final output resolution while the sampling chain runs smaller and faster. Dual-pass, SelfLift, and passthrough modes are unchanged.
|
- **MultiTrack Project / Moxie Project Video Combine**: Single-pass projects now condition and sample at half the editor-selected resolution internally. The project timeline is composed at the segments' own size, and Moxie Project Video Combine restores the exact editor-selected resolution in pixel space before any output leaves the node (RTX Video Super Resolution via the optional `nvidia-vfx` package when available, with an automatic Lanczos fallback otherwise) — so every output carries the full editor resolution regardless of template wiring. The editor resolution therefore stays the final output resolution while the sampling chain runs smaller and faster. Dual-pass, SelfLift, and passthrough modes are unchanged.
|
||||||
|
- **Moxie Project Video Combine**: Removed the leftover `VIDEO` and `FILENAME_PREFIX` outputs. The node now exposes exactly the components consumed downstream — `images`, `audio`, and `fps`, matching the core `GetVideoComponents` layout — and the output file name is chosen on `easy saveVideo`. The full-featured `easy multitrackProjectVideoCombine` node keeps its `VIDEO` and `FILENAME_PREFIX` outputs. Workflows saved before this change that wired the removed outputs need those links reconnected once; the shipped Moxie-consolidated template is already rewired.
|
||||||
- **MultiTrack Editor / MultiTrack Project**: The `format` combo now displays `Moxie Multimedia` while the internal format value stays `MiniMax`, so saved projects, conditioning caches, and all downstream logic keep working untouched (workflows saved before this change need the format re-picked once after updating). The per-run `Output upscale` console line was removed; the resolution restore now happens silently.
|
- **MultiTrack Editor / MultiTrack Project**: The `format` combo now displays `Moxie Multimedia` while the internal format value stays `MiniMax`, so saved projects, conditioning caches, and all downstream logic keep working untouched (workflows saved before this change need the format re-picked once after updating). The per-run `Output upscale` console line was removed; the resolution restore now happens silently.
|
||||||
- **Moxie Multimedia Loader**: The `lora_name` combo now defaults to the bundled turbo LoRA (`MM3step.safetensors`) so a fresh clone of the pack works out of the box, with a `none` entry to disable LoRA. Previously the default was a `"<no files found>"` placeholder, which silently skipped LoRA application even when a LoRA was bundled.
|
- **Moxie Multimedia Loader**: The `lora_name` combo now defaults to the bundled turbo LoRA (`MM3step.safetensors`) so a fresh clone of the pack works out of the box, with a `none` entry to disable LoRA. Previously the default was a `"<no files found>"` placeholder, which silently skipped LoRA application even when a LoRA was bundled.
|
||||||
- **Moxie Preview Override**: The `tiny_vae` combo now lists files from the node pack's own `models/vae_approx` folder first (shipping `MM-preview.safetensors` for MiniMax H3 previews as the default), falling back to ComfyUI's standard `models/vae_approx` directory. The folder is rescanned on every schema refresh, so newly dropped files appear without restarting ComfyUI.
|
- **Moxie Preview Override**: The `tiny_vae` combo now lists files from the node pack's own `models/vae_approx` folder first (shipping `MM-preview.safetensors` for MiniMax H3 previews as the default), falling back to ComfyUI's standard `models/vae_approx` directory. The folder is rescanned on every schema refresh, so newly dropped files appear without restarting ComfyUI.
|
||||||
|
|||||||
@ -295,18 +295,6 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"outputs": [
|
"outputs": [
|
||||||
{
|
|
||||||
"name": "VIDEO",
|
|
||||||
"type": "VIDEO",
|
|
||||||
"links": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "FILENAME_PREFIX",
|
|
||||||
"type": "STRING",
|
|
||||||
"links": [
|
|
||||||
108
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "images",
|
"name": "images",
|
||||||
"type": "IMAGE",
|
"type": "IMAGE",
|
||||||
@ -367,7 +355,7 @@
|
|||||||
{
|
{
|
||||||
"name": "filename_prefix",
|
"name": "filename_prefix",
|
||||||
"type": "STRING",
|
"type": "STRING",
|
||||||
"link": 108
|
"link": null
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"outputs": [
|
"outputs": [
|
||||||
@ -401,14 +389,14 @@
|
|||||||
24,
|
24,
|
||||||
"save",
|
"save",
|
||||||
false,
|
false,
|
||||||
"ComfyUI"
|
"easy_media/projects/girl1-test/out/girl1-test"
|
||||||
],
|
],
|
||||||
"widgets_values_named": {
|
"widgets_values_named": {
|
||||||
"input_mode": "images+audio",
|
"input_mode": "images+audio",
|
||||||
"input_mode.fps": 24,
|
"input_mode.fps": 24,
|
||||||
"output_mode": "save",
|
"output_mode": "save",
|
||||||
"output_mode.save_metadata": false,
|
"output_mode.save_metadata": false,
|
||||||
"filename_prefix": "ComfyUI"
|
"filename_prefix": "easy_media/projects/girl1-test/out/girl1-test"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@ -472,7 +460,7 @@
|
|||||||
[
|
[
|
||||||
105,
|
105,
|
||||||
103,
|
103,
|
||||||
4,
|
2,
|
||||||
36,
|
36,
|
||||||
0,
|
0,
|
||||||
"FLOAT"
|
"FLOAT"
|
||||||
@ -480,7 +468,7 @@
|
|||||||
[
|
[
|
||||||
106,
|
106,
|
||||||
103,
|
103,
|
||||||
2,
|
0,
|
||||||
36,
|
36,
|
||||||
1,
|
1,
|
||||||
"IMAGE"
|
"IMAGE"
|
||||||
@ -492,14 +480,6 @@
|
|||||||
36,
|
36,
|
||||||
2,
|
2,
|
||||||
"AUDIO"
|
"AUDIO"
|
||||||
],
|
|
||||||
[
|
|
||||||
108,
|
|
||||||
103,
|
|
||||||
1,
|
|
||||||
36,
|
|
||||||
3,
|
|
||||||
"STRING"
|
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
"groups": [
|
"groups": [
|
||||||
|
|||||||
@ -29,7 +29,7 @@ Moxie Multimedia Suite consolidates multi-node setups into a concise pipeline:
|
|||||||
│ (PROJECT_NAME)
|
│ (PROJECT_NAME)
|
||||||
▼
|
▼
|
||||||
[Moxie Project Video Combine]
|
[Moxie Project Video Combine]
|
||||||
│ (images, audio, fps, prefix)
|
│ (images, audio, fps)
|
||||||
▼
|
▼
|
||||||
[easy saveVideo]
|
[easy saveVideo]
|
||||||
```
|
```
|
||||||
@ -41,7 +41,7 @@ Moxie Multimedia Suite consolidates multi-node setups into a concise pipeline:
|
|||||||
| **Moxie Multimedia Loader** (`MoxieMultimediaLoader`) | Self-contained loader reading from local `models/` subdirectories (`diffusion`, `loras`, `vae`, `audio_vae`, `clip`). Chains **Diffusion Model → Attention Backend (`comfy_kitchen_int8`) → LoRA Loader** and outputs `model`, `clip`, `video_vae`, and `audio_vae` directly. The model set is MiniMax H3-only: the CLIP recipe is locked to the `minimax` (Qwen3-VL) text encoder with no model-type choices exposed. |
|
| **Moxie Multimedia Loader** (`MoxieMultimediaLoader`) | Self-contained loader reading from local `models/` subdirectories (`diffusion`, `loras`, `vae`, `audio_vae`, `clip`). Chains **Diffusion Model → Attention Backend (`comfy_kitchen_int8`) → LoRA Loader** and outputs `model`, `clip`, `video_vae`, and `audio_vae` directly. The model set is MiniMax H3-only: the CLIP recipe is locked to the `minimax` (Qwen3-VL) text encoder with no model-type choices exposed. |
|
||||||
| **Moxie Preview Override** (`MoxiePreviewOverride`) | Ported from ComfyUI-KJNodes' Model Preview Override. Intercepts outer-sampling iterations to stream full-resolution animated video/audio preview frames directly to the node canvas widget using `taeh3` / tiny VAE decoders. |
|
| **Moxie Preview Override** (`MoxiePreviewOverride`) | Ported from ComfyUI-KJNodes' Model Preview Override. Intercepts outer-sampling iterations to stream full-resolution animated video/audio preview frames directly to the node canvas widget using `taeh3` / tiny VAE decoders. |
|
||||||
| **Moxie MultiTrack Project** (`MoxieProject`) | Consolidates `easy multitrackProject` + `KSamplerSelect` (euler) + `BasicScheduler` (beta scheduler) + `ManualSigmas`. Takes `model`, `clip`, `video_vae`, and `audio_vae` directly from the Moxie Multimedia Loader. Hardcodes tested single-pass settings while exposing only **`steps`**, **`seed`**, and **`project_name`**. |
|
| **Moxie MultiTrack Project** (`MoxieProject`) | Consolidates `easy multitrackProject` + `KSamplerSelect` (euler) + `BasicScheduler` (beta scheduler) + `ManualSigmas`. Takes `model`, `clip`, `video_vae`, and `audio_vae` directly from the Moxie Multimedia Loader. Hardcodes tested single-pass settings while exposing only **`steps`**, **`seed`**, and **`project_name`**. |
|
||||||
| **Moxie Project Video Combine** (`MoxieCombine`) | Consolidates `easy multitrackProjectVideoCombine` + `GetVideoComponents`. Assembles rendered segments and outputs `images`, `audio`, `fps`, and `FILENAME_PREFIX` directly into `easy saveVideo`. |
|
| **Moxie Project Video Combine** (`MoxieCombine`) | Consolidates `easy multitrackProjectVideoCombine` + `GetVideoComponents`. Assembles rendered segments and outputs `images`, `audio`, and `fps` directly into `easy saveVideo` (the file name is set on `easy saveVideo`). |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@ -10,8 +10,9 @@ class MoxieCombine(EasyMultiTrackProjectVideoCombine):
|
|||||||
"""MultiTrack Project Video Combine + Get Video Components.
|
"""MultiTrack Project Video Combine + Get Video Components.
|
||||||
|
|
||||||
Consolidates `easy multitrackProjectVideoCombine` and core
|
Consolidates `easy multitrackProjectVideoCombine` and core
|
||||||
`GetVideoComponents`: one node emits the FILENAME_PREFIX plus the
|
`GetVideoComponents`: one node emits the images / audio / fps
|
||||||
images / audio / fps needed by `easy saveVideo`.
|
consumed by `easy saveVideo` - the output file name is chosen
|
||||||
|
on `easy saveVideo` itself.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
@ -31,8 +32,6 @@ class MoxieCombine(EasyMultiTrackProjectVideoCombine):
|
|||||||
],
|
],
|
||||||
hidden=[io.Hidden.unique_id],
|
hidden=[io.Hidden.unique_id],
|
||||||
outputs=[
|
outputs=[
|
||||||
io.Video.Output("VIDEO"),
|
|
||||||
io.String.Output("FILENAME_PREFIX"),
|
|
||||||
io.Image.Output("images"),
|
io.Image.Output("images"),
|
||||||
io.Audio.Output("audio"),
|
io.Audio.Output("audio"),
|
||||||
io.Float.Output("fps"),
|
io.Float.Output("fps"),
|
||||||
@ -43,10 +42,10 @@ class MoxieCombine(EasyMultiTrackProjectVideoCombine):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def execute(cls, project_name: str, project_data) -> io.NodeOutput:
|
def execute(cls, project_name: str, project_data) -> io.NodeOutput:
|
||||||
out = super().execute(project_name=project_name, project_data=project_data)
|
out = super().execute(project_name=project_name, project_data=project_data)
|
||||||
video, prefix = out[0], out[1]
|
video = out[0]
|
||||||
|
|
||||||
if isinstance(video, ExecutionBlocker):
|
if isinstance(video, ExecutionBlocker):
|
||||||
return io.NodeOutput(video, video, video, video, video)
|
return io.NodeOutput(video, video, video)
|
||||||
|
|
||||||
# The base combine has already restored the editor-selected
|
# The base combine has already restored the editor-selected
|
||||||
# resolution (utils/rtx_vsr.py) before the video was returned, so
|
# resolution (utils/rtx_vsr.py) before the video was returned, so
|
||||||
@ -54,8 +53,6 @@ class MoxieCombine(EasyMultiTrackProjectVideoCombine):
|
|||||||
# `easy saveVideo` - carries the full project resolution.
|
# `easy saveVideo` - carries the full project resolution.
|
||||||
components = video.get_components()
|
components = video.get_components()
|
||||||
return io.NodeOutput(
|
return io.NodeOutput(
|
||||||
video,
|
|
||||||
prefix,
|
|
||||||
components.images,
|
components.images,
|
||||||
components.audio,
|
components.audio,
|
||||||
float(components.frame_rate),
|
float(components.frame_rate),
|
||||||
|
|||||||
@ -411,7 +411,65 @@ check(
|
|||||||
and "collected.format = normalizeFormatValue(format)" in frontend_utils,
|
and "collected.format = normalizeFormatValue(format)" in frontend_utils,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 19. everything touched compiles
|
# --- MoxieCombine output cleanup (GetVideoComponents-style) ------------------
|
||||||
|
# 19. moxie_combine exposes only images/audio/fps; the base node keeps VIDEO+prefix
|
||||||
|
check(
|
||||||
|
"moxie_combine outputs are images/audio/fps only",
|
||||||
|
'io.Image.Output("images")' in combine_source
|
||||||
|
and 'io.Audio.Output("audio")' in combine_source
|
||||||
|
and 'io.Float.Output("fps")' in combine_source
|
||||||
|
and "io.Video.Output" not in combine_source
|
||||||
|
and "FILENAME_PREFIX" not in combine_source,
|
||||||
|
)
|
||||||
|
check(
|
||||||
|
"moxie_combine returns three components (blocker path included)",
|
||||||
|
"return io.NodeOutput(video, video, video)" in combine_source
|
||||||
|
and "components.images" in combine_source
|
||||||
|
and "float(components.frame_rate)" in combine_source,
|
||||||
|
)
|
||||||
|
check(
|
||||||
|
"base combine keeps VIDEO and FILENAME_PREFIX",
|
||||||
|
'io.Video.Output("VIDEO")' in project_source
|
||||||
|
and 'io.String.Output("FILENAME_PREFIX")' in project_source,
|
||||||
|
)
|
||||||
|
|
||||||
|
# 20. the consolidated template is rewired to the slimmed node
|
||||||
|
consolidated = _json.loads((PACK / "Moxie-consolidated.json").read_text(encoding="utf-8"))
|
||||||
|
consolidated_combine = next(
|
||||||
|
node for node in consolidated["nodes"] if node.get("type") == "MoxieCombine"
|
||||||
|
)
|
||||||
|
consolidated_save = next(
|
||||||
|
node for node in consolidated["nodes"] if node.get("type") == "easy saveVideo"
|
||||||
|
)
|
||||||
|
check(
|
||||||
|
"consolidated template MoxieCombine slots reindexed",
|
||||||
|
[o["name"] for o in consolidated_combine["outputs"]] == ["images", "audio", "fps"],
|
||||||
|
)
|
||||||
|
consolidated_links = {link[0]: link for link in consolidated["links"]}
|
||||||
|
check(
|
||||||
|
"consolidated template links follow the new slots",
|
||||||
|
consolidated_links[105][2] == 2
|
||||||
|
and consolidated_links[106][2] == 0
|
||||||
|
and 108 not in consolidated_links
|
||||||
|
and consolidated_links[107][1] == 102,
|
||||||
|
)
|
||||||
|
consolidated_prefix = next(
|
||||||
|
port for port in consolidated_save["inputs"] if port["name"] == "filename_prefix"
|
||||||
|
)
|
||||||
|
expected_prefix = "easy_media/projects/girl1-test/out/girl1-test"
|
||||||
|
check(
|
||||||
|
"consolidated template filename_prefix is a literal widget",
|
||||||
|
consolidated_prefix["link"] is None
|
||||||
|
and consolidated_save["widgets_values"][-1] == expected_prefix
|
||||||
|
and consolidated_save["widgets_values_named"]["filename_prefix"] == expected_prefix,
|
||||||
|
)
|
||||||
|
check(
|
||||||
|
"other templates do not reference MoxieCombine",
|
||||||
|
"MoxieCombine" not in (PACK / "Moxie.json").read_text(encoding="utf-8")
|
||||||
|
and "MoxieCombine" not in (PACK / "Moxie-clean.json").read_text(encoding="utf-8"),
|
||||||
|
)
|
||||||
|
|
||||||
|
# 21. everything touched compiles
|
||||||
for rel in (
|
for rel in (
|
||||||
"nodes/project.py",
|
"nodes/project.py",
|
||||||
"nodes/basic.py",
|
"nodes/basic.py",
|
||||||
|
|||||||
@ -503,6 +503,19 @@ def _load_minimax_node(monkeypatch):
|
|||||||
raise
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
def _load_moxie_combine(monkeypatch):
|
||||||
|
"""Load moxie_combine.py into the stub environment set up above."""
|
||||||
|
root = Path(__file__).parents[1]
|
||||||
|
spec = importlib.util.spec_from_file_location(
|
||||||
|
"easy_media.moxie_combine", root / "moxie_combine.py"
|
||||||
|
)
|
||||||
|
assert spec is not None and spec.loader is not None
|
||||||
|
module = importlib.util.module_from_spec(spec)
|
||||||
|
sys.modules[spec.name] = module
|
||||||
|
spec.loader.exec_module(module)
|
||||||
|
return module
|
||||||
|
|
||||||
|
|
||||||
def _image_values(*values):
|
def _image_values(*values):
|
||||||
return torch.tensor(values, dtype=torch.float32).reshape(len(values), 1, 1, 1)
|
return torch.tensor(values, dtype=torch.float32).reshape(len(values), 1, 1, 1)
|
||||||
|
|
||||||
@ -2080,6 +2093,63 @@ def test_project_video_combine_blocks_both_outputs_when_auto_combine_is_disabled
|
|||||||
assert output.values[1] is output.values[0]
|
assert output.values[1] is output.values[0]
|
||||||
|
|
||||||
|
|
||||||
|
def test_moxie_combine_schema_exposes_components_only(monkeypatch):
|
||||||
|
_load_minimax_node(monkeypatch)
|
||||||
|
combine = _load_moxie_combine(monkeypatch)
|
||||||
|
|
||||||
|
schema = combine.MoxieCombine.define_schema()
|
||||||
|
inputs = {port.name: port for port in schema.inputs}
|
||||||
|
|
||||||
|
assert schema.node_id == "MoxieCombine"
|
||||||
|
assert schema.display_name == "Moxie Project Video Combine"
|
||||||
|
assert inputs["project_name"].kwargs["force_input"] is True
|
||||||
|
assert "project_data" in inputs
|
||||||
|
assert [output.name for output in schema.outputs] == ["images", "audio", "fps"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_moxie_combine_returns_components_without_prefix(monkeypatch):
|
||||||
|
module = _load_minimax_node(monkeypatch)
|
||||||
|
combine = _load_moxie_combine(monkeypatch)
|
||||||
|
components = types.SimpleNamespace(images="images", audio="audio", frame_rate=24)
|
||||||
|
video = types.SimpleNamespace(get_components=lambda: components)
|
||||||
|
calls = []
|
||||||
|
monkeypatch.setattr(
|
||||||
|
module.EasyMultiTrackProjectVideoCombine,
|
||||||
|
"execute",
|
||||||
|
classmethod(
|
||||||
|
lambda cls, *args, **kwargs: calls.append(kwargs)
|
||||||
|
or (video, "easy_media/projects/demo/out/demo")
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
output = combine.MoxieCombine.execute("demo", {"project_name": "demo"})
|
||||||
|
|
||||||
|
assert output.values == ("images", "audio", 24.0)
|
||||||
|
assert calls == [{
|
||||||
|
"project_name": "demo",
|
||||||
|
"project_data": {"project_name": "demo"},
|
||||||
|
}]
|
||||||
|
|
||||||
|
|
||||||
|
def test_moxie_combine_blocks_all_outputs_when_auto_combine_is_disabled(monkeypatch):
|
||||||
|
from comfy_execution.graph_utils import ExecutionBlocker
|
||||||
|
|
||||||
|
module = _load_minimax_node(monkeypatch)
|
||||||
|
combine = _load_moxie_combine(monkeypatch)
|
||||||
|
blocker = ExecutionBlocker(None)
|
||||||
|
monkeypatch.setattr(
|
||||||
|
module.EasyMultiTrackProjectVideoCombine,
|
||||||
|
"execute",
|
||||||
|
classmethod(lambda cls, *args, **kwargs: (blocker, blocker)),
|
||||||
|
)
|
||||||
|
|
||||||
|
output = combine.MoxieCombine.execute(
|
||||||
|
"demo", {"project_name": "demo", "auto_combine": False}
|
||||||
|
)
|
||||||
|
|
||||||
|
assert output.values == (blocker, blocker, blocker)
|
||||||
|
|
||||||
|
|
||||||
def test_easy_h3_hard_and_hires_context_schemas_and_wrappers(monkeypatch):
|
def test_easy_h3_hard_and_hires_context_schemas_and_wrappers(monkeypatch):
|
||||||
module = _load_minimax_node(monkeypatch)
|
module = _load_minimax_node(monkeypatch)
|
||||||
assert not hasattr(module, "EasyMiniMaxH3MotionContext")
|
assert not hasattr(module, "EasyMiniMaxH3MotionContext")
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user