From 64846b515f5513273022ef4287c584ca33433e78 Mon Sep 17 00:00:00 2001 From: "Dr.Lt.Data" Date: Wed, 16 Aug 2023 22:40:16 +0900 Subject: [PATCH] feat: add wildcard for DetailerForEach nodes. --- js/impact-pack.js | 4 ++++ modules/impact/config.py | 2 +- modules/impact/impact_pack.py | 20 +++++++++++--------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/js/impact-pack.js b/js/impact-pack.js index 435122e..3a7c047 100644 --- a/js/impact-pack.js +++ b/js/impact-pack.js @@ -231,6 +231,10 @@ app.registerExtension({ case "BasicPipeToDetailerPipe": case "EditDetailerPipe": case "FaceDetailer": + case "DetailerForEach": + case "DetailerForEachDebug": + case "DetailerForEachPipe": + case "DetailerForEachDebugPipe": { for(let i in node.widgets) { let widget = node.widgets[i]; diff --git a/modules/impact/config.py b/modules/impact/config.py index 56cb8c1..eb52c53 100644 --- a/modules/impact/config.py +++ b/modules/impact/config.py @@ -2,7 +2,7 @@ import configparser import os -version = "V3.16.3" +version = "V3.17" dependency_version = 9 diff --git a/modules/impact/impact_pack.py b/modules/impact/impact_pack.py index a5d1664..c2ac5e7 100644 --- a/modules/impact/impact_pack.py +++ b/modules/impact/impact_pack.py @@ -540,6 +540,7 @@ class DetailerForEach: "feather": ("INT", {"default": 5, "min": 0, "max": 100, "step": 1}), "noise_mask": ("BOOLEAN", {"default": True, "label_on": "enabled", "label_off": "disabled"}), "force_inpaint": ("BOOLEAN", {"default": True, "label_on": "enabled", "label_off": "disabled"}), + "wildcard": ("STRING", {"multiline": True}), }, } @@ -605,12 +606,12 @@ class DetailerForEach: return image_tensor, cropped_list, enhanced_list, enhanced_alpha_list def doit(self, image, segs, model, clip, vae, guide_size, guide_size_for, max_size, seed, steps, cfg, sampler_name, - scheduler, positive, negative, denoise, feather, noise_mask, force_inpaint): + scheduler, positive, negative, denoise, feather, noise_mask, force_inpaint, wildcard): enhanced_img, cropped, cropped_enhanced, cropped_enhanced_alpha = \ DetailerForEach.do_detail(image, segs, model, clip, vae, guide_size, guide_size_for, max_size, seed, steps, cfg, sampler_name, scheduler, positive, negative, denoise, feather, noise_mask, - force_inpaint) + force_inpaint, wildcard) return (enhanced_img, ) @@ -633,7 +634,8 @@ class DetailerForEachPipe: "feather": ("INT", {"default": 5, "min": 0, "max": 100, "step": 1}), "noise_mask": ("BOOLEAN", {"default": True, "label_on": "enabled", "label_off": "disabled"}), "force_inpaint": ("BOOLEAN", {"default": True, "label_on": "enabled", "label_off": "disabled"}), - "basic_pipe": ("BASIC_PIPE", ) + "basic_pipe": ("BASIC_PIPE", ), + "wildcard": ("STRING", {"multiline": True}), }, } @@ -643,13 +645,13 @@ class DetailerForEachPipe: CATEGORY = "ImpactPack/Detailer" def doit(self, image, segs, guide_size, guide_size_for, max_size, seed, steps, cfg, sampler_name, scheduler, - denoise, feather, noise_mask, force_inpaint, basic_pipe): + denoise, feather, noise_mask, force_inpaint, basic_pipe, wildcard): model, clip, vae, positive, negative = basic_pipe enhanced_img, cropped, cropped_enhanced, cropped_enhanced_alpha = \ DetailerForEach.do_detail(image, segs, model, clip, vae, guide_size, guide_size_for, max_size, seed, steps, cfg, sampler_name, scheduler, positive, negative, denoise, feather, noise_mask, - force_inpaint) + force_inpaint, wildcard) return (enhanced_img, ) @@ -1541,12 +1543,12 @@ class DetailerForEachTest(DetailerForEach): CATEGORY = "ImpactPack/Detailer" def doit(self, image, segs, model, clip, vae, guide_size, guide_size_for, max_size, seed, steps, cfg, sampler_name, - scheduler, positive, negative, denoise, feather, noise_mask, force_inpaint): + scheduler, positive, negative, denoise, feather, noise_mask, force_inpaint, wildcard): enhanced_img, cropped, cropped_enhanced, cropped_enhanced_alpha = \ DetailerForEach.do_detail(image, segs, model, clip, vae, guide_size, guide_size_for, max_size, seed, steps, cfg, sampler_name, scheduler, positive, negative, denoise, feather, noise_mask, - force_inpaint) + force_inpaint, wildcard) # set fallback image if len(cropped) == 0: @@ -1571,13 +1573,13 @@ class DetailerForEachTestPipe(DetailerForEachPipe): CATEGORY = "ImpactPack/Detailer" def doit(self, image, segs, guide_size, guide_size_for, max_size, seed, steps, cfg, sampler_name, scheduler, - denoise, feather, noise_mask, force_inpaint, basic_pipe): + denoise, feather, noise_mask, force_inpaint, basic_pipe, wildcard): model, clip, vae, positive, negative = basic_pipe enhanced_img, cropped, cropped_enhanced, cropped_enhanced_alpha = \ DetailerForEach.do_detail(image, segs, model, clip, vae, guide_size, guide_size_for, max_size, seed, steps, cfg, sampler_name, scheduler, positive, negative, denoise, feather, noise_mask, - force_inpaint) + force_inpaint, wildcard) # set fallback image if len(cropped) == 0: