supervisely 6.73.322__py3-none-any.whl → 6.73.323__py3-none-any.whl

supervisely/annotation/annotation.py

@@ -404,7 +404,7 @@ class Annotation:
                 f"Failed to deserialize one of the label from JSON format annotation: \n{repr(e)}"
             )
 
-        custom_data = data.get(AnnotationJsonFields.CUSTOM_DATA, {})
+        custom_data = data.get(AnnotationJsonFields.CUSTOM_DATA, {}) or {}
         prob_labels = None
         if (
             AnnotationJsonFields.PROBABILITY_LABELS in custom_data

supervisely/convert/base_converter.py

@@ -71,6 +71,7 @@ class AvailablePointcloudEpisodesConverters:
 class AvailableVolumeConverters:
     SLY = "supervisely"
     DICOM = "dicom"
+    NII = "nii"
 
 
 class BaseConverter:

supervisely/convert/volume/__init__.py

@@ -1,3 +1,4 @@
 # Volume
 from supervisely.convert.volume.sly.sly_volume_converter import SLYVolumeConverter
 from supervisely.convert.volume.dicom.dicom_converter import DICOMConverter
+from supervisely.convert.volume.nii.nii_volume_converter import NiiConverter

supervisely/convert/volume/nii/nii_volume_converter.py

@@ -0,0 +1,151 @@
+import os
+from pathlib import Path
+
+import magic
+
+from supervisely import ProjectMeta, generate_free_name, logger
+from supervisely._utils import batched, is_development
+from supervisely.annotation.obj_class import ObjClass
+from supervisely.annotation.obj_class_collection import ObjClassCollection
+from supervisely.api.api import Api
+from supervisely.convert.base_converter import AvailableVolumeConverters
+from supervisely.convert.volume.nii import nii_volume_helper as helper
+from supervisely.convert.volume.volume_converter import VolumeConverter
+from supervisely.geometry.mask_3d import Mask3D
+from supervisely.io.fs import (
+    get_file_ext,
+    get_file_name,
+    get_file_name_with_ext,
+    list_files,
+)
+from supervisely.volume.volume import is_nifti_file
+from supervisely.volume_annotation.volume_annotation import VolumeAnnotation
+from supervisely.volume_annotation.volume_object import VolumeObject
+
+
+class NiiConverter(VolumeConverter):
+
+    def __str__(self) -> str:
+        return AvailableVolumeConverters.NII
+
+    def validate_format(self) -> bool:
+        # create Items
+        converted_dir_name = "converted"
+        # nrrds_dict = {}
+        nifti_dict = {}
+        nifti_dirs = {}
+        for root, _, files in os.walk(self._input_data):
+            dir_name = os.path.basename(root)
+            nifti_dirs[dir_name] = root
+            if converted_dir_name in root:
+                continue
+            for file in files:
+                path = os.path.join(root, file)
+                mime = magic.from_file(path, mime=True)
+                if mime == "application/gzip" or mime == "application/octet-stream":
+                    if is_nifti_file(path):  # is nifti
+                        name = get_file_name(path)
+                        if name.endswith(".nii"):
+                            name = get_file_name(name)
+                        nifti_dict[name] = path
+
+        self._items = []
+        skip_files = []
+        for name, nrrd_path in nifti_dict.items():
+            if name in nifti_dirs:
+                item = self.Item(item_path=nrrd_path)
+                ann_dir = nifti_dirs[name]
+                item.ann_data = list_files(ann_dir, [".nii", ".nii.gz", ".gz"], None, True)
+                self._items.append(item)
+                skip_files.extend(item.ann_data)
+                skip_files.append(nrrd_path)
+
+        for name, nrrd_path in nifti_dict.items():
+            if nrrd_path in skip_files:
+                continue
+            item = self.Item(item_path=nrrd_path)
+            self._items.append(item)
+
+        self._meta = ProjectMeta()
+        return self.items_count > 0
+
+    def upload_dataset(
+        self,
+        api: Api,
+        dataset_id: int,
+        batch_size: int = 1,
+        log_progress=True,
+    ):
+        """Upload converted data to Supervisely"""
+
+        meta, renamed_classes, renamed_tags = self.merge_metas_with_conflicts(api, dataset_id)
+
+        existing_names = set([vol.name for vol in api.volume.get_list(dataset_id)])
+
+        if log_progress:
+            progress, progress_cb = self.get_progress(
+                self.items_count, "Converting and uploading volumes..."
+            )
+        else:
+            progress_cb = None
+
+        converted_dir_name = "converted"
+        converted_dir = os.path.join(self._input_data, converted_dir_name)
+        meta_changed = False
+
+        for batch in batched(self._items, batch_size=batch_size):
+            item_names = []
+            item_paths = []
+
+            for item in batch:
+                # nii_path = item.path
+                item.path = helper.nifti_to_nrrd(item.path, converted_dir)
+                ext = get_file_ext(item.path)
+                if ext.lower() != ext:
+                    new_volume_path = Path(item.path).with_suffix(ext.lower()).as_posix()
+                    os.rename(item.path, new_volume_path)
+                    item.path = new_volume_path
+                item.name = get_file_name_with_ext(item.path)
+                item.name = generate_free_name(
+                    existing_names, item.name, with_ext=True, extend_used_names=True
+                )
+                item_names.append(item.name)
+                item_paths.append(item.path)
+
+                volume_info = api.volume.upload_nrrd_serie_path(
+                    dataset_id, name=item.name, path=item.path
+                )
+
+                if isinstance(item.ann_data, list) and len(item.ann_data) > 0:
+                    objs = []
+                    spatial_figures = []
+                    for ann_path in item.ann_data:
+                        ann_name = get_file_name(ann_path)
+                        if ann_name.endswith(".nii"):
+                            ann_name = get_file_name(ann_name)
+                        for mask, _ in helper.get_annotation_from_nii(ann_path):
+                            obj_class = meta.get_obj_class(ann_name)
+                            if obj_class is None:
+                                obj_class = ObjClass(ann_name, Mask3D)
+                                meta = meta.add_obj_class(obj_class)
+                                meta_changed = True
+                            obj = VolumeObject(obj_class, mask_3d=mask)
+                            spatial_figures.append(obj.figure)
+                            objs.append(obj)
+                    ann = VolumeAnnotation(
+                        volume_info.meta, objects=objs, spatial_figures=spatial_figures
+                    )
+
+                    if meta_changed:
+                        self._meta = meta
+                        _, _, _ = self.merge_metas_with_conflicts(api, dataset_id)
+
+                    api.volume.annotation.append(volume_info.id, ann)
+
+            if log_progress:
+                progress_cb(len(batch))
+
+        if log_progress:
+            if is_development():
+                progress.close()
+        logger.info(f"Dataset ID:{dataset_id} has been successfully uploaded.")

supervisely/convert/volume/nii/nii_volume_helper.py

@@ -0,0 +1,38 @@
+import os
+from typing import Generator
+
+import nrrd
+import numpy as np
+
+from supervisely.geometry.mask_3d import Mask3D
+from supervisely.io.fs import ensure_base_path, get_file_ext, get_file_name
+from supervisely.volume.volume import convert_3d_nifti_to_nrrd
+
+
+def nifti_to_nrrd(nii_file_path: str, converted_dir: str) -> str:
+    """Convert NIfTI 3D volume file to NRRD 3D volume file."""
+
+    output_name = get_file_name(nii_file_path)
+    if get_file_ext(output_name) == ".nii":
+        output_name = get_file_name(output_name)
+
+    data, header = convert_3d_nifti_to_nrrd(nii_file_path)
+
+    nrrd_file_path = os.path.join(converted_dir, f"{output_name}.nrrd")
+    ensure_base_path(nrrd_file_path)
+
+    nrrd.write(nrrd_file_path, data, header)
+    return nrrd_file_path
+
+
+def get_annotation_from_nii(path: str) -> Generator[Mask3D, None, None]:
+    """Get annotation from NIfTI 3D volume file."""
+
+    data, _ = convert_3d_nifti_to_nrrd(path)
+    unique_classes = np.unique(data)
+
+    for class_id in unique_classes:
+        if class_id == 0:
+            continue
+        mask = Mask3D(data == class_id)
+        yield mask, class_id

supervisely/volume/volume.py

@@ -799,6 +799,49 @@ def convert_nifti_to_nrrd(path: str) -> Tuple[np.ndarray, dict]:
     }
     return data, header
 
