Merge pull request #10 from ComfyNodePRs/licence-update

Update PyProject Toml - License

.github/workflows/publish.yml

@@ -0,0 +1,20 @@
+name: Publish to Comfy registry
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+"
+    paths:
+      - "pyproject.toml"
+
+jobs:
+  publish-node:
+    name: Publish Custom Node to registry
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Publish Custom Node
+        uses: Comfy-Org/publish-node-action@main
+        with:
+          personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}

.gitignore

@@ -1,2 +1,3 @@
 **/__pycache__/
 *.log
+**/.DS_Store

attention_couple.py

@@ -88,7 +88,7 @@ class AttentionCouple:
         if not self.sdxl:
             for id in [1,2,4,5,7,8]: # id of input_blocks that have cross attention
                 set_model_patch_replace(new_model, self.make_patch(new_model.model.diffusion_model.input_blocks[id][1].transformer_blocks[0].attn2), ("input", id))
-            set_model_patch_replace(new_model, self.make_patch(new_model.model.diffusion_model.middle_block[1].transformer_blocks[0].attn2), ("middle", id))
+            set_model_patch_replace(new_model, self.make_patch(new_model.model.diffusion_model.middle_block[1].transformer_blocks[0].attn2), ("middle", 0))
             for id in [3,4,5,6,7,8,9,10,11]: # id of output_blocks that have cross attention
                 set_model_patch_replace(new_model, self.make_patch(new_model.model.diffusion_model.output_blocks[id][1].transformer_blocks[0].attn2), ("output", id))
         else:
@@ -141,6 +141,10 @@ class AttentionCouple:
                 k = torch.cat([k[i].unsqueeze(0).repeat(b,1,1) for i in range(length)], dim=0)
                 v = torch.cat([v[i].unsqueeze(0).repeat(b,1,1) for i in range(length)], dim=0)
                 
+                if k.dtype != q_target.dtype or v.dtype != q_target.dtype:
+                    # Ensure all dtypes match
+                    k = k.to(q_target.dtype)
+                    v = v.to(q_target.dtype)
                 qkv = optimized_attention(q_target, k, v, extra_options["n_heads"])
                 qkv = qkv * masks
                 qkv = qkv.view(length, b, -1, module.heads * module.dim_head).sum(dim=0)

comfy_couple.py

@@ -62,7 +62,7 @@ class ComfyCouple:
             mask_rect_second_width = width_first
             mask_rect_second_height = height
         elif orientation == "vertical":
-            height_first = int(width * center)
+            height_first = int(height * center)
 
             mask_rect_first_x = 0
             mask_rect_first_y = height_first

pyproject.toml

@@ -0,0 +1,13 @@
+[project]
+name = "comfyui-comfycouple"
+description = "If you want to draw two different characters together without blending their features, so you could try to check out this custom node."
+version = "0.1.4"
+license = { text = "GNU General Public License v3.0" }
+
+[project.urls]
+Repository = "https://github.com/Danand/ComfyUI-ComfyCouple"
+
+[tool.comfy]
+PublisherId = "rei---"
+DisplayName = "ComfyUI-ComfyCouple"
+Icon = ""