From ee06e87a580062aa6d6834502d5a7833fd143537 Mon Sep 17 00:00:00 2001 From: lllyasviel Date: Tue, 12 Dec 2023 20:40:29 -0800 Subject: [PATCH] reduce artifacts by also setting styles --- fooocus_version.py | 2 +- webui.py | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/fooocus_version.py b/fooocus_version.py index 63cf931f..2284de57 100644 --- a/fooocus_version.py +++ b/fooocus_version.py @@ -1 +1 @@ -version = '2.1.831' +version = '2.1.832' diff --git a/webui.py b/webui.py index 8b864799..4c38f03a 100644 --- a/webui.py +++ b/webui.py @@ -201,19 +201,6 @@ with shared.gradio_root: choices=[flags.desc_type_photo, flags.desc_type_anime], value=flags.desc_type_photo) desc_btn = gr.Button(value='Describe this Image into Prompt') - - def trigger_describe(mode, img): - if mode == flags.desc_type_photo: - from extras.interrogate import default_interrogator as default_interrogator_photo - return default_interrogator_photo(img) - if mode == flags.desc_type_anime: - from extras.wd14tagger import default_interrogator as default_interrogator_anime - return default_interrogator_anime(img) - return mode - - desc_btn.click(trigger_describe, inputs=[desc_method, desc_input_image], - outputs=prompt, show_progress=True, queue=False) - gr.HTML('\U0001F4D4 Document') switch_js = "(x) => {if(x){viewer_to_bottom(100);viewer_to_bottom(500);}else{viewer_to_top();} return x;}" down_js = "() => {viewer_to_bottom();}" @@ -535,6 +522,18 @@ with shared.gradio_root: gr.Audio(interactive=False, value=notification_file, elem_id='audio_notification', visible=False) break + def trigger_describe(mode, img): + if mode == flags.desc_type_photo: + from extras.interrogate import default_interrogator as default_interrogator_photo + return default_interrogator_photo(img), ["Fooocus V2", "Fooocus Enhance"] + if mode == flags.desc_type_anime: + from extras.wd14tagger import default_interrogator as default_interrogator_anime + return default_interrogator_anime(img), ["Fooocus V2", "Fooocus Masterpiece"] + return mode, ["Fooocus V2"] + + desc_btn.click(trigger_describe, inputs=[desc_method, desc_input_image], + outputs=[prompt, style_selections], show_progress=True, queue=False) + def dump_default_english_config(): from modules.localization import dump_english_config