Merge branch 'master' into improved-hr-conflict-test

1 files changed, 32 insertions, 0 deletions

diff --git a/modules/scripts.py b/modules/scripts.py
index 24056a12..8de19884 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -33,6 +33,11 @@ class Script:
     parsing infotext to set the value for the component; see ui.py's txt2img_paste_fields for an example

     """

 

+    paste_field_names = None

+    """if set in ui(), this is a list of names of infotext fields; the fields will be sent through the

+    various "Send to <X>" buttons when clicked

+    """

+

     def title(self):

         """this function should return the title of the script. This is what will be displayed in the dropdown menu."""

 

@@ -80,6 +85,20 @@ class Script:
 

         pass

 

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

+        """

+        Called before extra networks are parsed from the prompt, so you can add

+        new extra network keywords to the prompt with this callback.

+

+        **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

+        """

+

+        pass

+

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

         """

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

@@ -256,6 +275,7 @@ class ScriptRunner:
         self.alwayson_scripts = []

         self.titles = []

         self.infotext_fields = []

+        self.paste_field_names = []

 

     def initialize_scripts(self, is_img2img):

         from modules import scripts_auto_postprocessing

@@ -304,6 +324,9 @@ class ScriptRunner:
             if script.infotext_fields is not None:

                 self.infotext_fields += script.infotext_fields

 

+            if script.paste_field_names is not None:

+                self.paste_field_names += script.paste_field_names

+

             inputs += controls

             inputs_alwayson += [script.alwayson for _ in controls]

             script.args_to = len(inputs)

@@ -388,6 +411,15 @@ class ScriptRunner:
                 print(f"Error running process: {script.filename}", file=sys.stderr)

                 print(traceback.format_exc(), file=sys.stderr)

 

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

+        for script in self.alwayson_scripts:

+            try:

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

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

+            except Exception:

+                print(f"Error running before_process_batch: {script.filename}", file=sys.stderr)

+                print(traceback.format_exc(), file=sys.stderr)

+

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

         for script in self.alwayson_scripts:

             try: