Bing-su/adetailer
1
0
Fork 0
mirror of https://github.com/Bing-su/adetailer.git synced 2026-04-29 18:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: controlnet ext if

Browse Source
This commit is contained in:
Bingsu
2023-05-06 15:05:28 +09:00
parent b909b28ef3
commit f6bbf35298
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/!adetailer.py
View File

@@ -260,8 +260,11 @@ class AfterDetailerScript(scripts.Script):
return w.tolist() return w.tolist()
def init_controlnet_ext(self) -> None: def init_controlnet_ext(self) -> None:
if self.controlnet_ext is None: if self.controlnet_ext is not None:
self.controlnet_ext = ControlNetExt() return
self.controlnet_ext = ControlNetExt()
if controlnet_exists:
try: try:
self.controlnet_ext.init_controlnet() self.controlnet_ext.init_controlnet()
except ImportError: except ImportError:
@@ -271,6 +274,16 @@ class AfterDetailerScript(scripts.Script):
file=sys.stderr, file=sys.stderr,
) )
def update_controlnet_args(self, p, args: ADetailerArgs) -> None:
if (
self.controlnet_ext is not None
and self.controlnet_ext.cn_available
and args.ad_controlnet_model != "None"
):
self.controlnet_ext.update_scripts_args(
p, args.ad_controlnet_model, args.ad_controlnet_weight
)
def is_ad_enabled(self, *args_) -> bool: def is_ad_enabled(self, *args_) -> bool:
if len(args_) < 2: if len(args_) < 2:
message = f"""[-] ADetailer: Not enough arguments passed to adetailer. message = f"""[-] ADetailer: Not enough arguments passed to adetailer.
@@ -393,8 +406,6 @@ class AfterDetailerScript(scripts.Script):
if sampler_name in ["PLMS", "UniPC"]: if sampler_name in ["PLMS", "UniPC"]:
sampler_name = "Euler" sampler_name = "Euler"
self.init_controlnet_ext()
i2i = StableDiffusionProcessingImg2Img( i2i = StableDiffusionProcessingImg2Img(
init_images=[image], init_images=[image],
resize_mode=0, resize_mode=0,
@@ -433,6 +444,7 @@ class AfterDetailerScript(scripts.Script):
i2i.script_args = deepcopy(p.script_args) i2i.script_args = deepcopy(p.script_args)
i2i._disable_adetailer = True i2i._disable_adetailer = True
self.init_controlnet_ext()
self.update_controlnet_args(i2i, args) self.update_controlnet_args(i2i, args)
return i2i return i2i
@@ -457,16 +469,6 @@ class AfterDetailerScript(scripts.Script):
raise ValueError(msg) raise ValueError(msg)
return model_mapping[name] return model_mapping[name]
def update_controlnet_args(self, p, args: ADetailerArgs) -> None:
if (
self.controlnet_ext is not None
and self.controlnet_ext.cn_available
and args.ad_controlnet_model != "None"
):
self.controlnet_ext.update_scripts_args(
p, args.ad_controlnet_model, args.ad_controlnet_weight
)
def process(self, p, *args_): def process(self, p, *args_):
if getattr(p, "_disable_adetailer", False): if getattr(p, "_disable_adetailer", False):
return return