From 2f6843da95384395ef689aef6ed1f587f2122849 Mon Sep 17 00:00:00 2001 From: lllyasviel Date: Fri, 13 Oct 2023 14:16:13 -0700 Subject: [PATCH] support embeddings (#675) --- fooocus_version.py | 2 +- modules/core.py | 3 ++- modules/path.py | 1 + presets/anime.json | 20 ++++++++++++++++++++ presets/realistic.json | 20 ++++++++++++++++++++ 5 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 presets/anime.json create mode 100644 presets/realistic.json diff --git a/fooocus_version.py b/fooocus_version.py index a2a9c44..233d474 100644 --- a/fooocus_version.py +++ b/fooocus_version.py @@ -1 +1 @@ -version = '2.1.58' +version = '2.1.59' diff --git a/modules/core.py b/modules/core.py index 26ea3e6..1be1800 100644 --- a/modules/core.py +++ b/modules/core.py @@ -24,6 +24,7 @@ from fcbh_extras.nodes_freelunch import FreeU from fcbh.sample import prepare_mask from modules.patch import patched_sampler_cfg_function, patched_model_function_wrapper from fcbh.lora import model_lora_keys_unet, model_lora_keys_clip, load_lora +from modules.path import embeddings_path opEmptyLatentImage = EmptyLatentImage() @@ -66,7 +67,7 @@ def apply_controlnet(positive, negative, control_net, image, strength, start_per @torch.no_grad() @torch.inference_mode() def load_model(ckpt_filename): - unet, clip, vae, clip_vision = load_checkpoint_guess_config(ckpt_filename) + unet, clip, vae, clip_vision = load_checkpoint_guess_config(ckpt_filename, embedding_directory=embeddings_path) unet.model_options['sampler_cfg_function'] = patched_sampler_cfg_function unet.model_options['model_function_wrapper'] = patched_model_function_wrapper return StableDiffusionModel(unet=unet, clip=clip, vae=vae, clip_vision=clip_vision) diff --git a/modules/path.py b/modules/path.py index d6b6e21..2ad758e 100644 --- a/modules/path.py +++ b/modules/path.py @@ -49,6 +49,7 @@ def get_dir_or_set_default(key, default_value): modelfile_path = get_dir_or_set_default('modelfile_path', '../models/checkpoints/') lorafile_path = get_dir_or_set_default('lorafile_path', '../models/loras/') +embeddings_path = get_dir_or_set_default('embeddings_path', '../models/embeddings/') vae_approx_path = get_dir_or_set_default('vae_approx_path', '../models/vae_approx/') upscale_models_path = get_dir_or_set_default('upscale_models_path', '../models/upscale_models/') inpaint_models_path = get_dir_or_set_default('inpaint_models_path', '../models/inpaint/') diff --git a/presets/anime.json b/presets/anime.json new file mode 100644 index 0000000..e329091 --- /dev/null +++ b/presets/anime.json @@ -0,0 +1,20 @@ +{ + "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", + "Default (Slightly Cinematic)" + ], + "default_negative_prompt": "low quality, bad hands, bad eyes, cropped, missing fingers, extra digit", + "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" + }, + "default_aspect_ratio": "1152*896" +} diff --git a/presets/realistic.json b/presets/realistic.json new file mode 100644 index 0000000..e329091 --- /dev/null +++ b/presets/realistic.json @@ -0,0 +1,20 @@ +{ + "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", + "Default (Slightly Cinematic)" + ], + "default_negative_prompt": "low quality, bad hands, bad eyes, cropped, missing fingers, extra digit", + "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" + }, + "default_aspect_ratio": "1152*896" +}