fix: within-library imports and SegmentationMasksSAM reference (#165)

* remove SegmentationMasksSAM message reference * change within-library imports from relative to absolute --------- Co-authored-by: klemen1999 <[email protected]>
luxonis · Jan 30, 2025 · 8543f4b · 8543f4b
1 parent 6cce15b
commit 8543f4b
Show file tree

Hide file tree

Showing 40 changed files with 98 additions and 95 deletions.
diff --git a/depthai_nodes/ml/helpers/tiles_patcher.py b/depthai_nodes/ml/helpers/tiles_patcher.py
@@ -2,8 +2,8 @@
 
 import depthai as dai
 
-from .tiling import Tiling
-from .utils.nms import nms_detections
+from depthai_nodes.ml.helpers.tiling import Tiling
+from depthai_nodes.ml.helpers.utils.nms import nms_detections
 
 
 class TilesPatcher(dai.node.HostNode):

diff --git a/depthai_nodes/ml/helpers/tiling.py b/depthai_nodes/ml/helpers/tiling.py
@@ -4,7 +4,7 @@
 import depthai as dai
 import numpy as np
 
-from .utils.to_planar import to_planar
+from depthai_nodes.ml.helpers.utils.to_planar import to_planar
 
 
 class Tiling(dai.node.HostNode):

diff --git a/depthai_nodes/ml/messages/README.md b/depthai_nodes/ml/messages/README.md
@@ -31,8 +31,6 @@ Here are the custom message types that we introduce in this package. They are us
     - [Attributes](#attributes-11)
   - [SegmentationMask](#segmentationmask)
     - [Attributes](#attributes-12)
-  - [SegmentationMasksSAM](#segmentationmaskssam)
-    - [Attributes](#attributes-13)
 
 ## Classifications
 
@@ -150,11 +148,3 @@ SegmentationMask class for a single- or multi-object segmentation mask. Backgrou
 ### Attributes
 
 - **mask** (NDArray\[np.int16\]): Segmentation mask.
-
-## SegmentationMasksSAM
-
-SegmentationMasksSAM class for storing segmentation masks.
-
-### Attributes
-
-- **masks** (np.ndarray): Mask coefficients.
diff --git a/depthai_nodes/ml/messages/creators/classification.py b/depthai_nodes/ml/messages/creators/classification.py
@@ -2,7 +2,7 @@
 
 import numpy as np
 
-from ...messages import Classifications
+from depthai_nodes.ml.messages import Classifications
 
 
 def create_classification_message(

diff --git a/depthai_nodes/ml/messages/creators/clusters.py b/depthai_nodes/ml/messages/creators/clusters.py
@@ -2,7 +2,7 @@
 
 import depthai as dai
 
-from ...messages import Cluster, Clusters
+from depthai_nodes.ml.messages import Cluster, Clusters
 
 
 def create_cluster_message(clusters: List[List[List[Union[float, int]]]]) -> Clusters:

diff --git a/depthai_nodes/ml/messages/creators/detection.py b/depthai_nodes/ml/messages/creators/detection.py
@@ -1,13 +1,13 @@
 import depthai as dai
 import numpy as np
 
-from ...messages import (
+from depthai_nodes.ml.messages import (
     ImgDetectionExtended,
     ImgDetectionsExtended,
     Line,
     Lines,
 )
-from ...parsers.utils import transform_to_keypoints
+from depthai_nodes.ml.parsers.utils import transform_to_keypoints
 
 
 def create_detection_message(

diff --git a/depthai_nodes/ml/messages/creators/keypoints.py b/depthai_nodes/ml/messages/creators/keypoints.py
@@ -2,7 +2,7 @@
 
 import numpy as np
 
-from ...messages import Keypoint, Keypoints
+from depthai_nodes.ml.messages import Keypoint, Keypoints
 
 
 def create_keypoints_message(

diff --git a/depthai_nodes/ml/messages/creators/map.py b/depthai_nodes/ml/messages/creators/map.py
@@ -1,6 +1,6 @@
 import numpy as np
 
-from ...messages import Map2D
+from depthai_nodes.ml.messages import Map2D
 
 
 def create_map_message(map: np.ndarray, min_max_scaling: bool = False) -> Map2D:

diff --git a/depthai_nodes/ml/messages/creators/regression.py b/depthai_nodes/ml/messages/creators/regression.py
@@ -1,6 +1,6 @@
 from typing import List
 
-from ...messages import Prediction, Predictions
+from depthai_nodes.ml.messages import Prediction, Predictions
 
 
 def create_regression_message(predictions: List[float]) -> Predictions:

diff --git a/depthai_nodes/ml/messages/creators/segmentation.py b/depthai_nodes/ml/messages/creators/segmentation.py
@@ -1,6 +1,6 @@
 import numpy as np
 
-from ...messages import SegmentationMask
+from depthai_nodes.ml.messages import SegmentationMask
 
 
 def create_segmentation_message(mask: np.ndarray) -> SegmentationMask:

diff --git a/depthai_nodes/ml/messages/img_detections.py b/depthai_nodes/ml/messages/img_detections.py
@@ -10,9 +10,8 @@
     OUTLINE_COLOR,
     TEXT_COLOR,
 )
-
-from .keypoints import Keypoint
-from .segmentation import SegmentationMask
+from depthai_nodes.ml.messages.keypoints import Keypoint
+from depthai_nodes.ml.messages.segmentation import SegmentationMask
 
 
 class ImgDetectionExtended(dai.Buffer):

diff --git a/depthai_nodes/ml/parsers/classification.py b/depthai_nodes/ml/parsers/classification.py
@@ -3,11 +3,11 @@
 import depthai as dai
 import numpy as np
 
-from ..messages.creators import (
+from depthai_nodes.ml.messages.creators import (
     create_classification_message,
 )
-from .base_parser import BaseParser
-from .utils.softmax import softmax
+from depthai_nodes.ml.parsers.base_parser import BaseParser
+from depthai_nodes.ml.parsers.utils.softmax import softmax
 
 
 class ClassificationParser(BaseParser):

diff --git a/depthai_nodes/ml/parsers/classification_sequence.py b/depthai_nodes/ml/parsers/classification_sequence.py
@@ -3,9 +3,9 @@
 import depthai as dai
 import numpy as np
 
-from ..messages.creators import create_classification_sequence_message
-from .classification import ClassificationParser
-from .utils.softmax import softmax
+from depthai_nodes.ml.messages.creators import create_classification_sequence_message
+from depthai_nodes.ml.parsers.classification import ClassificationParser
+from depthai_nodes.ml.parsers.utils.softmax import softmax
 
 
 class ClassificationSequenceParser(ClassificationParser):

diff --git a/depthai_nodes/ml/parsers/detection.py b/depthai_nodes/ml/parsers/detection.py
@@ -1,4 +1,4 @@
-from .base_parser import BaseParser
+from depthai_nodes.ml.parsers.base_parser import BaseParser
 
 
 class DetectionParser(BaseParser):

diff --git a/depthai_nodes/ml/parsers/embeddings.py b/depthai_nodes/ml/parsers/embeddings.py
@@ -2,7 +2,7 @@
 
 import depthai as dai
 
-from .base_parser import BaseParser
+from depthai_nodes.ml.parsers.base_parser import BaseParser
 
 
 class EmbeddingsParser(BaseParser):

diff --git a/depthai_nodes/ml/parsers/fastsam.py b/depthai_nodes/ml/parsers/fastsam.py
@@ -3,15 +3,16 @@
 import depthai as dai
 import numpy as np
 
-from ..messages.creators import create_segmentation_message
-from .base_parser import BaseParser
-from .utils.fastsam import (
+from depthai_nodes.ml.messages.creators import create_segmentation_message
+from depthai_nodes.ml.parsers.base_parser import BaseParser
+from depthai_nodes.ml.parsers.utils.fastsam import (
     box_prompt,
     decode_fastsam_output,
     merge_masks,
     point_prompt,
     process_single_mask,
 )
+
 from .utils.masks_utils import get_segmentation_outputs
 
 

diff --git a/depthai_nodes/ml/parsers/hrnet.py b/depthai_nodes/ml/parsers/hrnet.py
@@ -3,8 +3,8 @@
 import depthai as dai
 import numpy as np
 
-from ..messages.creators import create_keypoints_message
-from .keypoints import KeypointParser
+from depthai_nodes.ml.messages.creators import create_keypoints_message
+from depthai_nodes.ml.parsers.keypoints import KeypointParser
 
 
 class HRNetParser(KeypointParser):

diff --git a/depthai_nodes/ml/parsers/image_output.py b/depthai_nodes/ml/parsers/image_output.py
@@ -2,9 +2,9 @@
 
 import depthai as dai
 
-from ..messages.creators import create_image_message
-from .base_parser import BaseParser
-from .utils import unnormalize_image
+from depthai_nodes.ml.messages.creators import create_image_message
+from depthai_nodes.ml.parsers.base_parser import BaseParser
+from depthai_nodes.ml.parsers.utils import unnormalize_image
 
 
 class ImageOutputParser(BaseParser):

diff --git a/depthai_nodes/ml/parsers/keypoints.py b/depthai_nodes/ml/parsers/keypoints.py
@@ -3,8 +3,8 @@
 import depthai as dai
 import numpy as np
 
-from ..messages.creators import create_keypoints_message
-from .base_parser import BaseParser
+from depthai_nodes.ml.messages.creators import create_keypoints_message
+from depthai_nodes.ml.parsers.base_parser import BaseParser
 
 
 class KeypointParser(BaseParser):

diff --git a/depthai_nodes/ml/parsers/lane_detection.py b/depthai_nodes/ml/parsers/lane_detection.py
@@ -3,9 +3,9 @@
 import depthai as dai
 import numpy as np
 
-from ..messages.creators import create_cluster_message
-from .base_parser import BaseParser
-from .utils.ufld import decode_ufld
+from depthai_nodes.ml.messages.creators import create_cluster_message
+from depthai_nodes.ml.parsers.base_parser import BaseParser
+from depthai_nodes.ml.parsers.utils.ufld import decode_ufld
 
 
 class LaneDetectionParser(BaseParser):

diff --git a/depthai_nodes/ml/parsers/map_output.py b/depthai_nodes/ml/parsers/map_output.py
@@ -2,8 +2,8 @@
 
 import depthai as dai
 
-from ..messages.creators import create_map_message
-from .base_parser import BaseParser
+from depthai_nodes.ml.messages.creators import create_map_message
+from depthai_nodes.ml.parsers.base_parser import BaseParser
 
 
 class MapOutputParser(BaseParser):

diff --git a/depthai_nodes/ml/parsers/mediapipe_palm_detection.py b/depthai_nodes/ml/parsers/mediapipe_palm_detection.py
@@ -4,9 +4,9 @@
 import depthai as dai
 import numpy as np
 
-from ..messages.creators import create_detection_message
-from .detection import DetectionParser
-from .utils import generate_anchors_and_decode
+from depthai_nodes.ml.messages.creators import create_detection_message
+from depthai_nodes.ml.parsers.detection import DetectionParser
+from depthai_nodes.ml.parsers.utils import generate_anchors_and_decode
 
 
 class MPPalmDetectionParser(DetectionParser):

diff --git a/depthai_nodes/ml/parsers/mlsd.py b/depthai_nodes/ml/parsers/mlsd.py
@@ -3,9 +3,9 @@
 import depthai as dai
 import numpy as np
 
-from ..messages.creators import create_line_detection_message
-from .base_parser import BaseParser
-from .utils.mlsd import decode_scores_and_points, get_lines
+from depthai_nodes.ml.messages.creators import create_line_detection_message
+from depthai_nodes.ml.parsers.base_parser import BaseParser
+from depthai_nodes.ml.parsers.utils.mlsd import decode_scores_and_points, get_lines
 
 
 class MLSDParser(BaseParser):

diff --git a/depthai_nodes/ml/parsers/ppdet.py b/depthai_nodes/ml/parsers/ppdet.py
@@ -3,9 +3,9 @@
 import depthai as dai
 import numpy as np
 
-from ..messages.creators import create_detection_message
-from .detection import DetectionParser
-from .utils import parse_paddle_detection_outputs
+from depthai_nodes.ml.messages.creators import create_detection_message
+from depthai_nodes.ml.parsers.detection import DetectionParser
+from depthai_nodes.ml.parsers.utils import parse_paddle_detection_outputs
 
 
 class PPTextDetectionParser(DetectionParser):

diff --git a/depthai_nodes/ml/parsers/regression.py b/depthai_nodes/ml/parsers/regression.py
@@ -3,8 +3,8 @@
 import depthai as dai
 import numpy as np
 
-from ..messages.creators import create_regression_message
-from .base_parser import BaseParser
+from depthai_nodes.ml.messages.creators import create_regression_message
+from depthai_nodes.ml.parsers.base_parser import BaseParser
 
 
 class RegressionParser(BaseParser):

diff --git a/depthai_nodes/ml/parsers/scrfd.py b/depthai_nodes/ml/parsers/scrfd.py
@@ -3,10 +3,10 @@
 import depthai as dai
 import numpy as np
 
-from ..messages.creators import create_detection_message
-from .detection import DetectionParser
-from .utils.bbox_format_converters import xyxy_to_xywh
-from .utils.scrfd import decode_scrfd
+from depthai_nodes.ml.messages.creators import create_detection_message
+from depthai_nodes.ml.parsers.detection import DetectionParser
+from depthai_nodes.ml.parsers.utils.bbox_format_converters import xyxy_to_xywh
+from depthai_nodes.ml.parsers.utils.scrfd import decode_scrfd
 
 
 class SCRFDParser(DetectionParser):

diff --git a/depthai_nodes/ml/parsers/segmentation.py b/depthai_nodes/ml/parsers/segmentation.py
@@ -3,8 +3,8 @@
 import depthai as dai
 import numpy as np
 
-from ..messages.creators import create_segmentation_message
-from .base_parser import BaseParser
+from depthai_nodes.ml.messages.creators import create_segmentation_message
+from depthai_nodes.ml.parsers.base_parser import BaseParser
 
 
 class SegmentationParser(BaseParser):

diff --git a/depthai_nodes/ml/parsers/superanimal_landmarker.py b/depthai_nodes/ml/parsers/superanimal_landmarker.py
@@ -3,9 +3,9 @@
 import depthai as dai
 import numpy as np
 
-from ..messages.creators import create_keypoints_message
-from .keypoints import KeypointParser
-from .utils.superanimal import get_pose_prediction
+from depthai_nodes.ml.messages.creators import create_keypoints_message
+from depthai_nodes.ml.parsers.keypoints import KeypointParser
+from depthai_nodes.ml.parsers.utils.superanimal import get_pose_prediction
 
 
 class SuperAnimalParser(KeypointParser):

diff --git a/depthai_nodes/ml/parsers/utils/fastsam.py b/depthai_nodes/ml/parsers/utils/fastsam.py
@@ -3,7 +3,11 @@
 import cv2
 import numpy as np
 
-from .yolo import non_max_suppression, parse_yolo_outputs, sigmoid
+from depthai_nodes.ml.parsers.utils.yolo import (
+    non_max_suppression,
+    parse_yolo_outputs,
+    sigmoid,
+)
 
 
 def box_prompt(

diff --git a/depthai_nodes/ml/parsers/utils/keypoints.py b/depthai_nodes/ml/parsers/utils/keypoints.py
@@ -2,7 +2,7 @@
 
 import numpy as np
 
-from ...messages.creators.keypoints import Keypoint
+from depthai_nodes.ml.messages.creators.keypoints import Keypoint
 
 
 def normalize_keypoints(keypoints: np.ndarray, height: int, width: int) -> np.ndarray:

diff --git a/depthai_nodes/ml/parsers/utils/ppdet.py b/depthai_nodes/ml/parsers/utils/ppdet.py
@@ -3,7 +3,9 @@
 import cv2
 import numpy as np
 
-from .bbox_format_converters import corners_to_rotated_bbox
+from depthai_nodes.ml.parsers.utils.bbox_format_converters import (
+    corners_to_rotated_bbox,
+)
 
 
 def _get_mini_boxes(contour: np.ndarray) -> Tuple[np.ndarray, np.ndarray]:

diff --git a/depthai_nodes/ml/parsers/utils/scrfd.py b/depthai_nodes/ml/parsers/utils/scrfd.py
@@ -1,6 +1,6 @@
 import numpy as np
 
-from .nms import nms
+from depthai_nodes.ml.parsers.utils.nms import nms
 
 
 def distance2bbox(points, distance, max_shape=None):

diff --git a/depthai_nodes/ml/parsers/utils/ufld.py b/depthai_nodes/ml/parsers/utils/ufld.py
@@ -2,7 +2,7 @@
 
 import numpy as np
 
-from .softmax import softmax
+from depthai_nodes.ml.parsers.utils.softmax import softmax
 
 
 def decode_ufld(

diff --git a/depthai_nodes/ml/parsers/utils/yolo.py b/depthai_nodes/ml/parsers/utils/yolo.py
@@ -4,9 +4,9 @@
 
 import numpy as np
 
-from .bbox_format_converters import xywh_to_xyxy
-from .masks_utils import sigmoid
-from .nms import nms
+from depthai_nodes.ml.parsers.utils.bbox_format_converters import xywh_to_xyxy
+from depthai_nodes.ml.parsers.utils.masks_utils import sigmoid
+from depthai_nodes.ml.parsers.utils.nms import nms
 
 
 class YOLOSubtype(str, Enum):