supervisely 6.73.337__py3-none-any.whl → 6.73.338__py3-none-any.whl

supervisely/project/video_project.py

@@ -69,6 +69,8 @@ class VideoDataset(Dataset):
     annotation_class = VideoAnnotation
     item_info_class = VideoInfo
 
+    datasets_dir_name = "datasets"
+
     @property
     def project_dir(self) -> str:
         """
@@ -1308,24 +1310,19 @@ def download_video_project(
     LOG_BATCH_SIZE = 1
 
     key_id_map = KeyIdMap()
-
     project_fs = VideoProject(dest_dir, OpenMode.CREATE)
-
     meta = ProjectMeta.from_json(api.project.get_meta(project_id))
     project_fs.set_meta(meta)
-
     if progress_cb is not None:
         log_progress = False
 
-    datasets = []
-    if dataset_ids is not None:
-        for ds_id in dataset_ids:
-            datasets.append(api.dataset.get_info_by_id(ds_id))
-    else:
-        datasets = api.dataset.get_list(project_id)
+    dataset_ids = set(dataset_ids) if (dataset_ids is not None) else None
+    for parents, dataset in api.dataset.tree(project_id):
+        if dataset_ids is not None and dataset.id not in dataset_ids:
+            continue
 
-    for dataset in datasets:
-        dataset_fs = project_fs.create_dataset(dataset.name)
+        dataset_path = Dataset._get_dataset_path(dataset.name, parents)
+        dataset_fs = project_fs.create_dataset(dataset.name, dataset_path)
         videos = api.video.get_list(dataset.id)
 
         ds_progress = progress_cb
@@ -1463,9 +1460,17 @@ def upload_video_project(
     if progress_cb is not None:
         log_progress = False
 
+    dataset_map = {}
     for dataset_fs in project_fs.datasets:
         dataset_fs: VideoDataset
-        dataset = api.dataset.create(project.id, dataset_fs.name)
+        if len(dataset_fs.parents) > 0:
+            parent = f"{os.path.sep}".join(dataset_fs.parents)
+            parent_id = dataset_map.get(parent)
+        else:
+            parent = ""
+            parent_id = None      
+        dataset = api.dataset.create(project.id, dataset_fs.short_name, parent_id=parent_id)
+        dataset_map[os.path.join(parent, dataset.name)] = dataset.id
 
         names, item_paths, ann_paths = [], [], []
         for item_name in dataset_fs:
@@ -1603,15 +1608,14 @@ async def download_video_project_async(
     if progress_cb is not None:
         log_progress = False
 
-    datasets = []
-    if dataset_ids is not None:
-        for ds_id in dataset_ids:
-            datasets.append(api.dataset.get_info_by_id(ds_id))
-    else:
-        datasets = api.dataset.get_list(project_id, recursive=True)
+    dataset_ids = set(dataset_ids) if (dataset_ids is not None) else None
+    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)
 
-    for dataset in datasets:
-        dataset_fs = project_fs.create_dataset(dataset.name)
+        dataset_fs = project_fs.create_dataset(dataset.name, dataset_path)
         videos = api.video.get_list(dataset.id)
 
         if log_progress is True:

{supervisely-6.73.337.dist-info → supervisely-6.73.338.dist-info}/METADATA

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

{supervisely-6.73.337.dist-info → supervisely-6.73.338.dist-info}/RECORD

@@ -1026,7 +1026,7 @@ supervisely/project/project_settings.py,sha256=NLThzU_DCynOK6hkHhVdFyezwprn9Uqln
 supervisely/project/project_type.py,sha256=EZDJFRi4MmC_5epYexBgML5WMZsWdEVk_CjqDQy5m3c,572
 supervisely/project/readme_template.md,sha256=rGmSLRVUSGjvorjpzl0sZ7YA4sKfDexl95NFtMISj3I,9128
 supervisely/project/upload.py,sha256=AjgHYgVZwUE25ygC5pqvFjdAladbyB8T78mlet5Qpho,3750
-supervisely/project/video_project.py,sha256=STlkzLeRhpcg0kXLankWvX4DmkGTo4YlEgACAYSIeio,63580
+supervisely/project/video_project.py,sha256=bkQI3JTimQR-83iWAThjoz7bTcbCIqvvk039AG3BPXc,64081
 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
@@ -1082,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.337.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.337.dist-info/METADATA,sha256=jScEliXar4ZvwI1uw3RQwMuYWDQiojDu2__YBWsvfDg,33596
-supervisely-6.73.337.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.337.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.337.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.337.dist-info/RECORD,,
+supervisely-6.73.338.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.338.dist-info/METADATA,sha256=sLqnzYNr1rYjzV2CmXxFRZ5PEBbE_Vlsfx_5PxHB3sw,33596
+supervisely-6.73.338.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.338.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.338.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.338.dist-info/RECORD,,