From f0b72b81211881e083c84cff585380bb70d17271 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 12 Aug 2023 17:46:13 +0300
Subject: move seed, variation seed and variation seed strength to a single
 row, dump resize seed from UI add a way for scripts to register a callback
 for before/after just a single component's creation

---
 modules/processing_scripts/seed.py | 95 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 modules/processing_scripts/seed.py

(limited to 'modules/processing_scripts/seed.py')

diff --git a/modules/processing_scripts/seed.py b/modules/processing_scripts/seed.py
new file mode 100644
index 00000000..e0911bbe
--- /dev/null
+++ b/modules/processing_scripts/seed.py
@@ -0,0 +1,95 @@
+import json
+
+import gradio as gr
+
+from modules import scripts, ui, errors
+from modules.shared import cmd_opts
+from modules.ui_components import ToolButton
+
+
+class ScriptSeed(scripts.ScriptBuiltin):
+    section = "seed"
+    create_group = False
+
+    def __init__(self):
+        self.seed = None
+        self.reuse_seed = None
+        self.reuse_subseed = None
+
+    def title(self):
+        return "Seed"
+
+    def show(self, is_img2img):
+        return scripts.AlwaysVisible
+
+    def ui(self, is_img2img):
+        with gr.Row(elem_id=self.elem_id("seed_row")):
+            if cmd_opts.use_textbox_seed:
+                self.seed = gr.Textbox(label='Seed', value="", elem_id=self.elem_id("seed"))
+            else:
+                self.seed = gr.Number(label='Seed', value=-1, elem_id=self.elem_id("seed"), precision=0)
+
+            random_seed = ToolButton(ui.random_symbol, elem_id=self.elem_id("random_seed"), label='Random seed')
+            reuse_seed = ToolButton(ui.reuse_symbol, elem_id=self.elem_id("reuse_seed"), label='Reuse seed')
+
+            subseed = gr.Number(label='Variation seed', value=-1, elem_id=self.elem_id("subseed"), precision=0)
+
+            random_subseed = ToolButton(ui.random_symbol, elem_id=self.elem_id("random_subseed"))
+            reuse_subseed = ToolButton(ui.reuse_symbol, elem_id=self.elem_id("reuse_subseed"))
+
+            subseed_strength = gr.Slider(label='Variation strength', value=0.0, minimum=0, maximum=1, step=0.01, elem_id=self.elem_id("subseed_strength"))
+
+        random_seed.click(fn=None, _js="function(){setRandomSeed('" + self.elem_id("seed") + "')}", show_progress=False, inputs=[], outputs=[])
+        random_subseed.click(fn=None, _js="function(){setRandomSeed('" + self.elem_id("subseed") + "')}", show_progress=False, inputs=[], outputs=[])
+
+        self.infotext_fields = [
+            (self.seed, "Seed"),
+            (subseed, "Variation seed"),
+            (subseed_strength, "Variation seed strength"),
+        ]
+
+        self.on_after_component(lambda x: connect_reuse_seed(self.seed, reuse_seed, x.component, False), elem_id=f'generation_info_{self.tabname}')
+        self.on_after_component(lambda x: connect_reuse_seed(self.seed, reuse_subseed, x.component, True), elem_id=f'generation_info_{self.tabname}')
+
+        return self.seed, subseed, subseed_strength
+
+    def before_process(self, p, seed, subseed, subseed_strength):
+        p.seed = seed
+
+        if subseed_strength > 0:
+            p.subseed = subseed
+            p.subseed_strength = subseed_strength
+
+
+def connect_reuse_seed(seed: gr.Number, reuse_seed: gr.Button, generation_info: gr.Textbox, is_subseed):
+    """ Connects a 'reuse (sub)seed' button's click event so that it copies last used
+        (sub)seed value from generation info the to the seed field. If copying subseed and subseed strength
+        was 0, i.e. no variation seed was used, it copies the normal seed value instead."""
+
+    def copy_seed(gen_info_string: str, index):
+        res = -1
+
+        try:
+            gen_info = json.loads(gen_info_string)
+            index -= gen_info.get('index_of_first_image', 0)
+
+            if is_subseed and gen_info.get('subseed_strength', 0) > 0:
+                all_subseeds = gen_info.get('all_subseeds', [-1])
+                res = all_subseeds[index if 0 <= index < len(all_subseeds) else 0]
+            else:
+                all_seeds = gen_info.get('all_seeds', [-1])
+                res = all_seeds[index if 0 <= index < len(all_seeds) else 0]
+
+        except json.decoder.JSONDecodeError:
+            if gen_info_string:
+                errors.report(f"Error parsing JSON generation info: {gen_info_string}")
+
+        return [res, gr.update()]
+
+    reuse_seed.click(
+        fn=copy_seed,
+        _js="(x, y) => [x, selected_gallery_index()]",
+        show_progress=False,
+        inputs=[generation_info, seed],
+        outputs=[seed, seed]
+    )
-- 
cgit v1.2.3


