supervisely 6.73.449__py3-none-any.whl → 6.73.451__py3-none-any.whl

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/convert/image/csv/csv_converter.py

@@ -24,6 +24,7 @@ from supervisely.io.fs import (
     get_file_name_with_ext,
     list_files_recursively,
 )
+from supervisely.io.env import team_id
 from supervisely.io.json import load_json_file
 from supervisely.project.project_settings import LabelingInterface
 
@@ -78,16 +79,16 @@ class CSVConverter(ImageConverter):
     }
 
     def __init__(
-            self,
-            input_data: str,
-            labeling_interface: Optional[Union[LabelingInterface, str]],
-            upload_as_links: bool,
-            remote_files_map: Optional[Dict[str, str]] = None,
+        self,
+        input_data: str,
+        labeling_interface: Optional[Union[LabelingInterface, str]],
+        upload_as_links: bool,
+        remote_files_map: Optional[Dict[str, str]] = None,
     ):
         super().__init__(input_data, labeling_interface, upload_as_links, remote_files_map)
 
+        self._supports_links = True
         self._csv_reader = None
-        self._team_id = None
 
     def __str__(self):
         return AvailableImageConverters.CSV
@@ -121,6 +122,12 @@ class CSVConverter(ImageConverter):
 
         full_path = valid_files[0]
 
+        if self.upload_as_links and self._supports_links:
+            for local_path, remote_path in self._remote_files_map.items():
+                if local_path.endswith(full_path):
+                    self._api.storage.download(self._team_id, remote_path, local_path)
+                    break
+
         file_ext = get_file_ext(full_path)
         if file_ext in self.conversion_functions:
             csv_full_path = os.path.splitext(full_path)[0] + ".csv"
@@ -147,7 +154,7 @@ class CSVConverter(ImageConverter):
                         team_files = False
                     break
             if item_path is None:
