Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main_upstream' into feature/add-preset-selection

Browse Source 
# Conflicts:
#	modules/config.py
#	presets/realistic.json
This commit is contained in:
Manuel Schmid
2024-01-28 00:57:03 +01:00
parent 4900837786 31fc99d2bc
commit 6031f85f49
339 changed files with 2114 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webui.py
+8 -5
View File
@@ -262,7 +262,7 @@ with shared.gradio_root:
queue=False, show_progress=False)
if not args_manager.args.disable_image_log:
gr.HTML(f'<a href="/file={get_current_html_path()}" target="_blank">\U0001F4DA History Log</a>')
gr.HTML(f'<a href="file={get_current_html_path()}" target="_blank">\U0001F4DA History Log</a>')
with gr.Tab(label='Style'):
style_sorter.try_load_sorted_styles(
@@ -519,10 +519,13 @@ 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']
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)