From 64311faa6848d641cc452115e4e1eb47d2a7b519 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 12 Aug 2023 12:39:59 +0300
Subject: put refiner into main UI, into the new accordions section add VAE
 from main model into infotext, not from refiner model option to make scripts
 UI without gr.Group fix inconsistencies with refiner when usings samplers
 that do more denoising than steps

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

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

diff --git a/modules/processing_scripts/refiner.py b/modules/processing_scripts/refiner.py
new file mode 100644
index 00000000..5a82991a
--- /dev/null
+++ b/modules/processing_scripts/refiner.py
@@ -0,0 +1,55 @@
+import gradio as gr
+
+from modules import scripts, sd_models
+from modules.ui_common import create_refresh_button
+from modules.ui_components import InputAccordion
+
+
+class ScriptRefiner(scripts.Script):
+    section = "accordions"
+    create_group = False
+
+    def __init__(self):
+        pass
+
+    def title(self):
+        return "Refiner"
+
+    def show(self, is_img2img):
+        return scripts.AlwaysVisible
+
+    def ui(self, is_img2img):
+        with InputAccordion(False, label="Refiner", elem_id=self.elem_id("enable")) as enable_refiner:
+            with gr.Row():
+                refiner_checkpoint = gr.Dropdown(label='Checkpoint', elem_id=self.elem_id("checkpoint"), choices=sd_models.checkpoint_tiles(), value='', tooltip="switch to another model in the middle of generation")
+                create_refresh_button(refiner_checkpoint, sd_models.list_models, lambda: {"choices": sd_models.checkpoint_tiles()}, self.elem_id("checkpoint_refresh"))
+
+                refiner_switch_at = gr.Slider(value=0.8, label="Switch at", minimum=0.01, maximum=1.0, step=0.01, elem_id=self.elem_id("switch_at"), tooltip="fraction of sampling steps when the swtch to refiner model should happen; 1=never, 0.5=switch in the middle of generation")
+
+        def lookup_checkpoint(title):
+            info = sd_models.get_closet_checkpoint_match(title)
+            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'),
+        ]
+
+        return enable_refiner, refiner_checkpoint, refiner_switch_at
+
+    def before_process(self, p, enable_refiner, refiner_checkpoint, refiner_switch_at):
+        # the actual implementation is in sd_samplers_common.py, apply_refiner
+
+        p.refiner_checkpoint_info = None
+        p.refiner_switch_at = None
+
+        if not enable_refiner or refiner_checkpoint in (None, "", "None"):
+            return
+
+        refiner_checkpoint_info = sd_models.get_closet_checkpoint_match(refiner_checkpoint)
+        if refiner_checkpoint_info is None:
+            raise Exception(f'Could not find checkpoint with name {refiner_checkpoint}')
+
+        p.refiner_checkpoint_info = refiner_checkpoint_info
+        p.refiner_switch_at = refiner_switch_at
-- 
cgit v1.2.3


From b293ed30610c040e621e1840d63047ae298f0650 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 12 Aug 2023 12:54:32 +0300
Subject: make it possible to use hires fix together with refiner

---
 modules/processing.py                 | 6 ++++++
 modules/processing_scripts/refiner.py | 2 +-
 modules/sd_samplers_common.py         | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

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

diff --git a/modules/processing.py b/modules/processing.py
index 5996cbac..6ad105d7 100755
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -1200,6 +1200,12 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
         self.hr_c = self.get_conds_with_caching(prompt_parser.get_multicond_learned_conditioning, hr_prompts, total_steps, [self.cached_hr_c, self.cached_c], self.hr_extra_network_data)
 
     def setup_conds(self):
+        if self.is_hr_pass:
+            # if we are in hr pass right now, the call is being made from the refiner, and we don't need to setup firstpass cons or switch model
+            self.hr_c = None
+            self.calculate_hr_conds()
+            return
+
         super().setup_conds()
 
         self.hr_uc = None
diff --git a/modules/processing_scripts/refiner.py b/modules/processing_scripts/refiner.py
index 5a82991a..773ec5d0 100644
--- a/modules/processing_scripts/refiner.py
+++ b/modules/processing_scripts/refiner.py
@@ -24,7 +24,7 @@ class ScriptRefiner(scripts.Script):
                 refiner_checkpoint = gr.Dropdown(label='Checkpoint', elem_id=self.elem_id("checkpoint"), choices=sd_models.checkpoint_tiles(), value='', tooltip="switch to another model in the middle of generation")
                 create_refresh_button(refiner_checkpoint, sd_models.list_models, lambda: {"choices": sd_models.checkpoint_tiles()}, self.elem_id("checkpoint_refresh"))
 
-                refiner_switch_at = gr.Slider(value=0.8, label="Switch at", minimum=0.01, maximum=1.0, step=0.01, elem_id=self.elem_id("switch_at"), tooltip="fraction of sampling steps when the swtch to refiner model should happen; 1=never, 0.5=switch in the middle of generation")
+                refiner_switch_at = gr.Slider(value=0.8, label="Switch at", minimum=0.01, maximum=1.0, step=0.01, elem_id=self.elem_id("switch_at"), tooltip="fraction of sampling steps when the switch to refiner model should happen; 1=never, 0.5=switch in the middle of generation")
 
         def lookup_checkpoint(title):
             info = sd_models.get_closet_checkpoint_match(title)
diff --git a/modules/sd_samplers_common.py b/modules/sd_samplers_common.py
index 85f3c7e0..40c7aae0 100644
--- a/modules/sd_samplers_common.py
+++ b/modules/sd_samplers_common.py
@@ -151,6 +151,9 @@ def apply_refiner(cfg_denoiser):
     if refiner_checkpoint_info is None or shared.sd_model.sd_checkpoint_info == refiner_checkpoint_info:
         return False
 
+    if getattr(cfg_denoiser.p, "enable_hr", False) and not cfg_denoiser.p.is_hr_pass:
+        return False
+
     cfg_denoiser.p.extra_generation_params['Refiner'] = refiner_checkpoint_info.short_title
     cfg_denoiser.p.extra_generation_params['Refiner switch at'] = refiner_switch_at
 
-- 
cgit v1.2.3


From fa9370b7411166c19e8e386400dc4e6082f47b2d Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 13 Aug 2023 06:07:30 +0300
Subject: add refiner to StableDiffusionProcessing class write out correct
 model name in infotext, rather than the refiner model

---
 modules/processing.py                 | 38 +++++++++++++++++++++++++++--------
 modules/processing_scripts/refiner.py | 16 +++++----------
 modules/sd_samplers_common.py         |  2 +-
 3 files changed, 36 insertions(+), 20 deletions(-)

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

diff --git a/modules/processing.py b/modules/processing.py
index 6ad105d7..b47ddaa8 100755
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -111,7 +111,7 @@ class StableDiffusionProcessing:
     cached_uc = [None, None]
     cached_c = [None, None]
 
-    def __init__(self, sd_model=None, outpath_samples=None, outpath_grids=None, prompt: str = "", styles: List[str] = None, seed: int = -1, subseed: int = -1, subseed_strength: float = 0, seed_resize_from_h: int = -1, seed_resize_from_w: int = -1, seed_enable_extras: bool = True, sampler_name: str = None, batch_size: int = 1, n_iter: int = 1, steps: int = 50, cfg_scale: float = 7.0, width: int = 512, height: int = 512, restore_faces: bool = None, tiling: bool = None, do_not_save_samples: bool = False, do_not_save_grid: bool = False, extra_generation_params: Dict[Any, Any] = None, overlay_images: Any = None, negative_prompt: str = None, eta: float = None, do_not_reload_embeddings: bool = False, denoising_strength: float = 0, ddim_discretize: str = None, s_min_uncond: float = 0.0, s_churn: float = 0.0, s_tmax: float = None, s_tmin: float = 0.0, s_noise: float = None, override_settings: Dict[str, Any] = None, override_settings_restore_afterwards: bool = True, sampler_index: int = None, script_args: list = None):
+    def __init__(self, sd_model=None, outpath_samples=None, outpath_grids=None, prompt: str = "", styles: List[str] = None, seed: int = -1, subseed: int = -1, subseed_strength: float = 0, seed_resize_from_h: int = -1, seed_resize_from_w: int = -1, seed_enable_extras: bool = True, sampler_name: str = None, batch_size: int = 1, n_iter: int = 1, steps: int = 50, cfg_scale: float = 7.0, width: int = 512, height: int = 512, restore_faces: bool = None, tiling: bool = None, do_not_save_samples: bool = False, do_not_save_grid: bool = False, extra_generation_params: Dict[Any, Any] = None, overlay_images: Any = None, negative_prompt: str = None, eta: float = None, do_not_reload_embeddings: bool = False, denoising_strength: float = 0, ddim_discretize: str = None, s_min_uncond: float = 0.0, s_churn: float = 0.0, s_tmax: float = None, s_tmin: float = 0.0, s_noise: float = None, override_settings: Dict[str, Any] = None, override_settings_restore_afterwards: bool = True, sampler_index: int = None, refiner_checkpoint: str = None, refiner_switch_at: float = None, script_args: list = None):
         if sampler_index is not None:
             print("sampler_index argument for StableDiffusionProcessing does not do anything; use sampler_name", file=sys.stderr)
 
