From bbf90a97b7ebd1808836fb39d9e490966070f4c2 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Sun, 30 Jun 2024 15:44:35 +0200 Subject: [PATCH 1/2] feat: add pony preset and vae downloads uses default SDXL VAE, but the model doesn't include it --- launch.py | 6 ++++-- modules/config.py | 6 ++++++ presets/.gitignore | 1 + presets/pony_v6.json | 51 ++++++++++++++++++++++++++++++++++++++++++++ webui.py | 6 ++++-- 5 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 presets/pony_v6.json diff --git a/launch.py b/launch.py index 5d40cc5b..0e0ac994 100644 --- a/launch.py +++ b/launch.py @@ -97,7 +97,7 @@ if config.temp_path_cleanup_on_launch: print(f"[Cleanup] Failed to delete content of temp dir.") -def download_models(default_model, previous_default_models, checkpoint_downloads, embeddings_downloads, lora_downloads): +def download_models(default_model, previous_default_models, checkpoint_downloads, embeddings_downloads, lora_downloads, vae_downloads): for file_name, url in vae_approx_filenames: load_file_from_url(url=url, model_dir=config.path_vae_approx, file_name=file_name) @@ -129,12 +129,14 @@ def download_models(default_model, previous_default_models, checkpoint_downloads load_file_from_url(url=url, model_dir=config.path_embeddings, file_name=file_name) for file_name, url in lora_downloads.items(): load_file_from_url(url=url, model_dir=config.paths_loras[0], file_name=file_name) + for file_name, url in vae_downloads.items(): + load_file_from_url(url=url, model_dir=config.path_vae, file_name=file_name) return default_model, checkpoint_downloads config.default_base_model_name, config.checkpoint_downloads = download_models( config.default_base_model_name, config.previous_default_models, config.checkpoint_downloads, - config.embeddings_downloads, config.lora_downloads) + config.embeddings_downloads, config.lora_downloads, config.vae_downloads) from webui import * diff --git a/modules/config.py b/modules/config.py index a6767c37..bc9744e6 100644 --- a/modules/config.py +++ b/modules/config.py @@ -442,6 +442,12 @@ embeddings_downloads = get_config_item_or_set_default( validator=lambda x: isinstance(x, dict) and all(isinstance(k, str) and isinstance(v, str) for k, v in x.items()), expected_type=dict ) +vae_downloads = get_config_item_or_set_default( + key='vae_downloads', + default_value={}, + validator=lambda x: isinstance(x, dict) and all(isinstance(k, str) and isinstance(v, str) for k, v in x.items()), + expected_type=dict +) available_aspect_ratios = get_config_item_or_set_default( key='available_aspect_ratios', default_value=modules.flags.sdxl_aspect_ratios, diff --git a/presets/.gitignore b/presets/.gitignore index 27e74136..e39511a9 100644 --- a/presets/.gitignore +++ b/presets/.gitignore @@ -3,5 +3,6 @@ !default.json !lcm.json !playground_v2.5.json +!pony_v6.json !realistic.json !sai.json \ No newline at end of file diff --git a/presets/pony_v6.json b/presets/pony_v6.json new file mode 100644 index 00000000..c43255db --- /dev/null +++ b/presets/pony_v6.json @@ -0,0 +1,51 @@ +{ + "default_model": "ponyDiffusionV6XL.safetensors", + "default_refiner": "None", + "default_refiner_switch": 0.5, + "default_vae": "ponyDiffusionV6XL_vae.safetensors", + "default_loras": [ + [ + true, + "None", + 1.0 + ], + [ + true, + "None", + 1.0 + ], + [ + true, + "None", + 1.0 + ], + [ + true, + "None", + 1.0 + ], + [ + true, + "None", + 1.0 + ] + ], + "default_cfg_scale": 7.0, + "default_sample_sharpness": 2.0, + "default_sampler": "dpmpp_2m_sde_gpu", + "default_scheduler": "karras", + "default_performance": "Speed", + "default_prompt": "score_9, score_8_up, score_7_up, ", + "default_prompt_negative": "score_6, score_5, score_4, censored", + "default_styles": [], + "default_aspect_ratio": "896*1152", + "default_overwrite_step": -1, + "checkpoint_downloads": { + "ponyDiffusionV6XL.safetensors": "https://huggingface.co/mashb1t/fav_models/resolve/main/fav/ponyDiffusionV6XL.safetensors" + }, + "embeddings_downloads": {}, + "lora_downloads": {}, + "vae_downloads": { + "ponyDiffusionV6XL_vae.safetensors": "https://huggingface.co/mashb1t/fav_models/resolve/main/fav/ponyDiffusionV6XL_vae.safetensors" + } +} diff --git a/webui.py b/webui.py index a0982cae..fa98387c 100644 --- a/webui.py +++ b/webui.py @@ -601,9 +601,11 @@ with shared.gradio_root: checkpoint_downloads = preset_prepared.get('checkpoint_downloads', {}) embeddings_downloads = preset_prepared.get('embeddings_downloads', {}) lora_downloads = preset_prepared.get('lora_downloads', {}) + vae_downloads = preset_prepared.get('vae_downloads', {}) - preset_prepared['base_model'], preset_prepared['lora_downloads'] = launch.download_models( - default_model, previous_default_models, checkpoint_downloads, embeddings_downloads, lora_downloads) + preset_prepared['base_model'], preset_prepared['checkpoint_downloads'] = launch.download_models( + default_model, previous_default_models, checkpoint_downloads, embeddings_downloads, lora_downloads, + vae_downloads) if 'prompt' in preset_prepared and preset_prepared.get('prompt') == '': del preset_prepared['prompt'] From 72bb6ec0650688f1968d9a390ca59ba32f313308 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Sun, 30 Jun 2024 19:16:04 +0200 Subject: [PATCH 2/2] feat: add style Fooocus Pony --- presets/pony_v6.json | 8 +++++--- sdxl_styles/samples/fooocus_pony.jpg | Bin 0 -> 5200 bytes sdxl_styles/sdxl_styles_fooocus.json | 5 +++++ 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 sdxl_styles/samples/fooocus_pony.jpg diff --git a/presets/pony_v6.json b/presets/pony_v6.json index c43255db..f28064b8 100644 --- a/presets/pony_v6.json +++ b/presets/pony_v6.json @@ -35,9 +35,11 @@ "default_sampler": "dpmpp_2m_sde_gpu", "default_scheduler": "karras", "default_performance": "Speed", - "default_prompt": "score_9, score_8_up, score_7_up, ", - "default_prompt_negative": "score_6, score_5, score_4, censored", - "default_styles": [], + "default_prompt": "", + "default_prompt_negative": "", + "default_styles": [ + "Fooocus Pony" + ], "default_aspect_ratio": "896*1152", "default_overwrite_step": -1, "checkpoint_downloads": { diff --git a/sdxl_styles/samples/fooocus_pony.jpg b/sdxl_styles/samples/fooocus_pony.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b34e5c76d3ada385487fe4af0f01a9b03b3191d2 GIT binary patch literal 5200 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 literal 0 HcmV?d00001 diff --git a/sdxl_styles/sdxl_styles_fooocus.json b/sdxl_styles/sdxl_styles_fooocus.json index cf64eab4..669e97a4 100644 --- a/sdxl_styles/sdxl_styles_fooocus.json +++ b/sdxl_styles/sdxl_styles_fooocus.json @@ -30,5 +30,10 @@ "name": "Fooocus Cinematic", "prompt": "cinematic still {prompt} . emotional, harmonious, vignette, highly detailed, high budget, bokeh, cinemascope, moody, epic, gorgeous, film grain, grainy", "negative_prompt": "anime, cartoon, graphic, text, painting, crayon, graphite, abstract, glitch, deformed, mutated, ugly, disfigured" + }, + { + "name": "Fooocus Pony", + "prompt": "score_9, score_8_up, score_7_up, {prompt}", + "negative_prompt": "score_6, score_5, score_4" } ]