comfy-diffusion 2.4.2__tar.gz → 2.4.4__tar.gz

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-diffusion
-Version: 2.4.2
+Version: 2.4.4
 Summary: ComfyUI inference engine as a standalone Python library (no server, no UI).
 Author: Alejandro Quintero
 License: GPL-3.0-only

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/comfy_diffusion/_runtime.py

@@ -13,11 +13,12 @@ import urllib.request
 import zipfile
 from pathlib import Path
 
-COMFYUI_PINNED_REF = "fb991e2c1e7476809d566a4620c2132e05a466dd"
+COMFYUI_PINNED_REF = "822aca19836cd75c815631db23c3ad742d1f7d5e"
 COMFYUI_PINNED_ARCHIVE_URL = (
     "https://github.com/Comfy-Org/ComfyUI/archive/"
     f"{COMFYUI_PINNED_REF}.zip"
 )
+COMFYUI_PINNED_REF_MARKER = ".comfy-diffusion-comfyui-ref"
 
 
 def _comfyui_root() -> Path:
@@ -39,6 +40,26 @@ def _has_comfyui_runtime(comfyui_root: Path) -> bool:
     return comfyui_root.is_dir() and (comfyui_root / "comfy").is_dir()
 
 
+def _is_download_managed_runtime(comfyui_root: Path) -> bool:
+    """Return True when this runtime lives inside the installed package tree."""
+    package_dir = Path(__file__).resolve().parent
+    return comfyui_root == package_dir / "vendor" / "ComfyUI"
+
+
+def _has_pinned_comfyui_runtime(comfyui_root: Path) -> bool:
+    """Return True if a downloaded ComfyUI runtime matches the pinned ref."""
+    if not _has_comfyui_runtime(comfyui_root):
+        return False
+    if not _is_download_managed_runtime(comfyui_root):
+        return True
+
+    marker = comfyui_root / COMFYUI_PINNED_REF_MARKER
+    try:
+        return marker.read_text(encoding="utf-8").strip() == COMFYUI_PINNED_REF
+    except OSError:
+        return False
+
+
 def _download_and_extract_pinned_comfyui(comfyui_root: Path) -> None:
     """Download and extract the pinned ComfyUI ref into vendor/ComfyUI."""
     vendor_dir = comfyui_root.parent
@@ -64,13 +85,16 @@ def _download_and_extract_pinned_comfyui(comfyui_root: Path) -> None:
 
     if not _has_comfyui_runtime(comfyui_root):
         raise RuntimeError("ComfyUI runtime download completed but content is invalid.")
+    (comfyui_root / COMFYUI_PINNED_REF_MARKER).write_text(
+        f"{COMFYUI_PINNED_REF}\n", encoding="utf-8"
+    )
 
 
 def ensure_comfyui_available() -> Path:
     """Ensure vendored ComfyUI exists; download pinned ref if missing."""
     comfyui_root = _comfyui_root()
 
-    if not _has_comfyui_runtime(comfyui_root):
+    if not _has_pinned_comfyui_runtime(comfyui_root):
         _download_and_extract_pinned_comfyui(comfyui_root)
 
     return comfyui_root

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/comfy_diffusion/pipelines/video/wan/wan22/bernini.py

@@ -105,6 +105,58 @@ def _coerce_reference_images(reference_images: Any, image_to_tensor: Any) -> lis
     return coerced or None
 
 
