Add new image and file handling utilities
Introduced helper functions and nodes for loading and saving images, masks, and text files with enhanced functionality. These include handling RGB/RGBA formats, creating greyscale and alpha-based masks, and supporting directory creation and encoding options during file save operations.
This commit is contained in:
@@ -15,6 +15,73 @@ except:
|
||||
ComfyNodeABC = object
|
||||
|
||||
|
||||
# helper functions:
|
||||
|
||||
def load_image_helper(path: str):
|
||||
"""Helper function to load an image from a path"""
|
||||
from PIL import Image, ImageOps
|
||||
try:
|
||||
import pillow_jxl
|
||||
except ModuleNotFoundError:
|
||||
pass
|
||||
|
||||
if not os.path.exists(path):
|
||||
raise FileNotFoundError(f"Basic data handling: Image file not found: {path}")
|
||||
|
||||
# Open and process the image
|
||||
img = Image.open(path)
|
||||
img = ImageOps.exif_transpose(img)
|
||||
|
||||
return img
|
||||
|
||||
|
||||
def extract_mask_from_alpha(img):
|
||||
"""Extract a mask from the alpha channel of an image"""
|
||||
import numpy as np
|
||||
import torch
|
||||
|
||||
if 'A' in img.getbands():
|
||||
alpha = np.array(img.getchannel('A')).astype(np.float32) / 255.0
|
||||
mask_tensor = 1.0 - torch.from_numpy(alpha)
|
||||
elif img.mode == 'P' and 'transparency' in img.info:
|
||||
alpha = np.array(img.convert('RGBA').getchannel('A')).astype(np.float32) / 255.0
|
||||
mask_tensor = 1.0 - torch.from_numpy(alpha)
|
||||
else:
|
||||
# Create a blank mask if no alpha channel
|
||||
mask_tensor = torch.zeros((img.height, img.width), dtype=torch.float32)
|
||||
|
||||
# Add batch dimension to mask
|
||||
mask_tensor = mask_tensor.unsqueeze(0)
|
||||
|
||||
return mask_tensor
|
||||
|
||||
|
||||
def extract_mask_from_greyscale(img):
|
||||
"""Extract a mask from a greyscale image or the red channel of an RGB image"""
|
||||
import numpy as np
|
||||
import torch
|
||||
|
||||
if img.mode == 'L':
|
||||
# Image is already greyscale
|
||||
gray = np.array(img).astype(np.float32) / 255.0
|
||||
elif img.mode == 'RGB' or img.mode == 'RGBA':
|
||||
# Use the red channel of RGB or RGBA
|
||||
gray = np.array(img.getchannel('R')).astype(np.float32) / 255.0
|
||||
else:
|
||||
# Convert to greyscale if it's another format
|
||||
gray_img = img.convert('L')
|
||||
gray = np.array(gray_img).astype(np.float32) / 255.0
|
||||
|
||||
# Convert to tensor and invert (white pixels in image = transparent in mask)
|
||||
mask_tensor = 1.0 - torch.from_numpy(gray)
|
||||
|
||||
# Add batch dimension
|
||||
mask_tensor = mask_tensor.unsqueeze(0)
|
||||
|
||||
return mask_tensor
|
||||
|
||||
# the nodes:
|
||||
|
||||
class PathAbspath(ComfyNodeABC):
|
||||
"""
|
||||
Returns the absolute path of a file or directory.
|
||||
@@ -271,6 +338,35 @@ class PathGlob(ComfyNodeABC):
|
||||
FUNCTION = "glob_paths"
|
||||
OUTPUT_IS_LIST = (True,)
|
||||
|
||||
# Class variable to store the last matched paths
|
||||
_last_matched_paths = {}
|
||||
|
||||
@classmethod
|
||||
def IS_CHANGED(s, pattern: str, recursive: bool = False):
|
||||
# Get current paths
|
||||
current_paths = glob.glob(pattern, recursive=recursive)
|
||||
|
||||
# Create a key for this specific pattern and recursive setting
|
||||
key = f"{pattern}_{recursive}"
|
||||
|
||||
# If we haven't seen this pattern before, store it and trigger recalculation
|
||||
if key not in s._last_matched_paths:
|
||||
s._last_matched_paths[key] = current_paths
|
||||
return float("NaN")
|
||||
|
||||
# Compare with previous paths
|
||||
previous_paths = s._last_matched_paths[key]
|
||||
if previous_paths != current_paths:
|
||||
# Update stored paths and trigger recalculation
|
||||
s._last_matched_paths[key] = current_paths
|
||||
return float("NaN")
|
||||
|
||||
# No changes, return a consistent value
|
||||
import hashlib
|
||||
m = hashlib.md5()
|
||||
m.update(str(current_paths).encode())
|
||||
return m.hexdigest()
|
||||
|
||||
def glob_paths(self, pattern: str, recursive: bool = False) -> tuple[list[str]]:
|
||||
return (glob.glob(pattern, recursive=recursive),)
|
||||
|
||||
@@ -564,6 +660,386 @@ class PathSplitExt(ComfyNodeABC):
|
||||
return os.path.splitext(path)
|
||||
|
||||
|
||||
class PathLoadStringFile(ComfyNodeABC):
|
||||
"""
|
||||
Loads a text file in UTF-8 encoding and returns its content as a STRING
|
||||
without any further processing.
|
||||
"""
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"path": (IO.STRING, {"default": ""}),
|
||||
},
|
||||
}
|
||||
|
||||
RETURN_TYPES = (IO.STRING,)
|
||||
RETURN_NAMES = ("text",)
|
||||
CATEGORY = "Basic/Path"
|
||||
DESCRIPTION = cleandoc(__doc__ or "")
|
||||
FUNCTION = "load_text"
|
||||
|
||||
def load_text(self, path: str):
|
||||
if not os.path.exists(path):
|
||||
raise FileNotFoundError(f"Basic data handling: String file not found: {path}")
|
||||
|
||||
with open(path, "r", encoding="utf-8") as f:
|
||||
text = f.read()
|
||||
return (text,)
|
||||
|
||||
|
||||
class PathLoadImageRGB(ComfyNodeABC):
|
||||
"""
|
||||
Loads an image from a file path and returns only the RGB channels.
|
||||
|
||||
This node loads an image from the specified path and processes it to
|
||||
return only the RGB channels as a tensor, ignoring any alpha channel.
|
||||
"""
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"path": (IO.STRING, {"default": ""}),
|
||||
},
|
||||
}
|
||||
|
||||
RETURN_TYPES = (IO.IMAGE,)
|
||||
RETURN_NAMES = ("image",)
|
||||
CATEGORY = "Basic/Path"
|
||||
DESCRIPTION = cleandoc(__doc__ or "")
|
||||
FUNCTION = "load_image_rgb"
|
||||
|
||||
def load_image_rgb(self, path: str):
|
||||
import numpy as np
|
||||
import torch
|
||||
|
||||
img = load_image_helper(path)
|
||||
|
||||
# Convert to RGB (removing alpha if present)
|
||||
img_rgb = img.convert("RGB")
|
||||
|
||||
# Convert to tensor format expected by ComfyUI
|
||||
image_tensor = np.array(img_rgb).astype(np.float32) / 255.0
|
||||
image_tensor = torch.from_numpy(image_tensor)[None,]
|
||||
|
||||
return (image_tensor,)
|
||||
|
||||
|
||||
class PathLoadImageRGBA(ComfyNodeABC):
|
||||
"""
|
||||
Loads an image from a file path and returns RGB channels and Alpha as a mask.
|
||||
|
||||
This node loads an image from the specified path and processes it to
|
||||
return the RGB channels as a tensor and the Alpha channel as a mask tensor.
|
||||
If the image has no alpha channel, a blank mask is returned.
|
||||
"""
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"path": (IO.STRING, {"default": ""}),
|
||||
},
|
||||
}
|
||||
|
||||
RETURN_TYPES = (IO.IMAGE, IO.MASK)
|
||||
RETURN_NAMES = ("image", "mask")
|
||||
CATEGORY = "Basic/Path"
|
||||
DESCRIPTION = cleandoc(__doc__ or "")
|
||||
FUNCTION = "load_image_rgba"
|
||||
|
||||
def load_image_rgba(self, path: str):
|
||||
import numpy as np
|
||||
import torch
|
||||
|
||||
img = load_image_helper(path)
|
||||
|
||||
# Convert to RGB for the image
|
||||
img_rgb = img.convert("RGB")
|
||||
|
||||
# Convert to tensor format expected by ComfyUI
|
||||
image_tensor = np.array(img_rgb).astype(np.float32) / 255.0
|
||||
image_tensor = torch.from_numpy(image_tensor)[None,]
|
||||
|
||||
# Extract alpha channel as mask
|
||||
mask_tensor = extract_mask_from_alpha(img)
|
||||
|
||||
return (image_tensor, mask_tensor)
|
||||
|
||||
|
||||
class PathLoadMaskFromAlpha(ComfyNodeABC):
|
||||
"""
|
||||
Loads a mask from the alpha channel of an image.
|
||||
|
||||
This node loads an image from the specified path and extracts the alpha
|
||||
channel to use as a mask. If the image has no alpha channel, a blank mask
|
||||
is returned.
|
||||
"""
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"path": (IO.STRING, {"default": ""}),
|
||||
},
|
||||
}
|
||||
|
||||
RETURN_TYPES = (IO.MASK,)
|
||||
RETURN_NAMES = ("mask",)
|
||||
CATEGORY = "Basic/Path"
|
||||
DESCRIPTION = cleandoc(__doc__ or "")
|
||||
FUNCTION = "load_mask_from_alpha"
|
||||
|
||||
def load_mask_from_alpha(self, path: str):
|
||||
img = load_image_helper(path)
|
||||
mask_tensor = extract_mask_from_alpha(img)
|
||||
return (mask_tensor,)
|
||||
|
||||
|
||||
class PathLoadMaskFromGreyscale(ComfyNodeABC):
|
||||
"""
|
||||
Loads a mask from a greyscale image or the red channel of an RGB image.
|
||||
|
||||
This node loads an image from the specified path and creates a mask from it.
|
||||
If the image is greyscale, the intensity is used directly.
|
||||
If the image is RGB, the red channel is used.
|
||||
"""
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"path": (IO.STRING, {"default": ""}),
|
||||
},
|
||||
"optional": {
|
||||
"invert": (IO.BOOLEAN, {"default": False}),
|
||||
},
|
||||
}
|
||||
|
||||
RETURN_TYPES = (IO.MASK,)
|
||||
RETURN_NAMES = ("mask",)
|
||||
CATEGORY = "Basic/Path"
|
||||
DESCRIPTION = cleandoc(__doc__ or "")
|
||||
FUNCTION = "load_mask_from_greyscale"
|
||||
|
||||
def load_mask_from_greyscale(self, path: str, invert: bool = False):
|
||||
img = load_image_helper(path)
|
||||
mask_tensor = extract_mask_from_greyscale(img)
|
||||
|
||||
# Optionally invert the mask (1.0 - mask)
|
||||
if invert:
|
||||
mask_tensor = 1.0 - mask_tensor
|
||||
|
||||
return (mask_tensor,)
|
||||
|
||||
|
||||
class PathSaveStringFile(ComfyNodeABC):
|
||||
"""
|
||||
Saves a string to a text file.
|
||||
|
||||
This node takes a string and saves it to the specified path as a text file.
|
||||
Optionally, you can choose to create the directory if it doesn't exist.
|
||||
"""
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"text": (IO.STRING, {"default": ""}),
|
||||
"path": (IO.STRING, {"default": ""}),
|
||||
},
|
||||
"optional": {
|
||||
"create_dirs": (IO.BOOLEAN, {"default": True}),
|
||||
"encoding": (IO.STRING, {"default": "utf-8"}),
|
||||
}
|
||||
}
|
||||
|
||||
RETURN_TYPES = (IO.STRING, IO.BOOLEAN)
|
||||
RETURN_NAMES = ("path", "success")
|
||||
CATEGORY = "Basic/Path"
|
||||
DESCRIPTION = cleandoc(__doc__ or "")
|
||||
FUNCTION = "save_text"
|
||||
OUTPUT_NODE = True
|
||||
|
||||
def save_text(self, text: str, path: str, create_dirs: bool = True, encoding: str = "utf-8"):
|
||||
if not path:
|
||||
return (path, False)
|
||||
|
||||
try:
|
||||
# Create directories if needed
|
||||
directory = os.path.dirname(path)
|
||||
if directory and create_dirs and not os.path.exists(directory):
|
||||
os.makedirs(directory)
|
||||
|
||||
with open(path, "w", encoding=encoding) as f:
|
||||
f.write(text)
|
||||
|
||||
return (path, True)
|
||||
except Exception as e:
|
||||
print(f"Basic data handling: Error saving text file: {e}")
|
||||
return (path, False)
|
||||
|
||||
|
||||
class PathSaveImageRGB(ComfyNodeABC):
|
||||
"""
|
||||
Saves an image to a file.
|
||||
|
||||
This node takes an image tensor and saves it to the specified path.
|
||||
Supports various image formats like PNG, JPG, WEBP, etc.
|
||||
"""
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"images": (IO.IMAGE,),
|
||||
"path": (IO.STRING, {"default": ""}),
|
||||
},
|
||||
"optional": {
|
||||
"format": (IO.STRING, {"default": "png"}),
|
||||
"quality": (IO.INT, {"default": 95, "min": 1, "max": 100}),
|
||||
"create_dirs": (IO.BOOLEAN, {"default": True}),
|
||||
}
|
||||
}
|
||||
|
||||
RETURN_TYPES = (IO.BOOLEAN)
|
||||
RETURN_NAMES = ("success")
|
||||
CATEGORY = "Basic/Path"
|
||||
DESCRIPTION = cleandoc(__doc__ or "")
|
||||
FUNCTION = "save_image"
|
||||
OUTPUT_NODE = True
|
||||
|
||||
def save_image(self, images, path: str, format: str = "png", quality: int = 95, create_dirs: bool = True):
|
||||
if not path:
|
||||
return (False)
|
||||
|
||||
# If the path doesn't have an extension or it doesn't match the format, add it
|
||||
if not path.lower().endswith(f".{format.lower()}"):
|
||||
path = f"{path}.{format.lower()}"
|
||||
|
||||
try:
|
||||
import numpy as np
|
||||
from PIL import Image
|
||||
|
||||
# Create directories if needed
|
||||
directory = os.path.dirname(path)
|
||||
if directory and create_dirs and not os.path.exists(directory):
|
||||
os.makedirs(directory)
|
||||
|
||||
# Convert from tensor format back to PIL Image
|
||||
# Extract the first image from the batch
|
||||
i = 0
|
||||
img_tensor = images[i].cpu().numpy()
|
||||
|
||||
# Convert to uint8 format for PIL
|
||||
img_np = (img_tensor * 255).astype(np.uint8)
|
||||
|
||||
# Create PIL image
|
||||
pil_img = Image.fromarray(img_np)
|
||||
|
||||
# Save the image
|
||||
if format.lower() == "jpg" or format.lower() == "jpeg":
|
||||
pil_img.save(path, format="JPEG", quality=quality)
|
||||
elif format.lower() == "webp":
|
||||
pil_img.save(path, format="WEBP", quality=quality)
|
||||
else:
|
||||
pil_img.save(path, format=format.upper())
|
||||
|
||||
return (True)
|
||||
except Exception as e:
|
||||
print(f"Basic data handling: Error saving image: {e}")
|
||||
return (False)
|
||||
|
||||
|
||||
class PathSaveImageRGBA(ComfyNodeABC):
|
||||
"""
|
||||
Saves an image with a mask to a file with transparency.
|
||||
|
||||
This node takes an image tensor and a mask tensor and saves them to the
|
||||
specified path as an image with transparency, where the mask defines the
|
||||
alpha channel.
|
||||
"""
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls):
|
||||
return {
|
||||
"required": {
|
||||
"images": (IO.IMAGE,),
|
||||
"mask": (IO.MASK,),
|
||||
"path": (IO.STRING, {"default": ""}),
|
||||
},
|
||||
"optional": {
|
||||
"format": (IO.STRING, {"default": "png"}),
|
||||
"quality": (IO.INT, {"default": 95, "min": 1, "max": 100}),
|
||||
"invert_mask": (IO.BOOLEAN, {"default": False}),
|
||||
"create_dirs": (IO.BOOLEAN, {"default": True}),
|
||||
}
|
||||
}
|
||||
|
||||
RETURN_TYPES = (IO.BOOLEAN)
|
||||
RETURN_NAMES = ("success")
|
||||
CATEGORY = "Basic/Path"
|
||||
DESCRIPTION = cleandoc(__doc__ or "")
|
||||
FUNCTION = "save_image_with_mask"
|
||||
OUTPUT_NODE = True
|
||||
|
||||
def save_image_with_mask(self, images, mask, path: str, format: str = "png",
|
||||
quality: int = 95, invert_mask: bool = False,
|
||||
create_dirs: bool = True):
|
||||
if not path:
|
||||
return (False)
|
||||
|
||||
# Check format compatibility - needs to support alpha channel
|
||||
if format.lower() in ["jpg", "jpeg"]:
|
||||
print("Basic data handling: JPEG format doesn't support transparency. Using PNG instead.")
|
||||
format = "png"
|
||||
|
||||
# If the path doesn't have an extension or it doesn't match the format, add it
|
||||
if not path.lower().endswith(f".{format.lower()}"):
|
||||
path = f"{path}.{format.lower()}"
|
||||
|
||||
try:
|
||||
import numpy as np
|
||||
import torch
|
||||
from PIL import Image
|
||||
|
||||
# Create directories if needed
|
||||
directory = os.path.dirname(path)
|
||||
if directory and create_dirs and not os.path.exists(directory):
|
||||
os.makedirs(directory)
|
||||
|
||||
# Convert from tensor format back to PIL Image
|
||||
# Extract the first image from the batch
|
||||
i = 0
|
||||
img_tensor = images[i].cpu().numpy()
|
||||
mask_tensor = mask[i].cpu()
|
||||
|
||||
# Invert the mask if needed (1.0 becomes transparent, 0.0 becomes opaque)
|
||||
if invert_mask:
|
||||
mask_tensor = 1.0 - mask_tensor
|
||||
|
||||
# Convert to alpha channel (0-255)
|
||||
alpha_np = (255.0 * (1.0 - mask_tensor.numpy())).astype(np.uint8)
|
||||
|
||||
# Convert to uint8 format for PIL
|
||||
img_np = (img_tensor * 255).astype(np.uint8)
|
||||
|
||||
# Create PIL image (RGB)
|
||||
pil_img = Image.fromarray(img_np)
|
||||
|
||||
# Create alpha channel image
|
||||
alpha_img = Image.fromarray(alpha_np, mode='L')
|
||||
|
||||
# Convert to RGBA and add alpha channel
|
||||
pil_img_rgba = pil_img.convert("RGBA")
|
||||
pil_img_rgba.putalpha(alpha_img)
|
||||
|
||||
# Save the image
|
||||
if format.lower() == "webp":
|
||||
pil_img_rgba.save(format="WEBP", quality=quality)
|
||||
else:
|
||||
pil_img_rgba.save(format=format.upper())
|
||||
|
||||
return (True)
|
||||
except Exception as e:
|
||||
print(f"Basic data handling: Error saving image with mask: {e}")
|
||||
return (False)
|
||||
|
||||
|
||||
NODE_CLASS_MAPPINGS = {
|
||||
"Basic data handling: PathAbspath": PathAbspath,
|
||||
"Basic data handling: PathBasename": PathBasename,
|
||||
@@ -585,6 +1061,14 @@ NODE_CLASS_MAPPINGS = {
|
||||
"Basic data handling: PathRelative": PathRelative,
|
||||
"Basic data handling: PathSplit": PathSplit,
|
||||
"Basic data handling: PathSplitExt": PathSplitExt,
|
||||
"Basic data handling: PathLoadStringFile": PathLoadStringFile,
|
||||
"Basic data handling: PathLoadImageRGB": PathLoadImageRGB,
|
||||
"Basic data handling: PathLoadImageRGBA": PathLoadImageRGBA,
|
||||
"Basic data handling: PathLoadMaskFromAlpha": PathLoadMaskFromAlpha,
|
||||
"Basic data handling: PathLoadMaskFromGreyscale": PathLoadMaskFromGreyscale,
|
||||
"Basic data handling: PathSaveStringFile": PathSaveStringFile,
|
||||
"Basic data handling: PathSaveImageRGB": PathSaveImageRGB,
|
||||
"Basic data handling: PathSaveImageRGBA": PathSaveImageRGBA,
|
||||
}
|
||||
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
@@ -608,4 +1092,12 @@ NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
"Basic data handling: PathRelative": "relative",
|
||||
"Basic data handling: PathSplit": "split",
|
||||
"Basic data handling: PathSplitExt": "splitext",
|
||||
"Basic data handling: PathLoadStringFile": "load STRING from file",
|
||||
"Basic data handling: PathLoadImageRGB": "load IMAGE from file (RGB)",
|
||||
"Basic data handling: PathLoadImageRGBA": "load IMAGE+MASK from file (RGBA)",
|
||||
"Basic data handling: PathLoadMaskFromAlpha": "load MASK from alpha channel",
|
||||
"Basic data handling: PathLoadMaskFromGreyscale": "load MASK from greyscale/red",
|
||||
"Basic data handling: PathSaveStringFile": "save STRING to file",
|
||||
"Basic data handling: PathSaveImageRGB": "save IMAGE to file",
|
||||
"Basic data handling: PathSaveImageRGBA": "save IMAGE+MASK to file",
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user