supervisely 6.73.274__py3-none-any.whl → 6.73.276__py3-none-any.whl

supervisely/convert/pointcloud_episodes/pointcloud_episodes_converter.py

@@ -1,4 +1,6 @@
-from typing import Dict, Optional, Union
+import imghdr
+import os
+from typing import Dict, List, Optional, Set, Tuple, Union
 
 from supervisely import (
     Api,
@@ -10,9 +12,11 @@ from supervisely import (
 )
 from supervisely.api.module_api import ApiField
 from supervisely.convert.base_converter import BaseConverter
+from supervisely.io.fs import get_file_ext, get_file_name
 from supervisely.io.json import load_json_file
-from supervisely.project.project_settings import LabelingInterface
 from supervisely.pointcloud.pointcloud import ALLOWED_POINTCLOUD_EXTENSIONS
+from supervisely.pointcloud.pointcloud import validate_ext as validate_pcd_ext
+from supervisely.project.project_settings import LabelingInterface
 
 
 class PointcloudEpisodeConverter(BaseConverter):
@@ -89,13 +93,9 @@ class PointcloudEpisodeConverter(BaseConverter):
     ):
         """Upload converted data to Supervisely"""
 
-        meta, renamed_classes, renamed_tags = self.merge_metas_with_conflicts(
-            api, dataset_id
-        )
+        meta, renamed_classes, renamed_tags = self.merge_metas_with_conflicts(api, dataset_id)
 
