From 6247fc53135398a5d988d42e47d32762f86b2ab8 Mon Sep 17 00:00:00 2001 From: Pablo Martinez Date: Sat, 25 Feb 2023 19:11:58 -0300 Subject: [PATCH 1/2] init commit to test in cloud env --- scripts/controlnet.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/controlnet.py b/scripts/controlnet.py index 116232d7ade..4264b20b92f 100644 --- a/scripts/controlnet.py +++ b/scripts/controlnet.py @@ -574,7 +574,11 @@ def process(self, p, is_img2img=False, *args): networks.append(model_net) self.model_cache[model] = model_net - if input_image is not None: + is_api = getattr(p, 'control_net_api_access', False) + is_img2img_batch_tab = not is_api and is_img2img and img2img_tab_tracker.submit_img2img_tab == 'img2img_batch_tab' + if is_img2img_batch_tab and p.image_control is not None: + input_image = p.image_control + elif input_image is not None: input_image = HWC3(np.asarray(input_image)) elif image is not None: input_image = HWC3(image['image']) From 70d4e34ecd0cb691acff529ae09af262f5f02dce Mon Sep 17 00:00:00 2001 From: Pablo Martinez Date: Sat, 25 Feb 2023 21:41:36 -0300 Subject: [PATCH 2/2] fixed issue when executing without batch mode --- scripts/controlnet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/controlnet.py b/scripts/controlnet.py index 4264b20b92f..dc2c5a7128a 100644 --- a/scripts/controlnet.py +++ b/scripts/controlnet.py @@ -576,8 +576,8 @@ def process(self, p, is_img2img=False, *args): is_api = getattr(p, 'control_net_api_access', False) is_img2img_batch_tab = not is_api and is_img2img and img2img_tab_tracker.submit_img2img_tab == 'img2img_batch_tab' - if is_img2img_batch_tab and p.image_control is not None: - input_image = p.image_control + if is_img2img_batch_tab and hasattr(p, "image_control") and p.image_control is not None: + input_image = HWC3(np.asarray(p.image_control)) elif input_image is not None: input_image = HWC3(np.asarray(input_image)) elif image is not None: