From 20e53028a4c5baa7b348092793f93907db4fc289 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Mon, 29 Jan 2024 14:27:51 +0100 Subject: [PATCH] refactor: use central flag for ControlNet image count --- modules/async_worker.py | 2 +- modules/flags.py | 2 ++ webui.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/async_worker.py b/modules/async_worker.py index 1c788b62..28104a94 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -147,7 +147,7 @@ def worker(): metadata_scheme = MetadataScheme(args.pop()) if not args_manager.args.disable_metadata else MetadataScheme.FOOOCUS cn_tasks = {x: [] for x in flags.ip_list} - for _ in range(4): + for _ in range(flags.controlnet_image_count): cn_img = args.pop() cn_stop = args.pop() cn_weight = args.pop() diff --git a/modules/flags.py b/modules/flags.py index f0297783..31100284 100644 --- a/modules/flags.py +++ b/modules/flags.py @@ -58,6 +58,8 @@ metadata_scheme = [ lora_count = 5 lora_count_with_lcm = lora_count + 1 +controlnet_image_count = 4 + class Steps(Enum): QUALITY = 60 SPEED = 30 diff --git a/webui.py b/webui.py index 60d6540d..666d0a00 100644 --- a/webui.py +++ b/webui.py @@ -152,7 +152,7 @@ with shared.gradio_root: ip_weights = [] ip_ctrls = [] ip_ad_cols = [] - for _ in range(4): + for _ in range(flags.controlnet_image_count): with gr.Column(): ip_image = grh.Image(label='Image', source='upload', type='numpy', show_label=False, height=300) ip_images.append(ip_image)