refactor(controlnet): align Qwen-Image-2.1 with merged Fun ControlNet and bump upstream deps

chain_injectors/controlnet_injector.py

@@ -28,10 +28,10 @@ def inject(assembler, chain_definition, chain_items):
         default_megapixels = 1.0
     megapixels = float(chain_definition.get('megapixels', default_megapixels))
 
-    # 1. Qwen-Image-2.1 Fun ControlNet
-    if template_name == "QwenImage21FunControlNetApply":
+    # 1. Fun ControlNet (Qwen-Image-2.1)
+    if template_name in ("ZImageFunControlnet", "QwenImage21FunControlNetApply"):
         if 'model' not in assembler.workflow[ksampler_id]['inputs']:
-            print(f"Warning: KSampler node '{ksampler_name}' is missing 'model' input. Skipping Qwen Fun ControlNet.")
+            print(f"Warning: KSampler node '{ksampler_name}' is missing 'model' input. Skipping Fun ControlNet.")
             return
 
         current_model_connection = assembler.workflow[ksampler_id]['inputs']['model']
@@ -57,19 +57,24 @@ def inject(assembler, chain_definition, chain_items):
             apply_cn_id = assembler._get_unique_id()
             apply_cn_node = assembler._get_node_template(template_name)
             apply_cn_node['inputs']['strength'] = item_data.get('strength', 1.0)
-            apply_cn_node['inputs']['start_percent'] = 0.0
-            apply_cn_node['inputs']['end_percent'] = 1.0
+            if 'start_percent' in apply_cn_node.get('inputs', {}):
+                apply_cn_node['inputs']['start_percent'] = item_data.get('start_percent', 0.0)
+            if 'end_percent' in apply_cn_node.get('inputs', {}):
+                apply_cn_node['inputs']['end_percent'] = item_data.get('end_percent', 1.0)
             apply_cn_node['inputs']['model'] = current_model_connection
             apply_cn_node['inputs']['model_patch'] = [patch_loader_id, 0]
-            apply_cn_node['inputs']['control_image'] = [image_scaler_id, 0]
-            if vae_connection:
+            if 'image' in apply_cn_node.get('inputs', {}):
+                apply_cn_node['inputs']['image'] = [image_scaler_id, 0]
+            elif 'control_image' in apply_cn_node.get('inputs', {}):
+                apply_cn_node['inputs']['control_image'] = [image_scaler_id, 0]
+            if vae_connection and 'vae' in apply_cn_node.get('inputs', {}):
                 apply_cn_node['inputs']['vae'] = vae_connection
 
             assembler.workflow[apply_cn_id] = apply_cn_node
             current_model_connection = [apply_cn_id, 0]
 
         assembler.workflow[ksampler_id]['inputs']['model'] = current_model_connection
-        print(f"Qwen Fun ControlNet injector applied. KSampler model input redirected through {len(chain_items)} node(s).")
+        print(f"Fun ControlNet injector applied. KSampler model input redirected through {len(chain_items)} node(s).")
         return
 
     # 2. Anima LLLite ControlNet

comfy_integration/setup.py

@@ -25,12 +25,6 @@ def initialize_comfyui():
     else:
         print("✅ ComfyUI repository already exists.")
 
-    try:
-        print("--- [Setup] Applying PR #16519 for ComfyUI (Qwen-Image 2.1 Fun ControlNet) ---")
-        os.system(f"git -C {COMFYUI_TEMP_DIR} fetch --depth 1 origin pull/16519/head && git -c user.name=dev -c user.email=dev@example.com -C {COMFYUI_TEMP_DIR} merge --no-edit FETCH_HEAD || git -C {COMFYUI_TEMP_DIR} checkout -f FETCH_HEAD")
-        print("✅ Successfully applied PR #16519.")
-    except Exception as e:
-        print(f"⚠️ Warning: Could not apply PR #16519 for ComfyUI: {e}")
 
     print(f"--- Merging ComfyUI from '{COMFYUI_TEMP_DIR}' to '{APP_DIR}' ---")
     for item in os.listdir(COMFYUI_TEMP_DIR):

core/pipelines/workflow_recipes/_partials/conditioning/qwen-image-2.1.yaml

@@ -51,7 +51,7 @@ dynamic_lora_chains:
 
 dynamic_controlnet_chains:
   controlnet_chain:
-    template: "QwenImage21FunControlNetApply"
+    template: "ZImageFunControlnet"
     ksampler_node: "ksampler"
     vae_source: "vae_loader:0"
 

requirements.txt

@@ -1,5 +1,5 @@
 comfyui-frontend-package==1.53.6
-comfyui-workflow-templates==0.11.69
+comfyui-workflow-templates==0.11.70
 comfyui-embedded-docs==0.5.12
 torch
 torchsde
@@ -21,7 +21,7 @@ alembic
 SQLAlchemy>=2.0.0
 filelock
 av>=17.0.0
-comfy-kitchen==0.2.35
+comfy-kitchen==0.2.36
 comfy-aimdo==0.5.5
 requests
 simpleeval>=1.0.0