Merge branch 'master' into feat/cache-provider-api

- Hold references to pending store tasks to prevent "Task was destroyed
  but it is still pending" warnings (bigcat88)
- Parallel cache lookups with asyncio.gather instead of sequential
  awaits for better performance (bigcat88)
- Delegate Caching.register/unregister_provider to existing functions
  in cache_provider.py instead of reimplementing (bigcat88)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

comfy_api/latest/_input_impl/video_types.py

@@ -272,7 +272,7 @@ class VideoFromFile(VideoInput):
             has_first_frame = False
             for frame in frames:
                 offset_seconds = start_time - frame.pts * audio_stream.time_base
-                to_skip = max(0, int(offset_seconds * audio_stream.sample_rate))
+                to_skip = int(offset_seconds * audio_stream.sample_rate)
                 if to_skip < frame.samples:
                     has_first_frame = True
                     break
@@ -280,7 +280,7 @@ class VideoFromFile(VideoInput):
                 audio_frames.append(frame.to_ndarray()[..., to_skip:])
 
             for frame in frames:
-                if self.__duration and frame.time > start_time + self.__duration:
+                if frame.time > start_time + self.__duration:
                     break
                 audio_frames.append(frame.to_ndarray())  # shape: (channels, samples)
             if len(audio_frames) > 0:

comfy_execution/caching.py

@@ -148,10 +148,9 @@ class CacheKeySetInputSignature(CacheKeySet):
                     self.get_ordered_ancestry_internal(dynprompt, ancestor_id, ancestors, order_mapping)
 
 class BasicCache:
-    def __init__(self, key_class, enable_providers=False):
+    def __init__(self, key_class):
         self.key_class = key_class
         self.initialized = False
-        self.enable_providers = enable_providers
         self.dynprompt: DynamicPrompt
         self.cache_key_set: CacheKeySet
         self.cache = {}
@@ -240,8 +239,6 @@ class BasicCache:
             CacheValue, _contains_self_unequal, _logger
         )
 
-        if not self.enable_providers:
-            return
         if not _has_cache_providers():
             return
         if not self._is_external_cacheable_value(value):
@@ -277,8 +274,6 @@ class BasicCache:
             CacheValue, _contains_self_unequal, _logger
         )
 
-        if not self.enable_providers:
-            return None
         if not _has_cache_providers():
             return None
         if _contains_self_unequal(cache_key):
@@ -301,7 +296,7 @@ class BasicCache:
                         _logger.warning(f"Provider {provider.__class__.__name__} returned invalid outputs")
                         continue
                     from execution import CacheEntry
-                    return CacheEntry(ui=result.ui, outputs=list(result.outputs))
+                    return CacheEntry(ui=result.ui or {}, outputs=list(result.outputs))
             except Exception as e:
                 _logger.warning(f"Cache provider {provider.__class__.__name__} error on lookup: {e}")
 
@@ -359,8 +354,8 @@ class BasicCache:
         return result
 
 class HierarchicalCache(BasicCache):
-    def __init__(self, key_class, enable_providers=False):
-        super().__init__(key_class, enable_providers=enable_providers)
+    def __init__(self, key_class):
+        super().__init__(key_class)
 
     def _get_cache_for(self, node_id):
         assert self.dynprompt is not None
@@ -437,8 +432,8 @@ class NullCache:
         return self
 
 class LRUCache(BasicCache):
-    def __init__(self, key_class, max_size=100, enable_providers=False):
-        super().__init__(key_class, enable_providers=enable_providers)
+    def __init__(self, key_class, max_size=100):
+        super().__init__(key_class)
         self.max_size = max_size
         self.min_generation = 0
         self.generation = 0
@@ -506,8 +501,8 @@ RAM_CACHE_OLD_WORKFLOW_OOM_MULTIPLIER = 1.3
 
 class RAMPressureCache(LRUCache):
 
-    def __init__(self, key_class, enable_providers=False):
-        super().__init__(key_class, 0, enable_providers=enable_providers)
+    def __init__(self, key_class):
+        super().__init__(key_class, 0)
         self.timestamps = {}
 
     def clean_unused(self):

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.17.0"
+__version__ = "0.16.4"

execution.py

@@ -127,15 +127,15 @@ class CacheSet:
 
     # Performs like the old cache -- dump data ASAP
     def init_classic_cache(self):
-        self.outputs = HierarchicalCache(CacheKeySetInputSignature, enable_providers=True)
+        self.outputs = HierarchicalCache(CacheKeySetInputSignature)
         self.objects = HierarchicalCache(CacheKeySetID)
 
     def init_lru_cache(self, cache_size):
-        self.outputs = LRUCache(CacheKeySetInputSignature, max_size=cache_size, enable_providers=True)
+        self.outputs = LRUCache(CacheKeySetInputSignature, max_size=cache_size)
         self.objects = HierarchicalCache(CacheKeySetID)
 
     def init_ram_cache(self, min_headroom):
-        self.outputs = RAMPressureCache(CacheKeySetInputSignature, enable_providers=True)
+        self.outputs = RAMPressureCache(CacheKeySetInputSignature)
         self.objects = HierarchicalCache(CacheKeySetID)
 
     def init_null_cache(self):

pyproject.toml

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