Should be one underscore for module privates not two

This commit is contained in:
DepFA 2022-11-04 12:19:16 +00:00 committed by GitHub
parent c07f1d0d78
commit c3cd0d7a86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 19 deletions

View File

@ -46,7 +46,7 @@ class CFGDenoiserParams:
ScriptCallback = namedtuple("ScriptCallback", ["script", "callback"]) ScriptCallback = namedtuple("ScriptCallback", ["script", "callback"])
__callback_map = dict( _callback_map = dict(
callbacks_app_started=[], callbacks_app_started=[],
callbacks_model_loaded=[], callbacks_model_loaded=[],
callbacks_ui_tabs=[], callbacks_ui_tabs=[],
@ -58,11 +58,11 @@ __callback_map = dict(
def clear_callbacks(): def clear_callbacks():
for callback_list in __callback_map.values(): for callback_list in _callback_map.values():
callback_list.clear() callback_list.clear()
def app_started_callback(demo: Optional[Blocks], app: FastAPI): def app_started_callback(demo: Optional[Blocks], app: FastAPI):
for c in __callback_map['callbacks_app_started']: for c in _callback_map['callbacks_app_started']:
try: try:
c.callback(demo, app) c.callback(demo, app)
except Exception: except Exception:
@ -70,7 +70,7 @@ def app_started_callback(demo: Optional[Blocks], app: FastAPI):
def model_loaded_callback(sd_model): def model_loaded_callback(sd_model):
for c in __callback_map['callbacks_model_loaded']: for c in _callback_map['callbacks_model_loaded']:
try: try:
c.callback(sd_model) c.callback(sd_model)
except Exception: except Exception:
@ -80,7 +80,7 @@ def model_loaded_callback(sd_model):
def ui_tabs_callback(): def ui_tabs_callback():
res = [] res = []
for c in __callback_map['callbacks_ui_tabs']: for c in _callback_map['callbacks_ui_tabs']:
try: try:
res += c.callback() or [] res += c.callback() or []
except Exception: except Exception:
@ -90,7 +90,7 @@ def ui_tabs_callback():
def ui_settings_callback(): def ui_settings_callback():
for c in __callback_map['callbacks_ui_settings']: for c in _callback_map['callbacks_ui_settings']:
try: try:
c.callback() c.callback()
except Exception: except Exception:
@ -98,7 +98,7 @@ def ui_settings_callback():
def before_image_saved_callback(params: ImageSaveParams): def before_image_saved_callback(params: ImageSaveParams):
for c in __callback_map['callbacks_before_image_saved']: for c in _callback_map['callbacks_before_image_saved']:
try: try:
c.callback(params) c.callback(params)
except Exception: except Exception:
@ -106,7 +106,7 @@ def before_image_saved_callback(params: ImageSaveParams):
def image_saved_callback(params: ImageSaveParams): def image_saved_callback(params: ImageSaveParams):
for c in __callback_map['callbacks_image_saved']: for c in _callback_map['callbacks_image_saved']:
try: try:
c.callback(params) c.callback(params)
except Exception: except Exception:
@ -114,7 +114,7 @@ def image_saved_callback(params: ImageSaveParams):
def cfg_denoiser_callback(params: CFGDenoiserParams): def cfg_denoiser_callback(params: CFGDenoiserParams):
for c in __callback_map['callbacks_cfg_denoiser']: for c in _callback_map['callbacks_cfg_denoiser']:
try: try:
c.callback(params) c.callback(params)
except Exception: except Exception:
@ -133,13 +133,13 @@ def remove_current_script_callbacks():
filename = stack[0].filename if len(stack) > 0 else 'unknown file' filename = stack[0].filename if len(stack) > 0 else 'unknown file'
if filename == 'unknown file': if filename == 'unknown file':
return return
for callback_list in __callback_map.values(): for callback_list in _callback_map.values():
for callback_to_remove in [cb for cb in callback_list if cb.script == filename]: for callback_to_remove in [cb for cb in callback_list if cb.script == filename]:
callback_list.remove(callback_to_remove) callback_list.remove(callback_to_remove)
def remove_callbacks_for_function(callback_func): def remove_callbacks_for_function(callback_func):
for callback_list in __callback_map.values(): for callback_list in _callback_map.values():
for callback_to_remove in [cb for cb in callback_list if cb.callback == callback_func]: for callback_to_remove in [cb for cb in callback_list if cb.callback == callback_func]:
callback_list.remove(callback_to_remove) callback_list.remove(callback_to_remove)
@ -147,13 +147,13 @@ def remove_callbacks_for_function(callback_func):
def on_app_started(callback): def on_app_started(callback):
"""register a function to be called when the webui started, the gradio `Block` component and """register a function to be called when the webui started, the gradio `Block` component and
fastapi `FastAPI` object are passed as the arguments""" fastapi `FastAPI` object are passed as the arguments"""
add_callback(__callback_map['callbacks_app_started'], callback) add_callback(_callback_map['callbacks_app_started'], callback)
def on_model_loaded(callback): def on_model_loaded(callback):
"""register a function to be called when the stable diffusion model is created; the model is """register a function to be called when the stable diffusion model is created; the model is
passed as an argument""" passed as an argument"""
add_callback(__callback_map['callbacks_model_loaded'], callback) add_callback(_callback_map['callbacks_model_loaded'], callback)
def on_ui_tabs(callback): def on_ui_tabs(callback):
@ -166,13 +166,13 @@ def on_ui_tabs(callback):
title is tab text displayed to user in the UI title is tab text displayed to user in the UI
elem_id is HTML id for the tab elem_id is HTML id for the tab
""" """
add_callback(__callback_map['callbacks_ui_tabs'], callback) add_callback(_callback_map['callbacks_ui_tabs'], callback)
def on_ui_settings(callback): def on_ui_settings(callback):
"""register a function to be called before UI settings are populated; add your settings """register a function to be called before UI settings are populated; add your settings
by using shared.opts.add_option(shared.OptionInfo(...)) """ by using shared.opts.add_option(shared.OptionInfo(...)) """
add_callback(__callback_map['callbacks_ui_settings'], callback) add_callback(_callback_map['callbacks_ui_settings'], callback)
def on_before_image_saved(callback): def on_before_image_saved(callback):
@ -180,7 +180,7 @@ def on_before_image_saved(callback):
The callback is called with one argument: The callback is called with one argument:
- params: ImageSaveParams - parameters the image is to be saved with. You can change fields in this object. - params: ImageSaveParams - parameters the image is to be saved with. You can change fields in this object.
""" """
add_callback(__callback_map['callbacks_before_image_saved'], callback) add_callback(_callback_map['callbacks_before_image_saved'], callback)
def on_image_saved(callback): def on_image_saved(callback):
@ -188,7 +188,7 @@ def on_image_saved(callback):
The callback is called with one argument: The callback is called with one argument:
- params: ImageSaveParams - parameters the image was saved with. Changing fields in this object does nothing. - params: ImageSaveParams - parameters the image was saved with. Changing fields in this object does nothing.
""" """
add_callback(__callback_map['callbacks_image_saved'], callback) add_callback(_callback_map['callbacks_image_saved'], callback)
def on_cfg_denoiser(callback): def on_cfg_denoiser(callback):
@ -196,5 +196,4 @@ def on_cfg_denoiser(callback):
The callback is called with one argument: The callback is called with one argument:
- params: CFGDenoiserParams - parameters to be passed to the inner model and sampling state details. - params: CFGDenoiserParams - parameters to be passed to the inner model and sampling state details.
""" """
add_callback(__callback_map['callbacks_cfg_denoiser'], callback) add_callback(_callback_map['callbacks_cfg_denoiser'], callback)