diff --git a/aaaaaa/ui.py b/aaaaaa/ui.py index 212095c..ef76375 100644 --- a/aaaaaa/ui.py +++ b/aaaaaa/ui.py @@ -7,12 +7,12 @@ from typing import Any import gradio as gr +from lib_controlnet.external_code import ControlMode from aaaaaa.conditional import InputAccordion from adetailer import ADETAILER, __version__ from adetailer.args import ALL_ARGS, MASK_MERGE_INVERT from controlnet_ext import controlnet_exists, controlnet_type, get_cn_models -from lib_controlnet.external_code import ControlMode if controlnet_type == "forge": from lib_controlnet import global_state diff --git a/adetailer/args.py b/adetailer/args.py index d9d925c..1ca020c 100644 --- a/adetailer/args.py +++ b/adetailer/args.py @@ -5,6 +5,7 @@ from enum import Enum from functools import cached_property, partial from typing import Any, Literal, NamedTuple, Optional, Union + from lib_controlnet.external_code import ControlMode try: diff --git a/controlnet_ext/controlnet_ext_forge.py b/controlnet_ext/controlnet_ext_forge.py index 5d9652b..d226aa2 100644 --- a/controlnet_ext/controlnet_ext_forge.py +++ b/controlnet_ext/controlnet_ext_forge.py @@ -4,7 +4,7 @@ import numpy as np from lib_controlnet import external_code, global_state -from lib_controlnet.external_code import ControlNetUnit, ControlMode +from lib_controlnet.external_code import ControlMode, ControlNetUnit from modules import scripts from modules.processing import StableDiffusionProcessing diff --git a/scripts/!adetailer.py b/scripts/!adetailer.py index 42470e2..7ad4c40 100644 --- a/scripts/!adetailer.py +++ b/scripts/!adetailer.py @@ -174,7 +174,7 @@ def update_controlnet_args(self, p, args: ADetailerArgs) -> None: weight=args.ad_controlnet_weight, guidance_start=args.ad_controlnet_guidance_start, guidance_end=args.ad_controlnet_guidance_end, - control_mode=args.ad_controlnet_control_mode + control_mode=args.ad_controlnet_control_mode, ) def is_ad_enabled(self, *args) -> bool: