supervisely 6.73.199__py3-none-any.whl → 6.73.200__py3-none-any.whl

supervisely/api/dataset_api.py

@@ -14,6 +14,7 @@ from supervisely.api.module_api import (
     UpdateableModule,
     _get_single_item,
 )
+from supervisely.project.project_type import ProjectType
 
 
 class DatasetInfo(NamedTuple):
@@ -418,6 +419,13 @@ class DatasetApi(UpdateableModule, RemoveableModuleApi):
             raise RuntimeError(
                 'Can not match "ids" and "new_names" lists, len(ids) != len(new_names)'
             )
+        project_info = self._api.project.get_info_by_id(dst_project_id)
+        if project_info.type == str(ProjectType.IMAGES):
+            items_api = self._api.image
+        elif project_info.type == str(ProjectType.VIDEOS):
+            items_api = self._api.video
+        else:
+            raise RuntimeError(f"Unsupported project type: {project_info.type}")
 
         new_datasets = []
         for idx, dataset_id in enumerate(ids):
@@ -425,16 +433,16 @@ class DatasetApi(UpdateableModule, RemoveableModuleApi):
             new_dataset_name = dataset.name
             if new_names is not None:
                 new_dataset_name = new_names[idx]
-            src_images = self._api.image.get_list(dataset.id)
-            src_image_ids = [image.id for image in src_images]
+            src_items = items_api.get_list(dataset.id)
+            src_item_ids = [item.id for item in src_items]
             new_dataset = self._api.dataset.create(
                 dst_project_id,
                 new_dataset_name,
                 dataset.description,
                 change_name_if_conflict=change_name_if_conflict,
             )
