Added back pose and depth

Author: Sen-sou

ai_diffusion/backend/resources.py

@@ -377,6 +377,8 @@ def can_substitute_universal(self, arch: Arch):
             return self in [
                 ControlMode.scribble,
                 ControlMode.line_art,
+                ControlMode.depth,
+                ControlMode.pose,
                 ControlMode.blur,
             ]
         if arch.is_sdxl_like or arch is Arch.qwen:
@@ -760,11 +762,13 @@ def is_required(kind: ResourceKind, arch: Arch, identifier: ControlMode | Upscal
     resource_id(ResourceKind.controlnet, Arch.sd15, ControlMode.depth): ["control_sd15_depth_anything", "control_v11f1p_sd15_depth", "control_lora_rank128_v11f1p_sd15_depth"],
     resource_id(ResourceKind.controlnet, Arch.sdxl, ControlMode.depth): ["xinsirdepth", "depth-sdxl", "control-lora-depth-rank", "sai_xl_depth_"],
     resource_id(ResourceKind.controlnet, Arch.flux, ControlMode.depth): ["flux-depth"],
+    resource_id(ResourceKind.controlnet, Arch.anima, ControlMode.depth): ["anima*lllite*depth", "lllite*anima*depth", "depth*anima*lllite", "depth*lllite*anima"],
     resource_id(ResourceKind.controlnet, Arch.illu, ControlMode.depth): ["noob-sdxl-controlnet-depth", "noobaixlcontrolnet_epsdepth"],
     resource_id(ResourceKind.controlnet, Arch.sd15, ControlMode.normal): ["control_v11p_sd15_normalbae", "control_lora_rank128_v11p_sd15_normalbae"],
     resource_id(ResourceKind.controlnet, Arch.illu, ControlMode.normal): ["noob-sdxl-controlnet-normal", "noobaixlcontrolnet_epsnormal"],
     resource_id(ResourceKind.controlnet, Arch.sd15, ControlMode.pose): ["control_v11p_sd15_openpose", "control_lora_rank128_v11p_sd15_openpose"],
     resource_id(ResourceKind.controlnet, Arch.sdxl, ControlMode.pose): ["xinsiropenpose", "openpose-sdxl", "control-lora-openposexl2-rank", "thibaud_xl_openpose"],
+    resource_id(ResourceKind.controlnet, Arch.anima, ControlMode.pose): ["anima*lllite*pose", "anima*lllite*openpose", "lllite*anima*pose", "lllite*anima*openpose", "pose*anima*lllite", "openpose*anima*lllite", "pose*lllite*anima", "openpose*lllite*anima"],
     resource_id(ResourceKind.controlnet, Arch.illu, ControlMode.pose): ["noob-sdxl-controlnet-openpose", "noobaixlcontrolnet_openpose"],
     resource_id(ResourceKind.controlnet, Arch.sd15, ControlMode.segmentation): ["control_v11p_sd15_seg", "control_lora_rank128_v11p_sd15_seg"],
     resource_id(ResourceKind.controlnet, Arch.sdxl, ControlMode.segmentation): ["sdxl_segmentation_ade20k_controlnet"],

ai_diffusion/backend/workflow.py

@@ -981,9 +981,7 @@ def detect_inpaint(
         )
     elif arch.is_sdxl_like:
         result.use_inpaint_model = strength > 0.8
-    elif arch in (Arch.flux, Arch.zimage):
-        result.use_inpaint_model = strength == 1.0
-    elif arch is Arch.anima:
+    elif arch in (Arch.flux, Arch.zimage, Arch.anima):
         result.use_inpaint_model = strength == 1.0
     elif arch.is_edit:
         result.mode = InpaintMode.custom

tests/test_workflow.py

@@ -230,9 +230,9 @@ def test_inpaint_params():
 def test_anima_lllite_control_workflow():
     w = ComfyWorkflow()
     models = ClientModels()
-    models.resources[
-        resource_id(ResourceKind.controlnet, Arch.anima, ControlMode.blur)
-    ] = "anima-lllite-blur.safetensors"
+    models.resources[resource_id(ResourceKind.controlnet, Arch.anima, ControlMode.universal)] = (
+        "anima-lllite-anytest.safetensors"
+    )
     cond = workflow.ConditioningOutput(workflow.Output(2, 0), workflow.Output(3, 0))
     control = workflow.Control(
         ControlMode.blur,
@@ -253,6 +253,8 @@ def test_anima_lllite_control_workflow():
 
     assert result == cond
     assert w.root[str(model.node)]["class_type"] == "ETN_control_apply"
+    assert w.root[str(model.node)]["inputs"]["control_net"] == [str(model.node - 1), 1]
+    assert w.root[str(model.node - 1)]["inputs"]["weights"] == "anima-lllite-anytest.safetensors"
     assert any(n["class_type"] == "ETN_control_load" for n in w.root.values())
     assert not any(n["class_type"] == "ControlNetLoader" for n in w.root.values())