diff --git a/modules/impact/core.py b/modules/impact/core.py index 32b350c5..ac4a933e 100644 --- a/modules/impact/core.py +++ b/modules/impact/core.py @@ -230,7 +230,7 @@ def enhance_detail(image, model, clip, vae, guide_size, guide_size_for_bbox, max noise_mask = noise_mask.squeeze(3) if noise_mask_feather > 0: - model = nodes_differential_diffusion.DifferentialDiffusion().apply(model)[0] + model = nodes_differential_diffusion.DifferentialDiffusion().execute(model)[0] if wildcard_opt is not None and wildcard_opt != "": model, _, wildcard_positive = wildcards.process_with_loras(wildcard_opt, model, clip) @@ -370,7 +370,7 @@ def enhance_detail_for_animatediff(image_frames, model, clip, vae, guide_size, g noise_mask = noise_mask.squeeze(3) if noise_mask_feather > 0: - model = nodes_differential_diffusion.DifferentialDiffusion().apply(model)[0] + model = nodes_differential_diffusion.DifferentialDiffusion().execute(model)[0] if wildcard_opt is not None and wildcard_opt != "": model, _, wildcard_positive = wildcards.process_with_loras(wildcard_opt, model, clip) diff --git a/modules/impact/segs_upscaler.py b/modules/impact/segs_upscaler.py index ba09d2cb..475c135b 100644 --- a/modules/impact/segs_upscaler.py +++ b/modules/impact/segs_upscaler.py @@ -99,7 +99,7 @@ def img2img_segs(image, model, clip, vae, seed, steps, cfg, sampler_name, schedu noise_mask = noise_mask.squeeze(3) if noise_mask_feather > 0: - model = nodes_differential_diffusion.DifferentialDiffusion().apply(model)[0] + model = nodes_differential_diffusion.DifferentialDiffusion().execute(model)[0] if control_net_wrapper is not None: positive, negative, _ = control_net_wrapper.apply(positive, negative, image, noise_mask) diff --git a/modules/impact/util_nodes.py b/modules/impact/util_nodes.py index 1a73992c..18efa9c6 100644 --- a/modules/impact/util_nodes.py +++ b/modules/impact/util_nodes.py @@ -325,7 +325,7 @@ def INPUT_TYPES(s): CATEGORY = "ImpactPack/Operation" def doit(self, images): - if len(images) <= 1: + if len(images) < 1: return (images,) else: image1 = images[0] @@ -549,9 +549,8 @@ def doit(self, string, delimiter, prefix_all, postfix_all, restrict_to_tags, exc # some sanity checks and normalization for later processing if prefix_all is None: prefix_all = "" if postfix_all is None: postfix_all = "" - if restrict_to_tags is None: restrict_to_tags = "" if exclude_tags is None: exclude_tags = "" - if not isinstance(restrict_to_tags, list): + if restrict_to_tags is not None and restrict_to_tags != "" and not isinstance(restrict_to_tags, list): restrict_to_tags = restrict_to_tags.split(", ") if not isinstance(exclude_tags, list): exclude_tags = exclude_tags.split(", ") @@ -564,7 +563,7 @@ def doit(self, string, delimiter, prefix_all, postfix_all, restrict_to_tags, exc labels.append(label) x = x.split(", ") # restrict to tags - if restrict_to_tags != "": + if isinstance(restrict_to_tags, list): x = list(set(x) & set(restrict_to_tags)) # remove tags if exclude_tags != "":