diff --git a/config.json b/config.json index 25cf7809e..8bd8dc4b7 100644 --- a/config.json +++ b/config.json @@ -195,5 +195,20 @@ "hidden_tabs": [], "img_downscale_threshold": 4.0, "target_side_length": 4000.0, - "no_dpmpp_sde_batch_determinism": false + "no_dpmpp_sde_batch_determinism": false, + "control_net_model_config": "/home/vlado/dev/automatic/extensions/sd-webui-controlnet/models/cldm_v15.yaml", + "control_net_model_adapter_config": "/home/vlado/dev/automatic/extensions/sd-webui-controlnet/models/sketch_adapter_v14.yaml", + "control_net_detectedmap_dir": "/home/vlado/dev/automatic/extensions/sd-webui-controlnet/detected_maps", + "control_net_models_path": "", + "control_net_max_models_num": 1, + "control_net_model_cache_size": 2, + "control_net_control_transfer": false, + "control_net_no_detectmap": false, + "control_net_detectmap_autosaving": false, + "control_net_only_midctrl_hires": true, + "control_net_allow_script_control": false, + "control_net_skip_img2img_processing": false, + "control_net_monocular_depth_optim": false, + "control_net_only_mid_control": false, + "control_net_cfg_based_guidance": false } \ No newline at end of file diff --git a/extensions-builtin/sd-dynamic-thresholding b/extensions-builtin/sd-dynamic-thresholding index e3a995db4..3bfbc0748 160000 --- a/extensions-builtin/sd-dynamic-thresholding +++ b/extensions-builtin/sd-dynamic-thresholding @@ -1 +1 @@ -Subproject commit e3a995db47855dfd3b4959356a2c8258d0320ac8 +Subproject commit 3bfbc07485a594f2576c90d912bb2c881bf28c92 diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index a7719788f..ec90df77a 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit a7719788fc69a5fa47ec833143b135b30cc25b9e +Subproject commit ec90df77aaeb7bd9a103b0cc91e05a538c69355d diff --git a/modules/lora b/modules/lora index 71b728d5f..f0ae7eea9 160000 --- a/modules/lora +++ b/modules/lora @@ -1 +1 @@ -Subproject commit 71b728d5fcfe16f4434e2bf61e75cdfb76f93e14 +Subproject commit f0ae7eea950b93b1550dc34a782da3bafda2a8c0 diff --git a/ui-config.json b/ui-config.json index bda8feb9e..8f81da29b 100644 --- a/ui-config.json +++ b/ui-config.json @@ -1173,5 +1173,107 @@ "customscript/loopback.py/img2img/Append interrogated prompt at each iteration/visible": true, "customscript/loopback.py/img2img/Append interrogated prompt at each iteration/value": "None", "train/Use PNG alpha channel as loss weight/visible": true, - "train/Use PNG alpha channel as loss weight/value": false + "train/Use PNG alpha channel as loss weight/value": false, + "customscript/controlnet.py/txt2img/Enable/visible": true, + "customscript/controlnet.py/txt2img/Enable/value": false, + "customscript/controlnet.py/txt2img/Invert Input Color/visible": true, + "customscript/controlnet.py/txt2img/Invert Input Color/value": false, + "customscript/controlnet.py/txt2img/RGB to BGR/visible": true, + "customscript/controlnet.py/txt2img/RGB to BGR/value": false, + "customscript/controlnet.py/txt2img/Low VRAM/visible": true, + "customscript/controlnet.py/txt2img/Low VRAM/value": false, + "customscript/controlnet.py/txt2img/Guess Mode/visible": true, + "customscript/controlnet.py/txt2img/Guess Mode/value": false, + "customscript/controlnet.py/txt2img/Preprocessor/visible": true, + "customscript/controlnet.py/txt2img/Preprocessor/value": "none", + "customscript/controlnet.py/txt2img/Model/visible": true, + "customscript/controlnet.py/txt2img/Model/value": "None", + "customscript/controlnet.py/txt2img/Weight/visible": true, + "customscript/controlnet.py/txt2img/Weight/value": 1.0, + "customscript/controlnet.py/txt2img/Weight/minimum": 0.0, + "customscript/controlnet.py/txt2img/Weight/maximum": 2.0, + "customscript/controlnet.py/txt2img/Weight/step": 0.05, + "customscript/controlnet.py/txt2img/Guidance strength (T)/visible": true, + "customscript/controlnet.py/txt2img/Guidance strength (T)/value": 1.0, + "customscript/controlnet.py/txt2img/Guidance strength (T)/minimum": 0.0, + "customscript/controlnet.py/txt2img/Guidance strength (T)/maximum": 1.0, + "customscript/controlnet.py/txt2img/Guidance strength (T)/step": 0.01, + "customscript/controlnet.py/txt2img/Annotator resolution/visible": true, + "customscript/controlnet.py/txt2img/Annotator resolution/value": 64, + "customscript/controlnet.py/txt2img/Annotator resolution/minimum": 64, + "customscript/controlnet.py/txt2img/Annotator resolution/maximum": 2048, + "customscript/controlnet.py/txt2img/Annotator resolution/step": 10, + "customscript/controlnet.py/txt2img/Threshold A/visible": true, + "customscript/controlnet.py/txt2img/Threshold A/value": 64, + "customscript/controlnet.py/txt2img/Threshold A/minimum": 64, + "customscript/controlnet.py/txt2img/Threshold A/maximum": 1024, + "customscript/controlnet.py/txt2img/Threshold A/step": 1, + "customscript/controlnet.py/txt2img/Threshold B/visible": true, + "customscript/controlnet.py/txt2img/Threshold B/value": 64, + "customscript/controlnet.py/txt2img/Threshold B/minimum": 64, + "customscript/controlnet.py/txt2img/Threshold B/maximum": 1024, + "customscript/controlnet.py/txt2img/Threshold B/step": 1, + "customscript/controlnet.py/txt2img/Resize Mode/visible": true, + "customscript/controlnet.py/txt2img/Resize Mode/value": "Scale to Fit (Inner Fit)", + "txt2img/Canvas Width/visible": true, + "txt2img/Canvas Width/value": 512, + "txt2img/Canvas Width/minimum": 256, + "txt2img/Canvas Width/maximum": 1024, + "txt2img/Canvas Width/step": 64, + "txt2img/Canvas Height/visible": true, + "txt2img/Canvas Height/value": 512, + "txt2img/Canvas Height/minimum": 256, + "txt2img/Canvas Height/maximum": 1024, + "txt2img/Canvas Height/step": 64, + "customscript/controlnet.py/img2img/Enable/visible": true, + "customscript/controlnet.py/img2img/Enable/value": false, + "customscript/controlnet.py/img2img/Invert Input Color/visible": true, + "customscript/controlnet.py/img2img/Invert Input Color/value": false, + "customscript/controlnet.py/img2img/RGB to BGR/visible": true, + "customscript/controlnet.py/img2img/RGB to BGR/value": false, + "customscript/controlnet.py/img2img/Low VRAM/visible": true, + "customscript/controlnet.py/img2img/Low VRAM/value": false, + "customscript/controlnet.py/img2img/Guess Mode/visible": true, + "customscript/controlnet.py/img2img/Guess Mode/value": false, + "customscript/controlnet.py/img2img/Preprocessor/visible": true, + "customscript/controlnet.py/img2img/Preprocessor/value": "none", + "customscript/controlnet.py/img2img/Model/visible": true, + "customscript/controlnet.py/img2img/Model/value": "None", + "customscript/controlnet.py/img2img/Weight/visible": true, + "customscript/controlnet.py/img2img/Weight/value": 1.0, + "customscript/controlnet.py/img2img/Weight/minimum": 0.0, + "customscript/controlnet.py/img2img/Weight/maximum": 2.0, + "customscript/controlnet.py/img2img/Weight/step": 0.05, + "customscript/controlnet.py/img2img/Guidance strength (T)/visible": true, + "customscript/controlnet.py/img2img/Guidance strength (T)/value": 1.0, + "customscript/controlnet.py/img2img/Guidance strength (T)/minimum": 0.0, + "customscript/controlnet.py/img2img/Guidance strength (T)/maximum": 1.0, + "customscript/controlnet.py/img2img/Guidance strength (T)/step": 0.01, + "customscript/controlnet.py/img2img/Annotator resolution/visible": true, + "customscript/controlnet.py/img2img/Annotator resolution/value": 64, + "customscript/controlnet.py/img2img/Annotator resolution/minimum": 64, + "customscript/controlnet.py/img2img/Annotator resolution/maximum": 2048, + "customscript/controlnet.py/img2img/Annotator resolution/step": 10, + "customscript/controlnet.py/img2img/Threshold A/visible": true, + "customscript/controlnet.py/img2img/Threshold A/value": 64, + "customscript/controlnet.py/img2img/Threshold A/minimum": 64, + "customscript/controlnet.py/img2img/Threshold A/maximum": 1024, + "customscript/controlnet.py/img2img/Threshold A/step": 1, + "customscript/controlnet.py/img2img/Threshold B/visible": true, + "customscript/controlnet.py/img2img/Threshold B/value": 64, + "customscript/controlnet.py/img2img/Threshold B/minimum": 64, + "customscript/controlnet.py/img2img/Threshold B/maximum": 1024, + "customscript/controlnet.py/img2img/Threshold B/step": 1, + "customscript/controlnet.py/img2img/Resize Mode/visible": true, + "customscript/controlnet.py/img2img/Resize Mode/value": "Scale to Fit (Inner Fit)", + "img2img/Canvas Width/visible": true, + "img2img/Canvas Width/value": 512, + "img2img/Canvas Width/minimum": 256, + "img2img/Canvas Width/maximum": 1024, + "img2img/Canvas Width/step": 64, + "img2img/Canvas Height/visible": true, + "img2img/Canvas Height/value": 512, + "img2img/Canvas Height/minimum": 256, + "img2img/Canvas Height/maximum": 1024, + "img2img/Canvas Height/step": 64 } \ No newline at end of file diff --git a/user.css b/user.css index 14825fdd5..02aa064c2 100644 --- a/user.css +++ b/user.css @@ -74,13 +74,14 @@ div.gradio-container.dark > div.w-full.flex.flex-col.min-h-screen > div { backgr #txt2img_prompt > label > textarea { font-size: 1.2rem; } #txt2img_results, #img2img_results, #extras_results { background-color: black; } #txt2img_seed_row { padding: 0; margin-top: 8px; } -#txt2img_settings, #img2img_settings { min-width: var(--left-column); max-width: var(--left-column); background-color: #111111; padding-top: 16px; } +#txt2img_settings { min-width: var(--left-column); max-width: var(--left-column); background-color: #111111; padding-top: 16px; } +#img2img_settings { min-width: calc(2 * var(--left-column)); max-width: calc(2 * var(--left-column)); background-color: #111111; padding-top: 16px; } #txt2img_subseed_row { padding: 0; margin-top: 16px; } #txt2img_subseed_show { min-width: 74px; padding: 8px 0 0 0 } #txt2img_subseed_strength { margin-top: 0; } #txt2img_tools, #img2img_tools { margin-left: 8px; } #txtimg_hr_finalres { max-width: 200px; } -#quicksettings .gr-button-tool { font-size: 1.6rem; box-shadow: none; margin-left: -20px; margin-top: -6px; } +#quicksettings .gr-button-tool { font-size: 1.6rem; box-shadow: none; margin-left: -20px; margin-top: -2px; } #txt2img_prompt, #txt2img_neg_prompt, #img2img_prompt, #img2img_neg_prompt { background-color: black; } #refresh_txt2img_styles, #refresh_img2img_styles, #open_folder_txt2img, #open_folder_img2img, #open_folder_extras, #footer, #style_pos_col, #style_neg_col, #roll_col, #save_zip_txt2img, #save_zip_img2img, #extras_upscaler_2, #extras_upscaler_2_visibility, #txt2img_res_switch_btn, #img2img_res_switch_btn, #txt2img_seed_resize_from_w, #txt2img_seed_resize_from_h, #txt2img_subseed_show, #txt2img_reuse_seed, #txt2img_reuse_subseed, #txt2img_tiling, #img2img_subseed_show { display: none; }