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

supervisely/_utils.py

@@ -471,9 +471,20 @@ def get_or_create_event_loop() -> asyncio.AbstractEventLoop:
             return loop
 
 
-def sync_call(coro):
+def run_coroutine(coroutine):
     """
-    This function is used to run asynchronous functions in synchronous context.
+    Runs an asynchronous coroutine in a synchronous context and waits for its result.
+
+    This function checks if an event loop is already running:
+    - If a loop is running, it schedules the coroutine using `asyncio.run_coroutine_threadsafe()`
+      and waits for the result.
+    - If no loop is running, it creates one and executes the coroutine with `run_until_complete()`.
+
+    This ensures compatibility with both synchronous and asynchronous environments
+    without creating unnecessary event loops.
+
+    ⚠️ Note: This method is preferable when working with `asyncio` objects like `Semaphore`,
+    since it avoids issues with mismatched event loops.
 
     :param coro: Asynchronous function.
     :type coro: Coroutine
@@ -484,13 +495,13 @@ def sync_call(coro):
 
     .. code-block:: python
 
-            from supervisely.utils import sync_call
+            from supervisely._utils import run_coroutine
 
             async def async_function():
                 await asyncio.sleep(1)
                 return "Hello, World!"
             coro = async_function()
-            result = sync_call(coro)
+            result = run_coroutine(coro)
             print(result)
             # Output: Hello, World!
     """
@@ -498,10 +509,10 @@ def sync_call(coro):
     loop = get_or_create_event_loop()
 
     if loop.is_running():
-        future = asyncio.run_coroutine_threadsafe(coro, loop=loop)
+        future = asyncio.run_coroutine_threadsafe(coroutine, loop=loop)
         return future.result()
     else:
-        return loop.run_until_complete(coro)
+        return loop.run_until_complete(coroutine)
 
 
 def get_filename_from_headers(url):

supervisely/api/file_api.py

@@ -23,8 +23,9 @@ from typing_extensions import Literal
 
 import supervisely.io.env as env
 import supervisely.io.fs as sly_fs
-from supervisely._utils import batched, rand_str
+from supervisely._utils import batched, rand_str, run_coroutine
 from supervisely.api.module_api import ApiField, ModuleApiBase
