Merge pull request #18 from ryanontheinside/fix/base-nodes-to-src

fix: moves base nodes to src folder

__init__.py

@@ -40,7 +40,7 @@ def load_nodes_from_directory(package_path):
                         # Check if it's a ComfyUI node (heuristic: has INPUT_TYPES)
                         if hasattr(obj, "INPUT_TYPES") and callable(obj.INPUT_TYPES):
                             # Exclude base classes/mixins if they are explicitly named or lack a CATEGORY
-                            if not name.endswith("Base") and not name.endswith("Mixin") and hasattr(obj, "CATEGORY"):
+                            if "Base" not in name and not name.endswith("Mixin") and hasattr(obj, "CATEGORY"):
                                 loaded_nodes[name] = obj
 
                                 # Generate display name (similar to original logic)

node_wrappers/mediapipe_vision/face/detection/face_detection.py

@@ -3,8 +3,8 @@ import logging
 import torch
 
 from .....src.mediapipe_vision.face_detection.detector import FaceDetector
-from ...common.base_detector_node import BaseMediaPipeDetectorNode
-from ...common.model_loader import MediaPipeModelLoaderBaseNode
+from .....src.mediapipe_vision.common.base_detector_node import BaseMediaPipeDetectorNode
+from .....src.mediapipe_vision.common.model_loader import MediaPipeModelLoaderBaseNode
 
 logger = logging.getLogger(__name__)
 _category = "Realtime Nodes/MediaPipe Vision/Face/FaceDetection"

node_wrappers/mediapipe_vision/face/detection/face_detection_visualization.py

@@ -3,7 +3,7 @@ import logging
 
 import cv2
 
-from ...common.base_visualization_nodes import BaseDetectionVisualizationNode
+from .....src.mediapipe_vision.common.base_visualization_nodes import BaseDetectionVisualizationNode
 
 logger = logging.getLogger(__name__)
 

node_wrappers/mediapipe_vision/face/landmark/face_landmark_detection.py

@@ -5,10 +5,10 @@ import logging
 import torch
 
 from .....src.mediapipe_vision.face_landmark.detector import FaceLandmarkDetector
-from ...common.base_detector_node import BaseMediaPipeDetectorNode
+from .....src.mediapipe_vision.common.base_detector_node import BaseMediaPipeDetectorNode
 
 # Import Base Classes
-from ...common.model_loader import MediaPipeModelLoaderBaseNode
+from .....src.mediapipe_vision.common.model_loader import MediaPipeModelLoaderBaseNode
 
 logger = logging.getLogger(__name__)
 

node_wrappers/mediapipe_vision/face/landmark/face_landmark_detection_visualization.py

@@ -4,7 +4,7 @@ from typing import Any, List, Optional
 
 import mediapipe as mp
 
-from ...common.base_visualization_nodes import BaseLandmarkVisualizationNode
+from .....src.mediapipe_vision.common.base_visualization_nodes import BaseLandmarkVisualizationNode
 
 logger = logging.getLogger(__name__)
 

node_wrappers/mediapipe_vision/face/stylization/face_stylization.py

@@ -5,7 +5,7 @@ import torch
 from .....src.mediapipe_vision.face_stylization.detector import FaceStylizer
 
 # Import Base Loader and Detector
-from ...common.model_loader import MediaPipeModelLoaderBaseNode
+from .....src.mediapipe_vision.common.model_loader import MediaPipeModelLoaderBaseNode
 
 logger = logging.getLogger(__name__)
 _category = "Realtime Nodes/MediaPipe Vision/Face/FaceStylization"
@@ -86,7 +86,7 @@ class MediaPipeFaceStylizerNode:
 
 # --- Mappings ---
 NODE_CLASS_MAPPINGS = {
-    "MediaPipeFaceStylizerModelLoader": MediaPipeFaceStylizerModelLoaderNode,
+    "MediaPipeFaceStylizerModelLoader": MediaPipeFaceStylizerModelLoaderNode, 
     "MediaPipeFaceStylizer": MediaPipeFaceStylizerNode,
 }
 

node_wrappers/mediapipe_vision/hand/gesture/gesture_visualiztion.py

