comfy-diffusion 2.3.1__tar.gz → 2.4.0__tar.gz

{comfy_diffusion-2.3.1 → comfy_diffusion-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-diffusion
-Version: 2.3.1
+Version: 2.4.0
 Summary: ComfyUI inference engine as a standalone Python library (no server, no UI).
 Author: Alejandro Quintero
 License: GPL-3.0-only
@@ -130,7 +130,7 @@ from comfy_diffusion.sampling import sample
 
 ## Quick Start
 
-Call `check_runtime()` before loading models or sampling. On first runtime use, comfy-diffusion can perform an automatic download of the pinned ComfyUI release when the vendored runtime is missing. Expected failures are returned as an error dict instead of being raised; `check_runtime()` returns an error dict for runtime bootstrap problems.
+Call `check_runtime()` before loading models or sampling. On first runtime use, comfy-diffusion can perform an automatic download of the pinned ComfyUI ref when the vendored runtime is missing. Expected failures are returned as an error dict instead of being raised; `check_runtime()` returns an error dict for runtime bootstrap problems.
 
 Example:
 

{comfy_diffusion-2.3.1 → comfy_diffusion-2.4.0}/README.md

@@ -52,7 +52,7 @@ from comfy_diffusion.sampling import sample
 
 ## Quick Start
 
-Call `check_runtime()` before loading models or sampling. On first runtime use, comfy-diffusion can perform an automatic download of the pinned ComfyUI release when the vendored runtime is missing. Expected failures are returned as an error dict instead of being raised; `check_runtime()` returns an error dict for runtime bootstrap problems.
+Call `check_runtime()` before loading models or sampling. On first runtime use, comfy-diffusion can perform an automatic download of the pinned ComfyUI ref when the vendored runtime is missing. Expected failures are returned as an error dict instead of being raised; `check_runtime()` returns an error dict for runtime bootstrap problems.
 
 Example:
 

{comfy_diffusion-2.3.1 → comfy_diffusion-2.4.0}/comfy_diffusion/_runtime.py

@@ -13,10 +13,10 @@ import urllib.request
 import zipfile
 from pathlib import Path
 
-COMFYUI_PINNED_TAG = "v0.24.1"
+COMFYUI_PINNED_REF = "fb991e2c1e7476809d566a4620c2132e05a466dd"
 COMFYUI_PINNED_ARCHIVE_URL = (
-    "https://github.com/Comfy-Org/ComfyUI/archive/refs/tags/"
-    f"{COMFYUI_PINNED_TAG}.zip"
+    "https://github.com/Comfy-Org/ComfyUI/archive/"
+    f"{COMFYUI_PINNED_REF}.zip"
 )
 
 
@@ -40,7 +40,7 @@ def _has_comfyui_runtime(comfyui_root: Path) -> bool:
 
 
 def _download_and_extract_pinned_comfyui(comfyui_root: Path) -> None:
-    """Download and extract the pinned ComfyUI release into vendor/ComfyUI."""
+    """Download and extract the pinned ComfyUI ref into vendor/ComfyUI."""
     vendor_dir = comfyui_root.parent
     vendor_dir.mkdir(parents=True, exist_ok=True)
 
@@ -67,7 +67,7 @@ def _download_and_extract_pinned_comfyui(comfyui_root: Path) -> None:
 
 
 def ensure_comfyui_available() -> Path:
-    """Ensure vendored ComfyUI exists; download pinned release if missing."""
+    """Ensure vendored ComfyUI exists; download pinned ref if missing."""
     comfyui_root = _comfyui_root()
 
     if not _has_comfyui_runtime(comfyui_root):

{comfy_diffusion-2.3.1 → comfy_diffusion-2.4.0}/comfy_diffusion/cli/main.py

@@ -10,7 +10,7 @@ from typing import Annotated, Any
 import click
 import typer
 
-from comfy_diffusion._runtime import COMFYUI_PINNED_TAG, _comfyui_root
+from comfy_diffusion._runtime import COMFYUI_PINNED_REF, _comfyui_root
 from comfy_diffusion.downloader import (
     CivitAIModelEntry,
     HFModelEntry,
@@ -116,7 +116,7 @@ def runtime_paths(
         "package_root": str(_package_root()),
         "comfyui_root": str(_comfyui_root()),
         "models_dir": str(resolved_models_dir),
-        "comfyui_pinned_tag": COMFYUI_PINNED_TAG,
+        "comfyui_pinned_ref": COMFYUI_PINNED_REF,
     }
     if json_output:
         _echo_json(payload)

{comfy_diffusion-2.3.1 → comfy_diffusion-2.4.0}/comfy_diffusion/conditioning.py

@@ -181,6 +181,83 @@ def wan_image_to_video(
     return positive, negative, {"samples": latent}
 
 
+def _resize_long_edge(image: Any, max_size: int, stride: int = 16) -> Any:
+    """Resize an image batch so the long edge is capped and dimensions snap to stride."""
+    _, _, comfy_utils, _ = _get_wan_conditioning_dependencies()
+
+    height = image.shape[1]
+    width = image.shape[2]
+    scale = min(max_size / max(height, width), 1.0)
+    resized_height = max(stride, round(height * scale / stride) * stride)
+    resized_width = max(stride, round(width * scale / stride) * stride)
+    return comfy_utils.common_upscale(
+        image[:, :, :, :3].movedim(-1, 1),
+        resized_width,
+        resized_height,
+        "area",
+        "disabled",
+    ).movedim(1, -1)
+
+
+def bernini_conditioning(
+    positive: Any,
+    negative: Any,
+    vae: _VaeEncoder,
+    width: int = 832,
+    height: int = 480,
+    length: int = 81,
+    batch_size: int = 1,
+    *,
+    source_video: Any | None = None,
+    reference_video: Any | None = None,
+    reference_images: Sequence[Any] | None = None,
+    ref_max_size: int = 848,
+) -> tuple[Any, Any, dict[str, Any]]:
+    """Build Bernini in-context WAN conditioning and an empty video latent.
+
+    Mirrors ComfyUI's ``BerniniConditioning`` node.  Context streams are VAE
+    encoded in this order: source video, reference video, then each reference
+    image.  When any context stream is present, the resulting latent list is
+    attached to both positive and negative conditioning as ``context_latents``.
+    """
+    torch, model_management, comfy_utils, node_helpers = _get_wan_conditioning_dependencies()
+
+    latent = torch.zeros(
+        [batch_size, 16, ((length - 1) // 4) + 1, height // 8, width // 8],
+        device=model_management.intermediate_device(),
+    )
+
+    context = []
+    if source_video is not None:
+        video = comfy_utils.common_upscale(
+            source_video[:length, :, :, :3].movedim(-1, 1),
+            width,
+            height,
+            "area",
+            "center",
+        ).movedim(1, -1)
+        context.append(vae.encode(video[:, :, :, :3]))
+
+    if reference_video is not None:
+        resized_reference_video = _resize_long_edge(reference_video[:length], ref_max_size)
+        context.append(vae.encode(resized_reference_video[:, :, :, :3]))
+
+    if reference_images:
+        for images in reference_images:
+            if images is None:
+                continue
+            for index in range(images.shape[0]):
+                image = _resize_long_edge(images[index : index + 1], ref_max_size)
+                context.append(vae.encode(image[:, :, :, :3]))
+
+    if context:
+        values = {"context_latents": context}
+        positive = node_helpers.conditioning_set_values(positive, values)
+        negative = node_helpers.conditioning_set_values(negative, values)
+
+    return positive, negative, {"samples": latent}
+
+
 def wan_first_last_frame_to_video(
     positive: Any,
     negative: Any,
@@ -2229,6 +2306,7 @@ __all__ = [
     "encode_prompt_flux",
     "encode_clip_vision",
     "wan_image_to_video",
+    "bernini_conditioning",
     "wan_first_last_frame_to_video",
     "wan_vace_to_video",
     "wan_fun_control_to_video",

{comfy_diffusion-2.3.1 → comfy_diffusion-2.4.0}/comfy_diffusion/pipelines/video/wan/wan22/__init__.py

@@ -5,4 +5,4 @@ Import directly from the specific pipeline module, e.g.::
     from comfy_diffusion.pipelines.video.wan.wan22.t2v import manifest, run
 """
 
-__all__ = ["t2v", "i2v", "flf2v", "s2v", "ti2v"]
+__all__ = ["t2v", "i2v", "flf2v", "s2v", "ti2v", "bernini"]

comfy_diffusion-2.4.0/comfy_diffusion/pipelines/video/wan/wan22/bernini.py

@@ -0,0 +1,225 @@
+"""WAN 2.2 Bernini reference-guided video editing pipeline.
+
+This pipeline adapts the supplied ComfyUI Bernini workflow into the
+``comfy-diffusion`` module pattern: ``manifest()`` declares the required model
+files and ``run()`` composes the public runtime helpers directly.  It supports
+video editing, reference-to-video, and multi-reference conditioning.
+
+Workflow data flow
+------------------
+1. Load Bernini high-noise and low-noise WAN 2.2 UNets
+2. Apply the LightX2V model-only LoRA to both experts
+3. Load WAN text encoder and VAE
+4. Encode positive and negative prompts
+5. Attach source-video and optional reference-image context with Bernini conditioning
+6. Sample with ``SamplerCustom`` using split sigmas: high-noise first, low-noise second
+7. Decode the latent video to frames
+"""
+
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Any
+
+from comfy_diffusion.downloader import HFModelEntry, ModelEntry
+
+__all__ = ["manifest", "run"]
+
+_HF_REPO_BERNINI = "Kijai/WanVideo_comfy_fp8_scaled"
+_HF_REPO_LIGHTX2V = "Kijai/WanVideo_comfy"
+_HF_REPO_WAN22 = "Comfy-Org/Wan_2.2_ComfyUI_Repackaged"
+_HF_REPO_NSFW_WAN_UMT5 = "NSFW-API/NSFW-Wan-UMT5-XXL"
+
+_UNET_HIGH_DEST = (
+    Path("diffusion_models") / "Wan22_Bernini_HIGH_fp8_e4m3fn_scaled.safetensors"
+)
+_UNET_LOW_DEST = (
+    Path("diffusion_models") / "Wan22_Bernini_LOW_fp8_e4m3fn_scaled.safetensors"
+)
+_LORA_DEST = (
+    Path("loras")
+    / "wan22"
+    / "lightx2v_T2V_14B_cfg_step_distill_v2_lora_rank64_bf16.safetensors"
+)
+_TEXT_ENCODER_DEST = Path("text_encoders") / "nsfw_wan_umt5-xxl_fp8_scaled.safetensors"
+_VAE_DEST = Path("vae") / "wan_2.1_vae.safetensors"
+
+_DEFAULT_NEGATIVE_PROMPT = (
+    "色调艳丽，过曝，静态，细节模糊不清，字幕，风格，作品，画作，画面，静止，整体发灰，最差质量，低质量，"
+    "JPEG压缩残留，丑陋的，残缺的，多余的手指，画得不好的手部，画得不好的脸部，畸形的，毁容的，"
+    "形态畸形的肢体，手指融合，静止不动的画面，杂乱的背景，三条腿，背景人很多，倒着走"
+)
+_DEFAULT_PROMPT = (
+    "Replace the character for the character in image 0. "
+    "Keep camera motion, lighting, and background unchanged."
+)
+
+
+def manifest() -> list[ModelEntry]:
+    """Return the model files required by the Bernini WAN 2.2 pipeline."""
+    return [
+        HFModelEntry(
+            repo_id=_HF_REPO_BERNINI,
+            filename="Bernini/Wan22_Bernini_HIGH_fp8_e4m3fn_scaled.safetensors",
+            dest=_UNET_HIGH_DEST,
+        ),
+        HFModelEntry(
+            repo_id=_HF_REPO_BERNINI,
+            filename="Bernini/Wan22_Bernini_LOW_fp8_e4m3fn_scaled.safetensors",
+            dest=_UNET_LOW_DEST,
+        ),
+        HFModelEntry(
+            repo_id=_HF_REPO_LIGHTX2V,
+            filename="Lightx2v/lightx2v_T2V_14B_cfg_step_distill_v2_lora_rank64_bf16.safetensors",
+            dest=_LORA_DEST,
+        ),
+        HFModelEntry(
+            repo_id=_HF_REPO_NSFW_WAN_UMT5,
+            filename="nsfw_wan_umt5-xxl_fp8_scaled.safetensors",
+            dest=_TEXT_ENCODER_DEST,
+        ),
+        HFModelEntry(
+            repo_id=_HF_REPO_WAN22,
+            filename="split_files/vae/wan_2.1_vae.safetensors",
+            dest=_VAE_DEST,
+        ),
+    ]
+
+
+def _resolve_path(models_dir: Path, override: str | Path | None, default: Path) -> Path:
+    if override is None:
+        return models_dir / default
+    return Path(override)
+
+
+def _coerce_reference_images(reference_images: Any, image_to_tensor: Any) -> list[Any] | None:
+    if reference_images is None:
+        return None
+
+    images = (
+        list(reference_images)
+        if isinstance(reference_images, (list, tuple))
+        else [reference_images]
+    )
+    coerced = [image_to_tensor(image) if hasattr(image, "convert") else image for image in images]
+    return coerced or None
+
+
+def run(
+    source_video: Any | None = None,
+    reference_image: Any | None = None,
+    prompt: str = _DEFAULT_PROMPT,
+    negative_prompt: str = _DEFAULT_NEGATIVE_PROMPT,
+    width: int = 832,
+    height: int = 480,
+    length: int = 81,
+    *,
+    models_dir: str | Path,
+    seed: int = 3,
+    steps: int = 8,
+    split_step: int = 4,
+    cfg: float = 1.0,
+    high_lora_strength: float = 3.0,
+    low_lora_strength: float = 1.5,
+    sampler_name: str = "res_multistep",
+    scheduler: str = "simple",
+    ref_max_size: int = 848,
+    batch_size: int = 1,
+    unet_high_filename: str | Path | None = None,
+    unet_low_filename: str | Path | None = None,
+    lora_filename: str | Path | None = None,
+    text_encoder_filename: str | Path | None = None,
+    vae_filename: str | Path | None = None,
+) -> list[Any]:
+    """Run Bernini reference-guided video editing.
+
+    ``source_video`` may be omitted for reference-to-video generation, a path,
+    or a BHWC tensor such as the output from
+    :func:`comfy_diffusion.video.load_video`. ``reference_image`` may be
+    omitted when a source video is present, a single PIL/BHWC image, or a list
+    of PIL/BHWC images for multi-reference conditioning.
+    """
+    from comfy_diffusion.conditioning import bernini_conditioning, encode_prompt
+    from comfy_diffusion.image import image_to_tensor
+    from comfy_diffusion.lora import apply_lora
+    from comfy_diffusion.models import ModelManager
+    from comfy_diffusion.runtime import check_runtime
+    from comfy_diffusion.sampling import (
+        basic_scheduler,
+        get_sampler,
+        sample_custom_simple,
+        split_sigmas,
+    )
+    from comfy_diffusion.vae import vae_decode_batch
+    from comfy_diffusion.video import load_video
+
+    check_result = check_runtime()
+    if check_result.get("error"):
+        raise RuntimeError(f"ComfyUI runtime not available: {check_result['error']}")
+
+    reference_images = _coerce_reference_images(reference_image, image_to_tensor)
+    if source_video is None and reference_images is None:
+        raise ValueError("source_video or reference_image must be provided")
+    if isinstance(source_video, (str, Path)):
+        source_video = load_video(source_video)
+
+    models_dir = Path(models_dir)
+    mm = ModelManager(models_dir)
+
+    unet_high_path = _resolve_path(models_dir, unet_high_filename, _UNET_HIGH_DEST)
+    unet_low_path = _resolve_path(models_dir, unet_low_filename, _UNET_LOW_DEST)
+    lora_path = _resolve_path(models_dir, lora_filename, _LORA_DEST)
+    text_encoder_path = _resolve_path(models_dir, text_encoder_filename, _TEXT_ENCODER_DEST)
+    vae_path = _resolve_path(models_dir, vae_filename, _VAE_DEST)
+
+    model_high = mm.load_unet(unet_high_path)
+    model_low = mm.load_unet(unet_low_path)
+    clip = mm.load_clip(text_encoder_path, clip_type="wan")
+    vae = mm.load_vae(vae_path)
+
+    model_high, _ = apply_lora(model_high, clip, lora_path, high_lora_strength, 0.0)
+    model_low, _ = apply_lora(model_low, clip, lora_path, low_lora_strength, 0.0)
+
+    positive, negative = encode_prompt(clip, prompt, negative_prompt)
+
+    positive, negative, latent = bernini_conditioning(
+        positive,
+        negative,
+        vae,
+        width=width,
+        height=height,
+        length=length,
+        batch_size=batch_size,
+        source_video=source_video,
+        reference_images=reference_images,
+        ref_max_size=ref_max_size,
+    )
+
+    sampler = get_sampler(sampler_name)
+    sigmas = basic_scheduler(model_low, scheduler, steps, denoise=1.0)
+    high_sigmas, low_sigmas = split_sigmas(sigmas, split_step)
+
+    latent = sample_custom_simple(
+        model_high,
+        add_noise=True,
+        noise_seed=seed,
+        cfg=cfg,
+        positive=positive,
+        negative=negative,
+        sampler=sampler,
+        sigmas=high_sigmas,
+        latent_image=latent,
+    )
+    latent = sample_custom_simple(
+        model_low,
+        add_noise=False,
+        noise_seed=0,
+        cfg=cfg,
+        positive=positive,
+        negative=negative,
+        sampler=sampler,
+        sigmas=low_sigmas,
+        latent_image=latent,
+    )
+
+    return vae_decode_batch(vae, latent)

{comfy_diffusion-2.3.1 → comfy_diffusion-2.4.0}/comfy_diffusion.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-diffusion
-Version: 2.3.1
+Version: 2.4.0
 Summary: ComfyUI inference engine as a standalone Python library (no server, no UI).
 Author: Alejandro Quintero
 License: GPL-3.0-only
@@ -130,7 +130,7 @@ from comfy_diffusion.sampling import sample
 
 ## Quick Start
 
-Call `check_runtime()` before loading models or sampling. On first runtime use, comfy-diffusion can perform an automatic download of the pinned ComfyUI release when the vendored runtime is missing. Expected failures are returned as an error dict instead of being raised; `check_runtime()` returns an error dict for runtime bootstrap problems.
+Call `check_runtime()` before loading models or sampling. On first runtime use, comfy-diffusion can perform an automatic download of the pinned ComfyUI ref when the vendored runtime is missing. Expected failures are returned as an error dict instead of being raised; `check_runtime()` returns an error dict for runtime bootstrap problems.
 
 Example:
 

{comfy_diffusion-2.3.1 → comfy_diffusion-2.4.0}/comfy_diffusion.egg-info/SOURCES.txt

@@ -85,6 +85,7 @@ comfy_diffusion/pipelines/video/wan/wan21/flf2v.py
 comfy_diffusion/pipelines/video/wan/wan21/i2v.py
 comfy_diffusion/pipelines/video/wan/wan21/t2v.py
 comfy_diffusion/pipelines/video/wan/wan22/__init__.py
+comfy_diffusion/pipelines/video/wan/wan22/bernini.py
 comfy_diffusion/pipelines/video/wan/wan22/flf2v.py
 comfy_diffusion/pipelines/video/wan/wan22/i2v.py
 comfy_diffusion/pipelines/video/wan/wan22/s2v.py
@@ -179,6 +180,7 @@ tests/test_pipelines_video_wan_wiring.py
 tests/test_pipelines_wan21_flf2v.py
 tests/test_pipelines_wan21_i2v.py
 tests/test_pipelines_wan21_t2v.py
+tests/test_pipelines_wan22_bernini.py
 tests/test_pipelines_wan22_flf2v.py
 tests/test_pipelines_wan22_i2v.py
 tests/test_pipelines_wan22_s2v.py
@@ -282,6 +284,7 @@ vendor/ComfyUI/alembic_db/script.py.mako
 vendor/ComfyUI/alembic_db/versions/0001_assets.py
 vendor/ComfyUI/alembic_db/versions/0002_merge_to_asset_references.py
 vendor/ComfyUI/alembic_db/versions/0003_add_metadata_job_id.py
+vendor/ComfyUI/alembic_db/versions/0004_drop_tag_type.py
 vendor/ComfyUI/api_server/__init__.py
 vendor/ComfyUI/api_server/routes/__init__.py
 vendor/ComfyUI/api_server/routes/internal/README.md
@@ -315,8 +318,10 @@ vendor/ComfyUI/app/assets/database/queries/tags.py
 vendor/ComfyUI/app/assets/services/__init__.py
 vendor/ComfyUI/app/assets/services/asset_management.py
 vendor/ComfyUI/app/assets/services/bulk_ingest.py
+vendor/ComfyUI/app/assets/services/cursor.py
 vendor/ComfyUI/app/assets/services/file_utils.py
 vendor/ComfyUI/app/assets/services/hashing.py
+vendor/ComfyUI/app/assets/services/image_dimensions.py
 vendor/ComfyUI/app/assets/services/ingest.py
 vendor/ComfyUI/app/assets/services/metadata_extract.py
 vendor/ComfyUI/app/assets/services/path_utils.py
@@ -497,6 +502,7 @@ vendor/ComfyUI/comfy/k_diffusion/deis.py
 vendor/ComfyUI/comfy/k_diffusion/sa_solver.py
 vendor/ComfyUI/comfy/k_diffusion/sampling.py
 vendor/ComfyUI/comfy/k_diffusion/utils.py
+vendor/ComfyUI/comfy/ldm/colormap.py
 vendor/ComfyUI/comfy/ldm/common_dit.py
 vendor/ComfyUI/comfy/ldm/util.py
 vendor/ComfyUI/comfy/ldm/ace/ace_step15.py
@@ -534,6 +540,13 @@ vendor/ComfyUI/comfy/ldm/cosmos/vae.py
 vendor/ComfyUI/comfy/ldm/cosmos/cosmos_tokenizer/layers3d.py
 vendor/ComfyUI/comfy/ldm/cosmos/cosmos_tokenizer/patching.py
 vendor/ComfyUI/comfy/ldm/cosmos/cosmos_tokenizer/utils.py
+vendor/ComfyUI/comfy/ldm/depth_anything_3/camera.py
+vendor/ComfyUI/comfy/ldm/depth_anything_3/dpt.py
+vendor/ComfyUI/comfy/ldm/depth_anything_3/model.py
+vendor/ComfyUI/comfy/ldm/depth_anything_3/preprocess.py
+vendor/ComfyUI/comfy/ldm/depth_anything_3/ray_pose.py
+vendor/ComfyUI/comfy/ldm/depth_anything_3/reference_view_selector.py
+vendor/ComfyUI/comfy/ldm/depth_anything_3/transform.py
 vendor/ComfyUI/comfy/ldm/ernie/model.py
 vendor/ComfyUI/comfy/ldm/flux/controlnet.py
 vendor/ComfyUI/comfy/ldm/flux/layers.py
@@ -844,6 +857,7 @@ vendor/ComfyUI/comfy_api_nodes/util/upload_helpers.py
 vendor/ComfyUI/comfy_api_nodes/util/validation_utils.py
 vendor/ComfyUI/comfy_config/config_parser.py
 vendor/ComfyUI/comfy_config/types.py
+vendor/ComfyUI/comfy_execution/asset_enrichment.py
 vendor/ComfyUI/comfy_execution/cache_provider.py
 vendor/ComfyUI/comfy_execution/caching.py
 vendor/ComfyUI/comfy_execution/graph.py
@@ -860,6 +874,7 @@ vendor/ComfyUI/comfy_extras/nodes_ar_video.py
 vendor/ComfyUI/comfy_extras/nodes_attention_multiply.py
 vendor/ComfyUI/comfy_extras/nodes_audio.py
 vendor/ComfyUI/comfy_extras/nodes_audio_encoder.py
+vendor/ComfyUI/comfy_extras/nodes_bernini.py
 vendor/ComfyUI/comfy_extras/nodes_bg_removal.py
 vendor/ComfyUI/comfy_extras/nodes_camera_trajectory.py
 vendor/ComfyUI/comfy_extras/nodes_canny.py
@@ -875,6 +890,7 @@ vendor/ComfyUI/comfy_extras/nodes_cosmos.py
 vendor/ComfyUI/comfy_extras/nodes_curve.py
 vendor/ComfyUI/comfy_extras/nodes_custom_sampler.py
 vendor/ComfyUI/comfy_extras/nodes_dataset.py
+vendor/ComfyUI/comfy_extras/nodes_depth_anything_3.py
 vendor/ComfyUI/comfy_extras/nodes_differential_diffusion.py
 vendor/ComfyUI/comfy_extras/nodes_easycache.py
 vendor/ComfyUI/comfy_extras/nodes_edit_model.py
@@ -943,6 +959,7 @@ vendor/ComfyUI/comfy_extras/nodes_rtdetr.py
 vendor/ComfyUI/comfy_extras/nodes_sag.py
 vendor/ComfyUI/comfy_extras/nodes_sam3.py
 vendor/ComfyUI/comfy_extras/nodes_save_3d.py
+vendor/ComfyUI/comfy_extras/nodes_scail.py
 vendor/ComfyUI/comfy_extras/nodes_sd3.py
 vendor/ComfyUI/comfy_extras/nodes_sdpose.py
 vendor/ComfyUI/comfy_extras/nodes_sdupscale.py
@@ -1039,8 +1056,10 @@ vendor/ComfyUI/tests-unit/assets_test/test_assets_missing_sync.py
 vendor/ComfyUI/tests-unit/assets_test/test_crud.py
 vendor/ComfyUI/tests-unit/assets_test/test_downloads.py
 vendor/ComfyUI/tests-unit/assets_test/test_file_utils.py
+vendor/ComfyUI/tests-unit/assets_test/test_list_cursor.py
 vendor/ComfyUI/tests-unit/assets_test/test_list_filter.py
 vendor/ComfyUI/tests-unit/assets_test/test_metadata_filters.py
+vendor/ComfyUI/tests-unit/assets_test/test_prompt_id_enforcement.py
 vendor/ComfyUI/tests-unit/assets_test/test_prune_orphaned_assets.py
 vendor/ComfyUI/tests-unit/assets_test/test_sync_references.py
 vendor/ComfyUI/tests-unit/assets_test/test_tags_api.py
@@ -1048,6 +1067,7 @@ vendor/ComfyUI/tests-unit/assets_test/test_uploads.py
 vendor/ComfyUI/tests-unit/assets_test/queries/conftest.py
 vendor/ComfyUI/tests-unit/assets_test/queries/test_asset.py
 vendor/ComfyUI/tests-unit/assets_test/queries/test_asset_info.py
+vendor/ComfyUI/tests-unit/assets_test/queries/test_asset_reference_keyset.py
 vendor/ComfyUI/tests-unit/assets_test/queries/test_cache_state.py
 vendor/ComfyUI/tests-unit/assets_test/queries/test_metadata.py
 vendor/ComfyUI/tests-unit/assets_test/queries/test_tags.py
@@ -1055,7 +1075,9 @@ vendor/ComfyUI/tests-unit/assets_test/services/__init__.py
 vendor/ComfyUI/tests-unit/assets_test/services/conftest.py
 vendor/ComfyUI/tests-unit/assets_test/services/test_asset_management.py
 vendor/ComfyUI/tests-unit/assets_test/services/test_bulk_ingest.py
+vendor/ComfyUI/tests-unit/assets_test/services/test_cursor.py
 vendor/ComfyUI/tests-unit/assets_test/services/test_enrich.py
+vendor/ComfyUI/tests-unit/assets_test/services/test_image_dimensions.py
 vendor/ComfyUI/tests-unit/assets_test/services/test_ingest.py
 vendor/ComfyUI/tests-unit/assets_test/services/test_path_utils.py
 vendor/ComfyUI/tests-unit/assets_test/services/test_tag_histogram.py
@@ -1072,6 +1094,7 @@ vendor/ComfyUI/tests-unit/comfy_test/folder_path_test.py
 vendor/ComfyUI/tests-unit/comfy_test/model_detection_test.py
 vendor/ComfyUI/tests-unit/execution_test/preview_method_override_test.py
 vendor/ComfyUI/tests-unit/execution_test/test_cache_provider.py
+vendor/ComfyUI/tests-unit/execution_test/test_enrich_output.py
 vendor/ComfyUI/tests-unit/execution_test/validate_node_input_test.py
 vendor/ComfyUI/tests-unit/folder_paths_test/__init__.py
 vendor/ComfyUI/tests-unit/folder_paths_test/filter_by_content_types_test.py

{comfy_diffusion-2.3.1 → comfy_diffusion-2.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "comfy-diffusion"
-version = "2.3.1"
+version = "2.4.0"
 description = "ComfyUI inference engine as a standalone Python library (no server, no UI)."
 readme = "README.md"
 license = { text = "GPL-3.0-only" }

{comfy_diffusion-2.3.1 → comfy_diffusion-2.4.0}/tests/test_cli_package.py

@@ -44,7 +44,7 @@ def test_runtime_paths_prints_expected_keys(tmp_path: Path) -> None:
     payload = json.loads(result.stdout)
     assert payload["package_root"].endswith("comfy_diffusion")
     assert payload["models_dir"] == str(tmp_path.resolve())
-    assert payload["comfyui_pinned_tag"]
+    assert payload["comfyui_pinned_ref"]
     assert payload["comfyui_root"]
 
 

{comfy_diffusion-2.3.1 → comfy_diffusion-2.4.0}/tests/test_comfyui_submodule.py

@@ -3,13 +3,12 @@
 from __future__ import annotations
 
 import re
-import shutil
 import subprocess
 from pathlib import Path
 
 SUBMODULE_NAME = "vendor/ComfyUI"
 SUBMODULE_URL = "https://github.com/Comfy-Org/ComfyUI.git"
-PINNED_TAG = "v0.24.1"
+PINNED_REF = "fb991e2c1e7476809d566a4620c2132e05a466dd"
 
 
 def _repo_root() -> Path:
@@ -27,19 +26,17 @@ def _run_git(*args: str, cwd: Path | None = None) -> str:
     return result.stdout.strip()
 
 
-def test_submodule_is_gitlink_and_pinned_to_stable_tag() -> None:
+def test_submodule_is_gitlink_and_checked_out_at_pinned_ref() -> None:
     index_entry = _run_git("ls-files", "--stage", "--", SUBMODULE_NAME)
     mode, sha, stage_and_path = index_entry.split(maxsplit=2)
 
     assert mode == "160000"
     assert len(sha) == 40
     assert stage_and_path.endswith(SUBMODULE_NAME)
-    assert re.fullmatch(r"v\d+\.\d+\.\d+", PINNED_TAG)
+    assert re.fullmatch(r"(v\d+\.\d+\.\d+|[0-9a-f]{40})", PINNED_REF)
 
-    checked_out_tag = _run_git(
-        "-C", SUBMODULE_NAME, "describe", "--tags", "--exact-match", "HEAD"
-    )
-    assert checked_out_tag == PINNED_TAG
+    checked_out_sha = _run_git("-C", SUBMODULE_NAME, "rev-parse", "HEAD")
+    assert checked_out_sha == PINNED_REF
 
 
 def test_gitmodules_references_comfyui_repository() -> None:
@@ -54,20 +51,18 @@ def test_gitmodules_references_comfyui_repository() -> None:
     assert url_value == SUBMODULE_URL
 
 
-def test_submodule_update_init_restores_pinned_tag_without_manual_steps() -> None:
+def test_submodule_head_contains_pinned_ref() -> None:
     submodule_path = _repo_root() / SUBMODULE_NAME
-    _run_git("submodule", "deinit", "-f", "--", SUBMODULE_NAME)
-    shutil.rmtree(submodule_path, ignore_errors=True)
-
-    _run_git("submodule", "update", "--init", "--checkout", "--", SUBMODULE_NAME)
     assert submodule_path.is_dir()
 
-    checked_out_tag = _run_git(
-        "-C", SUBMODULE_NAME, "describe", "--tags", "--exact-match", "HEAD"
+    is_ancestor = subprocess.run(
+        ["git", "-C", SUBMODULE_NAME, "merge-base", "--is-ancestor", PINNED_REF, "HEAD"],
+        cwd=_repo_root(),
+        check=False,
     )
-    assert checked_out_tag == PINNED_TAG
+    assert is_ancestor.returncode == 0
 
 
-def test_pinned_tag_is_documented() -> None:
+def test_pinned_ref_is_documented() -> None:
     gitmodules_text = (_repo_root() / ".gitmodules").read_text(encoding="utf-8")
-    assert f"Pinned ComfyUI release tag: {PINNED_TAG}" in gitmodules_text
+    assert f"Pinned ComfyUI ref: {PINNED_REF}" in gitmodules_text

{comfy_diffusion-2.3.1 → comfy_diffusion-2.4.0}/tests/test_conditioning.py

@@ -14,6 +14,7 @@ import pytest
 
 import comfy_diffusion.conditioning as conditioning
 from comfy_diffusion.conditioning import (
+    bernini_conditioning,
     conditioning_combine,
     conditioning_set_mask,
     conditioning_set_timestep_range,
@@ -277,6 +278,7 @@ def test_conditioning_public_api_exports_expected_entrypoints() -> None:
     assert flux_guidance.__name__ == "flux_guidance"
     assert encode_clip_vision.__name__ == "encode_clip_vision"
     assert wan_image_to_video.__name__ == "wan_image_to_video"
+    assert bernini_conditioning.__name__ == "bernini_conditioning"
     assert wan_first_last_frame_to_video.__name__ == "wan_first_last_frame_to_video"
     assert ltxv_img_to_video.__name__ == "ltxv_img_to_video"
     assert ltxv_conditioning.__name__ == "ltxv_conditioning"
@@ -285,6 +287,7 @@ def test_conditioning_public_api_exports_expected_entrypoints() -> None:
         "encode_prompt_flux",
         "encode_clip_vision",
         "wan_image_to_video",
+        "bernini_conditioning",
         "wan_first_last_frame_to_video",
         "wan_vace_to_video",
         "wan_fun_control_to_video",