+from supervisely.api.remote_storage_api import RemoteStorageApi
 from supervisely.io.fs import (
     ensure_base_path,
     get_file_ext,
@@ -1420,7 +1421,8 @@ class FileApi(ModuleApiBase):
             api.file.upload_directory(9, local_path, path_to_dir)
         """
         if not remote_dir.startswith("/"):
-            remote_dir = "/" + remote_dir
+            if not RemoteStorageApi.is_bucket_url(remote_dir):
+                remote_dir = "/" + remote_dir
 
         if self.dir_exists(team_id, remote_dir):
             if change_name_if_conflict is True:
@@ -2302,3 +2304,89 @@ class FileApi(ModuleApiBase):
             else:
                 raise e
         return res_remote_dir
+
+    def upload_directory_fast(
+        self,
+        team_id: int,
+        local_dir: str,
+        remote_dir: str,
+        change_name_if_conflict: Optional[bool] = True,
+        progress_cb: Optional[Union[tqdm, Callable]] = None,
+        replace_if_conflict: Optional[bool] = False,
+        enable_fallback: Optional[bool] = True,
+    ) -> str:
+        """
+        Upload Directory to Team Files from local path in fast mode.
+        Files are uploaded asynchronously. If an error occurs, the method will fallback to synchronous upload.
+
+        :param team_id: Team ID in Supervisely.
+        :type team_id: int
+        :param local_dir: Path to local Directory.
+        :type local_dir: str
+        :param remote_dir: Path to Directory in Team Files.
+        :type remote_dir: str
+        :param change_name_if_conflict: Checks if given name already exists and adds suffix to the end of the name.
+        :type change_name_if_conflict: bool, optional
+        :param progress_cb: Function for tracking download progress in bytes.
+        :type progress_cb: Progress, optional
+        :param replace_if_conflict: If True, replace existing dir.
+        :type replace_if_conflict: bool, optional
+        :param enable_fallback: If True, the method will fallback to synchronous upload if an error occurs.
+        :type enable_fallback: bool, optional
+        :return: Path to Directory in Team Files
+        :rtype: :class:`str`
+        """
+        coroutine = self.upload_directory_async(
+            team_id=team_id,
+            local_dir=local_dir,
+            remote_dir=remote_dir,
+            change_name_if_conflict=change_name_if_conflict,
+            progress_size_cb=progress_cb,
+            replace_if_conflict=replace_if_conflict,
+            enable_fallback=enable_fallback,
+        )
+        return run_coroutine(coroutine)
+
+    def upload_bulk_fast(
+        self,
+        team_id: int,
+        src_paths: List[str],
+        dst_paths: List[str],
+        semaphore: Optional[asyncio.Semaphore] = None,
+        progress_cb: Optional[Union[tqdm, Callable]] = None,
+        progress_cb_type: Literal["number", "size"] = "size",
+        enable_fallback: Optional[bool] = True,
+    ) -> None:
+        """
+        Upload multiple files from local paths to Team Files in fast mode.
+        Files are uploaded asynchronously. If an error occurs, the method will fallback to synchronous upload.
+
+        :param team_id: Team ID in Supervisely.
+        :type team_id: int
+        :param src_paths: List of local paths to files.
+        :type src_paths: List[str]
+        :param dst_paths: List of paths to save files in Team Files.
+        :type dst_paths: List[str]
+        :param semaphore: Semaphore for limiting the number of simultaneous uploads.
+        :type semaphore: asyncio.Semaphore, optional
+        :param progress_cb: Function for tracking download progress.
+        :type progress_cb: tqdm or callable, optional
+        :param progress_cb_type: Type of progress callback. Can be "number" or "size". Default is "size".
+                                "size" is used to track the number of transferred bytes.
+                                "number" is used to track the number of transferred files.
+        :type progress_cb_type: Literal["number", "size"], optional 
+        :param enable_fallback: If True, the method will fallback to synchronous upload if an error occurs.
+        :type enable_fallback: bool, optional
+        :return: None
+        :rtype: :class:`NoneType`
+        """
+        coroutine = self.upload_bulk_async(
+            team_id=team_id,
+            src_paths=src_paths,
+            dst_paths=dst_paths,
+            semaphore=semaphore,
+            progress_cb=progress_cb,
+            progress_cb_type=progress_cb_type,
+            enable_fallback=enable_fallback,
+        )
+        return run_coroutine(coroutine)

supervisely/app/fastapi/utils.py

@@ -3,6 +3,20 @@ import concurrent.futures
 
 
 def run_sync(coroutine):
+    """
+    Runs an asynchronous coroutine in a separate thread and waits for its result.
+    It is useful for running async functions in a synchronous
+    environment.
+
+    This method creates a new thread using ThreadPoolExecutor and executes the coroutine
+    inside a new event loop.
+
+    ⚠️ Note: This function creates a new event loop every time it is called,
+    which can cause issues when using objects tied to a specific loop (e.g., asyncio.Semaphore).
+
+    :param coroutine: coroutine to run
+    :return: result of coroutine
+    """
     try:
         with concurrent.futures.ThreadPoolExecutor(max_workers=1) as executor:
             result = executor.submit(

supervisely/convert/converter.py

@@ -57,12 +57,12 @@ class ImportManager:
         self._labeling_interface = labeling_interface
         self._upload_as_links = upload_as_links
         self._remote_files_map = {}
+        self._modality = project_type
 
         self._input_data = self._prepare_input_data(input_data)
         self._unpack_archives(self._input_data)
         remove_junk_from_dir(self._input_data)
 
-        self._modality = project_type
         self._converter = self.get_converter()
         if isinstance(self._converter, (HighColorDepthImageConverter, CSVConverter)):
             self._converter.team_id = self._team_id
@@ -112,17 +112,27 @@ class ImportManager:
             logger.info(f"Input data is a local file: {input_data}. Will use its directory")
             return os.path.dirname(input_data)
         elif self._api.storage.exists(self._team_id, input_data):
-            if self._upload_as_links:
+            if self._upload_as_links and str(self._modality) in [
+                ProjectType.IMAGES.value,
+                ProjectType.VIDEOS.value,
+            ]:
                 logger.info(f"Input data is a remote file: {input_data}. Scanning...")
-                return self._scan_remote_files(input_data)
+                return self._reproduce_remote_files(input_data)
             else:
+                if self._upload_as_links and str(self._modality) == ProjectType.VOLUMES.value:
+                    self._scan_remote_files(input_data)
                 logger.info(f"Input data is a remote file: {input_data}. Downloading...")
                 return self._download_input_data(input_data)
         elif self._api.storage.dir_exists(self._team_id, input_data):
-            if self._upload_as_links:
+            if self._upload_as_links and str(self._modality) in [
+                ProjectType.IMAGES.value,
+                ProjectType.VIDEOS.value,
+            ]:
                 logger.info(f"Input data is a remote directory: {input_data}. Scanning...")
-                return self._scan_remote_files(input_data, is_dir=True)
+                return self._reproduce_remote_files(input_data, is_dir=True)
             else:
+                if self._upload_as_links and str(self._modality) == ProjectType.VOLUMES.value:
+                    self._scan_remote_files(input_data, is_dir=True)
                 logger.info(f"Input data is a remote directory: {input_data}. Downloading...")
                 return self._download_input_data(input_data, is_dir=True)
         else:
@@ -160,7 +170,35 @@ class ImportManager:
         return local_path
 
     def _scan_remote_files(self, remote_path, is_dir=False):
-        """Scan remote directory and create dummy structure locally"""
+        """
+        Scan remote directory. Collect local-remote paths mapping
+        Will be used to save relations between uploaded files and remote files (for volumes).
+        """
+
+        dir_path = remote_path.rstrip("/") if is_dir else os.path.dirname(remote_path)
+        dir_name = os.path.basename(dir_path)
+
+        local_path = os.path.join(get_data_dir(), dir_name)
+
+        if is_dir:
+            files = self._api.storage.list(self._team_id, remote_path, include_folders=False)
+        else:
+            files = [self._api.storage.get_info_by_path(self._team_id, remote_path)]
+
+        unique_directories = set()
+        for file in files:
+            new_path = file.path.replace(dir_path, local_path)
+            self._remote_files_map[new_path] = file.path
+            unique_directories.add(str(Path(file.path).parent))
+
+        logger.info(f"Scanned remote directories:\n   - " + "\n   - ".join(unique_directories))
+        return local_path
+
+    def _reproduce_remote_files(self, remote_path, is_dir=False):
+        """
+        Scan remote directory and create dummy structure locally.
+        Will be used to detect annotation format (by dataset structure) remotely.
+        """
 
         dir_path = remote_path.rstrip("/") if is_dir else os.path.dirname(remote_path)
         dir_name = os.path.basename(dir_path)

supervisely/convert/volume/__init__.py

@@ -2,3 +2,6 @@
 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
+from supervisely.convert.volume.nii.nii_planes_volume_converter import (
+    NiiPlaneStructuredConverter,
+)

supervisely/convert/volume/nii/nii_planes_volume_converter.py

@@ -0,0 +1,114 @@
+import os
+from collections import defaultdict
+from pathlib import Path
+
+from supervisely import ProjectMeta, logger
+from supervisely.annotation.obj_class import ObjClass
+from supervisely.convert.volume.nii import nii_volume_helper as helper
+from supervisely.convert.volume.nii.nii_volume_converter import NiiConverter
+from supervisely.convert.volume.volume_converter import VolumeConverter
+from supervisely.geometry.mask_3d import Mask3D
+from supervisely.io.fs import get_file_name
+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 NiiPlaneStructuredConverter(NiiConverter, VolumeConverter):
+    """Convert NIfTI 3D volume file to Supervisely format.
+    The NIfTI file should be structured as follows:
+    - <prefix>_anatomic_<idx>.nii (or .nii.gz)
+    - <prefix>_inference_<idx>.nii (or .nii.gz)
+        where   <prefix> is one of the following: cor, sag, axl
+                <idx> is the index of the volume (to match volumes with annotations)
+
+    Supports .nii and .nii.gz files.
+
+    Example:
+        📂 .
+        ├── 🩻 axl_anatomic_1.nii
+        ├── 🩻 axl_inference_1.nii class 1 (may contain multiple instances of the same class)
+        ├── 🩻 cor_anatomic_1.nii
+        ├── 🩻 cor_inference_1.nii class 1
+        ├── 🩻 sag_anatomic_1.nii
+        ├── 🩻 sag_inference_1.nii class 1
+        ├── 🩻 sag_inference_2.nii class 2
+        └── 🩻 sag_inference_3.nii class 3
+    """
+
+    def validate_format(self) -> bool:
+        # create Items
+        converted_dir_name = "converted"
+
+        volumes_dict = defaultdict(list)
+        ann_dict = defaultdict(list)
+
+        for root, _, files in os.walk(self._input_data):
+            if converted_dir_name in root:
+                continue
+            for file in files:
+                path = os.path.join(root, file)
+                if is_nifti_file(path):
+                    full_name = get_file_name(path)
+                    if full_name.endswith(".nii"):
+                        full_name = get_file_name(full_name)
+                    prefix = full_name.split("_")[0]
+                    if prefix not in helper.PlanePrefix.values():
+                        continue
+                    name = full_name.split("_")[1]
+                    idx = 1 if len(name.split("_")) < 3 else int(name.split("_")[2])
+                    if name in helper.LABEL_NAME or name[:-1] in helper.LABEL_NAME:
+                        ann_dict[prefix].append(path)
+                    else:
+                        volumes_dict[prefix].append(path)
+
+        self._items = []
+        for prefix, paths in volumes_dict.items():
+            if len(paths) == 1:
+                item = self.Item(item_path=paths[0])
+                item.ann_data = ann_dict.get(prefix)
+                self._items.append(item)
+            elif len(paths) > 1:
+                logger.info(
+                    f"Found {len(paths)} volumes with prefix {prefix}. Will try to match them by directories."
+                )
+                for path in paths:
+                    item = self.Item(item_path=path)
+                    possible_ann_paths = []
+                    for ann_path in ann_dict.get(prefix):
+                        if Path(ann_path).parent == Path(path).parent:
+                            possible_ann_paths.append(ann_path)
+                    item.ann_data = possible_ann_paths
+                    self._items.append(item)
+        self._meta = ProjectMeta()
+        return self.items_count > 0
+
+    def to_supervisely(
+        self,
+        item: VolumeConverter.Item,
+        meta: ProjectMeta = None,
+        renamed_classes: dict = None,
+        renamed_tags: dict = None,
+    ) -> VolumeAnnotation:
+        """Convert to Supervisely format."""
+
+        try:
+            objs = []
+            spatial_figures = []
+            for idx, ann_path in enumerate(item.ann_data, start=1):
+                for mask, _ in helper.get_annotation_from_nii(ann_path):
+                    class_name = f"Segment_{idx}"
+                    class_name = renamed_classes.get(class_name, class_name)
+                    obj_class = meta.get_obj_class(class_name)
+                    if obj_class is None:
+                        obj_class = ObjClass(class_name, Mask3D)
+                        meta = meta.add_obj_class(obj_class)
+                        self._meta_changed = True
+                        self._meta = meta
+                    obj = VolumeObject(obj_class, mask_3d=mask)
+                    spatial_figures.append(obj.figure)
+                    objs.append(obj)
+            return VolumeAnnotation(item.volume_meta, objects=objs, spatial_figures=spatial_figures)
+        except Exception as e:
+            logger.warning(f"Failed to convert {item.path} to Supervisely format: {e}")
+            return item.create_empty_annotation()

supervisely/convert/volume/nii/nii_volume_converter.py

@@ -1,12 +1,9 @@
 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
@@ -18,12 +15,47 @@ from supervisely.io.fs import (
     get_file_name_with_ext,
     list_files,
 )
-from supervisely.volume.volume import is_nifti_file
+from supervisely.task.progress import tqdm_sly
+from supervisely.volume.volume import is_nifti_file, read_nrrd_serie_volume_np
 from supervisely.volume_annotation.volume_annotation import VolumeAnnotation
 from supervisely.volume_annotation.volume_object import VolumeObject
 
 
 class NiiConverter(VolumeConverter):
+    """
+    Convert NIfTI 3D volume file to Supervisely format.
+    Supports .nii and .nii.gz files.
+
+    The NIfTI file should be structured as follows:
+    - <volume_name>.nii
+    - <volume_name>/
+        - <cls_name_1>.nii
+        - <cls_name_2>.nii
+        - ...
+    - ...
+
+    where   <volume_name> is the name of the volume
+            If the volume has annotations, they should be in the corresponding directory
+                with the same name as the volume (without extension)
+            <cls_name> is the name of the annotation class
+                <cls_name>.nii:
+                    - represent objects of the single class
+                    - should be unique for the current volume (e.g. tumor.nii.gz, lung.nii.gz)
+                    - can contain multiple objects of the class (each object should be represented by a different value in the mask)
+
+    Example:
+    📂 .
+    ├── 📂 CTChest
+    │   ├── 🩻 lung.nii.gz
+    │   └── 🩻 tumor.nii.gz
+    ├── 🩻 CTChest.nii.gz
+    └── 🩻 Spine.nii.gz
+    """
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._supports_links = True
+        self._meta_changed = False
 
     def __str__(self) -> str:
         return AvailableVolumeConverters.NII
@@ -34,6 +66,9 @@ class NiiConverter(VolumeConverter):
         # nrrds_dict = {}
         nifti_dict = {}
         nifti_dirs = {}
+
+        planes_detected = {p: False for p in helper.PlanePrefix.values()}
+
         for root, _, files in os.walk(self._input_data):
             dir_name = os.path.basename(root)
             nifti_dirs[dir_name] = root
@@ -41,13 +76,17 @@ class NiiConverter(VolumeConverter):
                 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
+                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
+                    for prefix in planes_detected.keys():
+                        if name.startswith(prefix):
+                            planes_detected[prefix] = True
+
+        if any(planes_detected.values()):
+            return False
 
         self._items = []
         skip_files = []
@@ -69,6 +108,39 @@ class NiiConverter(VolumeConverter):
         self._meta = ProjectMeta()
         return self.items_count > 0
 
+    def to_supervisely(
+        self,
+        item: VolumeConverter.Item,
+        meta: ProjectMeta = None,
+        renamed_classes: dict = None,
+        renamed_tags: dict = None,
+    ) -> VolumeAnnotation:
+        """Convert to Supervisely format."""
+
+        try:
+            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)
+
+                ann_name = renamed_classes.get(ann_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)
+                        self._meta_changed = True
+                        self._meta = meta
+                    obj = VolumeObject(obj_class, mask_3d=mask)
+                    spatial_figures.append(obj.figure)
+                    objs.append(obj)
+            return VolumeAnnotation(item.volume_meta, objects=objs, spatial_figures=spatial_figures)
+        except Exception as e:
+            logger.warning(f"Failed to convert {item.path} to Supervisely format: {e}")
+            return item.create_empty_annotation()
+
     def upload_dataset(
         self,
         api: Api,
@@ -78,7 +150,7 @@ class NiiConverter(VolumeConverter):
     ):
         """Upload converted data to Supervisely"""
 
-        meta, renamed_classes, renamed_tags = self.merge_metas_with_conflicts(api, dataset_id)
+        meta, renamed_classes, _ = self.merge_metas_with_conflicts(api, dataset_id)
 
         existing_names = set([vol.name for vol in api.volume.get_list(dataset_id)])
 
@@ -91,13 +163,16 @@ class NiiConverter(VolumeConverter):
 
         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:
+                if self._upload_as_links:
+                    remote_path = self.remote_files_map.get(item.path)
+                    if remote_path is not None:
+                        item.custom_data = {"remote_path": remote_path}
                 # nii_path = item.path
                 item.path = helper.nifti_to_nrrd(item.path, converted_dir)
                 ext = get_file_ext(item.path)
@@ -112,35 +187,28 @@ class NiiConverter(VolumeConverter):
                 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
+                # upload volume
+                volume_np, volume_meta = read_nrrd_serie_volume_np(item.path)
+                progress_nrrd = tqdm_sly(
+                    desc=f"Uploading volume '{item.name}'",
+                    total=sum(volume_np.shape),
+                    leave=True if progress_cb is None else False,
+                    position=1,
                 )
+                if item.custom_data is not None:
+                    volume_meta.update(item.custom_data)
+                api.volume.upload_np(dataset_id, item.name, volume_np, volume_meta, progress_nrrd)
+                info = api.volume.get_info_by_name(dataset_id, item.name)
+                item.volume_meta = info.meta
 
-                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)
+                # create and upload annotation
+                if item.ann_data is not None:
+                    ann = self.to_supervisely(item, meta, renamed_classes, None)
+
+                    if self._meta_changed:
+                        meta, renamed_classes, _ = self.merge_metas_with_conflicts(api, dataset_id)
 
-                    api.volume.annotation.append(volume_info.id, ann)
+                    api.volume.annotation.append(info.id, ann)
 
             if log_progress:
                 progress_cb(len(batch))

supervisely/convert/volume/nii/nii_volume_helper.py

@@ -4,10 +4,22 @@ from typing import Generator
 import nrrd
 import numpy as np
 
+from supervisely.collection.str_enum import StrEnum
 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
 
+VOLUME_NAME = "anatomic"
+LABEL_NAME = ["inference", "label", "annotation", "mask", "segmentation"]
+
+
+class PlanePrefix(str, StrEnum):
+    """Prefix for plane names."""
+
+    CORONAL = "cor"
+    SAGITTAL = "sag"
+    AXIAL = "axl"
+
 
 def nifti_to_nrrd(nii_file_path: str, converted_dir: str) -> str:
     """Convert NIfTI 3D volume file to NRRD 3D volume file."""

supervisely/nn/training/train_app.py

@@ -39,7 +39,7 @@ from supervisely import (
     is_production,
     logger,
 )
-from supervisely._utils import abs_url, get_filename_from_headers, sync_call
+from supervisely._utils import abs_url, get_filename_from_headers
 from supervisely.api.file_api import FileInfo
 from supervisely.app import get_synced_data_dir
 from supervisely.app.widgets import Progress
@@ -60,7 +60,7 @@ from supervisely.nn.utils import ModelSource
 from supervisely.output import set_directory
 from supervisely.project.download import (
     copy_from_cache,
-    download_async_or_sync,
+    download_fast,
     download_to_cache,
     get_cache_size,
     is_cached,
@@ -806,7 +806,7 @@ class TrainApp:
         with self.progress_bar_main(message="Downloading input data", total=total_images) as pbar:
             logger.debug("Downloading project data without cache")
             self.progress_bar_main.show()
-            download_async_or_sync(
+            download_fast(
                 api=self._api,
                 project_id=self.project_id,
                 dest_dir=self.project_dir,
@@ -1619,14 +1619,13 @@ class TrainApp:
             unit_scale=True,
         ) as upload_artifacts_pbar:
             self.progress_bar_main.show()
-            remote_dir = sync_call(
-                self._api.file.upload_directory_async(
-                    team_id=self.team_id,
-                    local_dir=local_demo_dir,
-                    remote_dir=remote_demo_dir,
-                    progress_size_cb=upload_artifacts_pbar.update,
-                )
+            remote_dir = self._api.file.upload_directory_fast(
+                team_id=self.team_id,
+                local_dir=local_demo_dir,
+                remote_dir=remote_demo_dir,
+                progress_cb=upload_artifacts_pbar.update,
             )
+
             self.progress_bar_main.hide()
 
     def _get_train_val_splits_for_app_state(self) -> Dict:
@@ -1733,13 +1732,11 @@ class TrainApp:
             unit_scale=True,
         ) as upload_artifacts_pbar:
             self.progress_bar_main.show()
-            remote_dir = sync_call(
-                self._api.file.upload_directory_async(
-                    team_id=self.team_id,
-                    local_dir=self.output_dir,
-                    remote_dir=remote_artifacts_dir,
-                    progress_size_cb=upload_artifacts_pbar.update,
-                )
+            remote_dir = self._api.file.upload_directory_fast(
+                team_id=self.team_id,
+                local_dir=self.output_dir,
+                remote_dir=remote_artifacts_dir,
+                progress_cb=upload_artifacts_pbar.update,
             )
             self.progress_bar_main.hide()
 
@@ -2524,13 +2521,11 @@ class TrainApp:
             logger.debug(f"Uploading {len(export_weights)} export weights of size {size} bytes")
             logger.debug(f"Destination paths: {file_dest_paths}")
             self.progress_bar_main.show()
-            sync_call(
-                self._api.file.upload_bulk_async(
-                    team_id=self.team_id,
-                    src_paths=export_weights.values(),
-                    dst_paths=file_dest_paths,
-                    progress_cb=export_upload_main_pbar.update,
-                )
+            self._api.file.upload_bulk_fast(
+                team_id=self.team_id,
+                src_paths=export_weights.values(),
+                dst_paths=file_dest_paths,
+                progress_cb=export_upload_main_pbar.update,
             )
 
         self.progress_bar_main.hide()

supervisely/project/download.py

@@ -281,6 +281,34 @@ def download_async_or_sync(
         )
 
 
+def download_fast(
+    api: Api,
+    project_id: int,
+    dest_dir: str,
+    dataset_ids: Optional[List[int]] = None,
+    log_progress: bool = True,
+    progress_cb: Optional[Union[tqdm, Callable]] = None,
+    semaphore: Optional[asyncio.Semaphore] = None,
+    **kwargs,
+) -> None:
+    """
+    Download project in a fast mode.
+    Items are downloaded asynchronously. If an error occurs, the method will fallback to synchronous download.
+    Automatically detects project type.
+    You can pass :class:`ProjectInfo` as `project_info` kwarg to avoid additional API requests.
+    """
+    download_async_or_sync(
+        api=api,
+        project_id=project_id,
+        dest_dir=dest_dir,
+        dataset_ids=dataset_ids,
+        log_progress=log_progress,
+        progress_cb=progress_cb,
+        semaphore=semaphore,
+        **kwargs,
+    )
+
+
 def _get_cache_dir(project_id: int, dataset_path: str = None) -> str:
     p = os.path.join(apps_cache_dir(), str(project_id))
     if dataset_path is not None:
@@ -468,7 +496,7 @@ def _download_project_to_cache(
     if len(dataset_infos) == 0:
         logger.debug("No datasets to download")
         return
-    download_async_or_sync(
+    download_fast(
         api=api,
         project_id=project_id,
         dest_dir=cached_project_dir,

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

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

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

@@ -1,6 +1,6 @@
 supervisely/README.md,sha256=XM-DiMC6To3I9RjQZ0c61905EFRR_jnCUx2q3uNR-X8,3331
 supervisely/__init__.py,sha256=mtgVKiRSlnRU7yKG0Re130mBL10wCzsNfOfi-w-Kj4c,10833
-supervisely/_utils.py,sha256=hYzGRVAh-cB2RmqixHbaJQZHy4byNip4KZm2Gdt8P7k,16849
+supervisely/_utils.py,sha256=KWfbw8XFfV2uxLzhuku_J0UQKpG-D80Hp6UOQD316P8,17460
 supervisely/function_wrapper.py,sha256=R5YajTQ0GnRp2vtjwfC9hINkzQc0JiyGsu8TER373xY,1912
 supervisely/sly_logger.py,sha256=z92Vu5hmC0GgTIJO1n6kPDayRW9__8ix8hL6poDZj-Y,6274
 supervisely/tiny_timer.py,sha256=hkpe_7FE6bsKL79blSs7WBaktuPavEVu67IpEPrfmjE,183
@@ -25,7 +25,7 @@ supervisely/api/annotation_api.py,sha256=kuk4qwojTJxYr2iqAKbW-QhWw_DFc4TsjA2Wc2M
 supervisely/api/api.py,sha256=6TczKT1t0MWlbArSW31RmeyWP04pqngfUO_NrG5FETE,66287
 supervisely/api/app_api.py,sha256=RsbVej8WxWVn9cNo5s3Fqd1symsCdsfOaKVBKEUapRY,71927
 supervisely/api/dataset_api.py,sha256=GH7prDRJKyJlTv_7_Y-RkTwJN7ED4EkXNqqmi3iIdI4,41352
-supervisely/api/file_api.py,sha256=xVM4fFeIc52aKnxduCIU7L6Rgd7Rh36rzTJ8hVT8hw4,88925
+supervisely/api/file_api.py,sha256=bVWv6kf3B5n6qlB14HmUa6iUr8ara5cr-pPK8QC7XWg,92932
 supervisely/api/github_api.py,sha256=NIexNjEer9H5rf5sw2LEZd7C1WR-tK4t6IZzsgeAAwQ,623
 supervisely/api/image_annotation_tool_api.py,sha256=YcUo78jRDBJYvIjrd-Y6FJAasLta54nnxhyaGyanovA,5237
 supervisely/api/image_api.py,sha256=WIML_6N1qgOWBm3acexmGSWz4hAaSxlYmUtbytROaP8,192375
@@ -95,7 +95,7 @@ supervisely/app/fastapi/offline.py,sha256=CwMMkJ1frD6wiZS-SEoNDtQ1UJcJe1Ob6ohE3r
 supervisely/app/fastapi/request.py,sha256=NU7rKmxJ1pfkDZ7_yHckRcRAueJRQIqCor11UO2OHr8,766
 supervisely/app/fastapi/subapp.py,sha256=5lMfFLYBfHzE1OmITHsogB9hScyTJFjGV45AKY67Hkg,45647
 supervisely/app/fastapi/templating.py,sha256=JOAW8U-14GD47E286mzFi3mZSPbm_csJGqtXWLRM4rc,2929
-supervisely/app/fastapi/utils.py,sha256=GZuTWLcVRGVx8TL3jVEYUOZIT2FawbwIe2kAOBLw9ho,398
+supervisely/app/fastapi/utils.py,sha256=t_UquzlFrdkKtAJmH6eJ279pE8Aa3BaIu4XjX-SEaIE,946
 supervisely/app/fastapi/websocket.py,sha256=TlRSPOAhRItTv1HGvdukK1ZvhRjMUxRa-lJlsRR9rJw,1308
 supervisely/app/v1/__init__.py,sha256=OdU0PYv6hLwahYoyaLFO8m3cbJSchvPbqxuG1N3T734,848
 supervisely/app/v1/app_config.md,sha256=-8GKbiQoX25RhEj3EDJ7TxiYuFw5wL2TO3qV5AJLZTs,2536
@@ -566,7 +566,7 @@ supervisely/collection/key_indexed_collection.py,sha256=x2UVlkprspWhhae9oLUzjTWB
 supervisely/collection/str_enum.py,sha256=Zp29yFGvnxC6oJRYNNlXhO2lTSdsriU1wiGHj6ahEJE,1250
 supervisely/convert/__init__.py,sha256=ropgB1eebG2bfLoJyf2jp8Vv9UkFujaW3jVX-71ho1g,1353
 supervisely/convert/base_converter.py,sha256=O2SP4I_Hd0aSn8kbOUocy8orkc_-iD-TQ-z4ieUqabA,18579
-supervisely/convert/converter.py,sha256=tWxTDfFv7hwzQhUQrBxzfr6WP8FUGFX_ewg5T2HbUYo,8959
+supervisely/convert/converter.py,sha256=ymhjzy75bhtpOTJSB7Xfq5tcfZjK_DMxJXIa_uuEitA,10668
 supervisely/convert/image/__init__.py,sha256=JEuyaBiiyiYmEUYqdn8Mog5FVXpz0H1zFubKkOOm73I,1395
 supervisely/convert/image/image_converter.py,sha256=8vak8ZoKTN1ye2ZmCTvCZ605-Rw1AFLIEo7bJMfnR68,10426
 supervisely/convert/image/image_helper.py,sha256=fdV0edQD6hVGQ8TXn2JGDzsnrAXPDMacHBQsApzOME8,3677
@@ -658,14 +658,15 @@ 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=NjVfOa9uH1BdYvB-RynW6L28x0f_tqL9p7tHSIQ6Sso,245
+supervisely/convert/volume/__init__.py,sha256=RpSYjufciJT6AdhI9Oqp70b3XoFTtSkxFNexoqeOPW4,353
 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/nii/nii_planes_volume_converter.py,sha256=SV1OAoel92qOvWTfcVqzee9LQypAQGQ-hJEMJ9j7nLg,4995
+supervisely/convert/volume/nii/nii_volume_converter.py,sha256=nVHKK7wVhMvBiX1awMoXOwt2f5MHujqVmof0v_zW5E4,8502
+supervisely/convert/volume/nii/nii_volume_helper.py,sha256=wy8GqjgnFJaEgKKSOgKw_QPETdiYYY5c9BBfyJE3Hqo,1417
 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
@@ -979,7 +980,7 @@ supervisely/nn/tracker/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 supervisely/nn/tracker/utils/gmc.py,sha256=3JX8979H3NA-YHNaRQyj9Z-xb9qtyMittPEjGw8y2Jo,11557
 supervisely/nn/tracker/utils/kalman_filter.py,sha256=eSFmCjM0mikHCAFvj-KCVzw-0Jxpoc3Cfc2NWEjJC1Q,17268
 supervisely/nn/training/__init__.py,sha256=gY4PCykJ-42MWKsqb9kl-skemKa8yB6t_fb5kzqR66U,111
-supervisely/nn/training/train_app.py,sha256=yVsMdMlV6OHCRMJ63-hPmTfdsC3Z1-0ohphsMtDMpPw,104944
+supervisely/nn/training/train_app.py,sha256=lFvYxt2Zsd7FrqfeA2C-eNX0tQVLtz3V8om3DwvNFtM,104720
 supervisely/nn/training/gui/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 supervisely/nn/training/gui/classes_selector.py,sha256=8UgzA4aogOAr1s42smwEcDbgaBj_i0JLhjwlZ9bFdIA,3772
 supervisely/nn/training/gui/gui.py,sha256=CnT_QhihrxdSHKybpI0pXhPLwCaXEana_qdn0DhXByg,25558
@@ -1016,7 +1017,7 @@ supervisely/pointcloud_episodes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 supervisely/pointcloud_episodes/pointcloud_episodes.py,sha256=cRXdtw7bMsbsdVQjxfWxFSESrO-LGiqqsZyyExl2Mbg,3430
 supervisely/project/__init__.py,sha256=hlzdj9Pgy53Q3qdP8LMtGTChvZHQuuShdtui2eRUQeE,2601
 supervisely/project/data_version.py,sha256=6vOz5ovBeCIiMAKUG7lGQ5IXvQnU1GbcnrWxdOvaVlo,19311
-supervisely/project/download.py,sha256=zb8sb4XZ6Qi3CP7fmtLRUAYzaxs_W0WnOfe2x3ZVRMs,24639
+supervisely/project/download.py,sha256=GQFYN3KCdM_egXDzoyZrzl6Yeg2QshYQNFNlKi8Nh8A,25471
 supervisely/project/pointcloud_episode_project.py,sha256=yiWdNBQiI6f1O9sr1pg8JHW6O-w3XUB1rikJNn3Oung,41866
 supervisely/project/pointcloud_project.py,sha256=Kx1Vaes-krwG3BiRRtHRLQxb9G5m5bTHPN9IzRqmNWo,49399
 supervisely/project/project.py,sha256=nKnnYVrSx_MWh5G_fObaAegkRxLFJg_J074SaduEYGo,205871
@@ -1081,9 +1082,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.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,,
+supervisely-6.73.325.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.325.dist-info/METADATA,sha256=wRj0QjkNc2OGdL0AtTslp2JAlgDO8-1f3XeeUfoZfOY,33596
+supervisely-6.73.325.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.325.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.325.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.325.dist-info/RECORD,,