diff --git a/launch.py b/launch.py index 9fd1e5a3..fb7df30b 100644 --- a/launch.py +++ b/launch.py @@ -103,12 +103,12 @@ def download_models(default_model, previous_default_models, checkpoint_downloads if not os.path.exists(os.path.join(config.path_checkpoints, default_model)): for alternative_model_name in previous_default_models: if os.path.exists(os.path.join(config.path_checkpoints, alternative_model_name)): - print(f'You do not have [{config.default_base_model_name}] but you have [{alternative_model_name}].') + print(f'You do not have [{default_model}] but you have [{alternative_model_name}].') print(f'Fooocus will use [{alternative_model_name}] to avoid downloading new models, ' - f'but you are not using latest models.') + f'but you are not using the latest models.') print('Use --always-download-new-model to avoid fallback and always get new models.') - config.checkpoint_downloads = {} - config.default_base_model_name = alternative_model_name + checkpoint_downloads = {} + default_model = alternative_model_name break for file_name, url in checkpoint_downloads.items(): @@ -118,10 +118,11 @@ def download_models(default_model, previous_default_models, checkpoint_downloads for file_name, url in lora_downloads.items(): load_file_from_url(url=url, model_dir=config.path_loras, file_name=file_name) - return + return default_model, checkpoint_downloads -download_models(config.default_base_model_name, config.previous_default_models, config.checkpoint_downloads, - config.embeddings_downloads, config.lora_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) from webui import * diff --git a/presets/realistic.json b/presets/realistic.json index c377676b..9d5750eb 100644 --- a/presets/realistic.json +++ b/presets/realistic.json @@ -1,6 +1,6 @@ { "default_model": "realisticStockPhoto_v20.safetensors", - "default_refiner": "", + "default_refiner": "None", "default_refiner_switch": 0.5, "default_loras": [ [ diff --git a/webui.py b/webui.py index d1bcdbaa..6494490e 100644 --- a/webui.py +++ b/webui.py @@ -634,7 +634,9 @@ with shared.gradio_root: checkpoint_downloads = preset_prepared['checkpoint_downloads'] embeddings_downloads = preset_prepared['embeddings_downloads'] lora_downloads = preset_prepared['lora_downloads'] - launch.download_models(default_model, previous_default_models, checkpoint_downloads, embeddings_downloads, lora_downloads) + + preset_prepared['Base Model'], preset_prepared['lora_downloads'] = launch.download_models( + default_model, previous_default_models, checkpoint_downloads, embeddings_downloads, lora_downloads) return modules.meta_parser.load_parameter_button_click(json.dumps(preset_prepared), is_generating)