From 874651e4d2b05e19616355015dd0cc67c8b8fad1 Mon Sep 17 00:00:00 2001 From: Rickey Bowers Jr Date: Thu, 15 Sep 2022 09:02:19 -0600 Subject: [PATCH 1/2] match one based numbering or other batches --- scripts/prompts_from_file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/prompts_from_file.py b/scripts/prompts_from_file.py index e0c7f1d2c..d9b01c81b 100644 --- a/scripts/prompts_from_file.py +++ b/scripts/prompts_from_file.py @@ -33,7 +33,7 @@ class Script(scripts.Script): images = [] for batch_no in range(batch_count): - state.job = f"{batch_no} out of {batch_count * p.n_iter}" + state.job = f"{batch_no + 1} out of {batch_count * p.n_iter}" p.prompt = lines[batch_no*p.batch_size:(batch_no+1)*p.batch_size] * p.n_iter proc = process_images(p) images += proc.images From 2ddaeb318a9626502ef4bf949a312253d8021ff0 Mon Sep 17 00:00:00 2001 From: OWKenobi Date: Thu, 15 Sep 2022 18:43:48 +0200 Subject: [PATCH 2/2] Update scripts.py fixes bug #464, which happens when controls is None, which leads to args_to being None. --- modules/scripts.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/scripts.py b/modules/scripts.py index de8c5fc3c..9cc5a1852 100644 --- a/modules/scripts.py +++ b/modules/scripts.py @@ -92,6 +92,7 @@ class ScriptRunner: for script in self.scripts: script.args_from = len(inputs) + script.args_to = len(inputs) controls = wrap_call(script.ui, script.filename, "ui", is_img2img)