From 4e8690906c02f14a81974200775bfc81718a9250 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 12 Aug 2023 18:00:30 +0300
Subject: update seed/subseed HTML widths

---
 modules/processing_scripts/seed.py | 25 +++++++++++++++----------
 style.css                          | 15 ---------------
 2 files changed, 15 insertions(+), 25 deletions(-)

(limited to 'modules/processing_scripts/seed.py')

diff --git a/modules/processing_scripts/seed.py b/modules/processing_scripts/seed.py
index e0911bbe..1ec20339 100644
--- a/modules/processing_scripts/seed.py
+++ b/modules/processing_scripts/seed.py
@@ -24,20 +24,25 @@ class ScriptSeed(scripts.ScriptBuiltin):
 
     def ui(self, is_img2img):
         with gr.Row(elem_id=self.elem_id("seed_row")):
-            if cmd_opts.use_textbox_seed:
-                self.seed = gr.Textbox(label='Seed', value="", elem_id=self.elem_id("seed"))
-            else:
-                self.seed = gr.Number(label='Seed', value=-1, elem_id=self.elem_id("seed"), precision=0)
+            with gr.Column(scale=1, min_width=205):
+                with gr.Row():
+                    if cmd_opts.use_textbox_seed:
+                        self.seed = gr.Textbox(label='Seed', value="", elem_id=self.elem_id("seed"), min_width=100)
+                    else:
+                        self.seed = gr.Number(label='Seed', value=-1, elem_id=self.elem_id("seed"), min_width=100, precision=0)
 
-            random_seed = ToolButton(ui.random_symbol, elem_id=self.elem_id("random_seed"), label='Random seed')
-            reuse_seed = ToolButton(ui.reuse_symbol, elem_id=self.elem_id("reuse_seed"), label='Reuse seed')
+                    random_seed = ToolButton(ui.random_symbol, elem_id=self.elem_id("random_seed"), label='Random seed')
+                    reuse_seed = ToolButton(ui.reuse_symbol, elem_id=self.elem_id("reuse_seed"), label='Reuse seed')
 
-            subseed = gr.Number(label='Variation seed', value=-1, elem_id=self.elem_id("subseed"), precision=0)
+            with gr.Column(scale=1, min_width=205):
+                with gr.Row():
+                    subseed = gr.Number(label='Variation seed', value=-1, elem_id=self.elem_id("subseed"), min_width=100, precision=0)
 
-            random_subseed = ToolButton(ui.random_symbol, elem_id=self.elem_id("random_subseed"))
-            reuse_subseed = ToolButton(ui.reuse_symbol, elem_id=self.elem_id("reuse_subseed"))
+                    random_subseed = ToolButton(ui.random_symbol, elem_id=self.elem_id("random_subseed"))
+                    reuse_subseed = ToolButton(ui.reuse_symbol, elem_id=self.elem_id("reuse_subseed"))
 
-            subseed_strength = gr.Slider(label='Variation strength', value=0.0, minimum=0, maximum=1, step=0.01, elem_id=self.elem_id("subseed_strength"))
+            with gr.Column(scale=2, min_width=100):
+                subseed_strength = gr.Slider(label='Variation strength', value=0.0, minimum=0, maximum=1, step=0.01, elem_id=self.elem_id("subseed_strength"))
 
         random_seed.click(fn=None, _js="function(){setRandomSeed('" + self.elem_id("seed") + "')}", show_progress=False, inputs=[], outputs=[])
         random_subseed.click(fn=None, _js="function(){setRandomSeed('" + self.elem_id("subseed") + "')}", show_progress=False, inputs=[], outputs=[])
