From c439128484232fa965b98e8dbef83eb1ca7614f0 Mon Sep 17 00:00:00 2001
From: Dowon <ks2515@naver.com>
Date: Sun, 22 Sep 2024 23:54:21 +0900
Subject: [PATCH] refactor(scripts): optimize get_override_settings method

Refactor the get_override_settings method in the AfterDetailerScript class to improve code readability and maintainability. Removed unused parameter '_p' and added type hints for better code documentation.
---
 scripts/!adetailer.py | 51 +++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/scripts/!adetailer.py b/scripts/!adetailer.py
index dff619f..1ba94ea 100644
--- a/scripts/!adetailer.py
+++ b/scripts/!adetailer.py
@@ -392,7 +392,7 @@ class AfterDetailerScript(scripts.Script):
             value = args.ad_scheduler
         return {"scheduler": value}
 
-    def get_override_settings(self, p, args: ADetailerArgs) -> dict[str, Any]:
+    def get_override_settings(self, _p, args: ADetailerArgs) -> dict[str, Any]:
         d = {}
 
         if args.ad_use_clip_skip:
@@ -413,7 +413,7 @@ class AfterDetailerScript(scripts.Script):
             d["sd_vae"] = args.ad_vae
         return d
 
-    def get_initial_noise_multiplier(self, p, args: ADetailerArgs) -> float | None:
+    def get_initial_noise_multiplier(self, _p, args: ADetailerArgs) -> float | None:
         return args.ad_noise_multiplier if args.ad_use_noise_multiplier else None
 
     @staticmethod
@@ -495,7 +495,9 @@ class AfterDetailerScript(scripts.Script):
 
         return new_args
 
-    def get_i2i_p(self, p, args: ADetailerArgs, image):
+    def get_i2i_p(
+        self, p, args: ADetailerArgs, image: Image.Image
+    ) -> StableDiffusionProcessingImg2Img:
         seed, subseed = self.get_seed(p)
         width, height = self.get_width_height(p, args)
         steps = self.get_steps(p, args)
@@ -563,6 +565,9 @@ class AfterDetailerScript(scripts.Script):
         return i2i
 
     def save_image(self, p, image, *, condition: str, suffix: str) -> None:
+        if not opts.data.get(condition, False):
+            return
+
         i = get_i(p)
         if p.all_prompts:
             i %= len(p.all_prompts)
@@ -571,23 +576,22 @@ class AfterDetailerScript(scripts.Script):
             save_prompt = p.prompt
         seed, _ = self.get_seed(p)
 
-        if opts.data.get(condition, False):
-            ad_save_images_dir: str = opts.data.get("ad_save_images_dir", "")
+        ad_save_images_dir: str = opts.data.get("ad_save_images_dir", "")
 
-            if not ad_save_images_dir.strip():
-                ad_save_images_dir = p.outpath_samples
+        if not ad_save_images_dir.strip():
+            ad_save_images_dir = p.outpath_samples
 
-            images.save_image(
-                image=image,
-                path=ad_save_images_dir,
-                basename="",
-                seed=seed,
-                prompt=save_prompt,
-                extension=opts.samples_format,
-                info=self.infotext(p),
-                p=p,
-                suffix=suffix,
-            )
+        images.save_image(
+            image=image,
+            path=ad_save_images_dir,
+            basename="",
+            seed=seed,
+            prompt=save_prompt,
+            extension=opts.samples_format,
+            info=self.infotext(p),
+            p=p,
+            suffix=suffix,
+        )
 
     def get_ad_model(self, name: str):
         if name not in model_mapping:
@@ -671,14 +675,9 @@ class AfterDetailerScript(scripts.Script):
             mask = ImageChops.invert(mask)
         mask = create_binary_mask(mask)
 
-        if is_skip_img2img(p):
-            if hasattr(p, "init_images") and p.init_images:
-                width, height = p.init_images[0].size
-            else:
-                msg = "[-] ADetailer: no init_images."
-                raise RuntimeError(msg)
-        else:
-            width, height = p.width, p.height
+        width, height = p.width, p.height
+        if is_skip_img2img(p) and hasattr(p, "init_images") and p.init_images:
+            width, height = p.init_images[0].size
         return images.resize_image(p.resize_mode, mask, width, height)
 
     @staticmethod