feat: extract attribute controlnet_softness

extras/preprocessors.py

@@ -1,6 +1,5 @@
 import cv2
 import numpy as np
-import modules.advanced_parameters as advanced_parameters
 
 
 def centered_canny(x: np.ndarray, canny_low_threshold, canny_high_threshold):

modules/advanced_parameters.py

@@ -1,7 +0,0 @@
-controlnet_softness = None
-
-
-def set_all_advanced_parameters(*args):
-    global controlnet_softness
-
-    controlnet_softness = args

modules/async_worker.py

@@ -156,6 +156,7 @@ def worker():
         canny_low_threshold = args.pop()
         canny_high_threshold = args.pop()
         refiner_swap_method = args.pop()
+        controlnet_softness = args.pop()
         freeu_enabled = args.pop()
         freeu_b1 = args.pop()
         freeu_b2 = args.pop()
@@ -232,6 +233,9 @@ def worker():
         modules.patch.sharpness = sharpness
         print(f'[Parameters] Sharpness = {modules.patch.sharpness}')
 
+        modules.patch.controlnet_softness = controlnet_softness
+        print(f'[Parameters] ControlNet Softness = {modules.patch.controlnet_softness}')
+
         modules.patch.positive_adm_scale = adm_scaler_positive
         modules.patch.negative_adm_scale = adm_scaler_negative
         modules.patch.adm_scaler_end = adm_scaler_end

modules/core.py

@@ -16,7 +16,6 @@ import ldm_patched.modules.controlnet
 import modules.sample_hijack
 import ldm_patched.modules.samplers
 import ldm_patched.modules.latent_formats
-import modules.advanced_parameters
 
 from ldm_patched.modules.sd import load_checkpoint_guess_config
 from ldm_patched.contrib.external import VAEDecode, EmptyLatentImage, VAEEncode, VAEEncodeTiled, VAEDecodeTiled, \

modules/patch.py

@@ -17,7 +17,6 @@ import ldm_patched.controlnet.cldm
 import ldm_patched.modules.model_patcher
 import ldm_patched.modules.samplers
 import ldm_patched.modules.args_parser
-import modules.advanced_parameters as advanced_parameters
 import warnings
 import safetensors.torch
 import modules.constants as constants
@@ -37,11 +36,12 @@ adm_scaler_end = 0.3
 positive_adm_scale = 1.5
 negative_adm_scale = 0.8
 
+controlnet_softness = 0.25
+
 adaptive_cfg = 7.0
 global_diffusion_progress = 0
 eps_record = None
 
-
 def calculate_weight_patched(self, patches, weight, key):
     for p in patches:
         alpha = p[0]
@@ -359,10 +359,10 @@ def patched_cldm_forward(self, x, hint, timesteps, context, y=None, **kwargs):
     h = self.middle_block(h, emb, context)
     outs.append(self.middle_block_out(h, emb, context))
 
-    if advanced_parameters.controlnet_softness > 0:
+    if controlnet_softness > 0:
         for i in range(10):
             k = 1.0 - float(i) / 9.0
-            outs[i] = outs[i] * (1.0 - advanced_parameters.controlnet_softness * k)
+            outs[i] = outs[i] * (1.0 - controlnet_softness * k)
 
     return outs
 

webui.py

@@ -11,7 +11,6 @@ import modules.async_worker as worker
 import modules.constants as constants
 import modules.flags as flags
 import modules.gradio_hijack as grh
-import modules.advanced_parameters as advanced_parameters
 import modules.style_sorter as style_sorter
 import modules.meta_parser
 import args_manager
@@ -446,8 +445,6 @@ with shared.gradio_root:
                         freeu_s2 = gr.Slider(label='S2', minimum=0, maximum=4, step=0.01, value=0.95)
                         freeu_ctrls = [freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2]
 
-                adps = [controlnet_softness]
-
                 def dev_mode_checked(r):
                     return gr.update(visible=r)
 
@@ -527,7 +524,7 @@ with shared.gradio_root:
         ctrls += [overwrite_step, overwrite_switch, overwrite_width, overwrite_height, overwrite_vary_strength]
         ctrls += [overwrite_upscale_strength, mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint]
         ctrls += [debugging_cn_preprocessor, skipping_cn_preprocessor, canny_low_threshold, canny_high_threshold]
-        ctrls += [refiner_swap_method]
+        ctrls += [refiner_swap_method, controlnet_softness]
         ctrls += freeu_ctrls
         ctrls += inpaint_ctrls
         ctrls += ip_ctrls
@@ -584,7 +581,6 @@ with shared.gradio_root:
         generate_button.click(lambda: (gr.update(visible=True, interactive=True), gr.update(visible=True, interactive=True), gr.update(visible=False, interactive=False), [], True),
                               outputs=[stop_button, skip_button, generate_button, gallery, state_is_generating]) \
             .then(fn=refresh_seed, inputs=[seed_random, image_seed], outputs=image_seed) \
-            .then(advanced_parameters.set_all_advanced_parameters, inputs=adps) \
             .then(fn=generate_clicked, inputs=ctrls, outputs=[progress_html, progress_window, progress_gallery, gallery]) \
             .then(lambda: (gr.update(visible=True, interactive=True), gr.update(visible=False, interactive=False), gr.update(visible=False, interactive=False), False),
                   outputs=[generate_button, stop_button, skip_button, state_is_generating]) \