feat: adetailer xyz to 1st args

This commit is contained in:
Bingsu
2023-06-05 13:52:46 +09:00
parent 51e70b1bca
commit 386d822ed3

View File

@@ -158,7 +158,7 @@ class AfterDetailerScript(scripts.Script):
checker = EnableChecker(a0=a0, a1=a1)
return checker.is_enabled()
def get_args(self, *args_) -> list[ADetailerArgs]:
def get_args(self, p, *args_) -> list[ADetailerArgs]:
"""
`args_` is at least 1 in length by `is_ad_enabled` immediately above
"""
@@ -168,6 +168,9 @@ class AfterDetailerScript(scripts.Script):
message = f"[-] ADetailer: Invalid arguments passed to ADetailer: {args_!r}"
raise ValueError(message)
if hasattr(p, "adetailer_xyz"):
args[0].update(p.adetailer_xyz)
all_inputs = []
for n, arg_dict in enumerate(args, 1):
@@ -449,7 +452,7 @@ class AfterDetailerScript(scripts.Script):
return
if self.is_ad_enabled(*args_):
arg_list = self.get_args(*args_)
arg_list = self.get_args(p, *args_)
extra_params = self.extra_params(arg_list)
p.extra_generation_params.update(extra_params)
@@ -539,7 +542,7 @@ class AfterDetailerScript(scripts.Script):
p._idx = getattr(p, "_idx", -1) + 1
init_image = copy(pp.image)
arg_list = self.get_args(*args_)
arg_list = self.get_args(p, *args_)
is_processed = False
with CNHijackRestore(), pause_total_tqdm(), cn_allow_script_control():