From a9feea2662092c3d0fda284aa1757d0d00ae6f6b Mon Sep 17 00:00:00 2001 From: Dowon Date: Tue, 12 Mar 2024 01:15:03 +0900 Subject: [PATCH] fix: replace CNHijackRestore with nullcontext for forge --- controlnet_ext/__init__.py | 9 +++++++++ scripts/!adetailer.py | 6 ++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/controlnet_ext/__init__.py b/controlnet_ext/__init__.py index 06cc3a1..1f03bed 100644 --- a/controlnet_ext/__init__.py +++ b/controlnet_ext/__init__.py @@ -13,8 +13,17 @@ except ImportError: get_cn_models, ) +from .restore import cn_allow_script_control + +if controlnet_type == "forge": + from contextlib import nullcontext as CNHijackRestore # noqa: N812 +else: + from .restore import CNHijackRestore + __all__ = [ "ControlNetExt", + "CNHijackRestore", + "cn_allow_script_control", "controlnet_exists", "controlnet_type", "get_cn_models", diff --git a/scripts/!adetailer.py b/scripts/!adetailer.py index ff761a2..534eae0 100644 --- a/scripts/!adetailer.py +++ b/scripts/!adetailer.py @@ -39,15 +39,13 @@ from adetailer.mask import ( from adetailer.traceback import rich_traceback from adetailer.ui import WebuiInfo, adui, ordinal, suffix from controlnet_ext import ( + CNHijackRestore, ControlNetExt, + cn_allow_script_control, controlnet_exists, controlnet_type, get_cn_models, ) -from controlnet_ext.restore import ( - CNHijackRestore, - cn_allow_script_control, -) from modules import images, paths, safe, script_callbacks, scripts, shared from modules.devices import NansException from modules.processing import (