diff --git a/comfy/model_management_types.py b/comfy/model_management_types.py index 4f7e5e34c..32d63c81b 100644 --- a/comfy/model_management_types.py +++ b/comfy/model_management_types.py @@ -138,7 +138,6 @@ class ModelManageable(Protocol, metaclass=ABCMeta): def force_cast_weights(self) -> bool: return False - @abstractmethod def prepare_hook_patches_current_keyframe(self, t, hook_group, model_options): pass diff --git a/comfy/nodes/comfyui_v3_package_imports.py b/comfy/nodes/comfyui_v3_package_imports.py index 77b4d7820..18cc9683c 100644 --- a/comfy/nodes/comfyui_v3_package_imports.py +++ b/comfy/nodes/comfyui_v3_package_imports.py @@ -24,7 +24,7 @@ def _comfy_entrypoint_upstream_v3_imports(module) -> ExportedNodes: if not isinstance(extension, ComfyExtension): logger.debug(f"comfy_entrypoint in {module} did not return a ComfyExtension, skipping.") else: - node_list = AsyncToSyncConverter.run_async_in_thread(extension.get_node_list) + node_list: list = list(AsyncToSyncConverter.run_async_in_thread(extension.get_node_list)) if not isinstance(node_list, list): logger.debug(f"comfy_entrypoint in {module} did not return a list of nodes, skipping.") else: diff --git a/comfy/samplers.py b/comfy/samplers.py index 1c3d4b497..c8996b1eb 100644 --- a/comfy/samplers.py +++ b/comfy/samplers.py @@ -25,6 +25,7 @@ from .model_patcher import ModelPatcher from .sampler_names import SCHEDULER_NAMES, SAMPLER_NAMES from .context_windows import ContextHandlerABC from .utils import common_upscale +from .patcher_extension import WrapperExecutor, get_all_wrappers, WrappersMP logger = logging.getLogger(__name__) @@ -998,10 +999,10 @@ class CFGGuider: return self.outer_predict_noise(*args, **kwargs) def outer_predict_noise(self, x, timestep, model_options={}, seed=None): - return comfy.patcher_extension.WrapperExecutor.new_class_executor( + return WrapperExecutor.new_class_executor( self.predict_noise, self, - comfy.patcher_extension.get_all_wrappers(comfy.patcher_extension.WrappersMP.PREDICT_NOISE, self.model_options, is_model_options=True) + get_all_wrappers(WrappersMP.PREDICT_NOISE, self.model_options, is_model_options=True) ).execute(x, timestep, model_options, seed) def predict_noise(self, x, timestep, model_options={}, seed=None): diff --git a/comfy_api/latest/_ui.py b/comfy_api/latest/_ui.py index 9e95f2af5..72a963aa1 100644 --- a/comfy_api/latest/_ui.py +++ b/comfy_api/latest/_ui.py @@ -11,7 +11,7 @@ import av import numpy as np import torch try: - import torchaudio + import torchaudio # pylint: disable=import-error TORCH_AUDIO_AVAILABLE = True except: TORCH_AUDIO_AVAILABLE = False