-                logger.warn(f"Failed to find image path in row: {row}. Skipping.")
+                logger.warning(f"Failed to find image path in row: {row}. Skipping.")
                 continue
             ann_data = row.get("tag")
             item = CSVConverter.Item(
@@ -192,7 +199,7 @@ class CSVConverter(ImageConverter):
                 ann_json = csv_helper.rename_in_json(ann_json, renamed_classes, renamed_tags)
             return Annotation.from_json(ann_json, meta)
         except Exception as e:
-            logger.warn(f"Failed to convert annotation: {repr(e)}")
+            logger.warning(f"Failed to convert annotation: {repr(e)}")
             return item.create_empty_annotation()
 
     def process_remote_image(
@@ -209,19 +216,21 @@ class CSVConverter(ImageConverter):
         image_path = image_path.strip()
         if is_team_file:
             if not api.file.exists(team_id, image_path):
-                logger.warn(f"File {image_path} not found in Team Files. Skipping...")
+                logger.warning(f"File {image_path} not found in Team Files. Skipping...")
                 return None
             team_file_image_info = api.file.list(team_id, image_path)
             image_path = team_file_image_info[0]["fullStorageUrl"]
             if not image_path:
-                logger.warn(f"Failed to get full storage URL for file '{image_path}'. Skipping...")
+                logger.warning(
+                    f"Failed to get full storage URL for file '{image_path}'. Skipping..."
+                )
                 return None
 
         extension = os.path.splitext(image_path)[1]
         if not extension:
-            logger.warn(f"FYI: Image [{image_path}] doesn't have extension.")
+            logger.warning(f"FYI: Image [{image_path}] doesn't have extension.")
         elif extension.lower() not in SUPPORTED_IMG_EXTS:
-            logger.warn(
+            logger.warning(
                 f"Image [{image_path}] has unsupported extension [{extension}]. Skipping..."
             )
             return None
@@ -234,7 +243,7 @@ class CSVConverter(ImageConverter):
                 force_metadata_for_links=force_metadata,
             )
         except Exception:
-            logger.warn(f"Failed to upload image {image_name}. Skipping...")
+            logger.warning(f"Failed to link image {image_name}. Skipping...")
             return None
         if progress_cb is not None:
             progress_cb(1)
@@ -312,7 +321,7 @@ class CSVConverter(ImageConverter):
                     success = False
                     continue
                 if item.name not in info.name:
-                    logger.warn(
+                    logger.warning(
                         f"Batched image with name '{item.name}' doesn't match uploaded image name '{info.name}'"
                     )
                     success = False
@@ -339,4 +348,4 @@ class CSVConverter(ImageConverter):
         if success:
             logger.info(f"Dataset ID:'{dataset_id}' has been successfully uploaded.")
         else:
-            logger.warn(f"Dataset ID:'{dataset_id}' has been uploaded.")
+            logger.warning(f"Dataset ID:'{dataset_id}' has been uploaded.")

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/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.449.dist-info → supervisely-6.73.451.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.449
+Version: 6.73.451
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely
@@ -24,7 +24,7 @@ Requires-Dist: cachetools<=5.5.0,>=4.2.3
 Requires-Dist: numpy<2.0.0,>=1.19
 Requires-Dist: opencv-python<5.0.0.0,>=4.6.0.66
 Requires-Dist: PTable<1.0.0,>=0.9.2
-Requires-Dist: pillow<=10.2.0,>=5.4.1
+Requires-Dist: pillow<=10.4.0,>=5.4.1
 Requires-Dist: protobuf<=3.20.3,>=3.19.5
 Requires-Dist: python-json-logger<3.0.0,>=0.1.11
 Requires-Dist: requests<3.0.0,>=2.27.1

{supervisely-6.73.449.dist-info → supervisely-6.73.451.dist-info}/RECORD

@@ -8,7 +8,7 @@ supervisely/versions.json,sha256=J7V7XPpDno0fvmNaAXXcxNksXqpRFaYRrG4POC0UDKQ,608
 supervisely/annotation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/annotation/annotation.py,sha256=th4gsIU-LNGcMRohHrtupmjxDwdzx1g4_0xIAa6NyJU,114717
 supervisely/annotation/annotation_transforms.py,sha256=TlVy_gUbM-XH6GbLpZPrAi6pMIGTr7Ow02iSKOSTa-I,9582
-supervisely/annotation/json_geometries_map.py,sha256=nL6AmMhFy02fw9ryBm75plKyOkDh61QdOToSuLAcz_Q,1659
+supervisely/annotation/json_geometries_map.py,sha256=2MaOklrooKc6QUGXEEEhatPsNxRodp2cPsaiYENlv98,1731
 supervisely/annotation/label.py,sha256=sOK6lGDa-uSNCb7o4F9BJwnPia-Qp36OmFOU8oHyHPA,40601
 supervisely/annotation/obj_class.py,sha256=W7-958-E9TfsL7eKAI3bbOvfAVxd3Unq-7F3lc2Gxjg,16672
 supervisely/annotation/obj_class_collection.py,sha256=lsBJ8mElvwMHky2vsj4GfZ9_Uq186eS-o4ldoNeUJnw,12416
@@ -599,7 +599,7 @@ supervisely/convert/image/coco/coco_anntotation_converter.py,sha256=O1PQbwrbnpQB
 supervisely/convert/image/coco/coco_converter.py,sha256=7dW7vE6yTRz7O31vTVSnEA4MDCc_UXTqc2UFEqaKorI,5650
 supervisely/convert/image/coco/coco_helper.py,sha256=gkSLgLPUQh-xFN1A7Nh41nZE7rwHvdZSzcPG_C1dh8I,39473
 supervisely/convert/image/csv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/convert/image/csv/csv_converter.py,sha256=iLyc2PAVtlsAq7blnGH4iS1_D7Ai6-4UsdI_RlDVB9Q,11677
+supervisely/convert/image/csv/csv_converter.py,sha256=FNuNKOdNWp0JoXAvUlCp8JWXVJ7uJbBgeFFb8Wbyo_k,12064
 supervisely/convert/image/csv/csv_helper.py,sha256=-nR192IfMU0vTlNRoKXu5FS6tTs9fENqySyeKKyemRs,8409
 supervisely/convert/image/high_color/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/image/high_color/high_color_depth.py,sha256=t1LsOnEwhSmXUWxs2K7e_EHit5H0132_UibtFIt1P_w,5276
@@ -721,6 +721,7 @@ supervisely/geometry/point_location.py,sha256=ufGPj5BShL3QbE1eAMlnKpSSnb1S23Gfsk
 supervisely/geometry/pointcloud.py,sha256=cc4P_UNLGx5dWah3caRJytW7_mAi8UnYsJOa20mUy8s,1472
 supervisely/geometry/polygon.py,sha256=lqXS8xkBay8UhkVsB7eG_gRhwP1lBqyPaEri85ZMK8c,11597
 supervisely/geometry/polyline.py,sha256=r6KKJhJT8Au9Ds94Oa7saKdz2IPaEtR4SuVJBc4-uiA,8191
+supervisely/geometry/polyline_3d.py,sha256=3uG-SszDH2iZPo2ES9ibMxvAjO2gEmr2PZIqN53Q2Hs,3458
 supervisely/geometry/rectangle.py,sha256=hWYNcVLzFTFf0WiDNhNFi9ktrgLPYxcow3QKltaQOiI,33875
 supervisely/geometry/sliding_windows.py,sha256=VWtE3DS9AaIlS0ch0PY6wwtWU89J82icDRZ-F0LFrjM,1700
 supervisely/geometry/sliding_windows_fuzzy.py,sha256=InvJlH6MEW55DM1IdoMHP2MLFLieTDZfHrZZEINLQOc,3626
@@ -759,7 +760,7 @@ supervisely/metric/precision_recall_metric.py,sha256=4AQCkcB84mpYQS94yJ-wkG1LBuX
 supervisely/metric/projects_applier.py,sha256=ORtgLQHYtNi4KYsSGaGPPWiZPexTJF9IWqX_RuLRxPk,3415
 supervisely/nn/__init__.py,sha256=ZGCDjx_cGIW8CxIWNCzVDRVfAzt7QzlkcvKvLBE8wMc,669
 supervisely/nn/experiments.py,sha256=1m5qq7LbHEVzI6nS4dFZg1zwJvjmhIvUoQ3iFhD8GBc,10387
-supervisely/nn/prediction_dto.py,sha256=oi146DJpUUBDbR-b-vYkL5WAhCZQYOGomqBDEQGbPdY,2700
+supervisely/nn/prediction_dto.py,sha256=Z0WDcSnz5tEVTZ-eyDvD1CpIXlM7OYSZhK2A1TVZTEY,2977
 supervisely/nn/task_type.py,sha256=UJvSJ4L3I08j_e6sU6Ptu7kS5p1H09rfhfoDUSZ2iys,522
 supervisely/nn/utils.py,sha256=WoEidpLo5__R6eXsvEFH7VRxb4MtXCr9H-kchg25FDY,2965
 supervisely/nn/artifacts/__init__.py,sha256=DOkRrpvwQoTMH1GaAGHxwgYWshORAhxpeyvzmXt_F50,588
@@ -1127,9 +1128,9 @@ supervisely/worker_proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 supervisely/worker_proto/worker_api_pb2.py,sha256=VQfi5JRBHs2pFCK1snec3JECgGnua3Xjqw_-b3aFxuM,59142
 supervisely/worker_proto/worker_api_pb2_grpc.py,sha256=3BwQXOaP9qpdi0Dt9EKG--Lm8KGN0C5AgmUfRv77_Jk,28940
 supervisely_lib/__init__.py,sha256=yRwzEQmVwSd6lUQoAUdBngKEOlnoQ6hA9ZcoZGJRNC4,331
-supervisely-6.73.449.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.449.dist-info/METADATA,sha256=d65TCju-7Q_u75UWtDWAgTcIRszBoX5r8KPONLcp0Bo,35480
-supervisely-6.73.449.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.449.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.449.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.449.dist-info/RECORD,,
+supervisely-6.73.451.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.451.dist-info/METADATA,sha256=UDSRIdFR3U9VbWpLqzckQ9YqL2IsB0wdyP_4Ny3asac,35480
+supervisely-6.73.451.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.451.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.451.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.451.dist-info/RECORD,,