Commenting out LeReS ControlNet image preprocessor until release of controlnet_aux v0.0.6 (supported on controlnet_aux current main, but not on latest release v0.0.5)

This commit is contained in:
user1 2023-06-25 14:25:14 -07:00
parent 45aa338a98
commit 10e8389fa4

View File

@ -30,7 +30,7 @@ from controlnet_aux import (
ZoeDetector, ZoeDetector,
MediapipeFaceDetector, MediapipeFaceDetector,
SamDetector, SamDetector,
LeresDetector, # LeresDetector,
) )
from controlnet_aux.util import ade_palette from controlnet_aux.util import ade_palette
@ -461,27 +461,27 @@ class MediapipeFaceProcessorInvocation(ImageProcessorInvocation, PILInvocationCo
processed_image = mediapipe_face_processor(image, max_faces=self.max_faces, min_confidence=self.min_confidence) processed_image = mediapipe_face_processor(image, max_faces=self.max_faces, min_confidence=self.min_confidence)
return processed_image return processed_image
class LeresImageProcessorInvocation(ImageProcessorInvocation, PILInvocationConfig): # class LeresImageProcessorInvocation(ImageProcessorInvocation, PILInvocationConfig):
"""Applies leres processing to image""" # """Applies leres processing to image"""
# fmt: off # # fmt: off
type: Literal["leres_image_processor"] = "leres_image_processor" # type: Literal["leres_image_processor"] = "leres_image_processor"
# Inputs # # Inputs
thr_a: float = Field(default=0, description="Leres parameter `thr_a`") # thr_a: float = Field(default=0, description="Leres parameter `thr_a`")
thr_b: float = Field(default=0, description="Leres parameter `thr_b`") # thr_b: float = Field(default=0, description="Leres parameter `thr_b`")
boost: bool = Field(default=False, description="Whether to use boost mode") # boost: bool = Field(default=False, description="Whether to use boost mode")
detect_resolution: int = Field(default=512, ge=0, description="The pixel resolution for detection") # detect_resolution: int = Field(default=512, ge=0, description="The pixel resolution for detection")
image_resolution: int = Field(default=512, ge=0, description="The pixel resolution for the output image") # image_resolution: int = Field(default=512, ge=0, description="The pixel resolution for the output image")
# fmt: on # # fmt: on
#
def run_processor(self, image): # def run_processor(self, image):
leres_processor = LeresDetector.from_pretrained("lllyasviel/Annotators") # leres_processor = LeresDetector.from_pretrained("lllyasviel/Annotators")
processed_image = leres_processor(image, # processed_image = leres_processor(image,
thr_a=self.thr_a, # thr_a=self.thr_a,
thr_b=self.thr_b, # thr_b=self.thr_b,
boost=self.boost, # boost=self.boost,
detect_resolution=self.detect_resolution, # detect_resolution=self.detect_resolution,
image_resolution=self.image_resolution) # image_resolution=self.image_resolution)
return processed_image # return processed_image
class SegmentAnythingProcessorInvocation(ImageProcessorInvocation, PILInvocationConfig): class SegmentAnythingProcessorInvocation(ImageProcessorInvocation, PILInvocationConfig):
"""Applies segment anything processing to image""" """Applies segment anything processing to image"""