diff --git a/style.css b/style.css
index 92093b89..dc44d2cc 100644
--- a/style.css
+++ b/style.css
@@ -222,21 +222,6 @@ div.block.gradio-accordion {
     padding: 0.1em 0.75em;
 }
 
-[id$=_seed], [id$=_subseed]{
-    max-width: 10em;
-}
-
-[id$=_subseed_show]{
-    min-width: auto !important;
-    flex-grow: 0 !important;
-    display: flex;
-}
-
-[id$=_subseed_show] .label-wrap{
-    margin: 0 0 0 0.5em;
-    align-self: end;
-}
-
 .html-log .comments{
     padding-top: 0.5em;
 }
-- 
cgit v1.2.3


From 6816ad5ed806b9ada81b4fab82e21a9455fa5720 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 12 Aug 2023 18:36:30 +0300
Subject: fix broken reuse seed

---
 modules/processing_scripts/seed.py |  2 +-
 modules/scripts.py                 | 42 ++++++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 19 deletions(-)

(limited to 'modules/processing_scripts/seed.py')

diff --git a/modules/processing_scripts/seed.py b/modules/processing_scripts/seed.py
index 1ec20339..cc90775a 100644
--- a/modules/processing_scripts/seed.py
+++ b/modules/processing_scripts/seed.py
@@ -54,7 +54,7 @@ class ScriptSeed(scripts.ScriptBuiltin):
         ]
 
         self.on_after_component(lambda x: connect_reuse_seed(self.seed, reuse_seed, x.component, False), elem_id=f'generation_info_{self.tabname}')
-        self.on_after_component(lambda x: connect_reuse_seed(self.seed, reuse_subseed, x.component, True), elem_id=f'generation_info_{self.tabname}')
+        self.on_after_component(lambda x: connect_reuse_seed(subseed, reuse_subseed, x.component, True), elem_id=f'generation_info_{self.tabname}')
 
         return self.seed, subseed, subseed_strength
 
diff --git a/modules/scripts.py b/modules/scripts.py
index 66fbec0d..c6459b45 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -62,10 +62,10 @@ class Script:
     api_info = None
     """Generated value of type modules.api.models.ScriptInfo with information about the script for API"""
 
-    on_before_component_elem_id = []
+    on_before_component_elem_id = None
     """list of callbacks to be called before a component with an elem_id is created"""
 
-    on_after_component_elem_id = []
+    on_after_component_elem_id = None
     """list of callbacks to be called after a component with an elem_id is created"""
 
     def title(self):
