resolve merge conflicts and swap to dev branch for now

1 files changed, 14 insertions, 0 deletions

diff --git a/modules/script_callbacks.py b/modules/script_callbacks.py
index 07911876..17109732 100644
--- a/modules/script_callbacks.py
+++ b/modules/script_callbacks.py
@@ -93,6 +93,7 @@ callback_map = dict(
     callbacks_infotext_pasted=[],

     callbacks_script_unloaded=[],

     callbacks_before_ui=[],

+    callbacks_on_reload=[],

 )

 

 

@@ -109,6 +110,14 @@ def app_started_callback(demo: Optional[Blocks], app: FastAPI):
             report_exception(c, 'app_started_callback')

 

 

+def app_reload_callback():

+    for c in callback_map['callbacks_on_reload']:

+        try:

+            c.callback()

+        except Exception:

+            report_exception(c, 'callbacks_on_reload')

+

+

 def model_loaded_callback(sd_model):

     for c in callback_map['callbacks_model_loaded']:

         try:

@@ -254,6 +263,11 @@ def on_app_started(callback):
     add_callback(callback_map['callbacks_app_started'], callback)

 

 

+def on_before_reload(callback):

+    """register a function to be called just before the server reloads."""

+    add_callback(callback_map['callbacks_on_reload'], callback)

+

+

 def on_model_loaded(callback):

     """register a function to be called when the stable diffusion model is created; the model is

     passed as an argument; this function is also called when the script is reloaded. """