Support NoobAI inpaint control-net

Author: Acly

ai_diffusion/comfy_workflow.py

@@ -724,8 +724,10 @@ def apply_ip_adapter_face(
     def apply_self_attention_guidance(self, model: Output):
         return self.add("SelfAttentionGuidance", 1, model=model, scale=0.5, blur_sigma=2.0)
 
-    def inpaint_preprocessor(self, image: Output, mask: Output):
-        return self.add("InpaintPreprocessor", 1, image=image, mask=mask)
+    def inpaint_preprocessor(self, image: Output, mask: Output, fill_black=False):
+        return self.add(
+            "InpaintPreprocessor", 1, image=image, mask=mask, black_pixel_for_xinsir_cn=fill_black
+        )
 
     def apply_fooocus_inpaint(self, model: Output, patch: Output, latent: Output):
         return self.add("INPAINT_ApplyFooocusInpaint", 1, model=model, patch=patch, latent=latent)

ai_diffusion/resources.py

@@ -442,6 +442,7 @@ def is_required(kind: ResourceKind, arch: Arch, identifier: ControlMode | Upscal
 search_paths: dict[str, list[str]] = {
     resource_id(ResourceKind.controlnet, Arch.sd15, ControlMode.inpaint): ["control_v11p_sd15_inpaint"],
     resource_id(ResourceKind.controlnet, Arch.flux, ControlMode.inpaint): ["flux.1-dev-controlnet-inpaint"],
+    resource_id(ResourceKind.controlnet, Arch.illu, ControlMode.inpaint): ["noobaiinpainting"],
     resource_id(ResourceKind.controlnet, Arch.sdxl, ControlMode.universal): ["union-sdxl", "xinsirunion"],
     resource_id(ResourceKind.controlnet, Arch.sd15, ControlMode.scribble): ["control_v11p_sd15_scribble", "control_lora_rank128_v11p_sd15_scribble"],
     resource_id(ResourceKind.controlnet, Arch.sdxl, ControlMode.scribble): ["xinsirscribble", "scribble-sdxl", "mistoline_fp16", "mistoline_rank", "control-lora-sketch-rank", "sai_xl_sketch_"],

ai_diffusion/workflow.py

@@ -461,12 +461,13 @@ def apply_control(
 ):
     models = models.control
     control_lora: ControlMode | None = None
+    is_illu = models.arch in [Arch.illu, Arch.illu_v]
 
     for control in (c for c in control_layers if c.mode.is_control_net):
         image = control.image.load(w, shape)
-        if control.mode is ControlMode.inpaint and models.arch is Arch.sd15:
+        if control.mode is ControlMode.inpaint and (models.arch is Arch.sd15 or is_illu):
             assert control.mask is not None, "Inpaint control requires a mask"
-            image = w.inpaint_preprocessor(image, control.mask.load(w))
+            image = w.inpaint_preprocessor(image, control.mask.load(w), fill_black=is_illu)
         if control.mode.is_lines:  # ControlNet expects white lines on black background
             image = w.invert_image(image)
 
@@ -772,7 +773,7 @@ def detect_inpaint(
             and prompt != ""
             and not any(c.mode.is_structural for c in control)
         )
-    elif sd_ver is Arch.sdxl:
+    elif sd_ver.is_sdxl_like:
         result.use_inpaint_model = strength > 0.8
     elif sd_ver is Arch.flux:
         result.use_inpaint_model = strength == 1.0