@@ -235,6 +235,8 @@ class Script:
         This function is an alternative to before_component in that it also cllows to run before a component is created, but
         it doesn't require to be called for every created component - just for the one you need.
         """
+        if self.on_before_component_elem_id is None:
+            self.on_before_component_elem_id = []
 
         self.on_before_component_elem_id.append((elem_id, callback))
 
@@ -242,6 +244,8 @@ class Script:
         """
         Calls callback after a component is created. The callback function is called with a single argument of type OnComponent.
         """
+        if self.on_after_component_elem_id is None:
+            self.on_after_component_elem_id = []
 
         self.on_after_component_elem_id.append((elem_id, callback))
 
@@ -545,11 +549,15 @@ class ScriptRunner:
         self.infotext_fields.extend([(script.group, onload_script_visibility) for script in self.selectable_scripts])
 
         for script in self.scripts:
-            for elem_id, callback in script.on_before_component_elem_id:
-                self.on_before_component_elem_id.get(elem_id, []).append((callback, script))
+            for elem_id, callback in script.on_before_component_elem_id or []:
+                items = self.on_before_component_elem_id.get(elem_id, [])
+                items.append((callback, script))
+                self.on_before_component_elem_id[elem_id] = items
 
-            for elem_id, callback in script.on_after_component_elem_id:
-                self.on_after_component_elem_id.get(elem_id, []).append((callback, script))
+            for elem_id, callback in script.on_after_component_elem_id or []:
+                items = self.on_after_component_elem_id.get(elem_id, [])
+                items.append((callback, script))
+                self.on_after_component_elem_id[elem_id] = items
 
         return self.inputs
 
@@ -644,12 +652,11 @@ class ScriptRunner:
                 errors.report(f"Error running postprocess_image: {script.filename}", exc_info=True)
 
     def before_component(self, component, **kwargs):
-        for callbacks in self.on_before_component_elem_id.get(kwargs.get("elem_id"), []):
-            for callback, script in callbacks:
-                try:
-                    callback(OnComponent(component=component))
-                except Exception:
-                    errors.report(f"Error running on_before_component: {script.filename}", exc_info=True)
+        for callback, script in self.on_before_component_elem_id.get(kwargs.get("elem_id"), []):
+            try:
+                callback(OnComponent(component=component))
+            except Exception:
+                errors.report(f"Error running on_before_component: {script.filename}", exc_info=True)
 
         for script in self.scripts:
             try:
@@ -658,12 +665,11 @@ class ScriptRunner:
                 errors.report(f"Error running before_component: {script.filename}", exc_info=True)
 
     def after_component(self, component, **kwargs):
-        for callbacks in self.on_after_component_elem_id.get(component.elem_id, []):
-            for callback, script in callbacks:
-                try:
-                    callback(OnComponent(component=component))
-                except Exception:
-                    errors.report(f"Error running on_after_component: {script.filename}", exc_info=True)
+        for callback, script in self.on_after_component_elem_id.get(component.elem_id, []):
+            try:
+                callback(OnComponent(component=component))
+            except Exception:
+                errors.report(f"Error running on_after_component: {script.filename}", exc_info=True)
 
         for script in self.scripts:
             try:
-- 
cgit v1.2.3


From f093c9d39d0fe9951a8f5c570027cecc68778ef2 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 13 Aug 2023 17:31:10 +0300
Subject: fix broken XYZ plot seeds add new callback for scripts to be used
 before processing

---
 modules/processing.py              | 32 ++++++++++++++++++++++++++++++--
 modules/processing_scripts/seed.py |  2 +-
 modules/scripts.py                 | 17 ++++++++++++++++-
 3 files changed, 47 insertions(+), 4 deletions(-)

(limited to 'modules/processing_scripts/seed.py')

diff --git a/modules/processing.py b/modules/processing.py
index fdf49359..74366655 100755
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -152,7 +152,9 @@ class StableDiffusionProcessing:
     token_merging_ratio_hr = 0
     disable_extra_networks: bool = False
 
-    script_args: list = None
+    scripts_value: scripts.ScriptRunner = field(default=None, init=False)
+    script_args_value: list = field(default=None, init=False)
+    scripts_setup_complete: bool = field(default=False, init=False)
 
     cached_uc = [None, None]
     cached_c = [None, None]
@@ -171,7 +173,6 @@ class StableDiffusionProcessing:
     step_multiplier: int = field(default=1, init=False)
     color_corrections: list = field(default=None, init=False)
 
-    scripts: list = field(default=None, init=False)
     all_prompts: list = field(default=None, init=False)
     all_negative_prompts: list = field(default=None, init=False)
     all_seeds: list = field(default=None, init=False)
@@ -229,6 +230,33 @@ class StableDiffusionProcessing:
     def sd_model(self, value):
         pass
 
+    @property
+    def scripts(self):
+        return self.scripts_value
+
+    @scripts.setter
+    def scripts(self, value):
+        self.scripts_value = value
+
+        if self.scripts_value and self.script_args_value and not self.scripts_setup_complete:
+            self.setup_scripts()
+
+    @property
+    def script_args(self):
+        return self.script_args_value
+
+    @script_args.setter
+    def script_args(self, value):
+        self.script_args_value = value
+
+        if self.scripts_value and self.script_args_value and not self.scripts_setup_complete:
+            self.setup_scripts()
+
+    def setup_scripts(self):
+        self.scripts_setup_complete = True
+
+        self.scripts.setup_scrips(self)
+
     def comment(self, text):
         self.comments[text] = 1
 
diff --git a/modules/processing_scripts/seed.py b/modules/processing_scripts/seed.py
index cc90775a..96b44dfb 100644
--- a/modules/processing_scripts/seed.py
+++ b/modules/processing_scripts/seed.py
@@ -58,7 +58,7 @@ class ScriptSeed(scripts.ScriptBuiltin):
 
         return self.seed, subseed, subseed_strength
 
-    def before_process(self, p, seed, subseed, subseed_strength):
+    def setup(self, p, seed, subseed, subseed_strength):
         p.seed = seed
 
         if subseed_strength > 0:
diff --git a/modules/scripts.py b/modules/scripts.py
index c6459b45..d4a9da94 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -106,9 +106,16 @@ class Script:
 
         pass
 
+    def setup(self, p, *args):
+        """For AlwaysVisible scripts, this function is called when the processing object is set up, before any processing starts.
+        args contains all values returned by components from ui().
+        """
+        pass
+
+
     def before_process(self, p, *args):
         """