@@ -3,7 +3,7 @@ import logging
 
 import cv2
 
-from ...common.base_visualization_nodes import BaseDetectionVisualizationNode
+from .....src.mediapipe_vision.common.base_visualization_nodes import BaseDetectionVisualizationNode
 
 logger = logging.getLogger(__name__)
 

node_wrappers/mediapipe_vision/hand/gesture/guesture.py

@@ -3,10 +3,10 @@ import logging
 import torch
 
 from .....src.mediapipe_vision.gesture_recognition.detector import GestureRecognizer
-from ...common.base_detector_node import BaseMediaPipeDetectorNode
+from .....src.mediapipe_vision.common.base_detector_node import BaseMediaPipeDetectorNode
 
 # Import Base Loader and Detector
-from ...common.model_loader import MediaPipeModelLoaderBaseNode
+from .....src.mediapipe_vision.common.model_loader import MediaPipeModelLoaderBaseNode
 
 logger = logging.getLogger(__name__)
 _category = "Realtime Nodes/MediaPipe Vision/Hand/GestureRecognition"

node_wrappers/mediapipe_vision/hand/landmark/hand_landmark.py

@@ -3,8 +3,8 @@ import logging
 import torch
 
 from .....src.mediapipe_vision.hand_landmark.detector import HandLandmarkDetector
-from ...common.base_detector_node import BaseMediaPipeDetectorNode
-from ...common.model_loader import MediaPipeModelLoaderBaseNode
+from .....src.mediapipe_vision.common.base_detector_node import BaseMediaPipeDetectorNode
+from .....src.mediapipe_vision.common.model_loader import MediaPipeModelLoaderBaseNode
 
 logger = logging.getLogger(__name__)
 

node_wrappers/mediapipe_vision/hand/landmark/hand_landmark_visualization.py

@@ -4,7 +4,7 @@ from typing import Any, List, Optional
 
 import mediapipe as mp
 
-from ...common.base_visualization_nodes import BaseLandmarkVisualizationNode
+from .....src.mediapipe_vision.common.base_visualization_nodes import BaseLandmarkVisualizationNode
 
 logger = logging.getLogger(__name__)
 _category = "Realtime Nodes/MediaPipe Vision/Hand/HandLandmark/Visualization"

node_wrappers/mediapipe_vision/holistic/holistic_landmark.py

@@ -3,7 +3,7 @@ import logging
 import torch
 
 from ....src.mediapipe_vision.holistic_landmark.detector import HolisticLandmarkDetector
-from ..common.base_detector_node import BaseMediaPipeDetectorNode
+from ....src.mediapipe_vision.common.base_detector_node import BaseMediaPipeDetectorNode
 
 logger = logging.getLogger(__name__)
 _category = "Realtime Nodes/MediaPipe Vision/Holistic"

node_wrappers/mediapipe_vision/image_embedding/image_embeddings.py

@@ -3,10 +3,10 @@ import logging
 import torch
 
 from ....src.mediapipe_vision.image_embedding.detector import ImageEmbedder
-from ..common.base_detector_node import BaseMediaPipeDetectorNode
+from ....src.mediapipe_vision.common.base_detector_node import BaseMediaPipeDetectorNode
 
 # Import Base Loader and Detector
-from ..common.model_loader import MediaPipeModelLoaderBaseNode
+from ....src.mediapipe_vision.common.model_loader import MediaPipeModelLoaderBaseNode
 
 logger = logging.getLogger(__name__)
 _category = "Realtime Nodes/MediaPipe Vision/ImageEmbedding"

node_wrappers/mediapipe_vision/image_segmentation/image_segmentation.py

@@ -8,10 +8,10 @@ import torch
 
 # Imports from this project
 from ....src.mediapipe_vision.image_segmentation.segmenter import ImageSegmenter
-from ..common.base_detector_node import BaseMediaPipeDetectorNode
+from ....src.mediapipe_vision.common.base_detector_node import BaseMediaPipeDetectorNode
 
 # Import Base Classes
-from ..common.model_loader import MediaPipeModelLoaderBaseNode
+from ....src.mediapipe_vision.common.model_loader import MediaPipeModelLoaderBaseNode
 
 logger = logging.getLogger(__name__)
 