@@ -153,10 +153,14 @@ class StableDiffusionProcessing:
         self.s_noise = s_noise if s_noise is not None else opts.s_noise
         self.override_settings = {k: v for k, v in (override_settings or {}).items() if k not in shared.restricted_opts}
         self.override_settings_restore_afterwards = override_settings_restore_afterwards
+        self.refiner_checkpoint = refiner_checkpoint
+        self.refiner_switch_at = refiner_switch_at
+
         self.is_using_inpainting_conditioning = False
         self.disable_extra_networks = False
         self.token_merging_ratio = 0
         self.token_merging_ratio_hr = 0
+        self.refiner_checkpoint_info = None
 
         if not seed_enable_extras:
             self.subseed = -1
@@ -191,6 +195,11 @@ class StableDiffusionProcessing:
 
         self.user = None
 
+        self.sd_model_name = None
+        self.sd_model_hash = None
+        self.sd_vae_name = None
+        self.sd_vae_hash = None
+
     @property
     def sd_model(self):
         return shared.sd_model
@@ -408,7 +417,10 @@ class Processed:
         self.batch_size = p.batch_size
         self.restore_faces = p.restore_faces
         self.face_restoration_model = opts.face_restoration_model if p.restore_faces else None
-        self.sd_model_hash = shared.sd_model.sd_model_hash
+        self.sd_model_name = p.sd_model_name
+        self.sd_model_hash = p.sd_model_hash
+        self.sd_vae_name = p.sd_vae_name
+        self.sd_vae_hash = p.sd_vae_hash
         self.seed_resize_from_w = p.seed_resize_from_w
         self.seed_resize_from_h = p.seed_resize_from_h
         self.denoising_strength = getattr(p, 'denoising_strength', None)
@@ -459,7 +471,10 @@ class Processed:
             "batch_size": self.batch_size,
             "restore_faces": self.restore_faces,
             "face_restoration_model": self.face_restoration_model,
+            "sd_model_name": self.sd_model_name,
             "sd_model_hash": self.sd_model_hash,
+            "sd_vae_name": self.sd_vae_name,
+            "sd_vae_hash": self.sd_vae_hash,
             "seed_resize_from_w": self.seed_resize_from_w,
             "seed_resize_from_h": self.seed_resize_from_h,
             "denoising_strength": self.denoising_strength,
@@ -578,10 +593,10 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iter
         "Seed": p.all_seeds[0] if use_main_prompt else all_seeds[index],
         "Face restoration": opts.face_restoration_model if p.restore_faces else None,
         "Size": f"{p.width}x{p.height}",
-        "Model hash": getattr(p, 'sd_model_hash', None if not opts.add_model_hash_to_info or not shared.sd_model.sd_model_hash else shared.sd_model.sd_model_hash),
-        "Model": (None if not opts.add_model_name_to_info else shared.sd_model.sd_checkpoint_info.name_for_extra),
-        "VAE hash": p.loaded_vae_hash if opts.add_model_hash_to_info else None,
-        "VAE": p.loaded_vae_name if opts.add_model_name_to_info else None,
+        "Model hash": p.sd_model_hash if opts.add_model_hash_to_info else None,
+        "Model": p.sd_model_name if opts.add_model_name_to_info else None,
+        "VAE hash": p.sd_vae_hash if opts.add_model_hash_to_info else None,
+        "VAE": p.sd_vae_name if opts.add_model_name_to_info else None,
         "Variation seed": (None if p.subseed_strength == 0 else (p.all_subseeds[0] if use_main_prompt else all_subseeds[index])),
         "Variation seed strength": (None if p.subseed_strength == 0 else p.subseed_strength),
         "Seed resize from": (None if p.seed_resize_from_w <= 0 or p.seed_resize_from_h <= 0 else f"{p.seed_resize_from_w}x{p.seed_resize_from_h}"),