-        This function is called very early before processing begins for AlwaysVisible scripts.
+        This function is called very early during 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()
         """
@@ -706,6 +713,14 @@ class ScriptRunner:
             except Exception:
                 errors.report(f"Error running before_hr: {script.filename}", exc_info=True)
 
+    def setup_scrips(self, p):
+        for script in self.alwayson_scripts:
+            try:
+                script_args = p.script_args[script.args_from:script.args_to]
+                script.setup(p, *script_args)
+            except Exception:
+                errors.report(f"Error running setup: {script.filename}", exc_info=True)
+
 
 scripts_txt2img: ScriptRunner = None
 scripts_img2img: ScriptRunner = None
-- 
cgit v1.2.3


From f3b96d4998d8ca376d33efa7a4454e8c28e24255 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Mon, 14 Aug 2023 10:22:52 +0300
Subject: return seed controls UI to how it was before

---
 modules/processing_scripts/seed.py | 47 +++++++++++++++++++++++---------------
 style.css                          | 15 ++++++++++++
 2 files changed, 44 insertions(+), 18 deletions(-)

(limited to 'modules/processing_scripts/seed.py')

diff --git a/modules/processing_scripts/seed.py b/modules/processing_scripts/seed.py
index 96b44dfb..6ce3b2fc 100644
--- a/modules/processing_scripts/seed.py
+++ b/modules/processing_scripts/seed.py
@@ -24,47 +24,58 @@ class ScriptSeed(scripts.ScriptBuiltin):
 
     def ui(self, is_img2img):
         with gr.Row(elem_id=self.elem_id("seed_row")):
-            with gr.Column(scale=1, min_width=205):
-                with gr.Row():
-                    if cmd_opts.use_textbox_seed:
-                        self.seed = gr.Textbox(label='Seed', value="", elem_id=self.elem_id("seed"), min_width=100)
-                    else:
-                        self.seed = gr.Number(label='Seed', value=-1, elem_id=self.elem_id("seed"), min_width=100, precision=0)
-
-                    random_seed = ToolButton(ui.random_symbol, elem_id=self.elem_id("random_seed"), label='Random seed')
-                    reuse_seed = ToolButton(ui.reuse_symbol, elem_id=self.elem_id("reuse_seed"), label='Reuse seed')
+            if cmd_opts.use_textbox_seed:
+                self.seed = gr.Textbox(label='Seed', value="", elem_id=self.elem_id("seed"), min_width=100)
+            else:
+                self.seed = gr.Number(label='Seed', value=-1, elem_id=self.elem_id("seed"), min_width=100, precision=0)
 
-            with gr.Column(scale=1, min_width=205):
-                with gr.Row():
-                    subseed = gr.Number(label='Variation seed', value=-1, elem_id=self.elem_id("subseed"), min_width=100, precision=0)
+            random_seed = ToolButton(ui.random_symbol, elem_id=self.elem_id("random_seed"), label='Random seed')
+            reuse_seed = ToolButton(ui.reuse_symbol, elem_id=self.elem_id("reuse_seed"), label='Reuse seed')
 
-                    random_subseed = ToolButton(ui.random_symbol, elem_id=self.elem_id("random_subseed"))
-                    reuse_subseed = ToolButton(ui.reuse_symbol, elem_id=self.elem_id("reuse_subseed"))
+            seed_checkbox = gr.Checkbox(label='Extra', elem_id=self.elem_id("subseed_show"), value=False)
 
-            with gr.Column(scale=2, min_width=100):
+        with gr.Group(visible=False, elem_id=self.elem_id("seed_extras")) as seed_extras:
+            with gr.Row(elem_id=self.elem_id("subseed_row")):
+                subseed = gr.Number(label='Variation seed', value=-1, elem_id=self.elem_id("subseed"), precision=0)
+                random_subseed = ToolButton(ui.random_symbol, elem_id=self.elem_id("random_subseed"))
+                reuse_subseed = ToolButton(ui.reuse_symbol, elem_id=self.elem_id("reuse_subseed"))
                 subseed_strength = gr.Slider(label='Variation strength', value=0.0, minimum=0, maximum=1, step=0.01, elem_id=self.elem_id("subseed_strength"))
 
+            with gr.Row(elem_id=self.elem_id("seed_resize_from_row")):
+                seed_resize_from_w = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize seed from width", value=0, elem_id=self.elem_id("seed_resize_from_w"))
+                seed_resize_from_h = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize seed from height", value=0, elem_id=self.elem_id("seed_resize_from_h"))
+
         random_seed.click(fn=None, _js="function(){setRandomSeed('" + self.elem_id("seed") + "')}", show_progress=False, inputs=[], outputs=[])
         random_subseed.click(fn=None, _js="function(){setRandomSeed('" + self.elem_id("subseed") + "')}", show_progress=False, inputs=[], outputs=[])
 
+        seed_checkbox.change(lambda x: gr.update(visible=x), show_progress=False, inputs=[seed_checkbox], outputs=[seed_extras])
+
         self.infotext_fields = [
             (self.seed, "Seed"),
+            (seed_checkbox, lambda d: "Variation seed" in d or "Seed resize from-1" in d),
             (subseed, "Variation seed"),
             (subseed_strength, "Variation seed strength"),
+            (seed_resize_from_w, "Seed resize from-1"),
+            (seed_resize_from_h, "Seed resize from-2"),
         ]
 
         self.on_after_component(lambda x: connect_reuse_seed(self.seed, reuse_seed, x.component, False), elem_id=f'generation_info_{self.tabname}')
         self.on_after_component(lambda x: connect_reuse_seed(subseed, reuse_subseed, x.component, True), elem_id=f'generation_info_{self.tabname}')
 
-        return self.seed, subseed, subseed_strength
+        return self.seed, seed_checkbox, subseed, subseed_strength, seed_resize_from_w, seed_resize_from_h
 
-    def setup(self, p, seed, subseed, subseed_strength):
+    def setup(self, p, seed, seed_checkbox, subseed, subseed_strength, seed_resize_from_w, seed_resize_from_h):
         p.seed = seed
 
-        if subseed_strength > 0:
+        if seed_checkbox and subseed_strength > 0:
             p.subseed = subseed
             p.subseed_strength = subseed_strength
 
+        if seed_checkbox and seed_resize_from_w > 0 and seed_resize_from_h > 0:
+            p.seed_resize_from_w = seed_resize_from_w
+            p.seed_resize_from_h = seed_resize_from_h
+
+
 
 def connect_reuse_seed(seed: gr.Number, reuse_seed: gr.Button, generation_info: gr.Textbox, is_subseed):
     """ Connects a 'reuse (sub)seed' button's click event so that it copies last used
diff --git a/style.css b/style.css
index dc528422..bdf0635a 100644
--- a/style.css
+++ b/style.css
@@ -222,6 +222,21 @@ div.block.gradio-accordion {
     padding: 0.1em 0.75em;
 }
 
+[id$=_subseed_show]{
+    min-width: auto !important;
+    flex-grow: 0 !important;
+    display: flex;
+}
+
+[id$=_subseed_show] label{
+    margin-bottom: 0.65em;
+    align-self: end;
+}
+
+[id$=_seed_extras] > div{
+    gap: 0.5em;
+}
+
 .html-log .comments{
     padding-top: 0.5em;
 }
-- 
cgit v1.2.3


From 353c876172a48c5044130249370c9303e611dd8b Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Mon, 14 Aug 2023 10:43:18 +0300
Subject: fix API always using -1 as seed

---
 modules/api/api.py                    |  2 ++
 modules/processing.py                 |  4 +++-
 modules/processing_scripts/refiner.py |  2 +-
 modules/processing_scripts/seed.py    |  2 +-
 modules/scripts.py                    | 12 +++++++++---
 5 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'modules/processing_scripts/seed.py')

diff --git a/modules/api/api.py b/modules/api/api.py
index 908c4514..fb2c2ce9 100644
--- a/modules/api/api.py
+++ b/modules/api/api.py
@@ -330,6 +330,7 @@ class Api:
 
         with self.queue_lock:
             with closing(StableDiffusionProcessingTxt2Img(sd_model=shared.sd_model, **args)) as p:
