supervisely 6.73.363__py3-none-any.whl → 6.73.364__py3-none-any.whl

supervisely/api/nn/deploy_api.py

@@ -1,3 +1,6 @@
+# coding: utf-8
+"""deploy pretrained and custom models"""
+
 from __future__ import annotations
 
 import time

supervisely/api/nn/neural_network_api.py

@@ -1,3 +1,6 @@
+# coding: utf-8
+"""deploy and connect to to running inference apps"""
+
 from __future__ import annotations
 
 from typing import Dict, List

supervisely/io/fs.py

@@ -1153,6 +1153,12 @@ def download(
 def copy_dir_recursively(
     src_dir: str, dst_dir: str, progress_cb: Optional[Union[tqdm, Callable]] = None
 ) -> List[str]:
+    mkdir(dst_dir)
+
+    for rel_sub_dir in get_subdirs(src_dir, recursive=True):
+        dst_sub_dir = os.path.join(dst_dir, rel_sub_dir)
+        mkdir(dst_sub_dir)
+
     files = list_files_recursively(src_dir)
     for src_file_path in files:
         dst_file_path = os.path.normpath(src_file_path.replace(src_dir, dst_dir))

supervisely/nn/model/model_api.py

@@ -1,3 +1,6 @@
+# coding: utf-8
+"""load and inference models"""
+
 from __future__ import annotations
 import os
 from os import PathLike

supervisely/nn/model/prediction.py

@@ -1,3 +1,6 @@
+# coding: utf-8
+"""single prediction object"""
+
 from __future__ import annotations
 
 import atexit

supervisely/nn/training/train_app.py

@@ -65,6 +65,7 @@ from supervisely.project.download import (
     download_fast,
     download_to_cache,
     get_cache_size,
+    get_dataset_path,
     is_cached,
 )
 
@@ -925,10 +926,15 @@ class TrainApp:
         :param total_images: Total number of images to download.
         :type total_images: int
         """
+        ds_paths = {
+            info.id: get_dataset_path(self._api, dataset_infos, info.id) for info in dataset_infos
+        }
         to_download = [
-            info for info in dataset_infos if not is_cached(self.project_info.id, info.name)
+            info for info in dataset_infos if not is_cached(self.project_info.id, ds_paths[info.id])
+        ]
+        cached = [
+            info for info in dataset_infos if is_cached(self.project_info.id, ds_paths[info.id])
         ]
-        cached = [info for info in dataset_infos if is_cached(self.project_info.id, info.name)]
 
         logger.info(self._get_cache_log_message(cached, to_download))
         with self.progress_bar_main(message="Downloading input data", total=total_images) as pbar:
@@ -955,7 +961,7 @@ class TrainApp:
             copy_from_cache(
                 project_id=self.project_info.id,
                 dest_dir=self.project_dir,
-                dataset_names=[ds_info.name for ds_info in dataset_infos],
+                dataset_names=[ds_paths[info.id] for info in dataset_infos],
                 progress_cb=pbar.update,
             )
         self.progress_bar_main.hide()

supervisely/project/download.py

@@ -415,7 +415,7 @@ def _get_ds_full_name(
     if dataset_info.parent_id is None:
         return dataset_info.name + suffix
     parent = next((ds_info for ds_info in all_ds_infos if ds_info.id == dataset_info.parent_id))
-    return _get_ds_full_name(parent, all_ds_infos, "/" + dataset_info.name)
+    return _get_ds_full_name(parent, all_ds_infos, "/" + dataset_info.name + suffix)
 
 
 def _validate_dataset(
@@ -501,11 +501,11 @@ def _validate(
 ):
     project_id = project_info.id
     to_download, cached = _split_by_cache(
-        project_id, [_get_dataset_path(api, dataset_infos, info.id) for info in dataset_infos]
+        project_id, [get_dataset_path(api, dataset_infos, info.id) for info in dataset_infos]
     )
     to_download, cached = set(to_download), set(cached)
     for dataset_info in dataset_infos:
-        ds_path = _get_dataset_path(api, dataset_infos, dataset_info.id)
+        ds_path = get_dataset_path(api, dataset_infos, dataset_info.id)
         if ds_path in to_download:
             continue
         if not _validate_dataset(
@@ -615,7 +615,7 @@ def download_to_cache(
             dataset_infos = all_ds_infos
         else:
             dataset_infos = [ds_info for ds_info in all_ds_infos if ds_info.id in dataset_ids]
-    path_to_info = {_get_dataset_path(api, dataset_infos, info.id): info for info in dataset_infos}
+    path_to_info = {get_dataset_path(api, dataset_infos, info.id): info for info in dataset_infos}
     to_download, cached = _validate(api, project_info, project_meta, dataset_infos, all_ds_infos)
     if progress_cb is not None:
         cached_items_n = sum(path_to_info[ds_path].items_count for ds_path in cached)
@@ -632,24 +632,28 @@ def download_to_cache(
     return to_download, cached
 
 
-def _get_dataset_parents(api, dataset_infos, dataset_id):
+def _get_dataset_parents(api: Api, dataset_infos: List[DatasetInfo], dataset_id):
     dataset_infos_dict = {info.id: info for info in dataset_infos}
-    this_dataset_info = dataset_infos_dict.get(dataset_id, api.dataset.get_info_by_id(dataset_id))
+    this_dataset_info = dataset_infos_dict.get(dataset_id, None)
+    if this_dataset_info is None:
+        this_dataset_info = api.dataset.get_info_by_id(dataset_id)
     if this_dataset_info.parent_id is None:
         return []
     parent = _get_dataset_parents(
         api, list(dataset_infos_dict.values()), this_dataset_info.parent_id
     )
-    this_parent_name = dataset_infos_dict.get(
-        this_dataset_info.parent_id, api.dataset.get_info_by_id(dataset_id)
-    ).name
-    return [*parent, this_parent_name]
+    this_parent = dataset_infos_dict.get(this_dataset_info.parent_id, None)
+    if this_parent is None:
+        this_parent = api.dataset.get_info_by_id(this_dataset_info.parent_id)
+    return [*parent, this_parent.name]
 
 
-def _get_dataset_path(api: Api, dataset_infos: List[DatasetInfo], dataset_id: int) -> str:
+def get_dataset_path(api: Api, dataset_infos: List[DatasetInfo], dataset_id: int) -> str:
     parents = _get_dataset_parents(api, dataset_infos, dataset_id)
     dataset_infos_dict = {info.id: info for info in dataset_infos}
-    this_dataset_info = dataset_infos_dict.get(dataset_id, api.dataset.get_info_by_id(dataset_id))
+    this_dataset_info = dataset_infos_dict.get(dataset_id, None)
+    if this_dataset_info is None:
+        this_dataset_info = api.dataset.get_info_by_id(dataset_id)
     return Dataset._get_dataset_path(this_dataset_info.name, parents)
 
 

supervisely/project/project.py

@@ -612,7 +612,7 @@ class Dataset(KeyObject):
                     logger.warning(f"Failed to read blob offset file {offset_file_path}: {str(e)}")
 
         if len(img_names) == 0 and len(raw_ann_names) == 0:
-            logger.info("Dataset {!r} is empty".format(self.name))
+            logger.debug(f"Dataset '{self.name}' is empty")
             # raise RuntimeError("Dataset {!r} is empty".format(self.name))
 
         if len(img_names) == 0:  # items_names polyfield
@@ -1641,10 +1641,10 @@ class Dataset(KeyObject):
         """
         if self.item_exists(item_name):
             data_path, ann_path = self.get_item_paths(item_name)
-            img_info_path = self.get_img_info_path(item_name)
+            item_info_path = self.get_item_info_path(item_name)
             silent_remove(data_path)
             silent_remove(ann_path)
-            silent_remove(img_info_path)
+            silent_remove(item_info_path)
             self._item_to_ann.pop(item_name)
             return True
         return False

supervisely/project/video_project.py

@@ -1318,6 +1318,7 @@ def download_video_project(
 
     key_id_map = KeyIdMap()
 
+    project_fs = None
     meta = ProjectMeta.from_json(api.project.get_meta(project_id, with_settings=True))
     if os.path.exists(dest_dir) and resume_download:
         dump_json_file(meta.to_json(), os.path.join(dest_dir, "meta.json"))
@@ -1337,12 +1338,16 @@ def download_video_project(
         log_progress = False
 
     dataset_ids = set(dataset_ids) if (dataset_ids is not None) else None
+    existing_datasets = {dataset.path: dataset for dataset in project_fs.datasets}
     for parents, dataset in api.dataset.tree(project_id):
         if dataset_ids is not None and dataset.id not in dataset_ids:
             continue
 
         dataset_path = Dataset._get_dataset_path(dataset.name, parents)
-        dataset_fs = project_fs.create_dataset(dataset.name, dataset_path)
+        if dataset_path in existing_datasets:
+            dataset_fs = existing_datasets[dataset_path]
+        else:
+            dataset_fs = project_fs.create_dataset(dataset.name, dataset_path)
         videos = api.video.get_list(dataset.id)
 
         ds_progress = progress_cb
@@ -1499,6 +1504,9 @@ def upload_video_project(
             item_paths.append(video_path)
             ann_paths.append(ann_path)
 
+        if len(item_paths) == 0:
+            continue
+
         ds_progress = progress_cb
         if log_progress is True:
             ds_progress = tqdm_sly(
@@ -1622,6 +1630,7 @@ async def download_video_project_async(
 
     key_id_map = KeyIdMap()
 
+    project_fs = None
     meta = ProjectMeta.from_json(api.project.get_meta(project_id, with_settings=True))
     if os.path.exists(dest_dir) and resume_download:
         dump_json_file(meta.to_json(), os.path.join(dest_dir, "meta.json"))
@@ -1647,7 +1656,11 @@ async def download_video_project_async(
 
         dataset_path = Dataset._get_dataset_path(dataset.name, parents)
 
-        dataset_fs = project_fs.create_dataset(dataset.name, dataset_path)
+        existing_datasets = {dataset.path: dataset for dataset in project_fs.datasets}
+        if dataset_path in existing_datasets:
+            dataset_fs = existing_datasets[dataset_path]
+        else:
+            dataset_fs = project_fs.create_dataset(dataset.name, dataset_path)
         videos = api.video.get_list(dataset.id)
 
         if log_progress is True:
@@ -1769,7 +1782,7 @@ async def _download_project_item_async(
     try:
         await dataset_fs.add_item_file_async(
             video.name,
-            video_file_path,
+            None,
             ann=video_ann,
             _validate_item=False,
             _use_hardlink=True,

{supervisely-6.73.363.dist-info → supervisely-6.73.364.dist-info}/METADATA

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

{supervisely-6.73.363.dist-info → supervisely-6.73.364.dist-info}/RECORD

@@ -55,8 +55,8 @@ supervisely/api/entity_annotation/figure_api.py,sha256=rmsE3L_JfqN94sLN637pQ0syi
 supervisely/api/entity_annotation/object_api.py,sha256=gbcNvN_KY6G80Me8fHKQgryc2Co7VU_kfFd1GYILZ4E,8875
 supervisely/api/entity_annotation/tag_api.py,sha256=h19YsJzJLDp0VIicQzoYCRyVhY149KY7pUysb4XX0RI,11114
 supervisely/api/nn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/api/nn/deploy_api.py,sha256=2n0dKGfgte4Hh5WnYQTNhuUE2PjPgr5REqT5J6XkJXQ,34267
-supervisely/api/nn/neural_network_api.py,sha256=GqdrfwSNfES7JiVCL0hJZsDJ_lXGGkWJmAarq8lkyDE,10395
+supervisely/api/nn/deploy_api.py,sha256=V7zWO8yoroFDifIqLIFYmZA72tLQriH5kYAhN0-50co,34326
+supervisely/api/nn/neural_network_api.py,sha256=vZyYBaKQzLJX9G3SAt09LmsxNLC8h88oYJ9b_PACzp0,10466
 supervisely/api/pointcloud/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/api/pointcloud/pointcloud_annotation_api.py,sha256=x2Bw_1ZaGZffc89k670LWQiwMhlb4CbB-6suDpHJRgg,11256
 supervisely/api/pointcloud/pointcloud_api.py,sha256=pn72znCr5hkAfgniXxfD6Vi8-HqRb1Nrf6l23-HQ7Bc,53277
@@ -720,7 +720,7 @@ supervisely/io/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/io/docker_utils.py,sha256=hb_HXGM8IYB0PF-nD7NxMwaHgzaxIFxofsUzQ_RCUZI,7935
 supervisely/io/env.py,sha256=DLsoRhouPT-y5wJzzJBs7zhJ2UxOIvIcQVbVLP5Yx7U,18256
 supervisely/io/exception_handlers.py,sha256=_nAgMFeE94bCxEvWakR82hMtdOJUyn7Gc7OymMxI9WI,36484
-supervisely/io/fs.py,sha256=RWqw-HbKgam9-q1DeDCom94E1rnc1WEKorpx8mpUivw,63381
+supervisely/io/fs.py,sha256=GSgD6dMYd-NECTYlN7BB1jWlxQXWkHGCN5ZtqUpWcpo,63547
 supervisely/io/fs_cache.py,sha256=985gvBGzveLcDudgz10E4EWVjP9jxdU1Pa0GFfCBoCA,6520
 supervisely/io/github_utils.py,sha256=jGmvQJ5bjtACuSFABzrxL0jJdh14SezovrHp8T-9y8g,1779
 supervisely/io/json.py,sha256=25gBqA8nkKZW1xvssdmRYuJrO5fmIR0Z5cZGePfrJV4,8539
@@ -963,8 +963,8 @@ supervisely/nn/legacy/pytorch/weights.py,sha256=Zb9kcpUCg6ykr7seO53CkKSQa2K44wo8
 supervisely/nn/legacy/training/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/nn/legacy/training/eval_planner.py,sha256=zN9b0_CX7sWGdC8e6riTvD-NOUc3_Xduyhj00S7PEIo,1311
 supervisely/nn/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/nn/model/model_api.py,sha256=3dh0rLVT_u7B_ZDdt7kmYGVTmmetwTIRcmGYHg3VGj4,9617
-supervisely/nn/model/prediction.py,sha256=2Skw5bd5OXrDYS_6-TuxDIfNum8qNFzTExJJGZsC-EA,11259
+supervisely/nn/model/model_api.py,sha256=rIne6ymvL2aVwzSTJMGxAbevE0U-f-WKhDciqaneqRc,9666
+supervisely/nn/model/prediction.py,sha256=N3oO9s3NDiC5CFvW8utfU8rz3bfpCl37Sk4VEBH94Bc,11307
 supervisely/nn/model/prediction_session.py,sha256=3a3seJ7vCVfoUbbSqLxfomqYqUffpEkkeT11YRnBA3o,24438
 supervisely/nn/tracker/__init__.py,sha256=LiojByb5kGsTQ49lWuboEh7B4JUwM1vfz81J8kJlLYo,337
 supervisely/nn/tracker/tracker.py,sha256=Hs0c07l9IVF86jvjloNAGJsSZAHuNQZf0kVaUHfw3Fs,9694
@@ -994,7 +994,7 @@ supervisely/nn/tracking/__init__.py,sha256=Ld1ed7ZZQZPkhX-5Xr-UbHZx5zLCm2-tInHnP
 supervisely/nn/tracking/boxmot.py,sha256=H9cQjYGL9nX_TLrfKDChhljTIiE9lffcgbwWCf_4PJU,4277
 supervisely/nn/tracking/tracking.py,sha256=WNrNm02B1pspA3d_AmzSJ-54RZTqWV2NZiC7FHe88bo,857
 supervisely/nn/training/__init__.py,sha256=gY4PCykJ-42MWKsqb9kl-skemKa8yB6t_fb5kzqR66U,111
-supervisely/nn/training/train_app.py,sha256=lhFQ_bm7dxDuiKHMDmU3wWP5lTRniGXkjw6JlXARrk8,112067
+supervisely/nn/training/train_app.py,sha256=23nBt9fxa8LBIzFT_8cKwXoxRu2kkCmAC1-9dnUFgPg,112259
 supervisely/nn/training/gui/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 supervisely/nn/training/gui/classes_selector.py,sha256=Bpp-RFDQqcZ0kLJmS6ZnExkdscWwRusvF4vbWjEsKlQ,3926
 supervisely/nn/training/gui/gui.py,sha256=_8l7dXoQGs3c5iIAUzWPGC6AQbN920iLW1riBDDV3hY,43183
@@ -1032,16 +1032,16 @@ 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=P5Lui6i64pYeJWmAdGJDv8GRXxjfpSSZ8zT_MxIrynE,19553
-supervisely/project/download.py,sha256=nhxID-kbsNTgIY9l1lnRuUlzKrsJw80X07jEElyl3sE,28466
+supervisely/project/download.py,sha256=b6mpvkKA37yuVrRyv2ctfnTuS5j161LREfxlt6KkT1A,28677
 supervisely/project/pointcloud_episode_project.py,sha256=yiWdNBQiI6f1O9sr1pg8JHW6O-w3XUB1rikJNn3Oung,41866
 supervisely/project/pointcloud_project.py,sha256=Kx1Vaes-krwG3BiRRtHRLQxb9G5m5bTHPN9IzRqmNWo,49399
-supervisely/project/project.py,sha256=RokArUC17P7HXssoYXSKVCBo6DJvclwD-ozW7ysMWww,238002
+supervisely/project/project.py,sha256=a--aXygVMQDHVLKpLQBh5kVo4ZKEH9pnCrzYPOCoNA8,237998
 supervisely/project/project_meta.py,sha256=26s8IiHC5Pg8B1AQi6_CrsWteioJP2in00cRNe8QlW0,51423
 supervisely/project/project_settings.py,sha256=NLThzU_DCynOK6hkHhVdFyezwprn9UqlnrLDe_3qhkY,9347
 supervisely/project/project_type.py,sha256=7mQ7zg6r7Bm2oFn5aR8n_PeLqMmOaPZd6ph7Z8ZISTw,608
 supervisely/project/readme_template.md,sha256=VovSn591tcpz2xiwGgErm34iGHVxuGxXGPX6-iDiS88,9251
 supervisely/project/upload.py,sha256=AjgHYgVZwUE25ygC5pqvFjdAladbyB8T78mlet5Qpho,3750
-supervisely/project/video_project.py,sha256=zAtB3YpW9tC9Tc3qfapbQ9O2nhAWU2wDjMuS5sepXqc,65297
+supervisely/project/video_project.py,sha256=FNMaj5ZD54PlIZBFXag1ZooUQAKEQrw8hbiggZsN_XM,65797
 supervisely/project/volume_project.py,sha256=Kn9VEvWuKKZvL2nx6B6bjSvHuoZhAOxEc6DvPRexUco,22666
 supervisely/pyscripts_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/pyscripts_utils/utils.py,sha256=scEwHJvHRQa8NHIOn2eTwH6-Zc8CGdLoxM-WzH9jcRo,314
@@ -1097,9 +1097,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.363.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.363.dist-info/METADATA,sha256=6PAf_uEkpJWOi9CeWKDgUCmCGH7wEJeK7Gu41pIYqu8,35151
-supervisely-6.73.363.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.363.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.363.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.363.dist-info/RECORD,,
+supervisely-6.73.364.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.364.dist-info/METADATA,sha256=0BL3k_htpIh5B0XQb8NCxjYct8s-iRkC2OLOxRV48Yo,35151
+supervisely-6.73.364.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.364.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.364.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.364.dist-info/RECORD,,