Merge branch 'master' into feat/api-nodes/claude-node

Signed-off-by: bigcat88 <bigcat88@icloud.com>

comfy/utils.py

@@ -1164,18 +1164,12 @@ def tiled_scale_multidim(samples, function, tile=(64, 64), overlap=8, upscale_am
 
             o = out
             o_d = out_div
-            ps_view = ps
-            mask_view = mask
             for d in range(dims):
-                l = min(ps_view.shape[d + 2], o.shape[d + 2] - upscaled[d])
-                o = o.narrow(d + 2, upscaled[d], l)
-                o_d = o_d.narrow(d + 2, upscaled[d], l)
-                if l < ps_view.shape[d + 2]:
-                    ps_view = ps_view.narrow(d + 2, 0, l)
-                    mask_view = mask_view.narrow(d + 2, 0, l)
+                o = o.narrow(d + 2, upscaled[d], mask.shape[d + 2])
+                o_d = o_d.narrow(d + 2, upscaled[d], mask.shape[d + 2])
 
-            o.add_(ps_view * mask_view)
-            o_d.add_(mask_view)
+            o.add_(ps * mask)
+            o_d.add_(mask)
 
             if pbar is not None:
                 pbar.update(1)

comfyui_version.py

@@ -1,3 +1,3 @@
 # This file is automatically generated by the build process when version is
 # updated in pyproject.toml.
-__version__ = "0.21.1"
+__version__ = "0.21.0"

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ComfyUI"
-version = "0.21.1"
+version = "0.21.0"
 readme = "README.md"
 license = { file = "LICENSE" }
 requires-python = ">=3.10"

requirements.txt

@@ -1,5 +1,5 @@
 comfyui-frontend-package==1.43.18
-comfyui-workflow-templates==0.9.75
+comfyui-workflow-templates==0.9.73
 comfyui-embedded-docs==0.5.0
 torch
 torchsde

tests-unit/comfy_test/model_detection_test.py

@@ -1,23 +1,9 @@
-from collections import defaultdict
-
 import torch
 
 from comfy.model_detection import detect_unet_config, model_config_from_unet_config
 import comfy.supported_models
 
 
-def _freeze(value):
-    """Recursively convert a value to a hashable form so configs can be
-    compared/used as dict keys or set members."""
-    if isinstance(value, dict):
-        return frozenset((k, _freeze(v)) for k, v in value.items())
-    if isinstance(value, (list, tuple)):
-        return tuple(_freeze(v) for v in value)
-    if isinstance(value, set):
-        return frozenset(_freeze(v) for v in value)
-    return value
-
-
 def _make_longcat_comfyui_sd():
     """Minimal ComfyUI-format state dict for pre-converted LongCat-Image weights."""
     sd = {}
@@ -124,21 +110,3 @@ class TestModelDetection:
         model_config = model_config_from_unet_config(unet_config, sd)
         assert model_config is not None
         assert type(model_config).__name__ == "FluxSchnell"
-
-    def test_unet_config_and_required_keys_combination_is_unique(self):
-        """Each model in the registry must have a unique combination of
-        ``unet_config`` and ``required_keys``. If two models share the same
-        combination, ``BASE.matches`` cannot disambiguate between them and the
-        first one in the list will always win."""
-        models = comfy.supported_models.models
-        groups = defaultdict(list)
-        for model in models:
-            key = (_freeze(model.unet_config), _freeze(model.required_keys))
-            groups[key].append(model.__name__)
-
-        duplicates = {k: names for k, names in groups.items() if len(names) > 1}
-        assert not duplicates, (
-            "Found models sharing the same (unet_config, required_keys) "
-            "combination, which makes detection ambiguous: "
-            + "; ".join(", ".join(names) for names in duplicates.values())
-        )