diff --git a/__init__.py b/__init__.py index 91f63ba..391eae0 100644 --- a/__init__.py +++ b/__init__.py @@ -7,7 +7,7 @@ import importlib -version_code = [1, 2, 2] +version_code = [1, 3] version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '') print(f"### Loading: ComfyUI-Inspire-Pack ({version_str})") diff --git a/inspire/segs_support.py b/inspire/segs_support.py index 1abacc1..ff2580b 100644 --- a/inspire/segs_support.py +++ b/inspire/segs_support.py @@ -123,7 +123,16 @@ class InpaintPreprocessor_wrapper: if mask is None: mask = torch.ones((image.shape[1], image.shape[2]), dtype=torch.float32, device="cpu").unsqueeze(0) - return obj.preprocess(image, mask, self.black_pixel_for_xinsir_cn)[0] + try: + res = obj.preprocess(image, mask, black_pixel_for_xinsir_cn=self.black_pixel_for_xinsir_cn)[0] + except Exception as e: + if self.black_pixel_for_xinsir_cn: + raise e + else: + res = obj.preprocess(image, mask)[0] + print(f"[Inspire Pack] Installed 'ComfyUI's ControlNet Auxiliary Preprocessors.' is outdated.") + + return res class TilePreprocessor_wrapper: @@ -550,15 +559,18 @@ class Color_Preprocessor_Provider_for_SEGS: class InpaintPreprocessor_Provider_for_SEGS: @classmethod def INPUT_TYPES(s): - return {"required": { - "black_pixel_for_xinsir_cn": ("BOOLEAN", {"default": False, "label_on": "enable", "label_off": "disable"}), - }} + return { + "required": {}, + "optional": { + "black_pixel_for_xinsir_cn": ("BOOLEAN", {"default": False, "label_on": "enable", "label_off": "disable"}), + } + } RETURN_TYPES = ("SEGS_PREPROCESSOR",) FUNCTION = "doit" CATEGORY = "InspirePack/SEGS/ControlNet" - def doit(self, black_pixel_for_xinsir_cn): + def doit(self, black_pixel_for_xinsir_cn=False): obj = InpaintPreprocessor_wrapper(black_pixel_for_xinsir_cn) return (obj, ) diff --git a/pyproject.toml b/pyproject.toml index edf7a41..ca104b4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "comfyui-inspire-pack" description = "This extension provides various nodes to support Lora Block Weight and the Impact Pack. Provides many easily applicable regional features and applications for Variation Seed." -version = "1.2.2" +version = "1.3" license = { file = "LICENSE" } dependencies = ["matplotlib", "cachetools"]