allow embeddings download
This commit is contained in:
		
							parent
							
								
									2f6843da95
								
							
						
					
					
						commit
						9efa4ecd27
					
				@ -7,7 +7,8 @@ import fooocus_version
 | 
				
			|||||||
from build_launcher import build_launcher
 | 
					from build_launcher import build_launcher
 | 
				
			||||||
from modules.launch_util import is_installed, run, python, run_pip, requirements_met
 | 
					from modules.launch_util import is_installed, run, python, run_pip, requirements_met
 | 
				
			||||||
from modules.model_loader import load_file_from_url
 | 
					from modules.model_loader import load_file_from_url
 | 
				
			||||||
from modules.path import modelfile_path, lorafile_path, vae_approx_path, fooocus_expansion_path, checkpoint_downloads
 | 
					from modules.path import modelfile_path, lorafile_path, vae_approx_path, fooocus_expansion_path, \
 | 
				
			||||||
 | 
					    checkpoint_downloads, embeddings_path, embeddings_downloads
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
REINSTALL_ALL = False
 | 
					REINSTALL_ALL = False
 | 
				
			||||||
@ -63,6 +64,8 @@ vae_approx_filenames = [
 | 
				
			|||||||
def download_models():
 | 
					def download_models():
 | 
				
			||||||
    for file_name, url in checkpoint_downloads.items():
 | 
					    for file_name, url in checkpoint_downloads.items():
 | 
				
			||||||
        load_file_from_url(url=url, model_dir=modelfile_path, file_name=file_name)
 | 
					        load_file_from_url(url=url, model_dir=modelfile_path, file_name=file_name)
 | 
				
			||||||
 | 
					    for file_name, url in embeddings_downloads.items():
 | 
				
			||||||
 | 
					        load_file_from_url(url=url, model_dir=embeddings_path, file_name=file_name)
 | 
				
			||||||
    for file_name, url in lora_filenames:
 | 
					    for file_name, url in lora_filenames:
 | 
				
			||||||
        load_file_from_url(url=url, model_dir=lorafile_path, file_name=file_name)
 | 
					        load_file_from_url(url=url, model_dir=lorafile_path, file_name=file_name)
 | 
				
			||||||
    for file_name, url in vae_approx_filenames:
 | 
					    for file_name, url in vae_approx_filenames:
 | 
				
			||||||
 | 
				
			|||||||
@ -138,6 +138,11 @@ checkpoint_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())
 | 
					    validator=lambda x: isinstance(x, dict) and all(isinstance(k, str) and isinstance(v, str) for k, v in x.items())
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					embeddings_downloads = get_config_item_or_set_default(
 | 
				
			||||||
 | 
					    key='embeddings_downloads',
 | 
				
			||||||
 | 
					    default_value={},
 | 
				
			||||||
 | 
					    validator=lambda x: isinstance(x, dict) and all(isinstance(k, str) and isinstance(v, str) for k, v in x.items())
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
default_aspect_ratio = get_config_item_or_set_default(
 | 
					default_aspect_ratio = get_config_item_or_set_default(
 | 
				
			||||||
    key='default_aspect_ratio',
 | 
					    key='default_aspect_ratio',
 | 
				
			||||||
    default_value='1152*896',
 | 
					    default_value='1152*896',
 | 
				
			||||||
 | 
				
			|||||||
@ -16,5 +16,6 @@
 | 
				
			|||||||
        "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_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"
 | 
					        "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"
 | 
					    "default_aspect_ratio": "1152*896"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -16,5 +16,6 @@
 | 
				
			|||||||
        "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_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"
 | 
					        "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"
 | 
					    "default_aspect_ratio": "1152*896"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -16,5 +16,6 @@
 | 
				
			|||||||
        "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_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"
 | 
					        "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"
 | 
					    "default_aspect_ratio": "1152*896"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user