supervisely 6.73.360__tar.gz → 6.73.361__tar.gz

{supervisely-6.73.360/supervisely.egg-info → supervisely-6.73.361}/PKG-INFO

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

{supervisely-6.73.360 → supervisely-6.73.361}/supervisely/nn/inference/inference.py

@@ -1519,7 +1519,7 @@ class Inference:
         if frames_count is not None:
             n_frames = frames_count
         elif end_frame_index is not None:
-            n_frames = end_frame_index - start_frame_index
+            n_frames = end_frame_index - start_frame_index + 1
         elif duration is not None:
             fps = frames_reader.fps()
             n_frames = int(duration * fps)
@@ -1729,7 +1729,6 @@ class Inference:
         inference_settings = self._get_inference_settings(state)
         logger.debug(f"Inference settings:", extra=inference_settings)
         batch_size = self._get_batch_size_from_state(state)
-        video_id = state["videoId"]
         video_id = get_value_for_keys(state, ["videoId", "video_id"], ignore_none=True)
         if video_id is None:
             raise ValueError("Video id is not provided")

{supervisely-6.73.360 → supervisely-6.73.361}/supervisely/project/download.py

@@ -409,12 +409,22 @@ def _project_meta_changed(meta1: ProjectMeta, meta2: ProjectMeta) -> bool:
     return False
 
 
+def _get_ds_full_name(
+    dataset_info: DatasetInfo, all_ds_infos: List[DatasetInfo], suffix: str = ""
+) -> str:
+    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)
+
+
 def _validate_dataset(
     api: Api,
     project_id: int,
     project_type: str,
     project_meta: ProjectMeta,
     dataset_info: DatasetInfo,
+    all_ds_infos: List[DatasetInfo] = None,
 ):
     try:
         project_class = get_project_class(project_type)
