Merge branch 'dev' into master

1 files changed, 39 insertions, 1 deletions

diff --git a/modules/scripts.py b/modules/scripts.py
index 99bf836a..7d9dd59f 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -1,6 +1,7 @@
 import os

 import re

 import sys

+import inspect

 from collections import namedtuple

 

 import gradio as gr

@@ -116,6 +117,21 @@ class Script:
 

         pass

 

+    def after_extra_networks_activate(self, p, *args, **kwargs):

+        """

+        Calledafter extra networks activation, before conds calculation

+        allow modification of the network after extra networks activation been applied

+        won't be call if p.disable_extra_networks

+

+        **kwargs will have those items:

+          - batch_number - index of current batch, from 0 to number of batches-1

+          - prompts - list of prompts for current batch; you can change contents of this list but changing the number of entries will likely break things

+          - seeds - list of seeds for current batch

+          - subseeds - list of subseeds for current batch

+          - extra_network_data - list of ExtraNetworkParams for current stage

+        """

+        pass

+

     def process_batch(self, p, *args, **kwargs):

         """

         Same as process(), but called for every batch.

@@ -186,6 +202,11 @@ class Script:
 

         return f'script_{tabname}{title}_{item_id}'

 

+    def before_hr(self, p, *args):

+        """

+        This function is called before hires fix start.

+        """

+        pass

 

 current_basedir = paths.script_path

 

@@ -249,7 +270,7 @@ def load_scripts():
 

     def register_scripts_from_module(module):

         for script_class in module.__dict__.values():

-            if type(script_class) != type:

+            if not inspect.isclass(script_class):

                 continue

 

             if issubclass(script_class, Script):

@@ -483,6 +504,14 @@ class ScriptRunner:
             except Exception:

                 errors.report(f"Error running before_process_batch: {script.filename}", exc_info=True)

 

+    def after_extra_networks_activate(self, p, **kwargs):

+        for script in self.alwayson_scripts:

+            try:

+                script_args = p.script_args[script.args_from:script.args_to]

+                script.after_extra_networks_activate(p, *script_args, **kwargs)

+            except Exception:

+                errors.report(f"Error running after_extra_networks_activate: {script.filename}", exc_info=True)

+

     def process_batch(self, p, **kwargs):

         for script in self.alwayson_scripts:

             try:

@@ -548,6 +577,15 @@ class ScriptRunner:
                     self.scripts[si].args_to = args_to

 

 

+    def before_hr(self, p):

+        for script in self.alwayson_scripts:

+            try:

+                script_args = p.script_args[script.args_from:script.args_to]

+                script.before_hr(p, *script_args)

+            except Exception:

+                errors.report(f"Error running before_hr: {script.filename}", exc_info=True)

+

+

 scripts_txt2img: ScriptRunner = None

 scripts_img2img: ScriptRunner = None

 scripts_postproc: scripts_postprocessing.ScriptPostprocessingRunner = None