-            self._api.image.copy_batch(
-                new_dataset.id, src_image_ids, change_name_if_conflict, with_annotations
+            items_api.copy_batch(
+                new_dataset.id, src_item_ids, change_name_if_conflict, with_annotations
             )
             new_datasets.append(new_dataset)
         return new_datasets

supervisely/api/video/video_annotation_api.py

@@ -6,6 +6,7 @@ from typing import Callable, Dict, List, Optional, Union
 
 from tqdm import tqdm
 
+from supervisely._utils import batched
 from supervisely.api.entity_annotation.entity_annotation_api import EntityAnnotationAPI
 from supervisely.api.module_api import ApiField
 from supervisely.io.json import load_json_file
@@ -182,3 +183,67 @@ class VideoAnnotationAPI(EntityAnnotationAPI):
             self.append(video_id, ann)
             if progress_cb is not None:
                 progress_cb(1)
+
+    def copy_batch(
+        self,
+        src_video_ids: List[int],
+        dst_video_ids: List[int],
+        progress_cb: Optional[Union[tqdm, Callable]] = None,
+    ) -> None:
+        """
+        Copy annotations from one images IDs to another in API.
+
+        :param src_video_ids: Images IDs in Supervisely.
+        :type src_video_ids: List[int]
+        :param dst_video_ids: Unique IDs of images in API.
+        :type dst_video_ids: List[int]
+        :param progress_cb: Function for tracking download progress.
+        :type progress_cb: tqdm or callable, optional
+        :raises: :class:`RuntimeError`, if len(src_video_ids) != len(dst_video_ids)
+        :return: None
+        :rtype: :class:`NoneType`
+
+        :Usage example:
+
+         .. code-block:: python
+
+            import supervisely as sly
+            from tqdm import tqdm
+
+            os.environ['SERVER_ADDRESS'] = 'https://app.supervisely.com'
+            os.environ['API_TOKEN'] = 'Your Supervisely API Token'
+            api = sly.Api.from_env()
+
+            src_ids = [121236918, 121236919]
+            dst_ids = [547837053, 547837054]
+            p = tqdm(desc="Annotations copy: ", total=len(src_ids))
+
+            copy_anns = api.annotation.copy_batch(src_ids, dst_ids, progress_cb=p)
+            # Output:
+            # {"message": "progress", "event_type": "EventType.PROGRESS", "subtask": "Annotations copy: ", "current": 0, "total": 2, "timestamp": "2021-03-16T15:24:31.286Z", "level": "info"}
+            # {"message": "progress", "event_type": "EventType.PROGRESS", "subtask": "Annotations copy: ", "current": 2, "total": 2, "timestamp": "2021-03-16T15:24:31.288Z", "level": "info"}
+        """
+        if len(src_video_ids) != len(dst_video_ids):
+            raise RuntimeError(
+                'Can not match "src_video_ids" and "dst_video_ids" lists, '
+                "len(src_video_ids) != len(dst_video_ids)"
+            )
+        if len(src_video_ids) == 0:
+            return
+
+        src_dataset_id = self._api.video.get_info_by_id(src_video_ids[0]).dataset_id
+        dst_dataset_id = self._api.video.get_info_by_id(dst_video_ids[0]).dataset_id
+        dst_dataset_info = self._api.dataset.get_info_by_id(dst_dataset_id)
+        dst_project_meta = ProjectMeta.from_json(
+            self._api.project.get_meta(dst_dataset_info.project_id)
+        )
+        for src_ids_batch, dst_ids_batch in batched(list(zip(src_video_ids, dst_video_ids))):
+            ann_jsons = self.download_bulk(src_dataset_id, src_ids_batch)
+            for dst_id, ann_json in zip(dst_ids_batch, ann_jsons):
+                try:
+                    ann = VideoAnnotation.from_json(ann_json, dst_project_meta)
+                except Exception as e:
+                    raise RuntimeError("Failed to validate Annotation") from e
+                self.append(dst_id, ann)
+                if progress_cb is not None:
+                    progress_cb(1)

supervisely/api/video/video_api.py

@@ -950,6 +950,91 @@ class VideoApi(RemoveableBulkModuleApi):
 
         return result
 
+    def copy_batch(
+        self,
+        dst_dataset_id: int,
+        ids: List[int],
+        change_name_if_conflict: Optional[bool] = False,
+        with_annotations: Optional[bool] = False,
+        progress_cb: Optional[Union[tqdm, Callable]] = None,
+    ) -> List[VideoInfo]:
+        """
+        Copies Videos with given IDs to Dataset.
+
+        :param dst_dataset_id: Destination Dataset ID in Supervisely.
+        :type dst_dataset_id: int
+        :param ids: Videos IDs in Supervisely.
+        :type ids: List[int]
+        :param change_name_if_conflict: If True adds suffix to the end of Image name when Dataset already contains an Image with identical name, If False and images with the identical names already exist in Dataset raises error.
+        :type change_name_if_conflict: bool, optional
+        :param with_annotations: If True Image will be copied to Dataset with annotations, otherwise only Images without annotations.
+        :type with_annotations: bool, optional
+        :param progress_cb: Function for tracking the progress of copying.
+        :type progress_cb: tqdm or callable, optional
+        :raises: :class:`TypeError` if type of ids is not list
+        :raises: :class:`ValueError` if videos ids are from the destination Dataset
+        :return: List with information about Videos. See :class:`info_sequence<info_sequence>`
+        :rtype: :class:`List[VideoInfo]`
+        :Usage example:
+
+         .. code-block:: python
+
+            import supervisely as sly
+
+            os.environ['SERVER_ADDRESS'] = 'https://app.supervisely.com'
+            os.environ['API_TOKEN'] = 'Your Supervisely API Token'
+            api = sly.Api.from_env()
+
+            dataset_id = 1780
+
+            video_infos = api.video.get_list(dataset_id)
+
+            video_ids = [video_info.id for video_info in video_infos]
+
+            destination_dataset_id = 2574
+            destination_video_infos = api.video.copy_batch(destination_dataset_id, video_ids, with_annotations=True)
+        """
+        if type(ids) is not list:
+            raise TypeError(
+                "ids parameter has type {!r}. but has to be of type {!r}".format(type(ids), list)
+            )
+
+        if len(ids) == 0:
+            return
+
+        ids_info = self.get_info_by_id_batch(ids, force_metadata_for_links=False)
+        if len(set(vid_info.dataset_id for vid_info in ids_info)) > 1:
+            raise ValueError("Videos ids have to be from the same dataset")
+
+        existing_videos = self.get_list(dst_dataset_id)
+        existing_names = {video.name for video in existing_videos}
+
+        if change_name_if_conflict:
+            new_names = [
+                generate_free_name(existing_names, info.name, with_ext=True, extend_used_names=True)
+                for info in ids_info
+            ]
+        else:
+            new_names = [info.name for info in ids_info]
+            names_intersection = existing_names.intersection(set(new_names))
+            if len(names_intersection) != 0:
+                raise ValueError(
+                    "Videos with the same names already exist in destination dataset. "
+                    'Please, use argument "change_name_if_conflict=True" to automatically resolve '
+                    "names intersection"
+                )
+
+        new_videos = self.upload_ids(dst_dataset_id, new_names, ids, progress_cb=progress_cb)
+        new_ids = [new_video.id for new_video in new_videos]
+
+        if with_annotations:
+            src_project_id = self._api.dataset.get_info_by_id(ids_info[0].dataset_id).project_id
+            dst_project_id = self._api.dataset.get_info_by_id(dst_dataset_id).project_id
+            self._api.project.merge_metas(src_project_id, dst_project_id)
+            self._api.video.annotation.copy_batch(ids, new_ids)
+
+        return new_videos
+
     def _upload_bulk_add(
         self, func_item_to_kv, dataset_id, names, items, metas=None, progress_cb=None
     ):

supervisely/app/widgets/table/template.html

@@ -4,6 +4,7 @@
   style="width: {{{widget._width}}}"
   :content="data.{{{widget.widget_id}}}.table_data"
   :options="data.{{{widget.widget_id}}}.table_options"
+  :sort="state.{{{widget.widget_id}}}.sort"
   {%
   if
   widget._click_handled
@@ -11,12 +12,11 @@
   :value="state.{{{widget.widget_id}}}.selected_row"
   @input="state.{{{widget.widget_id}}}.selected_row = $event; 
           post('/{{{widget.widget_id}}}/cell_clicked_cb')"
+  @update:sort="state.{{{widget.widget_id}}}.sort = $event;
+                post('/{{{widget.widget_id}}}/update_sort_cb')"
   {%
   endif
   %}
-  :sort="state.{{{widget.widget_id}}}.sort"
-  @update:sort="state.{{{widget.widget_id}}}.sort = $event;
-                post('/{{{widget.widget_id}}}/update_sort_cb')"
 >
 </sly-table>
 <div v-if="data.{{{widget.widget_id}}}.table_data.data.length === 0">

{supervisely-6.73.199.dist-info → supervisely-6.73.200.dist-info}/METADATA

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

{supervisely-6.73.199.dist-info → supervisely-6.73.200.dist-info}/RECORD

@@ -24,7 +24,7 @@ supervisely/api/agent_api.py,sha256=ShWAIlXcWXcyI9fqVuP5GZVCigCMJmjnvdGUfLspD6Y,
 supervisely/api/annotation_api.py,sha256=Eps-Jf10_SQFy7DjghUnyiM6DcVJBsamHDViRAXv2fg,51403
 supervisely/api/api.py,sha256=u2T0yOQ-tUnP3iIzFu8zEQb4t_EDrXQSKnaXHCvFDyg,36514
 supervisely/api/app_api.py,sha256=zX3Iy16RuGwtcLZfMs3YfUFc93S9AVGb3W_eINeMjOs,66729
-supervisely/api/dataset_api.py,sha256=5di6OiBti9AMTd2bfjkHnO4uocEzAUPDra-P6qG9aQc,37542
+supervisely/api/dataset_api.py,sha256=7iwAyz3pmzFG2i072gLdXjczfBGbyj-V_rRl7Tx-V30,37944
 supervisely/api/file_api.py,sha256=ouqhqlFbBjxbpuf1hvUAJPIfabnxIzHqL3JDu-lUmHI,53094
 supervisely/api/github_api.py,sha256=NIexNjEer9H5rf5sw2LEZd7C1WR-tK4t6IZzsgeAAwQ,623
 supervisely/api/image_annotation_tool_api.py,sha256=YcUo78jRDBJYvIjrd-Y6FJAasLta54nnxhyaGyanovA,5237
@@ -63,8 +63,8 @@ supervisely/api/pointcloud/pointcloud_figure_api.py,sha256=r1sk3g9IgYVHuNhxyZT1T
 supervisely/api/pointcloud/pointcloud_object_api.py,sha256=bO1USWb9HAywG_CW4CDu1HLu6l58OqQFuD3ikS9F3bM,5130
 supervisely/api/pointcloud/pointcloud_tag_api.py,sha256=iShtr052nOElxsyMyZEUT2vypEm6kP00gnP13ABX24A,4691
 supervisely/api/video/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-supervisely/api/video/video_annotation_api.py,sha256=6lG2Y7VvxEPNY9x18rg4M9InAoAHq0_9W8RHPaln86E,6361
-supervisely/api/video/video_api.py,sha256=caqot3B1qBV5XGE_KnJ9Nluj1kF7SkiD9fRA9FxxJ2g,78790
+supervisely/api/video/video_annotation_api.py,sha256=DwZh11fBLa_AWwdYbpbSH1ZGh_5TFfLJiPKcXuOVc14,9319
+supervisely/api/video/video_api.py,sha256=4XrV-sAhsskSvYT6Lu1AILjAkmCumIOetb-NHUtcbjc,82597
 supervisely/api/video/video_figure_api.py,sha256=quksohjhgrK2l2-PtbbNE99fOW6uWXX59-_4xfc-I-k,6244
 supervisely/api/video/video_frame_api.py,sha256=4GwSI4xdCNYEUvTqzKc-Ewd44fw5zqkFoD24jrrN_aY,10214
 supervisely/api/video/video_object_api.py,sha256=IC0NP8EoIT_d3xxDRgz2cA3ixSiuJ5ymy64eS-RfmDM,2227
@@ -466,7 +466,7 @@ supervisely/app/widgets/switch/switch.py,sha256=k0oWbMjN9-ak1UcqBBEC3-yeJlEfiF4i
 supervisely/app/widgets/switch/template.html,sha256=Hqo565LsnWlq5fK13KZ04aLNaqr1kbZDQX8JPJnR5e4,462
 supervisely/app/widgets/table/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/app/widgets/table/table.py,sha256=knuSWJM5sBHfePYDFD4MVuGUM8W3oQgBQzyfWLYhr3g,16750
-supervisely/app/widgets/table/template.html,sha256=aOtGkX6T-Zg8rA-_HjQ-1tUNviObolH2ZxJw_cjBnmE,778
+supervisely/app/widgets/table/template.html,sha256=f895pzZzrc2dMN7ZFZ9iywQjxS2bWvSMIJxdqFbFL8k,778
 supervisely/app/widgets/tabs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/app/widgets/tabs/tabs.py,sha256=9TcBFyDEiOkNdHPrhodNuRAe_3bTGrUgb1vavYhsYJo,2356
 supervisely/app/widgets/tabs/template.html,sha256=kVesXGZrIR_YjqhLMwbbpzEku0FR3GAyPGGtEWh5OuU,402
@@ -953,9 +953,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.199.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.199.dist-info/METADATA,sha256=P_MB6rbtG8u9TNCV7jK84uRVaC4JRTPZWKkziTL8VdE,33077
-supervisely-6.73.199.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-supervisely-6.73.199.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.199.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.199.dist-info/RECORD,,
+supervisely-6.73.200.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.200.dist-info/METADATA,sha256=7nxrYfel8T-VAi0k_ist_K7npAJifyIQe2Wwv9H0ip0,33077
+supervisely-6.73.200.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+supervisely-6.73.200.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.200.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.200.dist-info/RECORD,,