fix control prompt lists

CHANGELOG.md

@@ -5,10 +5,12 @@
 - fix textual inversion loading
 - fix gallery mtime display
 - fix extra network scrollable area when using modernui
+- fix control prompts list handling
 - workaround for scale-by when using modernui
 - lock torch-directml version
 - improve xformers installer
 - improve ultralytics installer
+- improve triton installer
 
 ## Update for 2024-05-28
 

README.md

@@ -142,6 +142,7 @@ Also supported are modifiers such as:
 
 - [Step-by-step install guide](https://github.com/vladmandic/automatic/wiki/Installation)
 - [Advanced install notes](https://github.com/vladmandic/automatic/wiki/Advanced-Install)
+- [Video: install and use](https://www.youtube.com/watch?v=nWTnTyFTuAs)
 - [Common installation errors](https://github.com/vladmandic/automatic/discussions/1627)  
 - [FAQ](https://github.com/vladmandic/automatic/discussions/1011)
 

TODO.md

@@ -20,6 +20,7 @@ Main ToDo list can be found at [GitHub projects](https://github.com/users/vladma
 - diffusers public callbacks  
 - include reference styles
 - lora: sc lora, dora, etc
+- controlnet: additional models
 
 ## Experimental
 

modules/control/run.py

@@ -128,7 +128,7 @@ def control_run(units: List[unit.Unit] = [], inputs: List[Image.Image] = [], ini
         outpath_samples=shared.opts.outdir_samples or shared.opts.outdir_control_samples,
         outpath_grids=shared.opts.outdir_grids or shared.opts.outdir_control_grids,
     )
-    processing.process_init(p)
+    # processing.process_init(p)
     resize_mode_before = resize_mode_before if resize_name_before != 'None' and inputs is not None and len(inputs) > 0 else 0
 
     # TODO monkey-patch for modernui missing tabs.select event

modules/face/__init__.py

@@ -112,7 +112,6 @@ class Script(scripts.Script):
                 input_images[i] = Image.open(image['name'])
 
         processed = None
-        processing.process_init(p)
         if mode == 'FaceID': # faceid runs as ipadapter in its own pipeline
             from modules.face.insightface import get_app
             app = get_app('buffalo_l')

modules/face/instantid.py

@@ -43,8 +43,6 @@ def instant_id(p: processing.StableDiffusionProcessing, app, source_images, stre
         controlnet_model = ControlNetModel.from_pretrained(REPO_ID, subfolder="ControlNetModel", torch_dtype=devices.dtype, cache_dir=shared.opts.diffusers_dir)
         sd_models.move_model(controlnet_model, devices.device)
 
-    processing.process_init(p)
-
     # create new pipeline
     orig_pipeline = shared.sd_model # backup current pipeline definition
     shared.sd_model = StableDiffusionXLInstantIDPipeline(

modules/shared.py

@@ -754,7 +754,7 @@ options_templates.update(options_section(('postprocessing', "Postprocessing"), {
     "facehires_max_size": OptionInfo(0, "Max face size", gr.Slider, {"minimum": 0, "maximum": 1024, "step": 1}),
     "facehires_padding": OptionInfo(10, "Face padding", gr.Slider, {"minimum": 0, "maximum": 100, "step": 1}),
     "face_restoration_unload": OptionInfo(False, "Move model to CPU when complete"),
-    "facehires_strength": OptionInfo(0.0, "Face HiRes strength", gr.Slider, {"minimum": 0, "maximum": 1, "step": 0.01}),
+    "facehires_strength": OptionInfo(0.0, "Face restore strength", gr.Slider, {"minimum": 0, "maximum": 1, "step": 0.01}),
     "code_former_weight": OptionInfo(0.2, "CodeFormer weight parameter", gr.Slider, {"minimum": 0, "maximum": 1, "step": 0.01}),
 
     "postprocessing_sep_upscalers": OptionInfo("<h2>Upscaling</h2>", "", gr.HTML),

scripts/xyz_grid.py

@@ -554,6 +554,7 @@ class Script(scripts.Script):
             processing.fix_seed(p)
         if not shared.opts.return_grid:
             p.batch_size = 1
+
         def process_axis(opt, vals, vals_dropdown):
             if opt.label == 'Nothing':
                 return [0]