@@ -670,8 +685,15 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
     if p.tiling is None:
         p.tiling = opts.tiling
 
-    p.loaded_vae_name = sd_vae.get_loaded_vae_name()
-    p.loaded_vae_hash = sd_vae.get_loaded_vae_hash()
+    if p.refiner_checkpoint not in (None, "", "None"):
+        p.refiner_checkpoint_info = sd_models.get_closet_checkpoint_match(p.refiner_checkpoint)
+        if p.refiner_checkpoint_info is None:
+            raise Exception(f'Could not find checkpoint with name {p.refiner_checkpoint}')
+
+    p.sd_model_name = shared.sd_model.sd_checkpoint_info.name_for_extra
+    p.sd_model_hash = shared.sd_model.sd_model_hash
+    p.sd_vae_name = sd_vae.get_loaded_vae_name()
+    p.sd_vae_hash = sd_vae.get_loaded_vae_hash()
 
     modules.sd_hijack.model_hijack.apply_circular(p.tiling)
     modules.sd_hijack.model_hijack.clear_comments()
diff --git a/modules/processing_scripts/refiner.py b/modules/processing_scripts/refiner.py
index 773ec5d0..7b946d05 100644
--- a/modules/processing_scripts/refiner.py
+++ b/modules/processing_scripts/refiner.py
@@ -41,15 +41,9 @@ class ScriptRefiner(scripts.Script):
     def before_process(self, p, enable_refiner, refiner_checkpoint, refiner_switch_at):
         # the actual implementation is in sd_samplers_common.py, apply_refiner
 
-        p.refiner_checkpoint_info = None
-        p.refiner_switch_at = None
-
         if not enable_refiner or refiner_checkpoint in (None, "", "None"):
-            return
-
-        refiner_checkpoint_info = sd_models.get_closet_checkpoint_match(refiner_checkpoint)
-        if refiner_checkpoint_info is None:
-            raise Exception(f'Could not find checkpoint with name {refiner_checkpoint}')
-
-        p.refiner_checkpoint_info = refiner_checkpoint_info
-        p.refiner_switch_at = refiner_switch_at
+            p.refiner_checkpoint_info = None
+            p.refiner_switch_at = None
+        else:
+            p.refiner_checkpoint = refiner_checkpoint
+            p.refiner_switch_at = refiner_switch_at
diff --git a/modules/sd_samplers_common.py b/modules/sd_samplers_common.py
index 40c7aae0..380cdd5f 100644
--- a/modules/sd_samplers_common.py
+++ b/modules/sd_samplers_common.py
@@ -145,7 +145,7 @@ def apply_refiner(cfg_denoiser):
     refiner_switch_at = cfg_denoiser.p.refiner_switch_at
     refiner_checkpoint_info = cfg_denoiser.p.refiner_checkpoint_info
 
-    if refiner_switch_at is not None and completed_ratio <= refiner_switch_at:
+    if refiner_switch_at is not None and completed_ratio < refiner_switch_at:
         return False
 
     if refiner_checkpoint_info is None or shared.sd_model.sd_checkpoint_info == refiner_checkpoint_info:
-- 
cgit v1.2.3


From 007ecfbb29771aa7cdcf0263ab1811bc75fa5446 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sun, 13 Aug 2023 21:01:13 +0300
Subject: also use setup callback for the refiner instead of before_process

---
 modules/processing_scripts/refiner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/modules/processing_scripts/refiner.py b/modules/processing_scripts/refiner.py
index 7b946d05..3c5b37d2 100644
--- a/modules/processing_scripts/refiner.py
+++ b/modules/processing_scripts/refiner.py
@@ -38,7 +38,7 @@ class ScriptRefiner(scripts.Script):
 
         return enable_refiner, refiner_checkpoint, refiner_switch_at
 
-    def before_process(self, p, enable_refiner, refiner_checkpoint, refiner_switch_at):
+    def setup(self, p, enable_refiner, refiner_checkpoint, refiner_switch_at):
         # the actual implementation is in sd_samplers_common.py, apply_refiner
 
         if not enable_refiner or refiner_checkpoint in (None, "", "None"):
