From 51032dc0b209f6771e8b719516e031aa352590ea Mon Sep 17 00:00:00 2001 From: user1 <gregghelt@gmail.com> Date: Sat, 13 May 2023 04:17:53 -0700 Subject: [PATCH] Commented out ZoeDetector. Will re-instate once there's a controlnet-aux release that supports it. --- .../controlnet_image_processors.py | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/invokeai/app/invocations/controlnet_image_processors.py b/invokeai/app/invocations/controlnet_image_processors.py index 59b76da01b..20ef409b5b 100644 --- a/invokeai/app/invocations/controlnet_image_processors.py +++ b/invokeai/app/invocations/controlnet_image_processors.py @@ -26,7 +26,8 @@ from controlnet_aux import ( OpenposeDetector, PidiNetDetector, ContentShuffleDetector, - ZoeDetector) + # ZoeDetector, # FIXME: uncomment once ZoeDetector is availabel in official controlnet_aux release +) from .image import ImageOutput, build_image_output, PILInvocationConfig @@ -324,14 +325,16 @@ class ContentShuffleImageProcessorInvocation(ImageProcessorInvocation, PILInvoca return processed_image -class ZoeDepthImageProcessorInvocation(ImageProcessorInvocation, PILInvocationConfig): - """Applies Zoe depth processing to image""" - # fmt: off - type: Literal["zoe_depth_image_processor"] = "zoe_depth_image_processor" - # fmt: on - - def run_processor(self, image): - zoe_depth_processor = ZoeDetector.from_pretrained("lllyasviel/Annotators") - processed_image = zoe_depth_processor(image) - return processed_image +# # FIXME: ZoeDetector was implemented _after_ most recent official release of controlnet_aux (v0.0.3) +# # so it is commented out until a new release is made +# class ZoeDepthImageProcessorInvocation(ImageProcessorInvocation, PILInvocationConfig): +# """Applies Zoe depth processing to image""" +# # fmt: off +# type: Literal["zoe_depth_image_processor"] = "zoe_depth_image_processor" +# # fmt: on +# +# def run_processor(self, image): +# zoe_depth_processor = ZoeDetector.from_pretrained("lllyasviel/Annotators") +# processed_image = zoe_depth_processor(image) +# return processed_image