Forge webui support (#517)

* Forge support

* Separate Forge implementation

* Remove debug print
This commit is contained in:
catboxanon
2024-02-27 07:19:36 -05:00
committed by GitHub
parent ac0bb9ab00
commit 1441b55d6f
6 changed files with 171 additions and 37 deletions

View File

@@ -36,7 +36,12 @@ from adetailer.mask import (
)
from adetailer.traceback import rich_traceback
from adetailer.ui import WebuiInfo, adui, ordinal, suffix
from controlnet_ext import ControlNetExt, controlnet_exists, get_cn_models
from controlnet_ext import (
ControlNetExt,
controlnet_exists,
controlnet_forge,
get_cn_models,
)
from controlnet_ext.restore import (
CNHijackRestore,
cn_allow_script_control,
@@ -517,13 +522,14 @@ class AfterDetailerScript(scripts.Script):
i2i._ad_disabled = True
i2i._ad_inner = True
if args.ad_controlnet_model != "Passthrough":
self.disable_controlnet_units(i2i.script_args)
if not controlnet_forge:
if args.ad_controlnet_model != "Passthrough":
self.disable_controlnet_units(i2i.script_args)
if args.ad_controlnet_model not in ["None", "Passthrough"]:
self.update_controlnet_args(i2i, args)
elif args.ad_controlnet_model == "None":
i2i.control_net_enabled = False
if args.ad_controlnet_model not in ["None", "Passthrough"]:
self.update_controlnet_args(i2i, args)
elif args.ad_controlnet_model == "None":
i2i.control_net_enabled = False
return i2i
@@ -729,6 +735,12 @@ class AfterDetailerScript(scripts.Script):
p2.seed = self.get_each_tap_seed(seed, j)
p2.subseed = self.get_each_tap_seed(subseed, j)
if controlnet_forge:
if args.ad_controlnet_model not in "None":
self.update_controlnet_args(p2, args)
else:
p2.control_net_enabled = False
try:
processed = process_images(p2)
except NansException as e: