happyz
/
Fooocus
mirror of https://github.com/lllyasviel/Fooocus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/add-preset-selection' 

# Conflicts:
#	webui.py
This commit is contained in:
Manuel Schmid 2024-01-05 21:54:46 +01:00
parent 7a01c8a5b2 4900837786
commit b5bb4eb8b1
No known key found for this signature in database
GPG Key ID: 32C4F7569B40B84B
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
args_manager.py
View File

@ -2,7 +2,10 @@ import ldm_patched.modules.args_parser as args_parser
args_parser.parser.add_argument("--share", action='store_true', help="Set whether to share on Gradio.") args_parser.parser.add_argument("--share", action='store_true', help="Set whether to share on Gradio.")
args_parser.parser.add_argument("--preset", type=str, default=None, help="Apply specified UI preset.") args_parser.parser.add_argument("--preset", type=str, default=None, help="Apply specified UI preset.")
args_parser.parser.add_argument("--disable-preset-selection", action='store_true',
help="Disables preset selection in Gradio.")
args_parser.parser.add_argument("--language", type=str, default='default', args_parser.parser.add_argument("--language", type=str, default='default',
help="Translate UI using json files in [language] folder. " help="Translate UI using json files in [language] folder. "
@ -18,7 +21,7 @@ args_parser.parser.add_argument("--disable-image-log", action='store_true',
help="Prevent writing images and logs to hard drive.") help="Prevent writing images and logs to hard drive.")
args_parser.parser.add_argument("--disable-analytics", action='store_true', args_parser.parser.add_argument("--disable-analytics", action='store_true',
help="Disables analytics for Gradio", default=False) help="Disables analytics for Gradio.")
args_parser.parser.set_defaults( args_parser.parser.set_defaults(
disable_cuda_malloc=True, disable_cuda_malloc=True,

48
webui.py
View File

@ -230,10 +230,11 @@ with shared.gradio_root:
with gr.Column(scale=1, visible=modules.config.default_advanced_checkbox) as advanced_column: with gr.Column(scale=1, visible=modules.config.default_advanced_checkbox) as advanced_column:
with gr.Tab(label='Settings'): with gr.Tab(label='Settings'):
preset_selection = gr.Radio(label='Preset', if not args_manager.args.disable_preset_selection:
choices=modules.config.available_presets, preset_selection = gr.Radio(label='Preset',
value=args_manager.args.preset if args_manager.args.preset else "initial", choices=modules.config.available_presets,
interactive=True) value=args_manager.args.preset if args_manager.args.preset else "initial",
interactive=True)
performance_selection = gr.Radio(label='Performance', performance_selection = gr.Radio(label='Performance',
choices=modules.flags.performance_selections, choices=modules.flags.performance_selections,
value=modules.config.default_performance, value=modules.config.default_performance,
@ -495,13 +496,17 @@ with shared.gradio_root:
modules.config.update_presets() modules.config.update_presets()
results = [] results = []
results += [gr.update(choices=modules.config.model_filenames), results += [gr.update(choices=modules.config.model_filenames),
gr.update(choices=['None'] + modules.config.model_filenames), gr.update(choices=['None'] + modules.config.model_filenames)]
gr.update(choices=modules.config.available_presets)] if not args_manager.args.disable_preset_selection:
results += [gr.update(choices=modules.config.available_presets)]
for i in range(5): for i in range(5):
results += [gr.update(choices=['None'] + modules.config.lora_filenames), gr.update()] results += [gr.update(choices=['None'] + modules.config.lora_filenames), gr.update()]
return results return results
model_refresh.click(model_refresh_clicked, [], [base_model, refiner_model, preset_selection] + lora_ctrls, model_refresh_output = [base_model, refiner_model]
if not args_manager.args.disable_preset_selection:
model_refresh_output += [preset_selection]
model_refresh.click(model_refresh_clicked, [], model_refresh_output + lora_ctrls,
queue=False, show_progress=False) queue=False, show_progress=False)
with gr.Tab(label='Audio'): with gr.Tab(label='Audio'):
@ -524,17 +529,6 @@ with shared.gradio_root:
state_is_generating = gr.State(False) state_is_generating = gr.State(False)
def preset_selection_change(preset, is_generating):
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()
return modules.meta_parser.load_parameter_button_click(json.dumps(preset_prepared), is_generating)
load_parameter_outputs = [ load_parameter_outputs = [
advanced_checkbox, advanced_checkbox,
image_number, image_number,
@ -562,9 +556,21 @@ with shared.gradio_root:
load_parameter_button load_parameter_button
] + lora_ctrls ] + lora_ctrls
preset_selection.change(preset_selection_change, inputs=[preset_selection, state_is_generating], outputs=load_parameter_outputs, queue=False, show_progress=True) \ if not args_manager.args.disable_preset_selection:
.then(fn=style_sorter.sort_styles, inputs=style_selections, outputs=style_selections, queue=False, show_progress=False) \ def preset_selection_change(preset, is_generating):
.then(lambda: None, _js='()=>{refresh_style_localization();}') 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()
return modules.meta_parser.load_parameter_button_click(json.dumps(preset_prepared), is_generating)
preset_selection.change(preset_selection_change, inputs=[preset_selection, state_is_generating], outputs=load_parameter_outputs, queue=False, show_progress=True) \
.then(fn=style_sorter.sort_styles, inputs=style_selections, outputs=style_selections, queue=False, show_progress=False) \
.then(lambda: None, _js='()=>{refresh_style_localization();}')
performance_selection.change(lambda x: [gr.update(interactive=x != 'Extreme Speed')] * 11 + performance_selection.change(lambda x: [gr.update(interactive=x != 'Extreme Speed')] * 11 +