diff --git a/config.json b/config.json index 8bd8dc4b7..e21e5dc7e 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,11 @@ { "add_model_hash_to_info": true, "add_model_name_to_info": true, + "additional_networks_extra_lora_path": "", + "additional_networks_hash_thread_count": 1.0, + "additional_networks_model_name_filter": "", + "additional_networks_sort_models_by": "name", + "additional_networks_xy_grid_model_metadata": "", "aesthetic_scorer_clip_model": "ViT-L/14", "aesthetic_scorer_enabled": false, "always_discard_next_to_last_sigma": false, @@ -8,6 +13,21 @@ "CLIP_stop_at_last_layers": 1, "code_former_weight": 0.15, "comma_padding_backtrack": 20, + "control_net_model_config": "models/cldm_v15.yaml", + "control_net_model_adapter_config": "models/sketch_adapter_v14.yaml", + "control_net_detectedmap_dir": "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": true, + "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, "dataset_filename_join_string": " ", "dataset_filename_word_regex": "", "ddim_discretize": "uniform", @@ -46,7 +66,38 @@ "grid_prevent_empty_spots": true, "grid_save_to_dirs": false, "grid_save": true, + "hide_samplers": [ + "Euler", + "LMS", + "Heun", + "DPM2", + "DPM2 a", + "DPM++ 2M", + "DPM fast", + "DPM adaptive", + "DPM++ 2S a Karras", + "DPM++ 2S a", + "DPM++ SDE Karras", + "DPM2 a Karras", + "LMS Karras" + ], + "hidden_tabs": [], + "image_browser_copy_image": false, + "image_browser_delete_message": false, + "image_browser_delete_recycle": false, + "image_browser_logger_debug": false, + "image_browser_logger_warning": false, + "image_browser_mod_ctrl_shift": false, + "image_browser_mod_shift": false, + "image_browser_page_columns": 6.0, + "image_browser_page_rows": 20.0, + "image_browser_pages_perload": 20.0, + "image_browser_preload": false, + "image_browser_scan_exif": false, + "image_browser_txt_files": false, + "image_browser_with_subdirs": false, "images_record_paths": true, + "img_downscale_threshold": 4.0, "img2img_background_color": "#ffffff", "img2img_color_correction": false, "img2img_fix_steps": false, @@ -68,7 +119,7 @@ "interrogate_keep_models_in_memory": true, "interrogate_return_ranks": true, "interrogate_use_builtin_artists": false, - "jpeg_quality": 80, + "jpeg_quality": 85, "js_modal_lightbox_initially_zoomed": true, "js_modal_lightbox": true, "keyedit_precision_attention": 0.1, @@ -83,6 +134,7 @@ "memmon_poll_rate": 1, "multiple_tqdm": false, "n_rows": -1, + "no_dpmpp_sde_batch_determinism": false, "outdir_extras_samples": "outputs/extras", "outdir_grids": "", "outdir_img2img_grids": "outputs/grids", @@ -112,9 +164,9 @@ "samples_log_stdout": false, "samples_save": true, "save_images_add_number": true, - "save_images_before_color_correction": false, - "save_images_before_face_restoration": false, - "save_images_before_highres_fix": false, + "save_images_before_color_correction": true, + "save_images_before_face_restoration": true, + "save_images_before_highres_fix": true, "save_optimizer_state": false, "save_selected_only": true, "save_to_dirs": false, @@ -133,12 +185,13 @@ "send_size": true, "show_progress_every_n_steps": -1, "show_progress_grid": true, - "show_progress_in_title": false, + "show_progress_in_title": true, "show_progress_type": "Full", "show_progressbar": true, "show_warnings": false, "SWIN_tile_overlap": 8, "SWIN_tile": 192, + "target_side_length": 4000.0, "temp_dir": "", "training_enable_tensorboard": false, "training_image_repeats_per_epoch": 1, @@ -157,58 +210,5 @@ "use_old_karras_scheduler_sigmas": false, "use_original_name_batch": true, "use_save_to_dirs_for_ui": false, - "use_upscaler_name_as_suffix": true, - "hide_samplers": [ - "Euler", - "LMS", - "Heun", - "DPM2", - "DPM2 a", - "DPM++ 2M", - "DPM fast", - "DPM adaptive", - "DPM++ 2S a Karras", - "DPM++ 2S a", - "DPM++ SDE Karras", - "DPM2 a Karras", - "LMS Karras" - ], - "additional_networks_extra_lora_path": "", - "additional_networks_sort_models_by": "name", - "additional_networks_model_name_filter": "", - "additional_networks_xy_grid_model_metadata": "", - "additional_networks_hash_thread_count": 1.0, - "image_browser_with_subdirs": false, - "image_browser_preload": false, - "image_browser_copy_image": false, - "image_browser_delete_message": false, - "image_browser_txt_files": false, - "image_browser_logger_warning": false, - "image_browser_logger_debug": false, - "image_browser_delete_recycle": false, - "image_browser_scan_exif": false, - "image_browser_page_columns": 6.0, - "image_browser_page_rows": 20.0, - "image_browser_pages_perload": 20.0, - "image_browser_mod_shift": false, - "image_browser_mod_ctrl_shift": false, - "hidden_tabs": [], - "img_downscale_threshold": 4.0, - "target_side_length": 4000.0, - "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 + "use_upscaler_name_as_suffix": true } \ No newline at end of file diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index 291a739bd..875684377 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit 291a739bd69e1a299459ef0a7f503a6c40f531af +Subproject commit 8756843770a887fef41516c865ffdace1cf8ab3c diff --git a/extensions-builtin/stable-diffusion-webui-images-browser b/extensions-builtin/stable-diffusion-webui-images-browser index 3f61b9f29..576fe342a 160000 --- a/extensions-builtin/stable-diffusion-webui-images-browser +++ b/extensions-builtin/stable-diffusion-webui-images-browser @@ -1 +1 @@ -Subproject commit 3f61b9f2997d2b043e3ac806d4c841bd8d3d4fb5 +Subproject commit 576fe342a31aa0edbb51fc069f6d0dbf0a36bd14 diff --git a/javascript/progressbar.js b/javascript/progressbar.js index ff6d757ba..b7eb711ce 100644 --- a/javascript/progressbar.js +++ b/javascript/progressbar.js @@ -139,7 +139,8 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre var divProgress = document.createElement('div') divProgress.className='progressDiv' - divProgress.style.display = opts.show_progressbar ? "" : "none" + divProgress.id = 'progressbar' + divProgress.style.display = opts.show_progressbar ? "block" : "none" var divInner = document.createElement('div') divInner.className='progress' diff --git a/user.css b/user.css index 02aa064c2..12686de35 100644 --- a/user.css +++ b/user.css @@ -15,7 +15,7 @@ input[type=range]::-webkit-slider-thumb { box-shadow: 2px 2px 3px #111111; borde div.gradio-container.dark > div.w-full.flex.flex-col.min-h-screen > div { background-color: black; } /* gradio shadowroot */ -.gradio-container { font-family: "Segoe UI"; font-variant: small-caps; --left-column: 440px; --highlight-color: #CE6400; --inactive-color: #4E1400; } +.gradio-container { font-family: "Segoe UI"; font-variant: small-caps; --left-column: 490px; --highlight-color: #CE6400; --inactive-color: #4E1400; } /* gradio style classes */ .border-2 { border-width: 0; } @@ -23,7 +23,7 @@ div.gradio-container.dark > div.w-full.flex.flex-col.min-h-screen > div { backgr .dark .bg-gray-200, .dark .\!bg-gray-200 { background-color: transparent; } .dark .bg-white { color: lightyellow; border-radius: 0; background-color: var(--inactive-color); } .dark .dark\:bg-gray-900 { background-color: black; } -.dark .gr-box { border-radius: 0 !important; background-color: #111111; box-shadow: 2px 2px 3px #111111; border-width: 0; padding: 4px; margin: 12px 0px 12px 0px } +.dark .gr-box { border-radius: 0 !important; background-color: #111111 !important; box-shadow: 2px 2px 3px #111111; border-width: 0; padding: 4px; margin: 12px 0px 12px 0px } .dark .gr-button { border-radius: 0; font-weight: normal; box-shadow: 2px 2px 3px #111111; font-size: 0.8rem; min-width: 32px; min-height: 32px; padding: 3px; margin: 3px; } .dark .gr-check-radio { background-color: var(--inactive-color); border-width: 0; border-radius: 2px; box-shadow: 2px 2px 3px #111111; } .dark .gr-check-radio:checked { background-color: var(--highlight-color); } @@ -38,6 +38,7 @@ div.gradio-container.dark > div.w-full.flex.flex-col.min-h-screen > div { backgr .extra-network-cards .card { width: 10em; height: 10em; box-shadow: none; } .extra-network-cards .card:hover { transform: scale(2); transition: all 0.3s ease; z-index: 99; box-shadow: none; } .extra-network-cards .card .actions .name { font-weight: 400; font-size: 1.2rem; } +.eta-bar { display: none !important } .gap-2 { padding-top: 8px; } .gr-box > div > div > input.gr-text-input { right: 0.5rem; width: 4em; padding: 0; } .overflow-hidden .flex .flex-col .relative col .gap-4 { min-width: var(--left-column); max-width: var(--left-column); } /* this is a problematic one */ @@ -86,4 +87,4 @@ div.gradio-container.dark > div.w-full.flex.flex-col.min-h-screen > div { backgr #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; } /* custom elements overrides */ -#steps-animation { border-width: 0; } +#steps-animation, #controlnet { border-width: 0; }