From 8e97e3ceed58478e737a3471be0ccbf677403e67 Mon Sep 17 00:00:00 2001 From: lllyasviel Date: Mon, 29 Jan 2024 16:31:45 -0800 Subject: [PATCH] Update controlnet.py --- .../sd_forge_controlnet/scripts/controlnet.py | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/extensions-builtin/sd_forge_controlnet/scripts/controlnet.py b/extensions-builtin/sd_forge_controlnet/scripts/controlnet.py index 8c2d91df..a094ae35 100644 --- a/extensions-builtin/sd_forge_controlnet/scripts/controlnet.py +++ b/extensions-builtin/sd_forge_controlnet/scripts/controlnet.py @@ -389,7 +389,12 @@ class ControlNetForForgeOfficial(scripts.Script): return h, w, hr_y, hr_x - def process_unit_after_click_generate(self, p, unit, params, *args, **kwargs): + def process_unit_after_click_generate(self, + p: StableDiffusionProcessing, + unit: external_code.ControlNetUnit, + params: ControlNetCachedParameters, + *args, **kwargs): + h, w, hr_y, hr_x = self.get_target_dimensions(p) has_high_res_fix = ( @@ -452,9 +457,18 @@ class ControlNetForForgeOfficial(scripts.Script): return - def process_unit_before_every_sampling(self, p, unit, params, *args, **kwargs): + def process_unit_before_every_sampling(self, + p: StableDiffusionProcessing, + unit: external_code.ControlNetUnit, + params: ControlNetCachedParameters, + *args, **kwargs): + h, w, hr_y, hr_x = self.get_target_dimensions(p) - is_hr_pass = p.is_hr_pass + is_hr_pass = p.get('is_hr_pass', False) + cond = params.control_cond_for_hr_fix if is_hr_pass else params.control_cond + + a = 0 + return def process(self, p, *args, **kwargs):