From e61b80675776b65557be2aacea9d0a1700e8a5d8 Mon Sep 17 00:00:00 2001 From: Bingsu Date: Fri, 7 Jul 2023 10:00:21 +0900 Subject: [PATCH] fix: wrong index issue --- scripts/!adetailer.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/!adetailer.py b/scripts/!adetailer.py index 7a642a4..d44e05e 100644 --- a/scripts/!adetailer.py +++ b/scripts/!adetailer.py @@ -414,7 +414,7 @@ class AfterDetailerScript(scripts.Script): return i2i def save_image(self, p, image, *, condition: str, suffix: str) -> None: - i = p._ad_idx_all + i = p._ad_idx if p.all_prompts: i %= len(p.all_prompts) save_prompt = p.all_prompts[i] @@ -482,12 +482,12 @@ class AfterDetailerScript(scripts.Script): ) def need_call_process(self, p) -> bool: - i = p._ad_idx + i = p._ad_idx_batch bs = p.batch_size return i == bs - 1 def need_call_postprocess(self, p) -> bool: - i = p._ad_idx + i = p._ad_idx_batch return i == 0 @rich_traceback @@ -500,7 +500,7 @@ class AfterDetailerScript(scripts.Script): extra_params = self.extra_params(arg_list) p.extra_generation_params.update(extra_params) - p._ad_idx = -1 + p._ad_idx_batch = -1 def _postprocess_image(self, p, pp, args: ADetailerArgs, *, n: int = 0) -> bool: """ @@ -597,7 +597,7 @@ class AfterDetailerScript(scripts.Script): return p._ad_idx = getattr(p, "_ad_idx", -1) + 1 - p._ad_idx_all = getattr(p, "_ad_idx_all", -1) + 1 + p._ad_idx_batch = getattr(p, "_ad_idx_batch", -1) + 1 init_image = copy(pp.image) arg_list = self.get_args(p, *args_) @@ -623,7 +623,7 @@ class AfterDetailerScript(scripts.Script): p.scripts.process(copy(p)) try: - ia = p._ad_idx_all + ia = p._ad_idx lenp = len(p.all_prompts) if ia % lenp == lenp - 1: self.write_params_txt(p)