fix flux controlnet

Signed-off-by: Vladimir Mandic <[email protected]>
vladmandic · Jan 11, 2025 · ca6092e · ca6092e
1 parent ae8cb2e
commit ca6092e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log for SD.Next
 
-## Update for 2025-01-10
+## Update for 2025-01-11
 
 - [Allegro Video](https://huggingface.co/rhymes-ai/Allegro)  
   - optimizations: full offload and quantization support  
@@ -18,10 +18,6 @@
   - sort logged timers by duration  
   - allow min duration env variable for timers: `SD_MIN_TIMER=0.1` (default)  
   - update installer messages  
-- **Detailer**:
-  - add explicit detailer steps setting  
-- **SysInfo**:
-  - update to collected data and benchmarks  
 - **Refactor**:
   - refactored progress monitoring, job updates and live preview  
   - improved metadata save and restore  
@@ -32,11 +28,13 @@
     recommended to use with [TDD LoRA](https://huggingface.co/RED-AIGC/TDD/tree/main)  
 - **Detailer**:
   - add explicit detailer prompt and negative prompt  
+  - add explicit detailer steps setting  
   - move steps, strength, prompt, negative from settings into ui params  
   - set/restore detailer metadata  
   - new [detailer wiki](https://github.com/vladmandic/automatic/wiki/Detailer)
-- **XYZ Grid**
-  - add prompt search&replace options: *primary, refine, detailer, all*
+- **Other**
+  - **XYZ Grid**: add prompt search&replace options: *primary, refine, detailer, all*
+  - **SysInfo**: update to collected data and benchmarks  
 - [Wiki/Docs](https://vladmandic.github.io/sdnext-docs/):
   - updated: Detailer, Install, Debug, Control-HowTo, ZLUDA  
 - **Fixes**:
@@ -56,6 +54,7 @@
   - flux support on-the-fly quantization for bnb of unet only  
   - control restore pipeline before running hires  
   - restore args after batch run  
+  - flux controlnet  
 
 ## Update for 2024-12-31
 

diff --git a/modules/control/run.py b/modules/control/run.py
@@ -67,7 +67,7 @@ def set_pipe(p, has_models, unit_type, selected_models, active_model, active_str
             shared.log.warning('Control: T2I-Adapter does not support separate init image')
     elif unit_type == 'controlnet' and has_models:
         p.extra_generation_params["Control type"] = 'ControlNet'
-        p.task_args['controlnet_conditioning_scale'] = control_conditioning
+        p.task_args['controlnet_conditioning_scale'] = [control_conditioning]
         p.task_args['control_guidance_start'] = control_guidance_start
         p.task_args['control_guidance_end'] = control_guidance_end
         p.task_args['guess_mode'] = p.guess_mode

diff --git a/modules/shared.py b/modules/shared.py
@@ -665,8 +665,10 @@ def get_default_modes():
 }))
 
 options_templates.update(options_section(('system-paths', "System Paths"), {
+    "clean_temp_dir_at_start": OptionInfo(True, "Cleanup temporary folder on startup"),
     "models_paths_sep_options": OptionInfo("<h2>Models Paths</h2>", "", gr.HTML),
-    "models_dir": OptionInfo('models', "Base path where all models are stored", folder=True),
+    "models_dir": OptionInfo('models', "Root model folder", folder=True),
+    "model_paths_sep_options": OptionInfo("<h2>Paths for specific models</h2>", "", gr.HTML),
     "ckpt_dir": OptionInfo(os.path.join(paths.models_path, 'Stable-diffusion'), "Folder with stable diffusion models", folder=True),
     "diffusers_dir": OptionInfo(os.path.join(paths.models_path, 'Diffusers'), "Folder with Huggingface models", folder=True),
     "hfcache_dir": OptionInfo(hfcache_dir, "Folder for Huggingface cache", folder=True),
@@ -689,13 +691,12 @@ def get_default_modes():
     "swinir_models_path": OptionInfo(os.path.join(paths.models_path, 'SwinIR'), "Folder with SwinIR models", folder=True),
     "ldsr_models_path": OptionInfo(os.path.join(paths.models_path, 'LDSR'), "Folder with LDSR models", folder=True),
     "clip_models_path": OptionInfo(os.path.join(paths.models_path, 'CLIP'), "Folder with CLIP models", folder=True),
-    "other_paths_sep_options": OptionInfo("<h2>Other paths</h2>", "", gr.HTML),
-    "openvino_cache_path": OptionInfo('cache', "Directory for OpenVINO cache", folder=True),
-    "accelerate_offload_path": OptionInfo('cache/accelerate', "Directory for disk offload with Accelerate", folder=True),
-    "onnx_cached_models_path": OptionInfo(os.path.join(paths.models_path, 'ONNX', 'cache'), "Folder with ONNX cached models", folder=True),
-    "onnx_temp_dir": OptionInfo(os.path.join(paths.models_path, 'ONNX', 'temp'), "Directory for ONNX conversion and Olive optimization process", folder=True),
+    "other_paths_sep_options": OptionInfo("<h2>Cache folders</h2>", "", gr.HTML),
     "temp_dir": OptionInfo("", "Directory for temporary images; leave empty for default", folder=True),
-    "clean_temp_dir_at_start": OptionInfo(True, "Cleanup non-default temporary directory when starting webui"),
+    "accelerate_offload_path": OptionInfo('cache/accelerate', "Folder for disk offload", folder=True),
+    "openvino_cache_path": OptionInfo('cache', "Folder for OpenVINO cache", folder=True),
+    "onnx_cached_models_path": OptionInfo(os.path.join(paths.models_path, 'ONNX', 'cache'), "Folder for ONNX cached models", folder=True),
+    "onnx_temp_dir": OptionInfo(os.path.join(paths.models_path, 'ONNX', 'temp'), "Folder for ONNX conversion", folder=True),
 }))
 
 options_templates.update(options_section(('saving-images', "Image Options"), {