-- 
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/refiner.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


From 7e77a38cbc155baf96db66064afbdd40df715335 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Tue, 15 Aug 2023 08:27:50 +0300
Subject: get XYZ plot to work with recent changes to refined specified in
 fields of p rather than in settings

---
 modules/processing.py                 |  2 +-
 modules/processing_scripts/refiner.py |  2 +-
 scripts/xyz_grid.py                   | 18 +++++-------------
 3 files changed, 7 insertions(+), 15 deletions(-)

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

diff --git a/modules/processing.py b/modules/processing.py
index c983d001..25a19a77 100755
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -746,7 +746,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
     if p.tiling is None:
         p.tiling = opts.tiling
 
-    if p.refiner_checkpoint not in (None, "", "None"):
+    if p.refiner_checkpoint not in (None, "", "None", "none"):
         p.refiner_checkpoint_info = sd_models.get_closet_checkpoint_match(p.refiner_checkpoint)
         if p.refiner_checkpoint_info is None:
             raise Exception(f'Could not find checkpoint with name {p.refiner_checkpoint}')
diff --git a/modules/processing_scripts/refiner.py b/modules/processing_scripts/refiner.py
index b389c4ef..29ccb78f 100644
--- a/modules/processing_scripts/refiner.py
+++ b/modules/processing_scripts/refiner.py
@@ -42,7 +42,7 @@ class ScriptRefiner(scripts.ScriptBuiltinUI):
         # the actual implementation is in sd_samplers_common.py, apply_refiner
 
         if not enable_refiner or refiner_checkpoint in (None, "", "None"):
-            p.refiner_checkpoint_info = None
+            p.refiner_checkpoint = None
             p.refiner_switch_at = None
         else:
             p.refiner_checkpoint = refiner_checkpoint
diff --git a/scripts/xyz_grid.py b/scripts/xyz_grid.py
index 017a470f..2217cc69 100644
--- a/scripts/xyz_grid.py
+++ b/scripts/xyz_grid.py
@@ -85,20 +85,12 @@ def confirm_checkpoints(p, xs):
         if modules.sd_models.get_closet_checkpoint_match(x) is None:
             raise RuntimeError(f"Unknown checkpoint: {x}")
 
-def apply_refiner_checkpoint(p, x, xs):
-    if x == 'None':
-        p.override_settings['sd_refiner_checkpoint'] = 'None'
-        return
 
-    info = modules.sd_models.get_closet_checkpoint_match(x)
-    if info is None:
-        raise RuntimeError(f"Unknown checkpoint: {x}")
-    p.override_settings['sd_refiner_checkpoint'] = info.name
-
-def confirm_refiner_checkpoints(p, xs):
+def confirm_checkpoints_or_none(p, xs):
     for x in xs:
-        if x == 'None':
+        if x in (None, "", "None", "none"):
             continue
+
         if modules.sd_models.get_closet_checkpoint_match(x) is None:
             raise RuntimeError(f"Unknown checkpoint: {x}")
 
@@ -267,8 +259,8 @@ axis_options = [
     AxisOption("Token merging ratio", float, apply_override('token_merging_ratio')),
     AxisOption("Token merging ratio high-res", float, apply_override('token_merging_ratio_hr')),
     AxisOption("Always discard next-to-last sigma", str, apply_override('always_discard_next_to_last_sigma', boolean=True), choices=boolean_choice(reverse=True)),
-    AxisOption("Refiner checkpoint", str, apply_refiner_checkpoint, format_value=format_remove_path, confirm=confirm_refiner_checkpoints, cost=1.0, choices=lambda: ['None'] + sorted(sd_models.checkpoints_list, key=str.casefold)),
-    AxisOption("Refiner switch at", float, apply_override('sd_refiner_switch_at'))
+    AxisOption("Refiner checkpoint", str, apply_field('refiner_checkpoint'), format_value=format_remove_path, confirm=confirm_checkpoints_or_none, cost=1.0, choices=lambda: ['None'] + sorted(sd_models.checkpoints_list, key=str.casefold)),
+    AxisOption("Refiner switch at", float, apply_field('refiner_switch_at')),
 ]
 
 
-- 
cgit v1.2.3