supervisely 6.73.448__tar.gz → 6.73.450__tar.gz

{supervisely-6.73.448/supervisely.egg-info → supervisely-6.73.450}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.448
+Version: 6.73.450
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely

{supervisely-6.73.448 → supervisely-6.73.450}/supervisely/annotation/json_geometries_map.py

@@ -15,6 +15,7 @@ from supervisely.geometry.multichannel_bitmap import MultichannelBitmap
 from supervisely.geometry.closed_surface_mesh import ClosedSurfaceMesh
 from supervisely.geometry.alpha_mask import AlphaMask
 from supervisely.geometry.cuboid_2d import Cuboid2d
+from supervisely.geometry.polyline_3d import Polyline3D
 
 
 _INPUT_GEOMETRIES = [
@@ -34,6 +35,7 @@ _INPUT_GEOMETRIES = [
     ClosedSurfaceMesh,
     AlphaMask,
     Cuboid2d,
+    Polyline3D,
 ]
 _JSON_SHAPE_TO_GEOMETRY_TYPE = {
     geometry.geometry_name(): geometry for geometry in _INPUT_GEOMETRIES

supervisely-6.73.450/supervisely/geometry/polyline_3d.py

@@ -0,0 +1,110 @@
+from supervisely.geometry.geometry import Geometry
+from supervisely.geometry.constants import LABELER_LOGIN, UPDATED_AT, CREATED_AT, ID, CLASS_ID
+from supervisely.geometry.cuboid_3d import Vector3d
+from typing import List, Union
+
+
+class Polyline3D(Geometry):
+    """
+    Polyline3D geometry
+
+    :param points: List of 3D point coordinates which define the polyline in 3D space.
+    :type points: List[List[int, int, int]]
+    :param sly_id: Polyline ID in Supervisely server.
+    :type sly_id: int, optional
+    :param class_id: ID of :class:`ObjClass<supervisely.annotation.obj_class.ObjClass>` to which Polyline belongs.
+    :type class_id: int, optional
+    :param labeler_login: Login of the user who created Polyline.
+    :type labeler_login: str, optional
+    :param updated_at: Date and Time when Polyline was modified last. Date Format: Year:Month:Day:Hour:Minute:Seconds. Example: '2021-01-22T19:37:50.158Z'.
+    :type updated_at: str, optional
+    :param created_at: Date and Time when Polyline was created. Date Format is the same as in "updated_at" parameter.
+    :type created_at: str, optional
+
+    :Usage example:
+
+     .. code-block:: python
+
+        import supervisely as sly
+
+        points = [[1, 2, 3], [4, 5, 6], [7, 8, 9]]
+        figure = sly.Polyline(points)
+    """
+
+    @staticmethod
+    def geometry_name():
+        return "polyline_3d"
+
+    def __init__(
+        self,
+        points: Union[List[float], List[Vector3d]],
+        sly_id=None,
+        class_id=None,
+        labeler_login=None,
+        updated_at=None,
+        created_at=None,
+    ):
+        if not isinstance(points[0], Vector3d):
+            points = [Vector3d(point[0], point[1], point[2]) for point in points]
+        super().__init__(
+            sly_id=sly_id,
+            class_id=class_id,
+            labeler_login=labeler_login,
+            updated_at=updated_at,
+            created_at=created_at,
+        )
+
+        self._points = points
+
+    @property
+    def points(self):
+        return self._points
+
+    def to_json(self):
+        points = [[point.x, point.y, point.z] for point in self._points]
+        res = {"points": points}
+        self._add_creation_info(res)
+        return res
+
+    @classmethod
+    def from_json(cls, data):
+        """
+        Convert a json dict to Polyline3D.
+
+        :param data: Polyline3D in json format as a dict.
+        :type data: dict
+        :return: Polyline3D object
+        :rtype: :class:`Polyline3D<Polyline3D>`
+        :Usage example:
+
+         .. code-block:: python
+
+            import supervisely as sly
+
+            figure_json = {
+                "points": {
+                    [
+                        [1, 2, 3],
+                        [4, 5, 6],
+                        [7, 8, 9]
+                    ],
+                }
+            }
+            figure = sly.Polyline3D.from_json(figure_json)
+        """
+        if not data.get("points"):
+            raise ValueError("Data dict must contain 'points' field!")
+        points = data["points"]
+        labeler_login = data.get(LABELER_LOGIN, None)
+        updated_at = data.get(UPDATED_AT, None)
+        created_at = data.get(CREATED_AT, None)
+        sly_id = data.get(ID, None)
+        class_id = data.get(CLASS_ID, None)
+        return cls(
+            points,
+            sly_id=sly_id,
+            class_id=class_id,
+            labeler_login=labeler_login,
+            updated_at=updated_at,
+            created_at=created_at,
+        )

{supervisely-6.73.448 → supervisely-6.73.450}/supervisely/nn/prediction_dto.py

@@ -3,6 +3,7 @@ from typing import List, Optional
 import numpy as np
 
 from supervisely.geometry.cuboid_3d import Cuboid3d
+from supervisely.geometry.polyline_3d import Polyline3D
 
 
 class Prediction:
@@ -81,3 +82,9 @@ class PredictionCuboid3d(Prediction):
         super(PredictionCuboid3d, self).__init__(class_name=class_name)
         self.cuboid_3d = cuboid_3d
         self.score = score
+
+
+class PredictionPolyline3D(Prediction):
+    def __init__(self, class_name: str, polyline_3d: Polyline3D):
+        super(PredictionPolyline3D, self).__init__(class_name=class_name)
+        self.polyline_3d = polyline_3d

{supervisely-6.73.448 → supervisely-6.73.450}/supervisely/nn/training/gui/train_val_splits_selector.py

@@ -180,7 +180,13 @@ class TrainValSplitsSelector:
                 return False
 
             # Check if datasets are not empty
-            filters = [{ ApiField.FIELD: ApiField.ID, ApiField.OPERATOR: "in", ApiField.VALUE: train_dataset_id + val_dataset_id}]
+            filters = [
+                {
+                    ApiField.FIELD: ApiField.ID,
+                    ApiField.OPERATOR: "in",
+                    ApiField.VALUE: train_dataset_id + val_dataset_id,
+                }
+            ]
             selected_datasets = self.api.dataset.get_list(self.project_id, filters, recursive=True)
             datasets_count = {}
             for dataset in selected_datasets:
@@ -334,6 +340,7 @@ class TrainValSplitsSelector:
 
     def _detect_splits(self, collections_split: bool, datasets_split: bool) -> bool:
         """Detect splits based on the selected method"""
+        self._parse_collections()
         splits_found = False
         if collections_split:
             splits_found = self._detect_collections()
@@ -341,47 +348,59 @@ class TrainValSplitsSelector:
             splits_found = self._detect_datasets()
         return splits_found
 
+    def _parse_collections(self) -> None:
+        """Parse collections with train and val prefixes and set them to train_val_splits variables"""
+        all_collections = self.api.entities_collection.get_list(self.project_id)
+        existing_train_collections = [
+            collection for collection in all_collections if collection.name.startswith("train_")
+        ]
+        existing_val_collections = [
+            collection for collection in all_collections if collection.name.startswith("val_")
+        ]
+
+        self._all_train_collections = existing_train_collections
+        self._all_val_collections = existing_val_collections
+        self._latest_train_collection = self._get_latest_collection(existing_train_collections, "train")
+        self._latest_val_collection = self._get_latest_collection(existing_val_collections, "val")
+
+    def _get_latest_collection(
+        self, collections: List[EntitiesCollectionInfo], expected_prefix: str
+    ) -> EntitiesCollectionInfo:
+        curr_collection = None
+        curr_idx = 0
+        for collection in collections:
+            parts = collection.name.split("_")
+            if len(parts) == 2:
+                prefix = parts[0].lower()
+                if prefix == expected_prefix:
+                    if parts[1].isdigit():
+                        collection_idx = int(parts[1])
+                        if collection_idx > curr_idx:
+                            curr_idx = collection_idx
+                            curr_collection = collection
+        return curr_collection
+
+
     def _detect_collections(self) -> bool:
         """Find collections with train and val prefixes and set them to train_val_splits"""
-        def _get_latest_collection(collections: List[EntitiesCollectionInfo]) -> EntitiesCollectionInfo:
-            curr_collection = None
-            curr_idx = 0
-            for collection in collections:
-                collection_idx = int(collection.name.rsplit('_', 1)[-1])
-                if collection_idx > curr_idx:
-                    curr_idx = collection_idx
-                    curr_collection = collection
-            return curr_collection
 
-        all_collections = self.api.entities_collection.get_list(self.project_id)
-        train_collections = []
-        val_collections = []
         collections_found = False
-        for collection in all_collections:
-            if collection.name.lower().startswith("train_"):
-                train_collections.append(collection)
-            elif collection.name.lower().startswith("val_"):
-                val_collections.append(collection)
-
-        train_collection = _get_latest_collection(train_collections)
-        val_collection = _get_latest_collection(val_collections)
-        if train_collection is not None and val_collection is not None:
-            self.train_val_splits.set_collections_splits([train_collection.id], [val_collection.id])
+        if self._latest_train_collection is not None and self._latest_val_collection is not None:
+            self.train_val_splits.set_collections_splits(
+                [self._latest_train_collection.id], [self._latest_val_collection.id]
+            )
             self.validator_text = Text("Train and val collections are detected", status="info")
             self.validator_text.show()
             collections_found = True
-            self._all_train_collections = train_collections
-            self._all_val_collections = val_collections
-            self._latest_train_collection = train_collection
-            self._latest_val_collection = val_collection
         else:
             self.validator_text = Text("")
             self.validator_text.hide()
             collections_found = False
         return collections_found
-        
+
     def _detect_datasets(self) -> bool:
         """Find datasets with train and val prefixes and set them to train_val_splits"""
+
         def _extend_with_nested(root_ds):
             nested = self.api.dataset.get_nested(self.project_id, root_ds.id)
             nested_ids = [ds.id for ds in nested]
@@ -407,7 +426,9 @@ class TrainValSplitsSelector:
         val_count = len(train_val_dataset_ids["val"])
 
         if train_count > 0 and val_count > 0:
-            self.train_val_splits.set_datasets_splits(train_val_dataset_ids["train"], train_val_dataset_ids["val"])
+            self.train_val_splits.set_datasets_splits(
+                train_val_dataset_ids["train"], train_val_dataset_ids["val"]
+            )
             datasets_found = True
 
         if train_count > 0 and val_count > 0:
@@ -415,7 +436,7 @@ class TrainValSplitsSelector:
                 message = "train and val datasets are detected"
             else:
                 message = "Multiple train and val datasets are detected. Check manually if selection is correct"
-            
+
             self.validator_text = Text(message, status="info")
             self.validator_text.show()
             datasets_found = True
@@ -423,4 +444,4 @@ class TrainValSplitsSelector:
             self.validator_text = Text("")
             self.validator_text.hide()
             datasets_found = False
-        return datasets_found
+        return datasets_found

{supervisely-6.73.448 → supervisely-6.73.450/supervisely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.448
+Version: 6.73.450
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely

{supervisely-6.73.448 → supervisely-6.73.450}/supervisely.egg-info/SOURCES.txt

@@ -731,6 +731,7 @@ supervisely/geometry/point_location.py
 supervisely/geometry/pointcloud.py
 supervisely/geometry/polygon.py
 supervisely/geometry/polyline.py
+supervisely/geometry/polyline_3d.py
 supervisely/geometry/rectangle.py
 supervisely/geometry/sliding_windows.py
 supervisely/geometry/sliding_windows_fuzzy.py