+def _reference_images_to_autogrow(reference_images: list[Any] | None) -> dict[str, Any] | None:
+    if not reference_images:
+        return None
+    return {f"reference_image_{index}": image for index, image in enumerate(reference_images)}
+
+
+def _unwrap_bernini_output(output: Any) -> tuple[Any, Any, dict[str, Any]]:
+    result = getattr(output, "result", output)
+    if not isinstance(result, (tuple, list)) or len(result) != 3:
+        raise RuntimeError("BerniniConditioning returned an unexpected output shape")
+    return result[0], result[1], result[2]
+
+
+def _run_bernini_conditioning(
+    positive: Any,
+    negative: Any,
+    vae: Any,
+    *,
+    width: int,
+    height: int,
+    length: int,
+    batch_size: int,
+    source_video: Any | None,
+    reference_images: list[Any] | None,
+    ref_max_size: int,
+) -> tuple[Any, Any, dict[str, Any]]:
+    from comfy_diffusion._runtime import ensure_comfyui_on_path
+
+    ensure_comfyui_on_path()
+    try:
+        from comfy_extras.nodes_bernini import BerniniConditioning
+    except (ImportError, ModuleNotFoundError) as exc:
+        raise RuntimeError(
+            "Vendored ComfyUI does not include BerniniConditioning; "
+            "update the ComfyUI pin to a Bernini-capable nightly build."
+        ) from exc
+
+    output = BerniniConditioning.execute(
+        positive,
+        negative,
+        vae,
+        width,
+        height,
+        length,
+        batch_size,
+        source_video=source_video,
+        reference_images=_reference_images_to_autogrow(reference_images),
+        ref_max_size=ref_max_size,
+    )
+    return _unwrap_bernini_output(output)
+
+
 def run(
     source_video: Any | None = None,
     reference_image: Any | None = None,
@@ -139,7 +191,7 @@ def run(
     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.conditioning import encode_prompt
     from comfy_diffusion.image import image_to_tensor
     from comfy_diffusion.lora import apply_lora
     from comfy_diffusion.models import ModelManager
@@ -182,7 +234,7 @@ def run(
 
     positive, negative = encode_prompt(clip, prompt, negative_prompt)
 
-    positive, negative, latent = bernini_conditioning(
+    positive, negative, latent = _run_bernini_conditioning(
         positive,
         negative,
         vae,

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/comfy_diffusion.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comfy-diffusion
-Version: 2.4.2
+Version: 2.4.4
 Summary: ComfyUI inference engine as a standalone Python library (no server, no UI).
 Author: Alejandro Quintero
 License: GPL-3.0-only

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "comfy-diffusion"
-version = "2.4.2"
+version = "2.4.4"
 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.4.2 → comfy_diffusion-2.4.4}/tests/test_comfyui_submodule.py

@@ -8,7 +8,7 @@ from pathlib import Path
 
 SUBMODULE_NAME = "vendor/ComfyUI"
 SUBMODULE_URL = "https://github.com/Comfy-Org/ComfyUI.git"
-PINNED_REF = "fb991e2c1e7476809d566a4620c2132e05a466dd"
+PINNED_REF = "822aca19836cd75c815631db23c3ad742d1f7d5e"
 
 
 def _repo_root() -> Path:

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/tests/test_pipelines_wan22_bernini.py

@@ -4,6 +4,8 @@ from __future__ import annotations
 
 import ast
 import inspect
+import sys
+import types
 from pathlib import Path
 from unittest.mock import MagicMock, call, patch
 
@@ -22,7 +24,9 @@ _RUNTIME_PATCH = "comfy_diffusion.runtime.check_runtime"
 _MM_PATCH = "comfy_diffusion.models.ModelManager"
 _APPLY_LORA_PATCH = "comfy_diffusion.lora.apply_lora"
 _ENCODE_PATCH = "comfy_diffusion.conditioning.encode_prompt"
-_BERNINI_CONDITIONING_PATCH = "comfy_diffusion.conditioning.bernini_conditioning"
+_BERNINI_CONDITIONING_PATCH = (
+    "comfy_diffusion.pipelines.video.wan.wan22.bernini._run_bernini_conditioning"
+)
 _IMAGE_TO_TENSOR_PATCH = "comfy_diffusion.image.image_to_tensor"
 _GET_SAMPLER_PATCH = "comfy_diffusion.sampling.get_sampler"
 _BASIC_SCHEDULER_PATCH = "comfy_diffusion.sampling.basic_scheduler"
@@ -103,6 +107,48 @@ def test_run_signature_defaults_match_workflow() -> None:
     assert sig.parameters["ref_max_size"].default == 848
 
 
+def test_bernini_conditioning_uses_vendored_node_autogrow(monkeypatch: object) -> None:
+    from comfy_diffusion.pipelines.video.wan.wan22.bernini import _run_bernini_conditioning
+
+    class FakeNodeOutput:
+        def __init__(self, *values: object) -> None:
+            self.result = values
+
+    class FakeBerniniConditioning:
+        call_kwargs: dict[str, object]
+
+        @classmethod
+        def execute(cls, *args: object, **kwargs: object) -> FakeNodeOutput:
+            cls.call_kwargs = kwargs
+            return FakeNodeOutput("bernini_positive", "bernini_negative", {"samples": "latent"})
+
+    fake_module = types.SimpleNamespace(BerniniConditioning=FakeBerniniConditioning)
+    monkeypatch.setitem(sys.modules, "comfy_extras.nodes_bernini", fake_module)
+
+    reference_one = object()
+    reference_two = object()
+    result = _run_bernini_conditioning(
+        "positive",
+        "negative",
+        "vae",
+        width=832,
+        height=480,
+        length=81,
+        batch_size=1,
+        source_video="source",
+        reference_images=[reference_one, reference_two],
+        ref_max_size=848,
+    )
+
+    assert result == ("bernini_positive", "bernini_negative", {"samples": "latent"})
+    assert FakeBerniniConditioning.call_kwargs["source_video"] == "source"
+    assert FakeBerniniConditioning.call_kwargs["reference_images"] == {
+        "reference_image_0": reference_one,
+        "reference_image_1": reference_two,
+    }
+    assert FakeBerniniConditioning.call_kwargs["ref_max_size"] == 848
+
+
 def test_run_wires_bernini_workflow() -> None:
     from comfy_diffusion.pipelines.video.wan.wan22.bernini import run
 

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/tests/test_runtime_autodownload.py

@@ -98,6 +98,54 @@ def test_ensure_comfyui_available_skips_download_when_runtime_is_present(
     assert download_called["value"] is False
 
 
+def test_ensure_comfyui_available_redownloads_managed_runtime_without_pin_marker(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    comfyui_root = tmp_path / "comfy_diffusion" / "vendor" / "ComfyUI"
+    (comfyui_root / "comfy").mkdir(parents=True)
+    (comfyui_root / "comfy" / "__init__.py").write_text("", encoding="utf-8")
+    downloads: list[Path] = []
+
+    def fake_download(target: Path) -> None:
+        downloads.append(target)
+        (target / "comfy").mkdir(parents=True, exist_ok=True)
+        (target / "comfy" / "__init__.py").write_text("", encoding="utf-8")
+        (target / _runtime.COMFYUI_PINNED_REF_MARKER).write_text(
+            f"{_runtime.COMFYUI_PINNED_REF}\n", encoding="utf-8"
+        )
+
+    monkeypatch.setattr(_runtime, "_comfyui_root", lambda: comfyui_root)
+    monkeypatch.setattr(_runtime, "_is_download_managed_runtime", lambda _root: True)
+    monkeypatch.setattr(_runtime, "_download_and_extract_pinned_comfyui", fake_download)
+
+    result = _runtime.ensure_comfyui_available()
+
+    assert result == comfyui_root
+    assert downloads == [comfyui_root]
+
+
+def test_ensure_comfyui_available_skips_managed_runtime_with_matching_pin_marker(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    comfyui_root = tmp_path / "comfy_diffusion" / "vendor" / "ComfyUI"
+    (comfyui_root / "comfy").mkdir(parents=True)
+    (comfyui_root / "comfy" / "__init__.py").write_text("", encoding="utf-8")
+    (comfyui_root / _runtime.COMFYUI_PINNED_REF_MARKER).write_text(
+        f"{_runtime.COMFYUI_PINNED_REF}\n", encoding="utf-8"
+    )
+
+    def fake_download(target: Path) -> None:
+        raise AssertionError(f"unexpected download for {target}")
+
+    monkeypatch.setattr(_runtime, "_comfyui_root", lambda: comfyui_root)
+    monkeypatch.setattr(_runtime, "_is_download_managed_runtime", lambda _root: True)
+    monkeypatch.setattr(_runtime, "_download_and_extract_pinned_comfyui", fake_download)
+
+    result = _runtime.ensure_comfyui_available()
+
+    assert result == comfyui_root
+
+
 def test_ensure_comfyui_available_downloads_and_extracts_when_runtime_is_missing(
     monkeypatch: pytest.MonkeyPatch, tmp_path: Path
 ) -> None:
@@ -136,6 +184,9 @@ def test_ensure_comfyui_available_downloads_and_extracts_when_runtime_is_missing
     assert result == comfyui_root
     assert comfyui_root.is_dir()
     assert (comfyui_root / "comfy").is_dir()
+    assert (comfyui_root / _runtime.COMFYUI_PINNED_REF_MARKER).read_text(
+        encoding="utf-8"
+    ).strip() == _runtime.COMFYUI_PINNED_REF
     assert observed_url["value"] == _runtime.COMFYUI_PINNED_ARCHIVE_URL
     assert _runtime.COMFYUI_PINNED_REF in observed_url["value"]
     assert "value" in extracted_into

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/vendor/ComfyUI/README.md

@@ -364,7 +364,7 @@ For models compatible with Iluvatar Extension for PyTorch. Here's a step-by-step
 | Flag | Description |
 |------|-------------|
 | `--enable-manager` | Enable ComfyUI-Manager |
-| `--enable-manager-legacy-ui` | Use the legacy manager UI instead of the new UI (requires `--enable-manager`) |
+| `--enable-manager-legacy-ui` | Use the legacy manager UI instead of the new UI (implies `--enable-manager`) |
 | `--disable-manager-ui` | Disable the manager UI and endpoints while keeping background features like security checks and scheduled installation completion (requires `--enable-manager`) |
 
 

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/vendor/ComfyUI/comfy/cli_args.py

@@ -133,7 +133,7 @@ upcast.add_argument("--dont-upcast-attention", action="store_true", help="Disabl
 parser.add_argument("--enable-manager", action="store_true", help="Enable the ComfyUI-Manager feature.")
 manager_group = parser.add_mutually_exclusive_group()
 manager_group.add_argument("--disable-manager-ui", action="store_true", help="Disables only the ComfyUI-Manager UI and endpoints. Scheduled installations and similar background tasks will still operate.")
-manager_group.add_argument("--enable-manager-legacy-ui", action="store_true", help="Enables the legacy UI of ComfyUI-Manager")
+manager_group.add_argument("--enable-manager-legacy-ui", action="store_true", help="Enables the legacy UI of ComfyUI-Manager. Implies --enable-manager.")
 
 
 vram_group = parser.add_mutually_exclusive_group()
@@ -258,6 +258,10 @@ if args.disable_auto_launch:
 if args.force_fp16:
     args.fp16_unet = True
 
+# '--enable-manager-legacy-ui' is meaningless unless the manager is enabled, so imply '--enable-manager'.
+if args.enable_manager_legacy_ui:
+    args.enable_manager = True
+
 
 # '--fast' is not provided, use an empty set
 if args.fast is None:

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/vendor/ComfyUI/comfy_api/latest/_io.py

@@ -1400,7 +1400,8 @@ class V3Data(TypedDict):
 class HiddenHolder:
     def __init__(self, unique_id: str, prompt: Any,
                  extra_pnginfo: Any, dynprompt: Any,
-                 auth_token_comfy_org: str, api_key_comfy_org: str, **kwargs):
+                 auth_token_comfy_org: str, api_key_comfy_org: str,
+                 comfy_usage_source: str = None, **kwargs):
         self.unique_id = unique_id
         """UNIQUE_ID is the unique identifier of the node, and matches the id property of the node on the client side. It is commonly used in client-server communications (see messages)."""
         self.prompt = prompt
@@ -1413,6 +1414,8 @@ class HiddenHolder:
         """AUTH_TOKEN_COMFY_ORG is a token acquired from signing into a ComfyOrg account on frontend."""
         self.api_key_comfy_org = api_key_comfy_org
         """API_KEY_COMFY_ORG is an API Key generated by ComfyOrg that allows skipping signing into a ComfyOrg account on frontend."""
+        self.comfy_usage_source = comfy_usage_source
+        """COMFY_USAGE_SOURCE identifies the client that submitted the prompt (e.g. comfyui-frontend, comfy-cli, comfyui-mcp); forwarded to API nodes' upstream requests via the Comfy-Usage-Source header."""
 
     def __getattr__(self, key: str):
         '''If hidden variable not found, return None.'''
@@ -1429,6 +1432,7 @@ class HiddenHolder:
             dynprompt=d.get(Hidden.dynprompt, None),
             auth_token_comfy_org=d.get(Hidden.auth_token_comfy_org, None),
             api_key_comfy_org=d.get(Hidden.api_key_comfy_org, None),
+            comfy_usage_source=d.get(Hidden.comfy_usage_source, None),
         )
 
     @classmethod
@@ -1451,6 +1455,8 @@ class Hidden(str, Enum):
     """AUTH_TOKEN_COMFY_ORG is a token acquired from signing into a ComfyOrg account on frontend."""
     api_key_comfy_org = "API_KEY_COMFY_ORG"
     """API_KEY_COMFY_ORG is an API Key generated by ComfyOrg that allows skipping signing into a ComfyOrg account on frontend."""
+    comfy_usage_source = "COMFY_USAGE_SOURCE"
+    """COMFY_USAGE_SOURCE identifies the client that submitted the prompt (e.g. comfyui-frontend, comfy-cli, comfyui-mcp); forwarded to API nodes' upstream requests via the Comfy-Usage-Source header."""
 
 
 @dataclass
@@ -1654,6 +1660,8 @@ class Schema:
                 self.hidden.append(Hidden.auth_token_comfy_org)
             if Hidden.api_key_comfy_org not in self.hidden:
                 self.hidden.append(Hidden.api_key_comfy_org)
+            if Hidden.comfy_usage_source not in self.hidden:
+                self.hidden.append(Hidden.comfy_usage_source)
         # if is an output_node, will need prompt and extra_pnginfo
         if self.is_output_node:
             if Hidden.prompt not in self.hidden:

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/vendor/ComfyUI/comfy_api_nodes/nodes_bria.py

@@ -289,7 +289,7 @@ class BriaRemoveVideoBackground(IO.ComfyNode):
             ],
             is_api_node=True,
             price_badge=IO.PriceBadge(
-                expr="""{"type":"usd","usd":0.14,"format":{"suffix":"/second"}}""",
+                expr="""{"type":"usd","usd":0.0042,"format":{"suffix":"/second"}}""",
             ),
         )
 
@@ -357,7 +357,7 @@ class BriaVideoGreenScreen(IO.ComfyNode):
             ],
             is_api_node=True,
             price_badge=IO.PriceBadge(
-                expr="""{"type":"usd","usd":0.14,"format":{"suffix":"/second"}}""",
+                expr="""{"type":"usd","usd":0.0042,"format":{"suffix":"/second"}}""",
             ),
         )
 
@@ -433,7 +433,7 @@ class BriaVideoReplaceBackground(IO.ComfyNode):
             ],
             is_api_node=True,
             price_badge=IO.PriceBadge(
-                expr="""{"type":"usd","usd":0.14,"format":{"suffix":"/second"}}""",
+                expr="""{"type":"usd","usd":0.0042,"format":{"suffix":"/second"}}""",
             ),
         )
 
