diff --git a/fooocus_version.py b/fooocus_version.py index 13cdd9f4..56dbcb6c 100644 --- a/fooocus_version.py +++ b/fooocus_version.py @@ -1 +1 @@ -version = '2.1.813' +version = '2.1.814' diff --git a/modules/config.py b/modules/config.py index 31d748b9..ec9d4d0a 100644 --- a/modules/config.py +++ b/modules/config.py @@ -257,6 +257,21 @@ default_inpaint_engine_version = get_config_item_or_set_default( default_value='v2.6', validator=lambda x: x in modules.flags.inpaint_engine_versions ) +default_cfg_tsnr = get_config_item_or_set_default( + key='default_cfg_tsnr', + default_value=7.0, + validator=lambda x: isinstance(x, float) +) +default_overwrite_step = get_config_item_or_set_default( + key='default_overwrite_step', + default_value=-1, + validator=lambda x: isinstance(x, int) +) +default_overwrite_switch = get_config_item_or_set_default( + key='default_overwrite_switch', + default_value=-1, + validator=lambda x: isinstance(x, int) +) def add_ratio(x): diff --git a/presets/anime.json b/presets/anime.json index c7f84cdc..3f506a51 100644 --- a/presets/anime.json +++ b/presets/anime.json @@ -27,5 +27,6 @@ "default_aspect_ratio": "896*1152", "lora_downloads": { "sd_xl_offset_example-lora_1.0.safetensors": "https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_offset_example-lora_1.0.safetensors" - } + }, + "default_performance": "Speed" } diff --git a/presets/realistic.json b/presets/realistic.json index caf78a91..b62a734e 100644 --- a/presets/realistic.json +++ b/presets/realistic.json @@ -20,5 +20,6 @@ "default_aspect_ratio": "896*1152", "lora_downloads": { "SDXL_FILM_PHOTOGRAPHY_STYLE_BetaV0.4.safetensors": "https://huggingface.co/lllyasviel/fav_models/resolve/main/fav/SDXL_FILM_PHOTOGRAPHY_STYLE_BetaV0.4.safetensors" - } + }, + "default_performance": "Speed" } diff --git a/presets/sdxl.json b/presets/sdxl.json new file mode 100644 index 00000000..106636cd --- /dev/null +++ b/presets/sdxl.json @@ -0,0 +1,30 @@ +{ + "default_model": "sd_xl_base_1.0_0.9vae.safetensors", + "default_refiner": "sd_xl_refiner_1.0_0.9vae.safetensors", + "default_lora": "sd_xl_offset_example-lora_1.0.safetensors", + "default_lora_weight": 0.5, + "default_cfg_scale": 7.0, + "default_sampler": "dpmpp_2m_sde_gpu", + "default_scheduler": "karras", + "default_styles": [ + "Fooocus V2", + "Fooocus Cinematic" + ], + "default_negative_prompt": "", + "default_positive_prompt": "", + "checkpoint_downloads": { + "sd_xl_base_1.0_0.9vae.safetensors": "https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0_0.9vae.safetensors", + "sd_xl_refiner_1.0_0.9vae.safetensors": "https://huggingface.co/stabilityai/stable-diffusion-xl-refiner-1.0/resolve/main/sd_xl_refiner_1.0_0.9vae.safetensors" + }, + "embeddings_downloads": {}, + "default_aspect_ratio": "1152*896", + "lora_downloads": { + "sd_xl_offset_example-lora_1.0.safetensors": "https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_offset_example-lora_1.0.safetensors" + }, + "default_inpaint_engine_version": "v1", + "default_performance": "Speed", + "default_cfg_tsnr": 7.0, + "default_overwrite_step": -1, + "default_overwrite_switch": -1, + "default_refiner_switch": 0.667 +} diff --git a/update_log.md b/update_log.md index 3db5d4c1..8d4b53e4 100644 --- a/update_log.md +++ b/update_log.md @@ -1,3 +1,7 @@ +# 2.1.814 + +* Allow using previous preset of official SAI SDXL by modify the args to '--preset sdxl'. Note that this preset will set inpaint engine back to previous v1 to get same results like before. To change the inpaint engine to v2.6, use the dev tools -> inpaint engine -> v2.6. + # 2.1.813 * Allow preset to set default inpaint engine. diff --git a/webui.py b/webui.py index ebacae60..c2d5e3a7 100644 --- a/webui.py +++ b/webui.py @@ -303,7 +303,8 @@ with shared.gradio_root: refiner_swap_method = gr.Dropdown(label='Refiner swap method', value='joint', choices=['joint', 'separate', 'vae']) - adaptive_cfg = gr.Slider(label='CFG Mimicking from TSNR', minimum=1.0, maximum=30.0, step=0.01, value=7.0, + adaptive_cfg = gr.Slider(label='CFG Mimicking from TSNR', minimum=1.0, maximum=30.0, step=0.01, + value=modules.config.default_cfg_tsnr, info='Enabling Fooocus\'s implementation of CFG mimicking for TSNR ' '(effective when real CFG > mimicked CFG).') sampler_name = gr.Dropdown(label='Sampler', choices=flags.sampler_list, @@ -316,10 +317,12 @@ with shared.gradio_root: value=False) overwrite_step = gr.Slider(label='Forced Overwrite of Sampling Step', - minimum=-1, maximum=200, step=1, value=-1, + minimum=-1, maximum=200, step=1, + value=modules.config.default_overwrite_step, info='Set as -1 to disable. For developer debugging.') overwrite_switch = gr.Slider(label='Forced Overwrite of Refiner Switch Step', - minimum=-1, maximum=200, step=1, value=-1, + minimum=-1, maximum=200, step=1, + value=modules.config.default_overwrite_switch, info='Set as -1 to disable. For developer debugging.') overwrite_width = gr.Slider(label='Forced Overwrite of Generating Width', minimum=-1, maximum=2048, step=1, value=-1,