node_wrappers/mediapipe_vision/interactive_segmentation/interactive_segmentation.py

@@ -9,7 +9,7 @@ from ....src.mediapipe_vision.interactive_segmentation.detector import (
 from ....src.mediapipe_vision.types import PointOfInterest
 
 # Import Base Loader and Detector
-from ..common.model_loader import MediaPipeModelLoaderBaseNode
+from ....src.mediapipe_vision.common.model_loader import MediaPipeModelLoaderBaseNode
 
 logger = logging.getLogger(__name__)
 _category = "Realtime Nodes/MediaPipe Vision/InteractiveSegmentation"

node_wrappers/mediapipe_vision/object_detection/object_detection.py

@@ -3,8 +3,8 @@ import logging
 import torch
 
 from ....src.mediapipe_vision.object_detection.detector import ObjectDetector
-from ..common.base_detector_node import BaseMediaPipeDetectorNode
-from ..common.model_loader import MediaPipeModelLoaderBaseNode
+from ....src.mediapipe_vision.common.base_detector_node import BaseMediaPipeDetectorNode
+from ....src.mediapipe_vision.common.model_loader import MediaPipeModelLoaderBaseNode
 
 logger = logging.getLogger(__name__)
 _category = "Realtime Nodes/MediaPipe Vision/ObjectDetection"

node_wrappers/mediapipe_vision/object_detection/object_detection_visualization.py

@@ -3,7 +3,7 @@ import logging
 
 import cv2
 
-from ..common.base_visualization_nodes import BaseDetectionVisualizationNode
+from ....src.mediapipe_vision.common.base_visualization_nodes import BaseDetectionVisualizationNode
 
 logger = logging.getLogger(__name__)
 _category = "Realtime Nodes/MediaPipe Vision/ObjectDetection/Visualization"

node_wrappers/mediapipe_vision/pose/pose_landmark.py

@@ -3,8 +3,8 @@ import logging
 import torch
 
 from ....src.mediapipe_vision.pose_landmark.detector import PoseLandmarkDetector
-from ..common.base_detector_node import BaseMediaPipeDetectorNode
-from ..common.model_loader import MediaPipeModelLoaderBaseNode
+from ....src.mediapipe_vision.common.base_detector_node import BaseMediaPipeDetectorNode
+from ....src.mediapipe_vision.common.model_loader import MediaPipeModelLoaderBaseNode
 
 logger = logging.getLogger(__name__)
 _category = "Realtime Nodes/MediaPipe Vision/Pose"
@@ -39,7 +39,7 @@ class MediaPipePoseLandmarkerNode(BaseMediaPipeDetectorNode):
     @classmethod
     def INPUT_TYPES(cls):
         # Start with the base inputs from the parent class
-        inputs = super().INPUT_TYPES()
+        inputs = super().INPUT_TYPES() 
 
         # Add pose-specific parameters
         inputs["required"].update(

node_wrappers/mediapipe_vision/pose/pose_landmark_visualizer.py

@@ -4,7 +4,7 @@ from typing import Any, List, Optional
 
 import mediapipe as mp
 
-from ..common.base_visualization_nodes import BaseLandmarkVisualizationNode
+from ....src.mediapipe_vision.common.base_visualization_nodes import BaseLandmarkVisualizationNode
 
 logger = logging.getLogger(__name__)
 _category = "Realtime Nodes/MediaPipe Vision/Pose/Visualization"

src/mediapipe_vision/common/base_visualization_nodes.py

@@ -3,7 +3,7 @@ from typing import Any, List, Optional
 
 import cv2
 
-from ....src.utils.image import convert_to_cv2, convert_to_tensor
+from ...utils.image import convert_to_cv2, convert_to_tensor
 
 logger = logging.getLogger(__name__)
 

src/mediapipe_vision/common/model_loader.py

@@ -5,7 +5,7 @@ import logging
 import traceback  # For better error logging
 
 # Add import for MEDIAPIPE_MODELS dictionary and the get_model_description function
-from ....src.mediapipe_vision.model_loader import (
+from ..model_loader import (
     MediaPipeModelLoader,
     get_available_models,
     get_model_description,