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 'feature/add-preset-selection'

Browse Source 
# Conflicts:
#	webui.py
This commit is contained in:
Manuel Schmid
2024-01-01 18:50:43 +01:00
parent f52a356cfb 55bb233a3e
commit 0099dd4783
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webui.py
+5 -5
View File
@@ -505,7 +505,9 @@ with shared.gradio_root:
play_notification.change(fn=play_notification_checked, inputs=[play_notification, notification], outputs=[notification_input], queue=False) play_notification.change(fn=play_notification_checked, inputs=[play_notification, notification], outputs=[notification_input], queue=False)
notification_input.change(fn=notification_input_changed, inputs=[notification_input, notification], outputs=[notification], queue=False) notification_input.change(fn=notification_input_changed, inputs=[notification_input, notification], outputs=[notification], queue=False)
def preset_selection_change(preset): 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_content = modules.config.try_get_preset_content(preset) if preset != 'initial' else {}
preset_prepared = modules.meta_parser.parse_meta_from_preset(preset_content) preset_prepared = modules.meta_parser.parse_meta_from_preset(preset_content)
@@ -514,9 +516,9 @@ with shared.gradio_root:
launch.lora_downloads = preset_prepared['lora_downloads'] launch.lora_downloads = preset_prepared['lora_downloads']
launch.download_models() launch.download_models()
return modules.meta_parser.load_parameter_button_click(json.dumps(preset_prepared)) return modules.meta_parser.load_parameter_button_click(json.dumps(preset_prepared), is_generating)
preset_selection.change(preset_selection_change, inputs=preset_selection, outputs=[ preset_selection.change(preset_selection_change, inputs=[preset_selection, state_is_generating], outputs=[
advanced_checkbox, advanced_checkbox,
image_number, image_number,
prompt, prompt,
@@ -604,8 +606,6 @@ with shared.gradio_root:
ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt] ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt]
ctrls += ip_ctrls ctrls += ip_ctrls
state_is_generating = gr.State(False)
def parse_meta(raw_prompt_txt, is_generating): def parse_meta(raw_prompt_txt, is_generating):
loaded_json = None loaded_json = None
try: try: