Merge branch 'dev' into npu_support

2 files changed, 17 insertions, 22 deletions

diff --git a/modules/processing_scripts/refiner.py b/modules/processing_scripts/refiner.py
index 29ccb78f..ba33d8a4 100644
--- a/modules/processing_scripts/refiner.py
+++ b/modules/processing_scripts/refiner.py
@@ -1,6 +1,7 @@
 import gradio as gr

 

 from modules import scripts, sd_models

+from modules.infotext_utils import PasteField

 from modules.ui_common import create_refresh_button

 from modules.ui_components import InputAccordion

 

@@ -31,9 +32,9 @@ class ScriptRefiner(scripts.ScriptBuiltinUI):
             return None if info is None else info.title

 

         self.infotext_fields = [

-            (enable_refiner, lambda d: 'Refiner' in d),

-            (refiner_checkpoint, lambda d: lookup_checkpoint(d.get('Refiner'))),

-            (refiner_switch_at, 'Refiner switch at'),

+            PasteField(enable_refiner, lambda d: 'Refiner' in d),

+            PasteField(refiner_checkpoint, lambda d: lookup_checkpoint(d.get('Refiner')), api="refiner_checkpoint"),

+            PasteField(refiner_switch_at, 'Refiner switch at', api="refiner_switch_at"),

         ]

 

         return enable_refiner, refiner_checkpoint, refiner_switch_at

diff --git a/modules/processing_scripts/seed.py b/modules/processing_scripts/seed.py
index dc9c2da5..7a4c0159 100644
--- a/modules/processing_scripts/seed.py
+++ b/modules/processing_scripts/seed.py
@@ -3,8 +3,10 @@ import json
 import gradio as gr

 

 from modules import scripts, ui, errors

+from modules.infotext_utils import PasteField

 from modules.shared import cmd_opts

 from modules.ui_components import ToolButton

+from modules import infotext_utils

 

 

 class ScriptSeed(scripts.ScriptBuiltinUI):

@@ -51,12 +53,12 @@ class ScriptSeed(scripts.ScriptBuiltinUI):
         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"),

+            PasteField(self.seed, "Seed", api="seed"),

+            PasteField(seed_checkbox, lambda d: "Variation seed" in d or "Seed resize from-1" in d),

+            PasteField(subseed, "Variation seed", api="subseed"),

+            PasteField(subseed_strength, "Variation seed strength", api="subseed_strength"),

+            PasteField(seed_resize_from_w, "Seed resize from-1", api="seed_resize_from_h"),

+            PasteField(seed_resize_from_h, "Seed resize from-2", api="seed_resize_from_w"),

         ]

 

         self.on_after_component(lambda x: connect_reuse_seed(self.seed, reuse_seed, x.component, False), elem_id=f'generation_info_{self.tabname}')

@@ -76,7 +78,6 @@ class ScriptSeed(scripts.ScriptBuiltinUI):
             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

         (sub)seed value from generation info the to the seed field. If copying subseed and subseed strength

@@ -84,21 +85,14 @@ def connect_reuse_seed(seed: gr.Number, reuse_seed: gr.Button, generation_info:
 

     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:

+            infotext = gen_info.get('infotexts')[index]

+            gen_parameters = infotext_utils.parse_generation_parameters(infotext, [])

+            res = int(gen_parameters.get('Variation seed' if is_subseed else 'Seed', -1))

+        except Exception:

             if gen_info_string:

-                errors.report(f"Error parsing JSON generation info: {gen_info_string}")

+                errors.report(f"Error retrieving seed from generation info: {gen_info_string}", exc_info=True)

 

         return [res, gr.update()]