diff --git a/diffsynth/controlnets/processors.py b/diffsynth/controlnets/processors.py index cbc6ff4..06553e0 100644 --- a/diffsynth/controlnets/processors.py +++ b/diffsynth/controlnets/processors.py @@ -1,10 +1,4 @@ from typing_extensions import Literal, TypeAlias -import warnings -with warnings.catch_warnings(): - warnings.simplefilter("ignore") - from controlnet_aux.processor import ( - CannyDetector, MidasDetector, HEDdetector, LineartDetector, LineartAnimeDetector, OpenposeDetector, NormalBaeDetector - ) Processor_id: TypeAlias = Literal[ @@ -15,18 +9,25 @@ class Annotator: def __init__(self, processor_id: Processor_id, model_path="models/Annotators", detect_resolution=None, device='cuda', skip_processor=False): if not skip_processor: if processor_id == "canny": + from controlnet_aux.processor import CannyDetector self.processor = CannyDetector() elif processor_id == "depth": + from controlnet_aux.processor import MidasDetector self.processor = MidasDetector.from_pretrained(model_path).to(device) elif processor_id == "softedge": + from controlnet_aux.processor import HEDdetector self.processor = HEDdetector.from_pretrained(model_path).to(device) elif processor_id == "lineart": + from controlnet_aux.processor import LineartDetector self.processor = LineartDetector.from_pretrained(model_path).to(device) elif processor_id == "lineart_anime": + from controlnet_aux.processor import LineartAnimeDetector self.processor = LineartAnimeDetector.from_pretrained(model_path).to(device) elif processor_id == "openpose": + from controlnet_aux.processor import OpenposeDetector self.processor = OpenposeDetector.from_pretrained(model_path).to(device) elif processor_id == "normal": + from controlnet_aux.processor import NormalBaeDetector self.processor = NormalBaeDetector.from_pretrained(model_path).to(device) elif processor_id == "tile" or processor_id == "none" or processor_id == "inpaint": self.processor = None