Merge branch 'main_upstream'

# Conflicts:
#	launch.py
#	ldm_patched/modules/args_parser.py
#	modules/config.py
#	presets/anime.json
#	presets/default.json
#	presets/lcm.json
#	presets/realistic.json
This commit is contained in:
Manuel Schmid
2024-01-27 21:09:08 +01:00
60 changed files with 2049 additions and 275 deletions
+6 -4
View File
@@ -629,10 +629,12 @@ with shared.gradio_root:
preset_content = modules.config.try_get_preset_content(preset) if preset != 'initial' else {}
preset_prepared = modules.meta_parser.parse_meta_from_preset(preset_content)
launch.checkpoint_downloads = preset_prepared['checkpoint_downloads']
launch.embeddings_downloads = preset_prepared['embeddings_downloads']
launch.lora_downloads = preset_prepared['lora_downloads']
launch.download_models()
default_model = preset_prepared['Base Model']
previous_default_models = preset_prepared['previous_default_models']
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)
return modules.meta_parser.load_parameter_button_click(json.dumps(preset_prepared), is_generating)