@@ -452,7 +452,10 @@ class BriaVideoReplaceBackground(IO.ComfyNode):
             validate_video_duration(background_video, max_duration=60.0)
             background_url = await upload_video_to_comfyapi(cls, background_video, wait_label="Uploading background")
         else:
-            background_url = await upload_image_to_comfyapi(cls, background_image, wait_label="Uploading background")
+            # Bria's replace_background 500s on RGBA, so drop the alpha channel before upload.
+            background_url = await upload_image_to_comfyapi(
+                cls, background_image[:, :, :, :3], wait_label="Uploading background"
+            )
         response = await sync_op(
             cls,
             ApiEndpoint(path="/proxy/bria/v2/video/edit/replace_background", method="POST"),
@@ -530,7 +533,7 @@ class BriaTransparentVideoBackground(IO.ComfyNode):
             ],
             is_api_node=True,
             price_badge=IO.PriceBadge(
-                expr="""{"type":"usd","usd":0.14,"format":{"suffix":"/second"}}""",
+                expr="""{"type":"usd","usd":0.0042,"format":{"suffix":"/second"}}""",
             ),
         )
 
@@ -571,7 +574,7 @@ class BriaExtension(ComfyExtension):
             BriaRemoveImageBackground,
             BriaRemoveVideoBackground,
             BriaVideoGreenScreen,
