supervisely 6.73.425__py3-none-any.whl → 6.73.426__py3-none-any.whl

supervisely/api/pointcloud/pointcloud_episode_annotation_api.py

@@ -107,6 +107,9 @@ class PointcloudEpisodeAnnotationAPI(EntityAnnotationAPI):
         """
 
         response = self._api.post(self._method_download, {ApiField.DATASET_ID: dataset_id})
+        result = response.json()
+        if len(result) == 0:
+            return PointcloudEpisodeAnnotation().to_json()
         return response.json()[0]
 
     def download_bulk(self, dataset_id, entity_ids):

supervisely/project/pointcloud_episode_project.py

@@ -740,15 +740,19 @@ def download_pointcloud_episode_project(
     if progress_cb is not None:
         log_progress = False
 
-    datasets_infos = []
+    filter_fn = lambda x: True
     if dataset_ids is not None:
-        for ds_id in dataset_ids:
-            datasets_infos.append(api.dataset.get_info_by_id(ds_id))
-    else:
-        datasets_infos = api.dataset.get_list(project_id)
-
-    for dataset in datasets_infos:
-        dataset_fs: PointcloudEpisodeDataset = project_fs.create_dataset(dataset.name)
+        filter_fn = lambda ds: ds.id in dataset_ids
+
+    for parents, dataset in api.dataset.tree(project_id):
+        if not filter_fn(dataset):
+            continue
+        dataset_path = None
+        if parents:
+            dataset_path = "/datasets/".join(parents + [dataset.name])
+        dataset_fs: PointcloudEpisodeDataset = project_fs.create_dataset(
+            dataset.name, ds_path=dataset_path
+        )
         pointclouds = api.pointcloud_episode.get_list(dataset.id)
 
         # Download annotation to project_path/dataset_path/annotation.json

supervisely/project/pointcloud_project.py

@@ -994,24 +994,20 @@ def download_pointcloud_project(
     if progress_cb is not None:
         log_progress = False
 
-    filter = lambda d: True if dataset_ids is None else lambda d: d.id in dataset_ids
-    for path, datasets in api.dataset.tree(project_id):
-        pointclouds = []
-        if not isinstance(datasets, list):
-            datasets = [datasets]
-        for dataset in datasets:
-            if not filter(dataset):
-                continue
-            path_parts = []
-            if path:
-                for part in path:
-                    path_parts.extend([part, "datasets"])
-                path_parts.append(dataset.name)
-            fs_path = "/".join(path_parts) if path else None
-            dataset_fs: PointcloudDataset = project_fs.create_dataset(
-                ds_name=dataset.name, ds_path=fs_path
-            )
-            pointclouds.extend(api.pointcloud.get_list(dataset.id))
+    filter_fn = lambda ds: True
+    if dataset_ids is not None:
+        filter_fn = lambda ds: ds.id in dataset_ids
+
+    for parents, dataset in api.dataset.tree(project_id):
+        if not filter_fn(dataset):
+            continue
+        dataset_path = None
+        if parents:
+            dataset_path = "/datasets/".join(parents + [dataset.name])
+        dataset_fs: PointcloudDataset = project_fs.create_dataset(
+            ds_name=dataset.name, ds_path=dataset_path
+        )
+        pointclouds = api.pointcloud.get_list(dataset.id)
 
         ds_progress = progress_cb
         if log_progress:

{supervisely-6.73.425.dist-info → supervisely-6.73.426.dist-info}/METADATA

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

{supervisely-6.73.425.dist-info → supervisely-6.73.426.dist-info}/RECORD

@@ -62,7 +62,7 @@ supervisely/api/nn/neural_network_api.py,sha256=U1drXTtJsojBA2hJ1fOvbpNES8r3eyDd
 supervisely/api/pointcloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/api/pointcloud/pointcloud_annotation_api.py,sha256=xIXqCu0rKYsGt5ezh2EFT2utwsVrr2Xo-MOWUCnbvXc,11259
 supervisely/api/pointcloud/pointcloud_api.py,sha256=mPnVXWnxPxrb2P5giFLuabU969vV0xpeP6biETBNvUI,53875
-supervisely/api/pointcloud/pointcloud_episode_annotation_api.py,sha256=zmDWDkRzUSfHKX65qDVrc44kNyYjfvItSwYmsERJ_8g,7012
+supervisely/api/pointcloud/pointcloud_episode_annotation_api.py,sha256=DNmIpjzD8rkdBqfZS7dwk54OPISmrHl9Kju1l57M9SY,7133
 supervisely/api/pointcloud/pointcloud_episode_api.py,sha256=xg1zRKONV9ly0-B72V1dR6OMPFIw35bujazuEdrPGTQ,7922
 supervisely/api/pointcloud/pointcloud_episode_object_api.py,sha256=k2_wV0EVPo9vxSTVe1qOvqVOMSVE6zGDSkfR6TRNsKs,691
 supervisely/api/pointcloud/pointcloud_episode_tag_api.py,sha256=qqqNScrcLPV2FGBqjWlXHfOTfJLYQMqzscNIq9C0YUw,911
@@ -1045,8 +1045,8 @@ supervisely/pointcloud_episodes/pointcloud_episodes.py,sha256=trjCTqJEfHMnsk_HmY
 supervisely/project/__init__.py,sha256=hlzdj9Pgy53Q3qdP8LMtGTChvZHQuuShdtui2eRUQeE,2601
 supervisely/project/data_version.py,sha256=P5Lui6i64pYeJWmAdGJDv8GRXxjfpSSZ8zT_MxIrynE,19553
 supervisely/project/download.py,sha256=yCFpRum_q8fbY_z2mcRAhYAcYFcDc215ldioO3Gzg3Q,28680
-supervisely/project/pointcloud_episode_project.py,sha256=ahwL79Ojf5gLdvAph5SLKXr66jmVWzgiOXLsk2P8eVQ,48433
-supervisely/project/pointcloud_project.py,sha256=XQuyJgo4G7Si9TnGtFA4nqBOmQx0RchBfG2eLAVXuTM,57266
+supervisely/project/pointcloud_episode_project.py,sha256=f7kbsXRI1XedKQd3inmq4j3PNsab3q4xyb_RHqFthmI,48563
+supervisely/project/pointcloud_project.py,sha256=YBtv7Lh1ivXCgpM59MiXJGgqxfdehDeD87Fe1tOHVR0,57011
 supervisely/project/project.py,sha256=Xl_L_dRJp0KZJMioabXWGO2Zt1X6dl2W9v4-Zt66zYs,246561
 supervisely/project/project_meta.py,sha256=UTQPstRmRJvbtCcQ1noCtzcw3Sd4llwRMHes-Sz-JQg,51429
 supervisely/project/project_settings.py,sha256=NLThzU_DCynOK6hkHhVdFyezwprn9UqlnrLDe_3qhkY,9347
@@ -1121,9 +1121,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=7-3QnN8Zf0wj8NCr2oJmqoQWMKKPKTECvjH9pd2S5vY,159
-supervisely-6.73.425.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.425.dist-info/METADATA,sha256=AAllE-Z24DEnqaICef4-7m5K9Ct51005Emh1PShxeJo,35433
-supervisely-6.73.425.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.425.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.425.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.425.dist-info/RECORD,,
+supervisely-6.73.426.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.426.dist-info/METADATA,sha256=n8l1EDWAUS40PA5PAItiv2whk9oGDSPg3IkrqWk0shc,35433
+supervisely-6.73.426.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.426.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.426.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.426.dist-info/RECORD,,