diff --git a/modules/script_callbacks.py b/modules/script_callbacks.py index d07892e1f..7bc2b568d 100644 --- a/modules/script_callbacks.py +++ b/modules/script_callbacks.py @@ -109,8 +109,8 @@ callback_map = dict( callbacks_before_process=[], callbacks_after_process=[], callbacks_model_loaded=[], - callbacks_ui_tabs=[], callbacks_ui_settings=[], + callbacks_ui_tabs=[], callbacks_before_image_saved=[], callbacks_image_saved=[], callbacks_image_save_btn=[], @@ -200,6 +200,16 @@ def model_loaded_callback(sd_model): report_exception(e, c, 'model_loaded_callback') +def ui_settings_callback(): + for c in callback_map['callbacks_ui_settings']: + try: + t0 = time.time() + c.callback() + timer(t0, c.script, 'ui_settings') + except Exception as e: + report_exception(e, c, 'ui_settings_callback') + + def ui_tabs_callback(): res = [] for c in callback_map['callbacks_ui_tabs']: @@ -212,16 +222,6 @@ def ui_tabs_callback(): return res -def ui_settings_callback(): - for c in callback_map['callbacks_ui_settings']: - try: - t0 = time.time() - c.callback() - timer(t0, c.script, 'ui_settings') - except Exception as e: - report_exception(e, c, 'ui_settings_callback') - - def before_image_saved_callback(params: ImageSaveParams): for c in callback_map['callbacks_before_image_saved']: try: @@ -411,6 +411,12 @@ def on_model_loaded(callback): add_callback(callback_map['callbacks_model_loaded'], callback) +def on_ui_settings(callback): + """register a function to be called before UI settings are populated; add your settings + by using shared.opts.add_option(shared.OptionInfo(...)) """ + add_callback(callback_map['callbacks_ui_settings'], callback) + + def on_ui_tabs(callback): """register a function to be called when the UI is creating new tabs. The function must either return a None, which means no new tabs to be added, or a list, where @@ -424,12 +430,6 @@ def on_ui_tabs(callback): add_callback(callback_map['callbacks_ui_tabs'], callback) -def on_ui_settings(callback): - """register a function to be called before UI settings are populated; add your settings - by using shared.opts.add_option(shared.OptionInfo(...)) """ - add_callback(callback_map['callbacks_ui_settings'], callback) - - def on_before_image_saved(callback): """register a function to be called before an image is saved to a file. The callback is called with one argument: diff --git a/modules/ui.py b/modules/ui.py index ae35f6df9..1dc1af44b 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -137,8 +137,6 @@ def create_ui(startup_timer = None) -> gr.Blocks: timer.startup.record("ui-gallery") interfaces += [(gallery_interface, "Gallery", "gallery")] - interfaces += script_callbacks.ui_tabs_callback() - with gr.Blocks(analytics_enabled=False) as settings_interface: from modules import ui_settings ui_settings.create_ui(ui_disabled) @@ -148,6 +146,8 @@ def create_ui(startup_timer = None) -> gr.Blocks: timer.startup.record("ui-extensions") interfaces += [(settings_interface, "System", "system")] + interfaces += script_callbacks.ui_tabs_callback() + if 'info' not in ui_disabled: with gr.Blocks(analytics_enabled=False) as info_interface: from modules import ui_docs