+def convert_3d_nifti_to_nrrd(path: str) -> Tuple[np.ndarray, dict]:
+    """Convert 3D NIFTI volume to NRRD format.
+    Volume automatically reordered to RAS orientation as closest to canonical.
+
+    :param path: Path to NIFTI volume file.
+    :type path: str
+    :return: Volume data in NumPy array format and dictionary with metadata (NRRD header).
+    :rtype: Tuple[np.ndarray, dict]
+    :Usage example:
+
+     .. code-block:: python
+
+        import supervisely as sly
+
+        path = "/home/admin/work/volumes/vol_01.nii"
+        data, header = sly.volume.convert_nifti_to_nrrd(path)
+    """
+
+    import nibabel as nib  # pylint: disable=import-error
+
+    orientation_map = {
+        ('R', 'A', 'S'): "right-anterior-superior",
+        ('L', 'P', 'S'): "left-posterior-superior",
+        ('R', 'P', 'I'): "right-posterior-inferior",
+        ('L', 'A', 'I'): "left-anterior-inferior"
+    }
+    nifti = nib.load(path)
+    reordered_to_ras_nifti = nib.as_closest_canonical(nifti)
+    data = reordered_to_ras_nifti.get_fdata()
+    affine = reordered_to_ras_nifti.affine
+    orientation = nib.aff2axcodes(affine)
+    space_directions = affine[:3, :3].tolist()
+    space_origin = affine[:3, 3].tolist()
+    header = {
+        "space": orientation_map.get(orientation, "unknown"),
+        "space directions": space_directions,
+        "space origin": space_origin,
+        "sizes": data.shape,
+        "type": str(data.dtype),
+        "dimension": len(data.shape),
+    }
+    return data, header
+
 
 def is_nifti_file(path: str) -> bool:
     """Check if the file is a NIFTI file.

{supervisely-6.73.322.dist-info → supervisely-6.73.323.dist-info}/METADATA

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

{supervisely-6.73.322.dist-info → supervisely-6.73.323.dist-info}/RECORD

@@ -5,7 +5,7 @@ supervisely/function_wrapper.py,sha256=R5YajTQ0GnRp2vtjwfC9hINkzQc0JiyGsu8TER373
 supervisely/sly_logger.py,sha256=z92Vu5hmC0GgTIJO1n6kPDayRW9__8ix8hL6poDZj-Y,6274
 supervisely/tiny_timer.py,sha256=hkpe_7FE6bsKL79blSs7WBaktuPavEVu67IpEPrfmjE,183
 supervisely/annotation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/annotation/annotation.py,sha256=5AG1AhebkmiYy2r7nKbz6TjdmCF4tuf9FtqUjLLs7aU,114659
+supervisely/annotation/annotation.py,sha256=x1RizD9DPiwk14Mf8xGvuwPdzx_zI5Zx1CVvmCy_sII,114665
 supervisely/annotation/annotation_transforms.py,sha256=TlVy_gUbM-XH6GbLpZPrAi6pMIGTr7Ow02iSKOSTa-I,9582
 supervisely/annotation/json_geometries_map.py,sha256=nL6AmMhFy02fw9ryBm75plKyOkDh61QdOToSuLAcz_Q,1659
 supervisely/annotation/label.py,sha256=NpHZ5o2H6dI4KiII22o2HpiLXG1yekh-bEy8WvI2Ljg,37498
@@ -565,7 +565,7 @@ supervisely/collection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 supervisely/collection/key_indexed_collection.py,sha256=x2UVlkprspWhhae9oLUzjTWBoIouiWY9UQSS_MozfH0,37643
 supervisely/collection/str_enum.py,sha256=Zp29yFGvnxC6oJRYNNlXhO2lTSdsriU1wiGHj6ahEJE,1250
 supervisely/convert/__init__.py,sha256=ropgB1eebG2bfLoJyf2jp8Vv9UkFujaW3jVX-71ho1g,1353
-supervisely/convert/base_converter.py,sha256=rRMIxY3h7cX5WAu_qn7w9vzRBcDB_jLZm5u_XQh7QG4,18563
+supervisely/convert/base_converter.py,sha256=O2SP4I_Hd0aSn8kbOUocy8orkc_-iD-TQ-z4ieUqabA,18579
 supervisely/convert/converter.py,sha256=tWxTDfFv7hwzQhUQrBxzfr6WP8FUGFX_ewg5T2HbUYo,8959
 supervisely/convert/image/__init__.py,sha256=JEuyaBiiyiYmEUYqdn8Mog5FVXpz0H1zFubKkOOm73I,1395
 supervisely/convert/image/image_converter.py,sha256=8vak8ZoKTN1ye2ZmCTvCZ605-Rw1AFLIEo7bJMfnR68,10426
@@ -658,11 +658,14 @@ supervisely/convert/video/mot/mot_converter.py,sha256=wXbv-9Psc2uVnhzHuOt5VnRIvS
 supervisely/convert/video/sly/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/video/sly/sly_video_converter.py,sha256=S2qif7JFxqIi9VN_ez_iBtoJXpG9W6Ky2k5Er3-DtUo,4418
 supervisely/convert/video/sly/sly_video_helper.py,sha256=D8PgoXpi0y3z-VEqvBLDf_gSUQ2hTL3irrfJyGhaV0Y,6758
-supervisely/convert/volume/__init__.py,sha256=ZXV1GwQlvKY7sZroUU-jiMTkgngk1aimh51nw1onzuc,168
+supervisely/convert/volume/__init__.py,sha256=NjVfOa9uH1BdYvB-RynW6L28x0f_tqL9p7tHSIQ6Sso,245
 supervisely/convert/volume/volume_converter.py,sha256=3jpt2Yn_G4FSP_vHFsJHQfYNQpT7q6ar_sRyr_xrPnA,5335
 supervisely/convert/volume/dicom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/volume/dicom/dicom_converter.py,sha256=__QP8fMAaq_BdWFYh1_nAYT2gpY1WwZzdlDj39YwHhw,3195
 supervisely/convert/volume/dicom/dicom_helper.py,sha256=1EXmxl5Z8Xi3ZkZnfJ4EbiPCVyITSXUc0Cn_oo02pPE,1284
+supervisely/convert/volume/nii/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+supervisely/convert/volume/nii/nii_volume_converter.py,sha256=kI2JmeFuLfLWgYGCEozoaka1QH4TocnfgyN0em6maa0,5946
+supervisely/convert/volume/nii/nii_volume_helper.py,sha256=kzh20fsdeI8efA0vawW0M6Wh48nMlCLzHBQFuSNVFmc,1136
 supervisely/convert/volume/sly/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/volume/sly/sly_volume_converter.py,sha256=XmSuxnRqxchG87b244f3h0UHvOt6IkajMquL1drWlCM,5595
 supervisely/convert/volume/sly/sly_volume_helper.py,sha256=gUY0GW3zDMlO2y-zQQG36uoXMrKkKz4-ErM1CDxFCxE,5620
@@ -1056,7 +1059,7 @@ supervisely/volume/__init__.py,sha256=EBZBY_5mzabXzMUQh5akusIGd16XnX9n8J0jIi_JmW
 supervisely/volume/nrrd_encoder.py,sha256=1lqwwyqxEvctw1ysQ70x4xPSV1uy1g5YcH5CURwL7-c,4084
 supervisely/volume/nrrd_loader.py,sha256=_yqahKcqSRxunHZ5LtnUWIRA7UvIhPKOhAUwYijSGY4,9065
 supervisely/volume/stl_converter.py,sha256=WIMQgHO_u4JT58QdcMXcb_euF1BFhM7D52IVX_0QTxE,6285
-supervisely/volume/volume.py,sha256=-AAZIducizejhXyZWmaytCPLCcF8_vdnXDSTpJb5jIs,24337
+supervisely/volume/volume.py,sha256=7ebCIICqZMwRP3ruRy3PtSeiUpBpSlyRH20VJybBQbI,25828
 supervisely/volume_annotation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/volume_annotation/constants.py,sha256=BdFIh56fy7vzLIjt0gH8xP01EIU-qgQIwbSHVUcABCU,569
 supervisely/volume_annotation/plane.py,sha256=wyezAcc8tLp38O44CwWY0wjdQxf3VjRdFLWooCrk-Nw,16301
@@ -1078,9 +1081,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.322.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.322.dist-info/METADATA,sha256=tXlMoMRbbXrc18yQVTx6Ti09xSaTCC4TyKgLUoNIC_U,33596
-supervisely-6.73.322.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.322.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.322.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.322.dist-info/RECORD,,
+supervisely-6.73.323.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.323.dist-info/METADATA,sha256=uIqQoH6i-OiLhSZSLt6SqL7O1ZWPV0D6ZRJICli80eE,33596
+supervisely-6.73.323.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.323.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.323.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.323.dist-info/RECORD,,