diff --git a/__init__.py b/__init__.py index 7415135..5599c0a 100644 --- a/__init__.py +++ b/__init__.py @@ -19,13 +19,14 @@ import sys from pathlib import Path # Ensure this custom-node directory is on sys.path so that the sub-packages -# 'nodes' and 'utils' are importable regardless of ComfyUI's working directory. +# 'ri_nodes' and 'ri_utils' are importable regardless of ComfyUI's cwd. +# We use the prefix 'ri_' to avoid colliding with ComfyUI's own 'nodes.py'. _HERE = Path(__file__).parent.resolve() if str(_HERE) not in sys.path: sys.path.insert(0, str(_HERE)) -from nodes.rotate_image import RotateImage # noqa: E402 -from nodes.restore_rotated import RestoreRotatedImage # noqa: E402 +from ri_nodes.rotate_image import RotateImage # noqa: E402 +from ri_nodes.restore_rotated import RestoreRotatedImage # noqa: E402 # --------------------------------------------------------------------------- # ComfyUI node registration diff --git a/nodes/__init__.py b/ri_nodes/__init__.py similarity index 70% rename from nodes/__init__.py rename to ri_nodes/__init__.py index 510ff8b..1d0031a 100644 --- a/nodes/__init__.py +++ b/ri_nodes/__init__.py @@ -1,4 +1,4 @@ -# Nodes package for rotate-image ComfyUI custom nodes +# ri_nodes package for rotate-image ComfyUI custom nodes from .rotate_image import RotateImage from .restore_rotated import RestoreRotatedImage diff --git a/nodes/restore_rotated.py b/ri_nodes/restore_rotated.py similarity index 99% rename from nodes/restore_rotated.py rename to ri_nodes/restore_rotated.py index 932da62..c601f52 100644 --- a/nodes/restore_rotated.py +++ b/ri_nodes/restore_rotated.py @@ -13,7 +13,7 @@ from typing import Optional, Tuple import torch -from utils.rotation import ( +from ri_utils.rotation import ( DEFAULT_INTERPOLATION, INTERPOLATION_METHODS, center_crop, diff --git a/nodes/rotate_image.py b/ri_nodes/rotate_image.py similarity index 99% rename from nodes/rotate_image.py rename to ri_nodes/rotate_image.py index e11cb90..b0edac2 100644 --- a/nodes/rotate_image.py +++ b/ri_nodes/rotate_image.py @@ -11,7 +11,7 @@ from typing import Optional, Tuple import torch -from utils.rotation import ( +from ri_utils.rotation import ( DEFAULT_INTERPOLATION, INTERPOLATION_METHODS, center_crop, diff --git a/utils/__init__.py b/ri_utils/__init__.py similarity index 86% rename from utils/__init__.py rename to ri_utils/__init__.py index b208061..f60e545 100644 --- a/utils/__init__.py +++ b/ri_utils/__init__.py @@ -1,4 +1,4 @@ -# Utils package for rotate-image ComfyUI custom nodes +# ri_utils package for rotate-image ComfyUI custom nodes from .rotation import ( INTERPOLATION_METHODS, rotate_pil_image, diff --git a/utils/rotation.py b/ri_utils/rotation.py similarity index 100% rename from utils/rotation.py rename to ri_utils/rotation.py