Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to work with current stable release of controlnet_aux (v0.0.3). Turned of pre-processor params that were added post v0.0.3. Also change defaults for shuffle.

Browse Source
This commit is contained in:
user1 2023-05-16 19:44:45 -07:00 committed by Kent Keirsey
parent e4c89cba9c
commit 3ab147204c
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
invokeai/app/invocations/controlnet_image_processors.py
View File

@ -211,7 +211,8 @@ class HedImageprocessorInvocation(ImageProcessorInvocation, PILInvocationConfig)
# Inputs # Inputs
detect_resolution: int = Field(default=512, ge=0, description="pixel resolution for edge detection") detect_resolution: int = Field(default=512, ge=0, description="pixel resolution for edge detection")
image_resolution: int = Field(default=512, ge=0, description="pixel resolution for output image") image_resolution: int = Field(default=512, ge=0, description="pixel resolution for output image")
safe: bool = Field(default=False, description="whether to use safe mode") # safe not supported in controlnet_aux v0.0.3
# safe: bool = Field(default=False, description="whether to use safe mode")
scribble: bool = Field(default=False, description="whether to use scribble mode") scribble: bool = Field(default=False, description="whether to use scribble mode")
# fmt: on # fmt: on
@ -220,7 +221,8 @@ class HedImageprocessorInvocation(ImageProcessorInvocation, PILInvocationConfig)
processed_image = hed_processor(image, processed_image = hed_processor(image,
detect_resolution=self.detect_resolution, detect_resolution=self.detect_resolution,
image_resolution=self.image_resolution, image_resolution=self.image_resolution,
safe=self.safe, # safe not supported in controlnet_aux v0.0.3
# safe=self.safe,
scribble=self.scribble, scribble=self.scribble,
) )
return processed_image return processed_image
@ -290,7 +292,8 @@ class MidasDepthImageProcessorInvocation(ImageProcessorInvocation, PILInvocation
# Inputs # Inputs
a_mult: float = Field(default=2.0, ge=0, description="Midas parameter a = amult * PI") a_mult: float = Field(default=2.0, ge=0, description="Midas parameter a = amult * PI")
bg_th: float = Field(default=0.1, ge=0, description="Midas parameter bg_th") bg_th: float = Field(default=0.1, ge=0, description="Midas parameter bg_th")
depth_and_normal: bool = Field(default=False, description="whether to use depth and normal mode") # depth_and_normal not supported in controlnet_aux v0.0.3
# depth_and_normal: bool = Field(default=False, description="whether to use depth and normal mode")
# fmt: on # fmt: on
def run_processor(self, image): def run_processor(self, image):
@ -298,7 +301,9 @@ class MidasDepthImageProcessorInvocation(ImageProcessorInvocation, PILInvocation
processed_image = midas_processor(image, processed_image = midas_processor(image,
a=np.pi * self.a_mult, a=np.pi * self.a_mult,
bg_th=self.bg_th, bg_th=self.bg_th,
depth_and_normal=self.depth_and_normal) # dept_and_normal not supported in controlnet_aux v0.0.3
# depth_and_normal=self.depth_and_normal,
)
return processed_image return processed_image
@ -368,9 +373,9 @@ class ContentShuffleImageProcessorInvocation(ImageProcessorInvocation, PILInvoca
# Inputs # Inputs
detect_resolution: int = Field(default=512, ge=0, description="pixel resolution for edge detection") detect_resolution: int = Field(default=512, ge=0, description="pixel resolution for edge detection")
image_resolution: int = Field(default=512, ge=0, description="pixel resolution for output image") image_resolution: int = Field(default=512, ge=0, description="pixel resolution for output image")
h: Union[int | None] = Field(default=None, ge=0, description="content shuffle h parameter") h: Union[int | None] = Field(default=512, ge=0, description="content shuffle h parameter")
w: Union[int | None] = Field(default=None, ge=0, description="content shuffle w parameter") w: Union[int | None] = Field(default=512, ge=0, description="content shuffle w parameter")
f: Union[int | None] = Field(default=None, ge=0, description="cont") f: Union[int | None] = Field(default=256, ge=0, description="cont")
# fmt: on # fmt: on
def run_processor(self, image): def run_processor(self, image):