-        existing_names = set(
-            [pcde.name for pcde in api.pointcloud_episode.get_list(dataset_id)]
-        )
+        existing_names = set([pcde.name for pcde in api.pointcloud_episode.get_list(dataset_id)])
 
         if log_progress:
             progress, progress_cb = self.get_progress(
@@ -130,28 +130,20 @@ class PointcloudEpisodeConverter(BaseConverter):
                 camera_names = []
                 if len(item._related_images) > 0:
                     img_paths, rimg_ann_paths = list(zip(*item._related_images))
-                    rimg_hashes = api.pointcloud_episode.upload_related_images(
-                        img_paths
-                    )
+                    rimg_hashes = api.pointcloud_episode.upload_related_images(img_paths)
                     for img_ind, (img_hash, rimg_ann_path) in enumerate(
                         zip(rimg_hashes, rimg_ann_paths)
                     ):
                         meta_json = load_json_file(rimg_ann_path)
                         try:
                             if ApiField.META not in meta_json:
-                                raise ValueError(
-                                    "Related image meta not found in json file."
-                                )
+                                raise ValueError("Related image meta not found in json file.")
                             if ApiField.NAME not in meta_json:
-                                raise ValueError(
-                                    "Related image name not found in json file."
-                                )
+                                raise ValueError("Related image name not found in json file.")
                             if "deviceId" not in meta_json[ApiField.META].keys():
                                 camera_names.append(f"CAM_{str(img_ind).zfill(2)}")
                             else:
-                                camera_names.append(
-                                    meta_json[ApiField.META]["deviceId"]
-                                )
+                                camera_names.append(meta_json[ApiField.META]["deviceId"])
                             rimg_infos.append(
                                 {
                                     ApiField.ENTITY_ID: pcd_id,
@@ -162,7 +154,7 @@ class PointcloudEpisodeConverter(BaseConverter):
                             )
                             api.pointcloud.add_related_images(rimg_infos, camera_names)
                         except Exception as e:
-                            logger.warn(
+                            logger.warning(
                                 f"Failed to upload related image or add it to pointcloud episo: {repr(e)}"
                             )
                             continue
@@ -171,14 +163,77 @@ class PointcloudEpisodeConverter(BaseConverter):
                 progress_cb(len(batch))
 
         if self.items_count > 0:
-            ann = self.to_supervisely(
-                self._items[0], meta, renamed_classes, renamed_tags
-            )
-            api.pointcloud_episode.annotation.append(
-                dataset_id, ann, frame_to_pointcloud_ids
-            )
+            ann = self.to_supervisely(self._items[0], meta, renamed_classes, renamed_tags)
+            api.pointcloud_episode.annotation.append(dataset_id, ann, frame_to_pointcloud_ids)
 
         if log_progress:
             if is_development():
                 progress.close()
         logger.info(f"Dataset ID:{dataset_id} has been successfully uploaded.")
+
+    def _collect_items_if_format_not_detected(self) -> Tuple[List[Item], bool, Set[str]]:
+        only_modality_items = True
+        unsupported_exts = set()
+        pcd_dict = {}
+        frames_pcd_map = None
+        used_img_ext = set()
+        rimg_dict, rimg_json_dict = {}, {}
+        for root, _, files in os.walk(self._input_data):
+            for file in files:
+                full_path = os.path.join(root, file)
+                if file == "frame_pointcloud_map.json":
+                    frames_pcd_map = load_json_file(full_path)
+                    continue
+
+                ext = get_file_ext(full_path)
+                recognized_ext = imghdr.what(full_path)
+                if ext == ".json":
+                    rimg_json_dict[file] = full_path
+                elif recognized_ext:
+                    if ext.lower() == ".pcd":
+                        logger.warning(
+                            f"File '{file}' has been recognized as '.{recognized_ext}' format. Skipping."
+                        )
+                        continue
+                    rimg_dict[file] = full_path
+                    if ext not in used_img_ext:
+                        used_img_ext.add(ext)
+                elif ext.lower() in self.allowed_exts:
+                    try:
+                        validate_pcd_ext(ext)
+                        pcd_dict[file] = full_path
+                    except:
+                        pass
+                else:
+                    only_modality_items = False
+                    unsupported_exts.add(ext)
+
+        items = []
+        updated_frames_pcd_map = {}
+        if frames_pcd_map:
+            list_of_pcd_names = list(frames_pcd_map.values())
+        else:
+            list_of_pcd_names = sorted(pcd_dict.keys())
+
+        for i, pcd_name in enumerate(list_of_pcd_names):
+            if pcd_name in pcd_dict:
+                updated_frames_pcd_map[i] = pcd_name
+                item = self.Item(pcd_dict[pcd_name], i)
+                for ext in used_img_ext:
+                    rimg_name = f"{item.name}{ext}"
+                    if not rimg_name in rimg_dict:
+                        rimg_name = f"{get_file_name(item.name)}{ext}"
+                    if rimg_name in rimg_dict:
+                        rimg_path = rimg_dict[rimg_name]
+                        rimg_ann_name = f"{rimg_name}.json"
+                        if rimg_ann_name in rimg_json_dict:
+                            rimg_ann_path = rimg_json_dict[rimg_ann_name]
+                            item.set_related_images((rimg_path, rimg_ann_path))
+                items.append(item)
+            else:
+                logger.warning(f"Pointcloud file {pcd_name} not found. Skipping frame.")
+                continue
+        self._frame_pointcloud_map = updated_frames_pcd_map
+        self._frame_count = len(self._frame_pointcloud_map)
+
+        return items, only_modality_items, unsupported_exts

supervisely/convert/pointcloud_episodes/sly/sly_pointcloud_episodes_converter.py

@@ -48,7 +48,7 @@ class SLYPointcloudEpisodesConverter(PointcloudEpisodeConverter):
             return False
 
     def validate_format(self) -> bool:
-        ann_or_rimg_detected = False
+        sly_ann_detected = False
         ann_path = None
         pcd_dict = {}
         frames_pcd_map = None
@@ -74,7 +74,7 @@ class SLYPointcloudEpisodesConverter(PointcloudEpisodeConverter):
                 recognized_ext = imghdr.what(full_path)
                 if file in JUNK_FILES:
                     continue
-                elif ext in self.ann_ext:
+                elif ext == self.ann_ext:
                     rimg_json_dict[file] = full_path
                 elif recognized_ext:
                     if ext.lower() == ".pcd":
@@ -94,6 +94,7 @@ class SLYPointcloudEpisodesConverter(PointcloudEpisodeConverter):
 
         if self._meta is not None:
             meta = self._meta
+            sly_ann_detected = True
         else:
             meta = ProjectMeta()
         if ann_path is not None:
@@ -101,7 +102,10 @@ class SLYPointcloudEpisodesConverter(PointcloudEpisodeConverter):
                 meta = self.generate_meta_from_annotation(ann_path, meta)
             is_valid = self.validate_ann_file(ann_path, meta)
             if is_valid:
-                ann_or_rimg_detected = True
+                sly_ann_detected = True
+
+        if not sly_ann_detected:
+            return False
 
         self._items = []
         updated_frames_pcd_map = {}
@@ -124,18 +128,15 @@ class SLYPointcloudEpisodesConverter(PointcloudEpisodeConverter):
                         if rimg_ann_name in rimg_json_dict:
                             rimg_ann_path = rimg_json_dict[rimg_ann_name]
                             item.set_related_images((rimg_path, rimg_ann_path))
-                            ann_or_rimg_detected = True
                 self._items.append(item)
             else:
-                logger.warn(f"Pointcloud file {pcd_name} not found. Skipping frame.")
+                logger.warning(f"Pointcloud file {pcd_name} not found. Skipping frame.")
                 continue
         self._frame_pointcloud_map = updated_frames_pcd_map
         self._frame_count = len(self._frame_pointcloud_map)
 
         self._meta = meta
-        if self._frame_pointcloud_map is not None and len(self._items) > 0:
-            ann_or_rimg_detected = True
-        return ann_or_rimg_detected
+        return sly_ann_detected
 
     def to_supervisely(
         self,

{supervisely-6.73.274.dist-info → supervisely-6.73.276.dist-info}/METADATA

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

{supervisely-6.73.274.dist-info → supervisely-6.73.276.dist-info}/RECORD

@@ -205,7 +205,7 @@ supervisely/app/widgets/copy_to_clipboard/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 supervisely/app/widgets/copy_to_clipboard/copy_to_clipboard.py,sha256=UlBbXeCBS2_60wtJrMZj3jqPhQJR0wJ3T7vfK4WA588,3283
 supervisely/app/widgets/copy_to_clipboard/template.html,sha256=4gGPot40yVqFkpVVUZGz3DPogVFlZKQ98YM01EUfQDY,492
 supervisely/app/widgets/custom_models_selector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/app/widgets/custom_models_selector/custom_models_selector.py,sha256=yt9rmJR9cHcYorzb04g8yEu5yxrEsRxZVtmlb6-rsMU,20835
+supervisely/app/widgets/custom_models_selector/custom_models_selector.py,sha256=L4FFkTLODWpzrJ09JsCjJA9hNi7ITz9qe1uuRGkf874,21495
 supervisely/app/widgets/custom_models_selector/style.css,sha256=-zPPXHnJvatYj_xVVAb7T8uoSsUTyhm5xCKWkkFQ78E,548
 supervisely/app/widgets/custom_models_selector/template.html,sha256=k7f_Xl6nDUXXwu6IY_RblYni5TbZRRxCBduY5O_SyFs,2908
 supervisely/app/widgets/dataset_thumbnail/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -560,8 +560,8 @@ supervisely/cli/teamfiles/teamfiles_upload.py,sha256=xnsW2rvdq1e-KGjF1tMBu7Oxh3n
 supervisely/collection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/collection/key_indexed_collection.py,sha256=x2UVlkprspWhhae9oLUzjTWBoIouiWY9UQSS_MozfH0,37643
 supervisely/collection/str_enum.py,sha256=Zp29yFGvnxC6oJRYNNlXhO2lTSdsriU1wiGHj6ahEJE,1250
-supervisely/convert/__init__.py,sha256=fgJPpXP8jOt4lMbG0lYqWLOTDNcw695vINCqvZ0i6BA,2742
-supervisely/convert/base_converter.py,sha256=Y_uOUFJtqC44y_J6VsFB90hao8rrXkffV1ilxdj2T5o,18352
+supervisely/convert/__init__.py,sha256=qomoncLRQeOzJkMceC6okFbyYcVQIXdvH_VG0-yKMqo,2955
+supervisely/convert/base_converter.py,sha256=F2fD1zq3agV1H_T59V4nduI_0V4uVe9bjfPeu85L_8c,18004
 supervisely/convert/converter.py,sha256=tWxTDfFv7hwzQhUQrBxzfr6WP8FUGFX_ewg5T2HbUYo,8959
 supervisely/convert/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/image/image_converter.py,sha256=r-qdhuwOsk727mXIM26ucQhkoIKigu1M0BF-tw9IfGg,10321
@@ -609,7 +609,7 @@ supervisely/convert/image/yolo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 supervisely/convert/image/yolo/yolo_converter.py,sha256=cg5___X5MzvR-rZbNLmaKtr0MdRnyqtEzbBq5UBnYZ0,11171
 supervisely/convert/image/yolo/yolo_helper.py,sha256=aVCvOuSz73iwOM01lWb2N6ImXYsz0FMup9ACXKC1-Ek,7837
 supervisely/convert/pointcloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/convert/pointcloud/pointcloud_converter.py,sha256=WeJqEPhVQNWwJn5MiPoC3I1mUh8tH84BsGd2uHHjpnc,4907
+supervisely/convert/pointcloud/pointcloud_converter.py,sha256=yCCpzm7GrvL6WT4lNesvtYWWwdO3DO32JIOBBSSQgSA,7130
 supervisely/convert/pointcloud/bag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/pointcloud/bag/bag_converter.py,sha256=WWd6A2hS7H4MRgtLdJ-yYgmNU-Wk2eycl6LTTJM2GKQ,11391
 supervisely/convert/pointcloud/bag/bag_helper.py,sha256=2TFe49isZTxMhya-PApqLPxrvGnvRFMBc_--BwyCpWU,4284
@@ -619,20 +619,25 @@ supervisely/convert/pointcloud/las/las_helper.py,sha256=1gQ3OZLpe6D25CY_jXWDsrLB
 supervisely/convert/pointcloud/lyft/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/pointcloud/lyft/lyft_converter.py,sha256=bM9R3LLt4l5frK1Lhmy_WnhGUYCC7rH94v94sqmLxjY,11010
 supervisely/convert/pointcloud/lyft/lyft_helper.py,sha256=bTe7ryLPfSkW0MjzFP-6AMyDMBtPu8Xk9cx0g0MomoQ,8521
+supervisely/convert/pointcloud/nuscenes_conv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+supervisely/convert/pointcloud/nuscenes_conv/nuscenes_converter.py,sha256=YZlPjY8F_k270Mqir7yce7KIOh9SlU8i80nr-IaAj1Y,10121
 supervisely/convert/pointcloud/ply/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/pointcloud/ply/ply_converter.py,sha256=2ZCYkhJQzUev-sWGsBwCPtj1TGjdcx8o-Q--RAHavp8,2698
 supervisely/convert/pointcloud/ply/ply_helper.py,sha256=YfLiV9m6a4NNEMs0J32dmMTLffMLX4-JPTThMHOEK4w,268
 supervisely/convert/pointcloud/sly/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/convert/pointcloud/sly/sly_pointcloud_converter.py,sha256=cIBx5mEwtbJevxUCksPvC0KZRtQX_q3h7MaLSjli0N0,5455
-supervisely/convert/pointcloud/sly/sly_pointcloud_helper.py,sha256=fhXrRBFqAMpJpparkAwxAaLGN_yArRuAbKTAK4bJpfw,3898
+supervisely/convert/pointcloud/sly/sly_pointcloud_converter.py,sha256=r56Rwil-55cRnd0sIePFGrf_xXa-lKQSfwhEUrjOquk,5070
+supervisely/convert/pointcloud/sly/sly_pointcloud_helper.py,sha256=kOluL97FfCFfIvnUE_FeN8iQLMlwdiMR5gayorOGDXw,3968
 supervisely/convert/pointcloud_episodes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/convert/pointcloud_episodes/pointcloud_episodes_converter.py,sha256=ynqF1PSn3zWCD4SS7nvLE5eerAG1Nvj_StsoJ5JrNPg,6703
+supervisely/convert/pointcloud_episodes/pointcloud_episodes_converter.py,sha256=qULUzO96BvWgNVmyxSQ0pUPBPG3WHgUJuK_U7Z8NM-g,9428
 supervisely/convert/pointcloud_episodes/bag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/pointcloud_episodes/bag/bag_converter.py,sha256=jzWKXoFUWu11d5WlPfT1hphCubYpq_lhQZmhh07xZdQ,1659
 supervisely/convert/pointcloud_episodes/lyft/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/convert/pointcloud_episodes/lyft/lyft_converter.py,sha256=wdq_dO5Vejj0Df5Fuo-oQBWkEF1IGBr89XuBBHilGmM,10384
+supervisely/convert/pointcloud_episodes/lyft/lyft_converter.py,sha256=QXreWUJ-QhoWgLPqRxCayatYCCCuSV6Z2XCZKScrD3o,10419
+supervisely/convert/pointcloud_episodes/nuscenes_conv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+supervisely/convert/pointcloud_episodes/nuscenes_conv/nuscenes_converter.py,sha256=hveKmKVe-jOvME1mMbDwynTlL5kKqd53T9BDmFitbkM,12808
+supervisely/convert/pointcloud_episodes/nuscenes_conv/nuscenes_helper.py,sha256=RrTlskRrqxwzrjFfT4e5aI9YeAxnun7Io9fjoicZmnY,8959
 supervisely/convert/pointcloud_episodes/sly/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/convert/pointcloud_episodes/sly/sly_pointcloud_episodes_converter.py,sha256=7ONcZMOUJCNpmc0tmMX6FnNG0lu8Nj9K2SSTQHaSXFM,6188
+supervisely/convert/pointcloud_episodes/sly/sly_pointcloud_episodes_converter.py,sha256=fSEGxuTtFTAOLNBAZncOxw9PVALBOtB7yZ8qTCaET7w,6102
 supervisely/convert/pointcloud_episodes/sly/sly_pointcloud_episodes_helper.py,sha256=h4WvNH6cEHtjxxhCnU7Hs2vkyJMye0qwabqXNYVTywE,3570
 supervisely/convert/video/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/video/video_converter.py,sha256=f-b6FexBjXw9xWv5w8lxlNxCh4FvacNolX-WQDibWFs,11338
@@ -1062,9 +1067,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.274.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.274.dist-info/METADATA,sha256=PHTIEhW0ErGXlcajujh7MS3qSy4cq8TDdAIhh_eIY7U,33573
-supervisely-6.73.274.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.274.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.274.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.274.dist-info/RECORD,,
+supervisely-6.73.276.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.276.dist-info/METADATA,sha256=IEQlHjL5OYrRUVXISxSa5jZEaxfStqtTGbn40HHu810,33573
+supervisely-6.73.276.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.276.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.276.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.276.dist-info/RECORD,,