+                p.is_api = True
                 p.scripts = script_runner
                 p.outpath_grids = opts.outdir_txt2img_grids
                 p.outpath_samples = opts.outdir_txt2img_samples
@@ -390,6 +391,7 @@ class Api:
         with self.queue_lock:
             with closing(StableDiffusionProcessingImg2Img(sd_model=shared.sd_model, **args)) as p:
                 p.init_images = [decode_base64_to_image(x) for x in init_images]
+                p.is_api = True
                 p.scripts = script_runner
                 p.outpath_grids = opts.outdir_img2img_grids
                 p.outpath_samples = opts.outdir_img2img_samples
diff --git a/modules/processing.py b/modules/processing.py
index f34ba48a..b1eac2ab 100755
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -194,6 +194,8 @@ class StableDiffusionProcessing:
     sd_vae_name: str = field(default=None, init=False)
     sd_vae_hash: str = field(default=None, init=False)
 
+    is_api: bool = field(default=False, init=False)
+
     def __post_init__(self):
         if self.sampler_index is not None:
             print("sampler_index argument for StableDiffusionProcessing does not do anything; use sampler_name", file=sys.stderr)
@@ -258,7 +260,7 @@ class StableDiffusionProcessing:
     def setup_scripts(self):
         self.scripts_setup_complete = True
 
-        self.scripts.setup_scrips(self)
+        self.scripts.setup_scrips(self, is_ui=not self.is_api)
 
     def comment(self, text):
         self.comments[text] = 1
diff --git a/modules/processing_scripts/refiner.py b/modules/processing_scripts/refiner.py
index 3c5b37d2..b389c4ef 100644
--- a/modules/processing_scripts/refiner.py
+++ b/modules/processing_scripts/refiner.py
@@ -5,7 +5,7 @@ from modules.ui_common import create_refresh_button
 from modules.ui_components import InputAccordion
 
 
-class ScriptRefiner(scripts.Script):
+class ScriptRefiner(scripts.ScriptBuiltinUI):
     section = "accordions"
     create_group = False
 
diff --git a/modules/processing_scripts/seed.py b/modules/processing_scripts/seed.py
index 6ce3b2fc..6b6ff987 100644
--- a/modules/processing_scripts/seed.py
+++ b/modules/processing_scripts/seed.py
@@ -7,7 +7,7 @@ from modules.shared import cmd_opts
 from modules.ui_components import ToolButton
 
 
-class ScriptSeed(scripts.ScriptBuiltin):
+class ScriptSeed(scripts.ScriptBuiltinUI):
     section = "seed"
     create_group = False
 
diff --git a/modules/scripts.py b/modules/scripts.py
index cbdac2b5..fcab5d3a 100644
--- a/modules/scripts.py
+++ b/modules/scripts.py
@@ -68,6 +68,9 @@ class Script:
     on_after_component_elem_id = None
     """list of callbacks to be called after a component with an elem_id is created"""
 
+    setup_for_ui_only = False
+    """If true, the script setup will only be run in Gradio UI, not in API"""
+
     def title(self):
         """this function should return the title of the script. This is what will be displayed in the dropdown menu."""
 
@@ -258,7 +261,6 @@ class Script:
 
         self.on_after_component_elem_id.append((elem_id, callback))
 
-
     def describe(self):
         """unused"""
         return ""
@@ -280,7 +282,8 @@ class Script:
         pass
 
 
-class ScriptBuiltin(Script):
+class ScriptBuiltinUI(Script):
+    setup_for_ui_only = True
 
     def elem_id(self, item_id):
         """helper function to generate id for a HTML element, constructs final id out of tab and user-supplied item_id"""
@@ -728,8 +731,11 @@ class ScriptRunner:
             except Exception:
                 errors.report(f"Error running before_hr: {script.filename}", exc_info=True)
 
-    def setup_scrips(self, p):
+    def setup_scrips(self, p, *, is_ui=True):
         for script in self.alwayson_scripts:
+            if not is_ui and script.setup_for_ui_only:
+                continue
+
             try:
                 script_args = p.script_args[script.args_from:script.args_to]
                 script.setup(p, *script_args)
-- 
cgit v1.2.3