Merge branch 'release_candidate'

1 files changed, 84 insertions, 69 deletions

diff --git a/modules/scripts.py b/modules/scripts.py
index c902804b..99bf836a 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -1,12 +1,11 @@
 import os

 import re

 import sys

-import traceback

 from collections import namedtuple

 

 import gradio as gr

 

-from modules import shared, paths, script_callbacks, extensions, script_loading, scripts_postprocessing

+from modules import shared, paths, script_callbacks, extensions, script_loading, scripts_postprocessing, errors, timer

 

 AlwaysVisible = object()

 

@@ -20,6 +19,9 @@ class Script:
     name = None

     """script's internal name derived from title"""

 

+    section = None

+    """name of UI section that the script's controls will be placed into"""

+

     filename = None

     args_from = None

     args_to = None

@@ -82,6 +84,15 @@ class Script:
 

         pass

 

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

+        """

+        This function is called very early before processing begins for AlwaysVisible scripts.

+        You can modify the processing object (p) here, inject hooks, etc.

+        args contains all values returned by components from ui()

+        """

+

+        pass

+

     def process(self, p, *args):

         """

         This function is called before processing begins for AlwaysVisible scripts.

@@ -264,12 +275,12 @@ def load_scripts():
             register_scripts_from_module(script_module)

 

         except Exception:

-            print(f"Error loading script: {scriptfile.filename}", file=sys.stderr)

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

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

 

         finally:

             sys.path = syspath

             current_basedir = paths.script_path

+            timer.startup_timer.record(scriptfile.filename)

 

     global scripts_txt2img, scripts_img2img, scripts_postproc

 

@@ -280,11 +291,9 @@ def load_scripts():
 

 def wrap_call(func, filename, funcname, *args, default=None, **kwargs):

     try:

-        res = func(*args, **kwargs)

-        return res

+        return func(*args, **kwargs)

     except Exception:

-        print(f"Error calling: {filename}/{funcname}", file=sys.stderr)

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

+        errors.report(f"Error calling: {filename}/{funcname}", exc_info=True)

 

     return default

 

@@ -297,6 +306,7 @@ class ScriptRunner:
         self.titles = []

         self.infotext_fields = []

         self.paste_field_names = []

+        self.inputs = [None]

 

     def initialize_scripts(self, is_img2img):

         from modules import scripts_auto_postprocessing

@@ -324,69 +334,73 @@ class ScriptRunner:
                 self.scripts.append(script)

                 self.selectable_scripts.append(script)

 

-    def setup_ui(self):

+    def create_script_ui(self, script):

         import modules.api.models as api_models

 

-        self.titles = [wrap_call(script.title, script.filename, "title") or f"{script.filename} [error]" for script in self.selectable_scripts]

+        script.args_from = len(self.inputs)

+        script.args_to = len(self.inputs)

 

-        inputs = [None]

-        inputs_alwayson = [True]

+        controls = wrap_call(script.ui, script.filename, "ui", script.is_img2img)

 

-        def create_script_ui(script, inputs, inputs_alwayson):

-            script.args_from = len(inputs)

-            script.args_to = len(inputs)

+        if controls is None:

+            return

 

-            controls = wrap_call(script.ui, script.filename, "ui", script.is_img2img)

+        script.name = wrap_call(script.title, script.filename, "title", default=script.filename).lower()

+        api_args = []

 

-            if controls is None:

-                return

+        for control in controls:

+            control.custom_script_source = os.path.basename(script.filename)

 

-            script.name = wrap_call(script.title, script.filename, "title", default=script.filename).lower()

-            api_args = []

+            arg_info = api_models.ScriptArg(label=control.label or "")

 

-            for control in controls:

-                control.custom_script_source = os.path.basename(script.filename)

+            for field in ("value", "minimum", "maximum", "step", "choices"):

+                v = getattr(control, field, None)

+                if v is not None:

+                    setattr(arg_info, field, v)

 

-                arg_info = api_models.ScriptArg(label=control.label or "")

+            api_args.append(arg_info)

 

-                for field in ("value", "minimum", "maximum", "step", "choices"):

-                    v = getattr(control, field, None)

-                    if v is not None:

-                        setattr(arg_info, field, v)

+        script.api_info = api_models.ScriptInfo(

+            name=script.name,

+            is_img2img=script.is_img2img,

+            is_alwayson=script.alwayson,

+            args=api_args,

+        )

 

-                api_args.append(arg_info)

+        if script.infotext_fields is not None:

+            self.infotext_fields += script.infotext_fields

 

-            script.api_info = api_models.ScriptInfo(

-                name=script.name,

-                is_img2img=script.is_img2img,

-                is_alwayson=script.alwayson,

-                args=api_args,

-            )

+        if script.paste_field_names is not None:

+            self.paste_field_names += script.paste_field_names

 

-            if script.infotext_fields is not None:

-                self.infotext_fields += script.infotext_fields

+        self.inputs += controls

+        script.args_to = len(self.inputs)

 

-            if script.paste_field_names is not None:

-                self.paste_field_names += script.paste_field_names

+    def setup_ui_for_section(self, section, scriptlist=None):

+        if scriptlist is None:

+            scriptlist = self.alwayson_scripts

 

-            inputs += controls

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

-            script.args_to = len(inputs)

+        for script in scriptlist:

+            if script.alwayson and script.section != section:

+                continue

 

-        for script in self.alwayson_scripts:

-            with gr.Group() as group:

-                create_script_ui(script, inputs, inputs_alwayson)

+            with gr.Group(visible=script.alwayson) as group:

+                self.create_script_ui(script)

 

             script.group = group

 

-        dropdown = gr.Dropdown(label="Script", elem_id="script_list", choices=["None"] + self.titles, value="None", type="index")

-        inputs[0] = dropdown

+    def prepare_ui(self):

+        self.inputs = [None]

 

-        for script in self.selectable_scripts:

-            with gr.Group(visible=False) as group:

-                create_script_ui(script, inputs, inputs_alwayson)

+    def setup_ui(self):

+        self.titles = [wrap_call(script.title, script.filename, "title") or f"{script.filename} [error]" for script in self.selectable_scripts]

 

-            script.group = group

+        self.setup_ui_for_section(None)

+

+        dropdown = gr.Dropdown(label="Script", elem_id="script_list", choices=["None"] + self.titles, value="None", type="index")

+        self.inputs[0] = dropdown

+

+        self.setup_ui_for_section(None, self.selectable_scripts)

 

         def select_script(script_index):

             selected_script = self.selectable_scripts[script_index - 1] if script_index>0 else None

@@ -411,6 +425,7 @@ class ScriptRunner:
         )

 

         self.script_load_ctr = 0

+

         def onload_script_visibility(params):

             title = params.get('Script', None)

             if title:

@@ -421,10 +436,10 @@ class ScriptRunner:
             else:

                 return gr.update(visible=False)

 

-        self.infotext_fields.append( (dropdown, lambda x: gr.update(value=x.get('Script', 'None'))) )

-        self.infotext_fields.extend( [(script.group, onload_script_visibility) for script in self.selectable_scripts] )

+        self.infotext_fields.append((dropdown, lambda x: gr.update(value=x.get('Script', 'None'))))

+        self.infotext_fields.extend([(script.group, onload_script_visibility) for script in self.selectable_scripts])

 

-        return inputs

+        return self.inputs

 

     def run(self, p, *args):

         script_index = args[0]

@@ -444,14 +459,21 @@ class ScriptRunner:
 

         return processed

 

+    def before_process(self, p):

+        for script in self.alwayson_scripts:

+            try:

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

+                script.before_process(p, *script_args)

+            except Exception:

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

+

     def process(self, p):

         for script in self.alwayson_scripts:

             try:

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

                 script.process(p, *script_args)

             except Exception:

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

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

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

 

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

         for script in self.alwayson_scripts:

@@ -459,8 +481,7 @@ class ScriptRunner:
                 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)

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

 

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

         for script in self.alwayson_scripts:

@@ -468,8 +489,7 @@ class ScriptRunner:
                 script_args = p.script_args[script.args_from:script.args_to]

                 script.process_batch(p, *script_args, **kwargs)

             except Exception:

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

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

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

 

     def postprocess(self, p, processed):

         for script in self.alwayson_scripts:

@@ -477,8 +497,7 @@ class ScriptRunner:
                 script_args = p.script_args[script.args_from:script.args_to]

                 script.postprocess(p, processed, *script_args)

             except Exception:

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

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

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

 

     def postprocess_batch(self, p, images, **kwargs):

         for script in self.alwayson_scripts:

@@ -486,8 +505,7 @@ class ScriptRunner:
                 script_args = p.script_args[script.args_from:script.args_to]

                 script.postprocess_batch(p, *script_args, images=images, **kwargs)

             except Exception:

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

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

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

 

     def postprocess_image(self, p, pp: PostprocessImageArgs):

         for script in self.alwayson_scripts:

@@ -495,24 +513,21 @@ class ScriptRunner:
                 script_args = p.script_args[script.args_from:script.args_to]

                 script.postprocess_image(p, pp, *script_args)

             except Exception:

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

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

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

 

     def before_component(self, component, **kwargs):

         for script in self.scripts:

             try:

                 script.before_component(component, **kwargs)

             except Exception:

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

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

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

 

     def after_component(self, component, **kwargs):

         for script in self.scripts:

             try:

                 script.after_component(component, **kwargs)

             except Exception:

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

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

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

 

     def reload_sources(self, cache):

         for si, script in list(enumerate(self.scripts)):