chore: refresh ComfyUI deps, fix stale model sources, gate V3 input normalization
Browse files- README.md +0 -2
- chain_injectors/moss_image_control_injector.py +2 -2
- core/pipelines/workflow_executor.py +27 -0
- requirements.txt +2 -2
- ui/shared/ui_components.py +1 -1
- yaml/chain_features.yaml +1 -1
- yaml/file_list.yaml +3 -7
- yaml/model_list.yaml +0 -5
README.md
CHANGED
|
@@ -13,7 +13,6 @@ models:
|
|
| 13 |
# 1. **Directly Run Models:** Models and checkpoints actively loaded by our pipelines (configured via `yaml/file_list.yaml`).
|
| 14 |
# 2. **Upstream Base Models:** The original foundation architectures from which our optimized ports, quantized versions, or wrappers are derived.
|
| 15 |
# Directly Run Models
|
| 16 |
-
- abenzerps/Qwen-Image-2.1-Uncensored-GGUF
|
| 17 |
- AiAF/Illustrious-XL-v0.1.safetensors
|
| 18 |
- alibaba-pai/Qwen-Image-2.1-Fun-Controlnet-Union
|
| 19 |
- alibaba-pai/Z-Image-Turbo-Fun-Controlnet-Union-2.1
|
|
@@ -169,7 +168,6 @@ models:
|
|
| 169 |
- briaai/Fibo-2.0-dev
|
| 170 |
- briaai/Fibo-2.0-edit-turbo
|
| 171 |
- chinoll/Moss-Image-Edit
|
| 172 |
-
- darask0/MOSS-Image-color-depth-control
|
| 173 |
- HiDream-ai/HiDream-I1-Dev
|
| 174 |
- HiDream-ai/HiDream-I1-Fast
|
| 175 |
- HiDream-ai/HiDream-I1-Full
|
|
|
|
| 13 |
# 1. **Directly Run Models:** Models and checkpoints actively loaded by our pipelines (configured via `yaml/file_list.yaml`).
|
| 14 |
# 2. **Upstream Base Models:** The original foundation architectures from which our optimized ports, quantized versions, or wrappers are derived.
|
| 15 |
# Directly Run Models
|
|
|
|
| 16 |
- AiAF/Illustrious-XL-v0.1.safetensors
|
| 17 |
- alibaba-pai/Qwen-Image-2.1-Fun-Controlnet-Union
|
| 18 |
- alibaba-pai/Z-Image-Turbo-Fun-Controlnet-Union-2.1
|
|
|
|
| 168 |
- briaai/Fibo-2.0-dev
|
| 169 |
- briaai/Fibo-2.0-edit-turbo
|
| 170 |
- chinoll/Moss-Image-Edit
|
|
|
|
| 171 |
- HiDream-ai/HiDream-I1-Dev
|
| 172 |
- HiDream-ai/HiDream-I1-Fast
|
| 173 |
- HiDream-ai/HiDream-I1-Full
|
chain_injectors/moss_image_control_injector.py
CHANGED
|
@@ -26,7 +26,7 @@ def create_node(assembler, class_type, title=None):
|
|
| 26 |
def inject(assembler, chain_definition, chain_items):
|
| 27 |
"""
|
| 28 |
Injects MOSS-Image Color/Depth Control into the workflow:
|
| 29 |
-
1. Loads the
|
| 30 |
which widens the video_embedder from 128 to 384 channels.
|
| 31 |
2. Loads and scales the color map and/or depth map.
|
| 32 |
3. Adds the MOSSImageControl node to encode maps into latents, concatenate them into
|
|
@@ -52,7 +52,7 @@ def inject(assembler, chain_definition, chain_items):
|
|
| 52 |
if not color_map and not depth_map:
|
| 53 |
return
|
| 54 |
|
| 55 |
-
lora_filename = "
|
| 56 |
if ensure_file_downloaded:
|
| 57 |
try:
|
| 58 |
ensure_file_downloaded(lora_filename)
|
|
|
|
| 26 |
def inject(assembler, chain_definition, chain_items):
|
| 27 |
"""
|
| 28 |
Injects MOSS-Image Color/Depth Control into the workflow:
|
| 29 |
+
1. Loads the Comfy-Org/MOSS-Image color/depth control LoRA adapter (moss_image_color_depth_control.safetensors)
|
| 30 |
which widens the video_embedder from 128 to 384 channels.
|
| 31 |
2. Loads and scales the color map and/or depth map.
|
| 32 |
3. Adds the MOSSImageControl node to encode maps into latents, concatenate them into
|
|
|
|
| 52 |
if not color_map and not depth_map:
|
| 53 |
return
|
| 54 |
|
| 55 |
+
lora_filename = "moss_image_color_depth_control.safetensors"
|
| 56 |
if ensure_file_downloaded:
|
| 57 |
try:
|
| 58 |
ensure_file_downloaded(lora_filename)
|
core/pipelines/workflow_executor.py
CHANGED
|
@@ -24,8 +24,24 @@ def _normalize_dynamic_inputs(node_class, class_type, kwargs):
|
|
| 24 |
if not inputs:
|
| 25 |
return kwargs
|
| 26 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 27 |
# --- COMFY_AUTOGROW_V3 first: consume image1/video1/... slots ---
|
| 28 |
for spec in inputs:
|
|
|
|
|
|
|
| 29 |
sub_id = getattr(spec, 'id', None)
|
| 30 |
template = getattr(spec, 'template', None)
|
| 31 |
if not sub_id or template is None:
|
|
@@ -48,7 +64,12 @@ def _normalize_dynamic_inputs(node_class, class_type, kwargs):
|
|
| 48 |
kwargs[sub_id] = collected
|
| 49 |
|
| 50 |
# --- COMFY_DYNAMICCOMBO_V3 ---
|
|
|
|
|
|
|
|
|
|
| 51 |
for spec in inputs:
|
|
|
|
|
|
|
| 52 |
sub_id = getattr(spec, 'id', None)
|
| 53 |
options = getattr(spec, 'options', None)
|
| 54 |
if not sub_id or not options or sub_id not in kwargs:
|
|
@@ -65,6 +86,12 @@ def _normalize_dynamic_inputs(node_class, class_type, kwargs):
|
|
| 65 |
else:
|
| 66 |
option_keys.append(getattr(opt, 'key', None))
|
| 67 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 68 |
if value not in option_keys:
|
| 69 |
print(f"Warning: '{sub_id}' value {value!r} is not one of {option_keys} for {class_type}.")
|
| 70 |
continue
|
|
|
|
| 24 |
if not inputs:
|
| 25 |
return kwargs
|
| 26 |
|
| 27 |
+
def _io_type(spec):
|
| 28 |
+
getter = getattr(spec, 'get_io_type', None)
|
| 29 |
+
if callable(getter):
|
| 30 |
+
try:
|
| 31 |
+
return getter()
|
| 32 |
+
except Exception:
|
| 33 |
+
pass
|
| 34 |
+
return getattr(spec, 'io_type', None)
|
| 35 |
+
|
| 36 |
+
def _matches_io_type(spec, expected):
|
| 37 |
+
"""True when the spec's io type is unknown or matches ``expected``."""
|
| 38 |
+
io = _io_type(spec)
|
| 39 |
+
return io is None or io == expected
|
| 40 |
+
|
| 41 |
# --- COMFY_AUTOGROW_V3 first: consume image1/video1/... slots ---
|
| 42 |
for spec in inputs:
|
| 43 |
+
if not _matches_io_type(spec, "COMFY_AUTOGROW_V3"):
|
| 44 |
+
continue
|
| 45 |
sub_id = getattr(spec, 'id', None)
|
| 46 |
template = getattr(spec, 'template', None)
|
| 47 |
if not sub_id or template is None:
|
|
|
|
| 64 |
kwargs[sub_id] = collected
|
| 65 |
|
| 66 |
# --- COMFY_DYNAMICCOMBO_V3 ---
|
| 67 |
+
# Plain combo widgets (e.g. ImageScaleToTotalPixels' 'upscale_method') also
|
| 68 |
+
# expose ``.options``, so the io type gate below plus the keyed-option check
|
| 69 |
+
# keep them out: only a DynamicCombo carries ``DynamicCombo.Option`` objects.
|
| 70 |
for spec in inputs:
|
| 71 |
+
if not _matches_io_type(spec, "COMFY_DYNAMICCOMBO_V3"):
|
| 72 |
+
continue
|
| 73 |
sub_id = getattr(spec, 'id', None)
|
| 74 |
options = getattr(spec, 'options', None)
|
| 75 |
if not sub_id or not options or sub_id not in kwargs:
|
|
|
|
| 86 |
else:
|
| 87 |
option_keys.append(getattr(opt, 'key', None))
|
| 88 |
|
| 89 |
+
# A plain COMBO (e.g. ImageScaleToTotalPixels' 'upscale_method') also
|
| 90 |
+
# exposes `.options`, but as bare strings with no `.key`. Only a real
|
| 91 |
+
# DynamicCombo carries keyed options; anything else is not ours to touch.
|
| 92 |
+
if not any(key is not None for key in option_keys):
|
| 93 |
+
continue
|
| 94 |
+
|
| 95 |
if value not in option_keys:
|
| 96 |
print(f"Warning: '{sub_id}' value {value!r} is not one of {option_keys} for {class_type}.")
|
| 97 |
continue
|
requirements.txt
CHANGED
|
@@ -1,5 +1,5 @@
|
|
| 1 |
-
comfyui-frontend-package==1.
|
| 2 |
-
comfyui-workflow-templates==0.11.
|
| 3 |
comfyui-embedded-docs==0.5.16
|
| 4 |
torch
|
| 5 |
torchsde
|
|
|
|
| 1 |
+
comfyui-frontend-package==1.59.1
|
| 2 |
+
comfyui-workflow-templates==0.11.109
|
| 3 |
comfyui-embedded-docs==0.5.16
|
| 4 |
torch
|
| 5 |
torchsde
|
ui/shared/ui_components.py
CHANGED
|
@@ -653,7 +653,7 @@ def create_moss_image_control_ui(prefix: str):
|
|
| 653 |
|
| 654 |
with gr.Accordion("MOSS-Image Color/Depth Control Settings", open=False, visible=('moss_image_control' in default_enabled_chains)) as control_accordion:
|
| 655 |
components[key('moss_image_control_accordion')] = control_accordion
|
| 656 |
-
gr.Markdown("💡 **Tip:** Uses the [
|
| 657 |
with gr.Row():
|
| 658 |
components[key('moss_image_control_color_map')] = gr.Image(
|
| 659 |
type="pil", label="Color Region Map (Optional)", sources=["upload"], height=200
|
|
|
|
| 653 |
|
| 654 |
with gr.Accordion("MOSS-Image Color/Depth Control Settings", open=False, visible=('moss_image_control' in default_enabled_chains)) as control_accordion:
|
| 655 |
components[key('moss_image_control_accordion')] = control_accordion
|
| 656 |
+
gr.Markdown("💡 **Tip:** Uses the [Comfy-Org/MOSS-Image](https://huggingface.co/Comfy-Org/MOSS-Image) color/depth control LoRA.")
|
| 657 |
with gr.Row():
|
| 658 |
components[key('moss_image_control_color_map')] = gr.Image(
|
| 659 |
type="pil", label="Color Region Map (Optional)", sources=["upload"], height=200
|
yaml/chain_features.yaml
CHANGED
|
@@ -509,7 +509,7 @@ prompt_enhancer:
|
|
| 509 |
moss_image_control:
|
| 510 |
chains: moss_image_control
|
| 511 |
display_name: "MOSS-Image Color/Depth Control"
|
| 512 |
-
description: "Controls MOSS-Image generation using a color region map (object/region spatial layout) and/or a depth map (3D spatial depth, near is white) via
|
| 513 |
max_count: 1
|
| 514 |
usage_guideline: "Supply color_map (RGB region ID map) and/or depth_map (near=white grayscale map) as Base64 Data URI or HTTP/HTTPS URL. Set strength (default 1.0) and timestep range (start_percent 0.0, end_percent 0.5)."
|
| 515 |
parameters_schema:
|
|
|
|
| 509 |
moss_image_control:
|
| 510 |
chains: moss_image_control
|
| 511 |
display_name: "MOSS-Image Color/Depth Control"
|
| 512 |
+
description: "Controls MOSS-Image generation using a color region map (object/region spatial layout) and/or a depth map (3D spatial depth, near is white) via Comfy-Org/MOSS-Image color/depth control LoRA and MOSSImageControl node."
|
| 513 |
max_count: 1
|
| 514 |
usage_guideline: "Supply color_map (RGB region ID map) and/or depth_map (near=white grayscale map) as Base64 Data URI or HTTP/HTTPS URL. Set strength (default 1.0) and timestep range (start_percent 0.0, end_percent 0.5)."
|
| 515 |
parameters_schema:
|
yaml/file_list.yaml
CHANGED
|
@@ -703,10 +703,6 @@ file:
|
|
| 703 |
source: "hf"
|
| 704 |
repo_id: "Comfy-Org/Qwen-Image-2.1"
|
| 705 |
repository_file_path: "diffusion_models/qwen_image_2.1_turbo_int8_convrot.safetensors"
|
| 706 |
-
- filename: "qwen-image-2.1-UC-int8_convrot.safetensors"
|
| 707 |
-
source: "hf"
|
| 708 |
-
repo_id: "abenzerps/Qwen-Image-2.1-Uncensored-GGUF"
|
| 709 |
-
repository_file_path: "qwen-image-2.1-UC-int8_convrot.safetensors"
|
| 710 |
- filename: "NoctQ_V4_int8_convrot.safetensors"
|
| 711 |
source: "hf"
|
| 712 |
repo_id: "Noctaluna/Noct-Q-Uncensored-Qwen-Image-2.1"
|
|
@@ -898,10 +894,10 @@ file:
|
|
| 898 |
repository_file_path: "flux1-redux-dev.safetensors"
|
| 899 |
loras:
|
| 900 |
# MOSS-Image Color/Depth Control
|
| 901 |
-
- filename: "
|
| 902 |
source: "hf"
|
| 903 |
-
repo_id: "
|
| 904 |
-
repository_file_path: "
|
| 905 |
# MOSS-Image Edit
|
| 906 |
- filename: "moss_image_edit_lora_rank_64_bf16.safetensors"
|
| 907 |
source: "hf"
|
|
|
|
| 703 |
source: "hf"
|
| 704 |
repo_id: "Comfy-Org/Qwen-Image-2.1"
|
| 705 |
repository_file_path: "diffusion_models/qwen_image_2.1_turbo_int8_convrot.safetensors"
|
|
|
|
|
|
|
|
|
|
|
|
|
| 706 |
- filename: "NoctQ_V4_int8_convrot.safetensors"
|
| 707 |
source: "hf"
|
| 708 |
repo_id: "Noctaluna/Noct-Q-Uncensored-Qwen-Image-2.1"
|
|
|
|
| 894 |
repository_file_path: "flux1-redux-dev.safetensors"
|
| 895 |
loras:
|
| 896 |
# MOSS-Image Color/Depth Control
|
| 897 |
+
- filename: "moss_image_color_depth_control.safetensors"
|
| 898 |
source: "hf"
|
| 899 |
+
repo_id: "Comfy-Org/MOSS-Image"
|
| 900 |
+
repository_file_path: "loras/moss_image_color_depth_control.safetensors"
|
| 901 |
# MOSS-Image Edit
|
| 902 |
- filename: "moss_image_edit_lora_rank_64_bf16.safetensors"
|
| 903 |
source: "hf"
|
yaml/model_list.yaml
CHANGED
|
@@ -64,11 +64,6 @@ Checkpoint:
|
|
| 64 |
unet: "qwen_image_2.1_turbo_int8_convrot.safetensors"
|
| 65 |
vae: "qwen_image_2.1_vae_bf16.safetensors"
|
| 66 |
clip: "qwen3vl_8b_nvfp4.safetensors"
|
| 67 |
-
- display_name: "abenzerps/Qwen-Image-2.1-Uncensored"
|
| 68 |
-
components:
|
| 69 |
-
unet: "qwen-image-2.1-UC-int8_convrot.safetensors"
|
| 70 |
-
vae: "qwen_image_2.1_vae_bf16.safetensors"
|
| 71 |
-
clip: "qwen3vl_8b_nvfp4.safetensors"
|
| 72 |
- display_name: "Noctaluna/Noct-Q-Uncensored-Qwen-Image-2.1-V4"
|
| 73 |
components:
|
| 74 |
unet: "NoctQ_V4_int8_convrot.safetensors"
|
|
|
|
| 64 |
unet: "qwen_image_2.1_turbo_int8_convrot.safetensors"
|
| 65 |
vae: "qwen_image_2.1_vae_bf16.safetensors"
|
| 66 |
clip: "qwen3vl_8b_nvfp4.safetensors"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 67 |
- display_name: "Noctaluna/Noct-Q-Uncensored-Qwen-Image-2.1-V4"
|
| 68 |
components:
|
| 69 |
unet: "NoctQ_V4_int8_convrot.safetensors"
|