-            # BriaVideoReplaceBackground,  # server returns Status 500 when we pass background video
+            BriaVideoReplaceBackground,
             BriaTransparentVideoBackground,
         ]
 

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/vendor/ComfyUI/comfy_api_nodes/nodes_sonilo.py

@@ -16,7 +16,7 @@ from comfy_api_nodes.util import (
 )
 from comfy_api_nodes.util._helpers import (
     default_base_url,
-    get_auth_header,
+    get_comfy_api_headers,
     get_node_id,
     is_processing_interrupted,
 )
@@ -174,8 +174,7 @@ async def _stream_sonilo_music(
     """POST ``form`` to Sonilo, read the NDJSON stream, and return the first stream's audio bytes."""
     url = urljoin(default_base_url().rstrip("/") + "/", endpoint.path.lstrip("/"))
 
-    headers: dict[str, str] = {}
-    headers.update(get_auth_header(cls))
+    headers = get_comfy_api_headers(cls)
     headers.update(endpoint.headers)
 
     node_id = get_node_id(cls)

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/vendor/ComfyUI/comfy_api_nodes/util/_helpers.py

@@ -9,6 +9,7 @@ from io import BytesIO
 from yarl import URL
 
 from comfy.cli_args import args
+from comfy.deploy_environment import get_deploy_environment
 from comfy.model_management import processing_interrupted
 from comfy_api.latest import IO
 
@@ -35,6 +36,30 @@ def get_auth_header(node_cls: type[IO.ComfyNode]) -> dict[str, str]:
     return {}
 
 
+def get_usage_source(node_cls: type[IO.ComfyNode]) -> str:
+    """Source of the prompt that triggered this API node.
+
+    Defaults to "comfyui-api" when the submitting client didn't identify itself,
+    i.e. a direct API call to this server.
+    """
+    return node_cls.hidden.comfy_usage_source or "comfyui-api"
+
+
+def get_comfy_api_headers(node_cls: type[IO.ComfyNode]) -> dict[str, str]:
+    """Common headers (auth, deploy environment, usage source) for Comfy API requests.
+
+    Centralizes the shared header set so every Comfy API request sends a consistent
+    set and new shared headers only need to be added in one place. Intended for
+    relative/cloud URLs resolved against ``default_base_url()``; because the result
+    includes auth, callers must not attach it to arbitrary absolute/presigned URLs.
+    """
+    return {
+        **get_auth_header(node_cls),
+        "Comfy-Env": get_deploy_environment(),
+        "Comfy-Usage-Source": get_usage_source(node_cls),
+    }
+
+
 def default_base_url() -> str:
     return getattr(args, "comfy_api_base", "https://api.comfy.org")
 

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/vendor/ComfyUI/comfy_api_nodes/util/client.py

@@ -19,12 +19,10 @@ from comfy import utils
 from comfy_api.latest import IO
 from server import PromptServer
 
-from comfy.deploy_environment import get_deploy_environment
-
 from . import request_logger
 from ._helpers import (
     default_base_url,
-    get_auth_header,
+    get_comfy_api_headers,
     get_node_id,
     is_processing_interrupted,
     sleep_with_interrupt,
@@ -645,8 +643,7 @@ async def _request_base(cfg: _RequestConfig, expect_binary: bool):
 
         payload_headers = {"Accept": "*/*"} if expect_binary else {"Accept": "application/json"}
         if not parsed_url.scheme and not parsed_url.netloc:  # is URL relative?
-            payload_headers.update(get_auth_header(cfg.node_cls))
-            payload_headers["Comfy-Env"] = get_deploy_environment()
+            payload_headers.update(get_comfy_api_headers(cfg.node_cls))
         if cfg.endpoint.headers:
             payload_headers.update(cfg.endpoint.headers)
 

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/vendor/ComfyUI/comfy_api_nodes/util/download_helpers.py

@@ -17,7 +17,7 @@ from folder_paths import get_output_directory
 from . import request_logger
 from ._helpers import (
     default_base_url,
-    get_auth_header,
+    get_comfy_api_headers,
     is_processing_interrupted,
     sleep_with_interrupt,
     to_aiohttp_url,
@@ -64,7 +64,7 @@ async def download_url_to_bytesio(
         if cls is None:
             raise ValueError("For relative 'cloud' paths, the `cls` parameter is required.")
         url = urljoin(default_base_url().rstrip("/") + "/", url.lstrip("/"))
-        headers = get_auth_header(cls)
+        headers = get_comfy_api_headers(cls)
 
     while True:
         attempt += 1

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/vendor/ComfyUI/comfy_extras/nodes_flux.py

@@ -245,6 +245,11 @@ class KV_Attn_Input:
         cache_key = "{}_{}".format(extra_options["block_type"], extra_options["block_index"])
         if cache_key in self.cache:
             kk, vv = self.cache[cache_key]
+
+            # Fix batch size changing.
+            kk = comfy.utils.repeat_to_batch_size(kk, k.shape[0])
+            vv = comfy.utils.repeat_to_batch_size(vv, v.shape[0])
+
             self.set_cache = False
             return {"q": q, "k": torch.cat((k, kk), dim=2), "v": torch.cat((v, vv), dim=2)}
 

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/vendor/ComfyUI/execution.py

@@ -200,6 +200,8 @@ def get_input_data(inputs, class_def, unique_id, execution_list=None, dynprompt=
                 hidden_inputs_v3[io.Hidden.auth_token_comfy_org] = extra_data.get("auth_token_comfy_org", None)
             if io.Hidden.api_key_comfy_org.name in hidden:
                 hidden_inputs_v3[io.Hidden.api_key_comfy_org] = extra_data.get("api_key_comfy_org", None)
+            if io.Hidden.comfy_usage_source.name in hidden:
+                hidden_inputs_v3[io.Hidden.comfy_usage_source] = extra_data.get("comfy_usage_source", None)
     else:
         if "hidden" in valid_inputs:
             h = valid_inputs["hidden"]
@@ -216,6 +218,8 @@ def get_input_data(inputs, class_def, unique_id, execution_list=None, dynprompt=
                     input_data_all[x] = [extra_data.get("auth_token_comfy_org", None)]
                 if h[x] == "API_KEY_COMFY_ORG":
                     input_data_all[x] = [extra_data.get("api_key_comfy_org", None)]
+                if h[x] == "COMFY_USAGE_SOURCE":
+                    input_data_all[x] = [extra_data.get("comfy_usage_source", None)]
     v3_data["hidden_inputs"] = hidden_inputs_v3
     return input_data_all, missing_keys, v3_data
 

{comfy_diffusion-2.4.2 → comfy_diffusion-2.4.4}/vendor/ComfyUI/server.py

@@ -971,6 +971,11 @@ class PromptServer():
 
                 if "client_id" in json_data:
                     extra_data["client_id"] = json_data["client_id"]
+
+                if "comfy_usage_source" not in extra_data:
+                    usage_source = request.headers.get("Comfy-Usage-Source")
+                    if usage_source:
+                        extra_data["comfy_usage_source"] = usage_source
                 if valid[0]:
                     outputs_to_execute = valid[2]
                     sensitive = {}