nodes/Raykosan-ComfyUI_RaykoStudio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Complete modification of the RS Collage node

Browse Source
This commit is contained in:
Raykosan
2026-05-31 12:30:02 +03:00
parent 919007c3fe
commit 063e800515
5 changed files with 620 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Rayko_Collage.py
+52 -78
View File
@@ -1,18 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright 2025-2026 Raykosan (RaykoStudio)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import math
import torch
import numpy as np
import os
@@ -31,23 +17,19 @@ async def transform_handler(request):
data = await request.json()
node_id = str(data.get("id"))
transforms = data.get("transforms")
if node_id is None or transforms is None:
return web.json_response({"error": "Missing data"}, status=400)
TRANSFORM_CACHE[node_id] = {
**transforms,
"opacity": data.get("opacity", 1.0),
"feather_type": data.get("feather_type", "None"),
"edge_radius": data.get("edge_radius", 300),
"shape_radius": data.get("shape_radius", 0),
"blur_radius": data.get("blur_radius", 50),
"blur_hardness": data.get("blur_hardness", 0),
"feather_center_x": data.get("feather_center_x", 0.5),
"feather_center_y": data.get("feather_center_y", 0.5)
}
if node_id in PENDING_TRANSFORMS:
PENDING_TRANSFORMS[node_id]["status"] = "completed"
return web.json_response({"status": "ok"})
except Exception as e:
return web.json_response({"error": str(e)}, status=500)
@@ -74,8 +56,10 @@ async def cleanup_handler(request):
temp_dir = folder_paths.get_temp_directory()
for f in os.listdir(temp_dir):
if f.startswith(f"rs_collage_{node_id}_"):
try: os.remove(os.path.join(temp_dir, f))
except: pass
try:
os.remove(os.path.join(temp_dir, f))
except:
pass
return web.json_response({"status": "ok"})
except Exception as e:
return web.json_response({"error": str(e)}, status=500)
@@ -88,9 +72,9 @@ class RSCollage:
"overlay_image": ("IMAGE",),
"background_image": ("IMAGE",),
"opacity": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}),
"feather_type": (["None", "Radial In", "Radial Out", "Edge", "Shape"], {"default": "None"}),
"edge_radius": ("INT", {"default": 300, "min": 0, "max": 300, "step": 1}),
"shape_radius": ("INT", {"default": 0, "min": 0, "max": 5, "step": 1}),
"feather_type": (["None", "Radial Blur In", "Radial Blur Out", "Ellipse Blur In", "Ellipse Blur Out"], {"default": "None"}),
"blur_radius": ("INT", {"default": 50, "min": 0, "max": 100, "step": 1}),
"blur_hardness": ("INT", {"default": 0, "min": 0, "max": 100, "step": 1}),
},
"optional": {"overlay_mask": ("MASK",)},
"hidden": {"unique_id": "UNIQUE_ID"}
@@ -108,39 +92,47 @@ class RSCollage:
arr[black, 3] = 0
return Image.fromarray(arr, 'RGBA')
def apply_radial_feather(self, img, edge_radius, cx, cy, invert=False):
def apply_radial_feather(self, img, blur_radius, blur_hardness, cx, cy, invert=False):
if img.mode != 'RGBA': img = img.convert('RGBA')
arr = np.array(img).astype(np.float32)
h, w = arr.shape[:2]
cx_px, cy_px = w * cx, h * cy
y, x = np.ogrid[:h, :w]
dist = np.hypot(x - cx_px, y - cy_px)
max_dist = max(np.hypot(cx_px, cy_px), np.hypot(w-cx_px, cy_px), np.hypot(cx_px, h-cy_px), np.hypot(w-cx_px, h-cy_px)) or 1
feather_width = max((edge_radius / 300.0) * max_dist, 1.0)
mask = 1.0 - np.clip(dist / feather_width, 0.0, 1.0)
max_dist = max(math.hypot(cx_px, cy_px), math.hypot(w-1-cx_px, cy_px), math.hypot(cx_px, h-1-cy_px), math.hypot(w-1-cx_px, h-1-cy_px)) or 1.0
ratio, hardness = blur_radius/100.0, blur_hardness/100.0
overshoot = 1.15 + (1.0 - hardness) * 0.15
fw = max(ratio * max_dist * overshoot, 1e-6)
norm = np.clip(dist / fw, 0.0, 1.0)
exp = 1.0 + hardness * 30.0
mask = 1.0 - np.power(norm, exp)
if hardness >= 0.5: mask = np.where(mask < 0.02, 0.0, np.where(mask > 0.98, 1.0, mask))
if invert: mask = 1.0 - mask
arr[:,:,3] *= mask
return Image.fromarray(arr.astype(np.uint8), 'RGBA')
def apply_edge_feather(self, img, edge_radius):
def apply_ellipse_feather(self, img, blur_radius, blur_hardness, cx, cy, invert=False):
if img.mode != 'RGBA': img = img.convert('RGBA')
arr = np.array(img).astype(np.float32)
h, w = arr.shape[:2]
cx_px, cy_px = w * cx, h * cy
y, x = np.ogrid[:h, :w]
dist = np.minimum(np.minimum(x, w-1-x), np.minimum(y, h-1-y))
max_dist = min(w, h) / 2.0 or 1
feather_width = max((edge_radius / 300.0) * max_dist, 1.0)
mask = np.clip(dist / feather_width, 0.0, 1.0)
dX = max(cx_px, w-1-cx_px) or 1.0
dY = max(cy_px, h-1-cy_px) or 1.0
dx = np.abs(x - cx_px) / dX
dy = np.abs(y - cy_px) / dY
E = np.hypot(dx, dy)
ratio, hardness = blur_radius/100.0, blur_hardness/100.0
overshoot = 1.15 + (1.0 - hardness) * 0.15
fw = max(ratio * overshoot, 1e-6)
norm = np.clip(E / fw, 0.0, 1.0)
exp = 1.0 + hardness * 30.0
mask = 1.0 - np.power(norm, exp)
if hardness >= 0.5: mask = np.where(mask < 0.02, 0.0, np.where(mask > 0.98, 1.0, mask))
if invert: mask = 1.0 - mask
arr[:,:,3] *= mask
return Image.fromarray(arr.astype(np.uint8), 'RGBA')
def apply_shape_feather(self, img, shape_radius):
if shape_radius <= 0: return img
if img.mode != 'RGBA': img = img.convert('RGBA')
r, g, b, a = img.split()
a = a.filter(ImageFilter.GaussianBlur(radius=shape_radius))
return Image.merge('RGBA', (r, g, b, a))
def tensor2pil(self, tensor):
if len(tensor.shape) == 4:
if tensor.shape[0] > 1: tensor = tensor[0]
@@ -164,16 +156,11 @@ class RSCollage:
elif pil.mode != 'RGB': pass
return torch.from_numpy(np.array(pil).astype(np.float32) / 255.0).unsqueeze(0)
def composite(self, overlay_image, background_image, opacity=1.0, feather_type="None", edge_radius=0, shape_radius=0, overlay_mask=None, unique_id=None):
def composite(self, overlay_image, background_image, opacity=1.0, feather_type="None", blur_radius=50, blur_hardness=0, overlay_mask=None, unique_id=None):
unique_id = str(unique_id) if unique_id is not None else "unknown"
if overlay_image.numel() == 0 or background_image.numel() == 0:
return (background_image,)
if overlay_image.numel() == 0 or background_image.numel() == 0: return (background_image,)
h, w = overlay_image.shape[1], overlay_image.shape[2]
if h < 8 or w < 8:
return (background_image,)
if h < 8 or w < 8: return (background_image,)
TRANSFORM_CACHE.pop(unique_id, None)
bg_pil = self.tensor2pil(background_image)
@@ -191,38 +178,27 @@ class RSCollage:
def apply_transforms(data):
rx = bg_w/2 if data.get("x") is None else float(data.get("x"))
ry = bg_h/2 if data.get("y") is None else float(data.get("y"))
sc_x = float(data.get("scale_x") or 1.0)
sc_y = float(data.get("scale_y") or 1.0)
rot = float(data.get("rotation") or 0)
fh = bool(data.get("flip_h"))
fv = bool(data.get("flip_v"))
op = float(data.get("opacity") or opacity)
ft = data.get("feather_type") or feather_type
er = int(data.get("edge_radius") or edge_radius)
sr = int(data.get("shape_radius") or shape_radius)
br = int(data.get("blur_radius") or blur_radius)
bh = int(data.get("blur_hardness") or blur_hardness)
fcx = float(data.get("feather_center_x") or 0.5)
fcy = float(data.get("feather_center_y") or 0.5)
rc = rot if (fh != fv) else -rot
ov = ov_pil
if sc_x != 1.0 or sc_y != 1.0:
new_w = max(1, int(ov.width * sc_x))
new_h = max(1, int(ov.height * sc_y))
ov = ov.resize((new_w, new_h), Image.Resampling.LANCZOS)
if rc != 0:
ov = ov.rotate(rc, expand=True, resample=Image.Resampling.BICUBIC, center=(ov.width//2, ov.height//2))
ov = self.remove_black_corners(ov)
if sc_x != 1.0 or sc_y != 1.0: ov = ov.resize((max(1, int(ov.width * sc_x)), max(1, int(ov.height * sc_y))), Image.Resampling.LANCZOS)
if rc != 0: ov = ov.rotate(rc, expand=True, resample=Image.Resampling.BICUBIC, center=(ov.width//2, ov.height//2)); ov = self.remove_black_corners(ov)
if fh: ov = ImageOps.mirror(ov)
if fv: ov = ImageOps.flip(ov)
if ft == "Radial Out" and er > 0: ov = self.apply_radial_feather(ov, er, fcx, fcy, invert=False)
elif ft == "Radial In" and er > 0: ov = self.apply_radial_feather(ov, er, fcx, fcy, invert=True)
elif ft == "Edge" and er > 0: ov = self.apply_edge_feather(ov, er)
elif ft == "Shape" and sr > 0: ov = self.apply_shape_feather(ov, sr)
if "Radial Blur" in ft and br > 0: ov = self.apply_radial_feather(ov, br, bh, fcx, fcy, invert="Out" in ft)
elif "Ellipse Blur" in ft and br > 0: ov = self.apply_ellipse_feather(ov, br, bh, fcx, fcy, invert="Out" in ft)
if op < 1.0:
r,g,b,a = ov.split()
@@ -236,27 +212,25 @@ class RSCollage:
td = folder_paths.get_temp_directory()
for f in os.listdir(td):
if f.startswith(f"rs_collage_{unique_id}_"):
try: os.remove(os.path.join(td, f))
except: pass
try:
os.remove(os.path.join(td, f))
except:
pass
bfn = f"rs_collage_{unique_id}_{ts}_bg.png"
ofn = f"rs_collage_{unique_id}_{ts}_ov.png"
bg_pil.save(os.path.join(td, bfn))
ov_pil.save(os.path.join(td, ofn))
PENDING_TRANSFORMS[unique_id] = {"status": "pending"}
PromptServer.instance.send_sync("rs-collage-start", {
"id": unique_id, "bg_file": bfn, "ov_file": ofn, "bg_width": bg_w, "bg_height": bg_h,
"ov_width": ov_pil.width, "ov_height": ov_pil.height, "timestamp": ts,
"opacity": opacity, "feather_type": feather_type, "edge_radius": edge_radius, "shape_radius": shape_radius
"opacity": opacity, "feather_type": feather_type, "blur_radius": blur_radius, "blur_hardness": blur_hardness
})
print(f"[RS Collage] Node {unique_id} waiting for user input (Apply/Cancel)...")
while unique_id not in TRANSFORM_CACHE:
time.sleep(0.2)
if unique_id in PENDING_TRANSFORMS:
if PENDING_TRANSFORMS[unique_id].get("status") == "cancelled":
print(f"[RS Collage] Cancelled by user for node {unique_id}")
@@ -266,11 +240,11 @@ class RSCollage:
print(f"[RS Collage] Input received for node {unique_id}")
PENDING_TRANSFORMS.pop(unique_id, None)
result = apply_transforms(TRANSFORM_CACHE.pop(unique_id))
for f in [bfn, ofn]:
try: os.remove(os.path.join(td, f))
except: pass
try:
os.remove(os.path.join(td, f))
except:
pass
return (result,)
@classmethod
__init__.py
+1 -1
View File
@@ -29,7 +29,7 @@ IGNORED_MODULES: Set[str] = {'__init__.py'}
REQUIRED_MODULES: Set[str] = set()
PACKAGE_DISPLAY_NAME = "ComfyUI_RaykoStudio"
__version__ = "0.19.0"
__version__ = "0.20.0"
def load_modules():
print(f"🦊 {PACKAGE_DISPLAY_NAME}: Version: {__version__}")
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "ComfyUI_RaykoStudio",
"version": "0.19.0",
"version": "0.20.0",
"description": "Set of custom nodes for ComfyUI providing additional image processing capabilities",
"author": "Raykosan",
"license": "Apache License 2.0",
pyproject.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[project]
name = "ComfyUI_RaykoStudio"
description = "Set of custom nodes for ComfyUI providing additional image processing capabilities"
version = "0.19.0"
version = "0.20.0"
license = { file = "LICENSE" }
dependencies = ["torch>=1.7.0", "numpy>=1.19.0", "Pillow>=8.0.0", "freetype-py>=2.5.1"]
web/rs_collage.js
+565 -353
View File
File diff suppressed because it is too large Load Diff