@@ -430,10 +440,12 @@ def _validate_dataset(
     except:
         logger.debug("Validating dataset failed. Unable to download items infos.", exc_info=True)
         return False
+    if all_ds_infos is None:
+        all_ds_infos = api.dataset.get_list(project_id, recursive=True)
     project_meta_changed = _project_meta_changed(project_meta, project.meta)
     for dataset in project.datasets:
         dataset: Dataset
-        if dataset.name.endswith(dataset_info.name):  # TODO: fix it later
+        if dataset.name == _get_ds_full_name(dataset_info, all_ds_infos):
             diff = set(items_infos_dict.keys()).difference(set(dataset.get_items_names()))
             if diff:
                 logger.debug(
@@ -481,7 +493,11 @@ def _validate_dataset(
 
 
 def _validate(
-    api: Api, project_info: ProjectInfo, project_meta: ProjectMeta, dataset_infos: List[DatasetInfo]
+    api: Api,
+    project_info: ProjectInfo,
+    project_meta: ProjectMeta,
+    dataset_infos: List[DatasetInfo],
+    all_ds_infos: List[DatasetInfo] = None,
 ):
     project_id = project_info.id
     to_download, cached = _split_by_cache(
@@ -498,6 +514,7 @@ def _validate(
             project_info.type,
             project_meta,
             dataset_info,
+            all_ds_infos,
         ):
             to_download.add(ds_path)
             cached.remove(ds_path)
@@ -520,7 +537,7 @@ def _add_save_items_infos_to_kwargs(kwargs: dict, project_type: str):
 
 
 def _add_resume_download_to_kwargs(kwargs: dict, project_type: str):
-    supported_force_projects = (str(ProjectType.IMAGES),)
+    supported_force_projects = (str(ProjectType.IMAGES), (str(ProjectType.VIDEOS)))
     if project_type in supported_force_projects:
         kwargs["resume_download"] = True
     return kwargs
@@ -592,13 +609,14 @@ def download_to_cache(
     project_meta = ProjectMeta.from_json(api.project.get_meta(project_id))
     if dataset_infos is not None and dataset_ids is not None:
         raise ValueError("dataset_infos and dataset_ids cannot be specified at the same time")
+    all_ds_infos = api.dataset.get_list(project_id, recursive=True)
     if dataset_infos is None:
         if dataset_ids is None:
-            dataset_infos = api.dataset.get_list(project_id, recursive=True)
+            dataset_infos = all_ds_infos
         else:
-            dataset_infos = [api.dataset.get_info_by_id(dataset_id) for dataset_id in dataset_ids]
+            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}
-    to_download, cached = _validate(api, project_info, project_meta, 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)
         progress_cb(cached_items_n)

{supervisely-6.73.360 → supervisely-6.73.361}/supervisely/project/video_project.py

@@ -16,7 +16,7 @@ from supervisely.api.dataset_api import DatasetInfo
 from supervisely.api.module_api import ApiField
 from supervisely.api.video.video_api import VideoInfo
 from supervisely.collection.key_indexed_collection import KeyIndexedCollection
-from supervisely.io.fs import mkdir, touch, touch_async
+from supervisely.io.fs import clean_dir, mkdir, touch, touch_async
 from supervisely.io.json import dump_json_file, dump_json_file_async, load_json_file
 from supervisely.project.project import Dataset, OpenMode, Project
 from supervisely.project.project import read_single_project as read_project_wrapper
@@ -1056,6 +1056,7 @@ class VideoProject(Project):
         save_video_info: bool = False,
         log_progress: bool = True,
         progress_cb: Optional[Union[tqdm, Callable]] = None,
+        resume_download: Optional[bool] = False,
     ) -> None:
         """
         Download video project from Supervisely to the given directory.
@@ -1109,6 +1110,7 @@ class VideoProject(Project):
             save_video_info=save_video_info,
             log_progress=log_progress,
             progress_cb=progress_cb,
+            resume_download=resume_download,
         )
 
     @staticmethod
@@ -1182,6 +1184,7 @@ class VideoProject(Project):
         log_progress: bool = True,
         progress_cb: Optional[Union[tqdm, Callable]] = None,
         include_custom_data: bool = False,
+        resume_download: Optional[bool] = False,
         **kwargs,
     ) -> None:
         """
@@ -1238,6 +1241,7 @@ class VideoProject(Project):
             log_progress=log_progress,
             progress_cb=progress_cb,
             include_custom_data=include_custom_data,
+            resume_download=resume_download,
             **kwargs,
         )
 
@@ -1252,6 +1256,7 @@ def download_video_project(
     log_progress: bool = True,
     progress_cb: Optional[Union[tqdm, Callable]] = None,
     include_custom_data: Optional[bool] = False,
+    resume_download: Optional[bool] = False,
 ) -> None:
     """
     Download video project to the local directory.
@@ -1312,9 +1317,22 @@ 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))
+
+    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"))
+        try:
+            project_fs = VideoProject(dest_dir, OpenMode.READ)
+        except RuntimeError as e:
+            if "Project is empty" in str(e):
+                clean_dir(dest_dir)
+                project_fs = None
+            else:
+                raise
+    if project_fs is None:
+        project_fs = VideoProject(dest_dir, OpenMode.CREATE)
     project_fs.set_meta(meta)
+
     if progress_cb is not None:
         log_progress = False
 
@@ -1549,6 +1567,7 @@ async def download_video_project_async(
     log_progress: bool = True,
     progress_cb: Optional[Union[tqdm, Callable]] = None,
     include_custom_data: Optional[bool] = False,
+    resume_download: Optional[bool] = False,
     **kwargs,
 ) -> None:
     """
@@ -1603,9 +1622,19 @@ async def download_video_project_async(
 
     key_id_map = KeyIdMap()
 
-    project_fs = VideoProject(dest_dir, OpenMode.CREATE)
-
-    meta = ProjectMeta.from_json(api.project.get_meta(project_id))
+    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"))
+        try:
+            project_fs = VideoProject(dest_dir, OpenMode.READ)
+        except RuntimeError as e:
+            if "Project is empty" in str(e):
+                clean_dir(dest_dir)
+                project_fs = None
+            else:
+                raise
+    if project_fs is None:
+        project_fs = VideoProject(dest_dir, OpenMode.CREATE)
     project_fs.set_meta(meta)
 
     if progress_cb is not None:

{supervisely-6.73.360 → supervisely-6.73.361/supervisely.egg-info}/PKG-INFO

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