From 60caa8984f103104266097a7c1702912499afd4e Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Wed, 12 Apr 2023 12:23:07 -0400 Subject: [PATCH] fix css and change default settings --- TODO.md | 18 +- config.json | 237 ------------------ .../sd-extension-aesthetic-scorer | 2 +- extensions-builtin/sd-extension-system-info | 2 +- modules/sd_vae.py | 7 +- modules/shared.py | 7 +- modules/ui.py | 3 +- user.css | 4 +- 8 files changed, 16 insertions(+), 264 deletions(-) delete mode 100644 config.json diff --git a/TODO.md b/TODO.md index da89dc6a8..a6d7c12d8 100644 --- a/TODO.md +++ b/TODO.md @@ -7,7 +7,8 @@ Stuff to be fixed... - Reconnect WebUI - Redo Extensions tab - Fix Firefox CSS issues -- Integrate CSS into single file +- Cleanup & integrate CSS into single file +- Replace EXIF metadata handler ## Integration @@ -20,21 +21,6 @@ Tech that can be integrated as part of the core workflow... - - [Dream artist](https://github.com/7eu7d7/DreamArtist-sd-webui-extension) -## Video Generation - -- [Deforum](https://github.com/deforum-art/deforum-for-automatic1111-webui) -- [Latent blending](https://github.com/lunarring/latentblending/) -- [VIDM: video implicit diffusion models](https://github.com/MKFMIKU/vidm) -- [Tune-a-Video](https://github.com/showlab/Tune-A-Video) -- [Animator extension](https://github.com/Animator-Anon/animator_extension) -- [Prompt travel](https://github.com/Kahsolt/stable-diffusion-webui-prompt-travel) -- [KLMC2 animation](https://colab.research.google.com/github/dmarx/notebooks/blob/main/Stable_Diffusion_KLMC2_Animation.ipynb) -- [BOAAB-limit animation](https://colab.research.google.com/drive/17kesyBVqubV_Zzchf2XoR-7MHk5jxTuo?usp=sharing) -- [Disco diffusion](https://colab.research.google.com/github/alembics/disco-diffusion/blob/main/Disco_Diffusion.ipynb) -- [Video killed the radio star](https://colab.research.google.com/github/dmarx/video-killed-the-radio-star/blob/main/Video_Killed_The_Radio_Star_Defusion.ipynb) -- [Seed travel](https://github.com/yownas/seed_travel) -- [Prompt fusion](https://github.com/ljleb/prompt-fusion-extension) - ## Random - Bunch of stuff: diff --git a/config.json b/config.json deleted file mode 100644 index c493157de..000000000 --- a/config.json +++ /dev/null @@ -1,237 +0,0 @@ -{ - "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, - "clean_temp_dir_at_start": true, - "CLIP_stop_at_last_layers": 1, - "code_former_weight": 0.2, - "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": "outputs/maps", - "control_net_models_path": "", - "control_net_max_models_num": 1, - "control_net_model_cache_size": 1, - "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": true, - "control_net_only_mid_control": false, - "control_net_cfg_based_guidance": true, - "dataset_filename_join_string": " ", - "dataset_filename_word_regex": "", - "ddim_discretize": "uniform", - "deepbooru_escape": true, - "deepbooru_filter_tags": "", - "deepbooru_sort_alpha": false, - "deepbooru_use_spaces": false, - "dimensions_and_batch_together": true, - "directories_filename_pattern": "", - "directories_max_prompt_words": 8, - "disable_weights_auto_swap": true, - "disabled_extensions": [ - "ScuNET" - ], - "do_not_add_watermark": true, - "do_not_show_images": false, - "enable_batch_seeds": true, - "enable_emphasis": true, - "enable_pnginfo": true, - "enable_quantization": true, - "ESRGAN_tile_overlap": 8, - "ESRGAN_tile": 192, - "eta_ancestral": 1.0, - "eta_ddim": 0.0, - "eta_noise_seed_delta": 0, - "export_for_4chan": false, - "extra_networks_default_multiplier": 1, - "extra_networks_default_view": "cards", - "face_restoration_model": "CodeFormer", - "face_restoration_unload": false, - "font": "", - "grid_extended_filename": true, - "grid_format": "jpg", - "grid_only_if_multiple": true, - "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": true, - "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, - "initial_noise_multiplier": 1.0, - "inpainting_mask_weight": 1.0, - "inspiration_cols_num": 6, - "inspiration_max_samples": 4, - "inspiration_rows_num": 4, - "interrogate_clip_dict_limit": 2048.0, - "interrogate_clip_max_length": 200, - "interrogate_clip_min_length": 32, - "interrogate_clip_num_beams": 1, - "interrogate_clip_skip_categories": [ - "artists", - "movements", - "flavors" - ], - "interrogate_deepbooru_score_threshold": 0.65, - "interrogate_keep_models_in_memory": true, - "interrogate_return_ranks": true, - "interrogate_use_builtin_artists": false, - "jpeg_quality": 85, - "js_modal_lightbox_initially_zoomed": true, - "js_modal_lightbox": true, - "keyedit_precision_attention": 0.1, - "keyedit_precision_extra": 0.05, - "ldsr_cached": false, - "ldsr_steps": 100, - "live_preview_content": "Combined", - "live_preview_refresh_period": 1000, - "live_previews_enable": true, - "localization": "None", - "lora_apply_to_outputs": false, - "memmon_poll_rate": 1, - "multiple_tqdm": false, - "n_rows": -1, - "outdir_extras_samples": "outputs/extras", - "outdir_grids": "", - "outdir_img2img_grids": "outputs/grids", - "outdir_img2img_samples": "outputs/image", - "outdir_ip2p_samples": "outputs/ip2p-images", - "outdir_samples": "", - "outdir_save": "outputs/save", - "outdir_txt2img_grids": "outputs/grids", - "outdir_txt2img_samples": "outputs/text", - "pin_memory": true, - "postprocessing_enable_in_main_ui": [], - "postprocessing_operation_order": [], - "postprocessing_scipts_order": "upscale, gfpgan, codeformer", - "print_hypernet_extra": false, - "quicksettings": "sd_model_checkpoint", - "random_artist_categories": [], - "realesrgan_enabled_models": [ - "R-ESRGAN 4x+" - ], - "return_grid": true, - "s_churn": 0.0, - "s_noise": 1.0, - "s_tmin": 0.0, - "samplers_in_dropdown": true, - "samples_filename_pattern": "", - "samples_format": "jpg", - "samples_save": true, - "save_images_add_number": true, - "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, - "save_training_settings_to_txt": false, - "save_txt": false, - "sd_checkpoint_cache": 0, - "sd_checkpoint_hash": "cc6cb27103417325ff94f52b7a5d2dde45a7515b25c255d8e396c90014281516", - "sd_hypernetwork_strength": 1.0, - "sd_hypernetwork": "None", - "sd_lora": "", - "sd_model_checkpoint": "sd-v15-runwayml.ckpt [cc6cb27103]", - "sd_vae_as_default": false, - "sd_vae_checkpoint_cache": 0, - "sd_vae": "vae-ft-mse-840000-ema-pruned.ckpt", - "send_seed": true, - "send_size": true, - "show_progress_every_n_steps": -1, - "show_progress_grid": true, - "show_progress_in_title": false, - "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": 10, - "training_tensorboard_flush_every": 120, - "training_tensorboard_save_images": false, - "training_write_csv_every": 0.0, - "ui_extra_networks_tab_reorder": "", - "ui_reorder": "sampler, dimensions, cfg, seed, checkboxes, hires_fix, batch, scripts", - "unload_models_when_training": false, - "upcast_attn": false, - "upscaler_for_img2img": "SwinIR_4x", - "upscaling_max_images_in_cache": 5, - "use_old_hires_fix_width_height": false, - "use_original_name_batch": true, - "use_save_to_dirs_for_ui": false, - "use_upscaler_name_as_suffix": true, - "img_max_size_mp": 500.0, - "image_browser_active_tabs": "txt2img, img2img, txt2img-grids, img2img-grids, Extras, Favorites, Others", - "image_browser_enable_maint": false, - "image_browser_ranking_pnginfo": false, - "uni_pc_order": 3, - "webp_lossless": false, - "extra_networks_add_text_separator": " ", - "uni_pc_variant": "bh1", - "uni_pc_skip_type": "time_uniform", - "uni_pc_lower_order_final": true, - "image_browser_hidden_components": [], - "save_mask": false, - "save_mask_composite": false, - "extra_networks_card_width": 0.0, - "extra_networks_card_height": 0.0, - "return_mask": false, - "return_mask_composite": false, - "control_net_sync_field_args": false, - "image_browser_use_thumbnail": false, - "image_browser_thumbnail_size": 200.0, - "disable_all_extensions": "none", - "openpose3d_use_online_version": false, - "cross_attention": "xFormers for cross-attention layers", - "cross_attention_optimization": "Scaled-Dot-Product", - "cross_attention_options": [], - "disable_nan_check": false, - "opt_channelslast": false, - "cudnn_benchmark": false, - "image_browser_debug_level": "0 - none" -} \ No newline at end of file diff --git a/extensions-builtin/sd-extension-aesthetic-scorer b/extensions-builtin/sd-extension-aesthetic-scorer index 250871ed8..9978b44c0 160000 --- a/extensions-builtin/sd-extension-aesthetic-scorer +++ b/extensions-builtin/sd-extension-aesthetic-scorer @@ -1 +1 @@ -Subproject commit 250871ed889fc246179c342079c0e3879019d900 +Subproject commit 9978b44c0e86d801468463d8b148d708fdb06762 diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info index 8a7df4a91..b54f61d89 160000 --- a/extensions-builtin/sd-extension-system-info +++ b/extensions-builtin/sd-extension-system-info @@ -1 +1 @@ -Subproject commit 8a7df4a911469637cab61cd7722fbaa6d6a2a77d +Subproject commit b54f61d89909a65dcdab7ea677bdfd416c663405 diff --git a/modules/sd_vae.py b/modules/sd_vae.py index 061d444d1..7e7ab9ed6 100644 --- a/modules/sd_vae.py +++ b/modules/sd_vae.py @@ -8,7 +8,6 @@ import glob from copy import deepcopy from rich import print -vae_path = shared.opts.vae_dir vae_ignore_keys = {"model_ema.decay", "model_ema.num_updates"} vae_dict = {} @@ -59,9 +58,9 @@ def refresh_vae_list(): os.path.join(sd_models.model_path, '**/*.vae.ckpt'), os.path.join(sd_models.model_path, '**/*.vae.pt'), os.path.join(sd_models.model_path, '**/*.vae.safetensors'), - os.path.join(vae_path, '**/*.ckpt'), - os.path.join(vae_path, '**/*.pt'), - os.path.join(vae_path, '**/*.safetensors'), + os.path.join(shared.opts.vae_dir, '**/*.ckpt'), + os.path.join(shared.opts.vae_dir, '**/*.pt'), + os.path.join(shared.opts.vae_dir, '**/*.safetensors'), ] if shared.opts.ckpt_dir is not None and os.path.isdir(shared.opts.ckpt_dir): diff --git a/modules/shared.py b/modules/shared.py index 68c8b74b7..0ff042e4f 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -221,19 +221,20 @@ hide_dirs = {"visible": not cmd_opts.hide_ui_dir_config} tab_names = [] options_templates = {} +default_checkpoint = list_checkpoint_tiles()[0] if len(list_checkpoint_tiles()) > 0 else "model.ckpt" options_templates.update(options_section(('sd', "Stable Diffusion"), { - "sd_model_checkpoint": OptionInfo(None, "Stable Diffusion checkpoint", gr.Dropdown, lambda: {"choices": list_checkpoint_tiles()}, refresh=refresh_checkpoints), + "sd_model_checkpoint": OptionInfo(default_checkpoint, "Stable Diffusion checkpoint", gr.Dropdown, lambda: {"choices": list_checkpoint_tiles()}, refresh=refresh_checkpoints), "sd_checkpoint_cache": OptionInfo(0, "Checkpoints to cache in RAM", gr.Slider, {"minimum": 0, "maximum": 10, "step": 1}), "sd_vae_checkpoint_cache": OptionInfo(0, "VAE Checkpoints to cache in RAM", gr.Slider, {"minimum": 0, "maximum": 10, "step": 1}), "sd_vae": OptionInfo("Automatic", "SD VAE", gr.Dropdown, lambda: {"choices": shared_items.sd_vae_items()}, refresh=shared_items.refresh_vae_list), "sd_vae_as_default": OptionInfo(True, "Ignore selected VAE for stable diffusion checkpoints that have their own .vae.pt next to them"), "inpainting_mask_weight": OptionInfo(1.0, "Inpainting conditioning mask strength", gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.01}), "initial_noise_multiplier": OptionInfo(1.0, "Noise multiplier for img2img", gr.Slider, {"minimum": 0.5, "maximum": 1.5, "step": 0.01}), - "img2img_color_correction": OptionInfo(False, "Apply color correction to img2img results to match original colors."), + "img2img_color_correction": OptionInfo(True, "Apply color correction to img2img results to match original colors."), "img2img_fix_steps": OptionInfo(False, "With img2img, do exactly the amount of steps the slider specifies (normally you'd do less with less denoising)."), "img2img_background_color": OptionInfo("#ffffff", "With img2img, fill image's transparent parts with this color.", ui_components.FormColorPicker, {}), - "enable_quantization": OptionInfo(False, "Enable quantization in K samplers for sharper and cleaner results. This may change existing seeds. Requires restart to apply."), + "enable_quantization": OptionInfo(True, "Enable quantization in K samplers for sharper and cleaner results. This may change existing seeds. Requires restart to apply."), "enable_emphasis": OptionInfo(True, "Emphasis: use (text) to make model pay more attention to text and [text] to make it pay less attention"), "enable_batch_seeds": OptionInfo(True, "Make K-diffusion samplers produce same images in a batch as when making a single image"), "comma_padding_backtrack": OptionInfo(20, "Increase coherency by padding from the last comma within n tokens when using more than 75 tokens", gr.Slider, {"minimum": 0, "maximum": 74, "step": 1 }), diff --git a/modules/ui.py b/modules/ui.py index 38ac02cb2..db3c36515 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -1710,7 +1710,8 @@ def javascript_html(): script_js = os.path.join(script_path, "script.js") head = f'\n' - inline = f"{localization.localization_js(shared.opts.localization)};" + # inline = f"{localization.localization_js(shared.opts.localization)};" + inline = '' if cmd_opts.theme is not None: inline += f"set_theme('{cmd_opts.theme}');" diff --git a/user.css b/user.css index 238068e19..e1a7134e9 100644 --- a/user.css +++ b/user.css @@ -3,9 +3,11 @@ html { font-size: 16px; } body, button, input, select, textarea { font-family: "Segoe UI"; font-variant: small-caps; overflow-x: hidden; } button { font-size: 1.2rem; } img { background-color: black; } -input[type=range] { height: 18px; appearance: none; margin-top: 0; min-width: 160px; background-color: black; } +input[type=range] { height: 18px; appearance: none; margin-top: 0; min-width: 160px; background-color: black; width: 100%; background: transparent; } input[type=range]::-webkit-slider-runnable-track { width: 100%; height: 18px; cursor: pointer; box-shadow: 2px 2px 3px #111111; background: #50555C; border-radius: 2px; border: 0px solid #222222; } +input[type=range]::-moz-range-track { width: 100%; height: 18px; cursor: pointer; box-shadow: 2px 2px 3px #111111; background: #50555C; border-radius: 2px; border: 0px solid #222222; } input[type=range]::-webkit-slider-thumb { box-shadow: 2px 2px 3px #111111; border: 0px solid #000000; height: 18px; width: 40px; border-radius: 2px; background: var(--highlight-color); cursor: pointer; -webkit-appearance: none; margin-top: 0px; } +input[type=range]::-moz-range-thumb { box-shadow: 2px 2px 3px #111111; border: 0px solid #000000; height: 18px; width: 40px; border-radius: 2px; background: var(--highlight-color); cursor: pointer; -webkit-appearance: none; margin-top: 0px; } ::-webkit-scrollbar { width: 12px; } ::-webkit-scrollbar-track { background: #333333; } ::-webkit-scrollbar-thumb { background-color: var(--highlight-color); border-radius: 2px; border-width: 0; box-shadow: 2px 2px 3px #111111; }