supervisely 6.73.377__py3-none-any.whl → 6.73.378__py3-none-any.whl

supervisely/api/entity_annotation/tag_api.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-from typing import List, Optional
+from typing import Any, Dict, List, Optional, Union
 
 from supervisely._utils import batched
 from supervisely.api.module_api import ApiField, ModuleApi
@@ -210,11 +210,13 @@ class TagApi(ModuleApi):
             raise RuntimeError("SDK error: len(tags_keys) != len(tags_to_add)")
         if len(tags_keys) == 0:
             return
-        ids = self.append_to_objects_json(entity_id, tags_to_add)
+        ids = self.append_to_objects_json(entity_id, tags_to_add, project_id)
         KeyIdMap.add_tags_to(key_id_map, tags_keys, ids)
         return ids
 
-    def append_to_objects_json(self, entity_id: int, tags_json: dict) -> list:
+    def append_to_objects_json(
+        self, entity_id: int, tags_json: List[Dict], project_id: Optional[int] = None
+    ) -> List[int]:
         """
         Add Tags to Annotation Objects for specific entity (image etc.).
 
@@ -224,14 +226,50 @@ class TagApi(ModuleApi):
         :type tags_json: dict
         :return: List of tags IDs
         :rtype: list
+
+        :Usage example:
+
+             .. code-block:: python
+
+                import supervisely as sly
+
+                api = sly.Api(server_address, token)
+
+                tags_list = [
+                    {
+                        "tagId": 25926,
+                        "objectId": 652959,
+                        "value": None
+                    },
+                    {
+                        "tagId": 25927,
+                        "objectId": 652959,
+                        "value": "v1"
+                    },
+                    {
+                        "tagId": 25927,
+                        "objectId": 652958,
+                        "value": "v2"
+                    }
+                ]
+                response = api.video.tag.append_to_objects_json(12345, tags_list)
+
+                print(response)
+                # Output:
+                #    [
+                #        80421101,
+                #        80421102,
+                #        80421103
+                #    ]
         """
 
         if len(tags_json) == 0:
             return []
-        response = self._api.post(
-            "annotation-objects.tags.bulk.add",
-            {ApiField.ENTITY_ID: entity_id, ApiField.TAGS: tags_json},
-        )
+        if project_id is not None:
+            json_data = {ApiField.PROJECT_ID: project_id, ApiField.TAGS: tags_json}
+        else:
+            json_data = {ApiField.ENTITY_ID: entity_id, ApiField.TAGS: tags_json}
+        response = self._api.post("annotation-objects.tags.bulk.add", json_data)
         ids = [obj[ApiField.ID] for obj in response.json()]
         return ids
 
@@ -242,11 +280,21 @@ class TagApi(ModuleApi):
         batch_size: int = 100,
         log_progress: bool = False,
         progress: Optional[tqdm_sly] = None,
-    ) -> List[dict]:
+    ) -> List[Dict[str, Union[str, int, None]]]:
         """
-        Add Tags to existing Annotation Figures.
-        All figures must belong to entities of the same project.
-        Applies only to images project.
+        For images project:
+            Add Tags to existing Annotation Figures (labels).
+            The `tags_list` example:
+                [{"tagId": 12345, "figureId": 54321, "value": "tag_value"}, ...].
+        For video, pointcloud, volume and pointcloud episodes projects:
+            Add Tags to existing Annotation Objects.
+            The `frameRange` field is optional and is supported only for video and pointcloud episodes projects.
+            The `tags_list`` example:
+                [{"tagId": 12345, "objectId": 54321, "value": "tag_value"}, ...].
+            or with frameRange:
+                [{"tagId": 12345, "objectId": 54321, "value": "tag_value", "frameRange": [1, 10]}, ...].
+
+        All objects must belong to entities of the same project.
 
         :param project_id: Project ID in Supervisely.
         :type project_id: int
@@ -259,7 +307,7 @@ class TagApi(ModuleApi):
         :param progress: Progress bar object to display progress.
         :type progress: Optional[tqdm_sly]
         :return: List of tags infos as dictionaries.
-        :rtype: List[dict]
+        :rtype: List[Dict[str, Union[str, int, None]]]
 
         Usage example:
         .. code-block:: python
@@ -272,7 +320,8 @@ class TagApi(ModuleApi):
                 {
                     "tagId": 25926,
                     "figureId": 652959,
-                    "value": None # value is optional for tag with type 'None'
+                    "value": None # optional for tag with type 'None'
+                    "frameRange": [1, 10] # optional (supported only for video and pointcloud episodes projects)
                 },
                 {
                     "tagId": 25927,
@@ -282,7 +331,7 @@ class TagApi(ModuleApi):
                 {
                     "tagId": 25927,
                     "figureId": 652958,
-                    "value": "v2"
+                    "value": "v2",
                 }
             ]
             response = api.image.tag.add_to_figures(12345, tag_list)
@@ -310,16 +359,14 @@ class TagApi(ModuleApi):
             #        }
             #    ]
         """
-        if type(self) is not TagApi:
-            raise NotImplementedError("This method is not available for classes except TagApi")
-
-        if len(tags_list) == 0:
-            return []
 
         if progress is not None:
             log_progress = False
 
         result = []
+
+        if len(tags_list) == 0:
+            return result
         if log_progress:
             progress = tqdm_sly(
                 desc="Adding tags to figures",
@@ -327,8 +374,164 @@ class TagApi(ModuleApi):
             )
         for batch in batched(tags_list, batch_size):
             data = {ApiField.PROJECT_ID: project_id, ApiField.TAGS: batch}
-            response = self._api.post("figures.tags.bulk.add", data)
+            if type(self) is TagApi:
+                response = self._api.post("figures.tags.bulk.add", data)
+            else:
+                response = self._api.post("annotation-objects.tags.bulk.add", data)
             result.extend(response.json())
             if progress is not None:
                 progress.update(len(batch))
         return result
+
+    def add_to_entities_json(
+        self,
+        project_id: int,
+        tags_list: List[Dict[str, Union[str, int, None]]],
+        batch_size: int = 100,
+        log_progress: bool = False,
+    ) -> List[int]:
+        """
+        Bulk add tags to entities (images, videos, pointclouds, volumes) in a project.
+        Not supported for pointcloud episodes projects.
+        All entities must belong to the same project.
+        The `frameRange` field in a tag object within the tags list is optional and is supported only for video projects.
+
+        The `tags_list` example:
+            [{"tagId": 12345, "entityId": 54321, "value": "tag_value"}, ...].
+        or with frameRange:
+            [{"tagId": 12345, "entityId": 54321, "value": "tag_value", "frameRange": [1, 10]}, ...].
+
+        :param project_id: Project ID in Supervisely.
+        :type project_id: int
+        :param tags_list: List of tag object infos as dictionaries
+                          (e.g. {"tagId": 12345, "entityId": 54321, "value": "tag_value"}).
+        :param batch_size: Number of tags to add in one request.
+        :type batch_size: int
+        :param log_progress: If True, will display a progress bar.
+        :type log_progress: bool
+        :return: List of tags IDs.
+        :rtype: List[int]
+
+        Usage example:
+        .. code-block:: python
+
+            import supervisely as sly
+
+            api = sly.Api(server_address, token)
+
+            tag_list = [
+                {
+                    "tagId": 25926,
+                    "entityId": 652959,
+                    "value": None # optional for tag with type 'None'
+                    "frameRange": [1, 10] # optional (supported only for video projects)
+                },
+                {
+                    "tagId": 25927,
+                    "entityId": 652959,
+                    "value": "v1"
+                },
+                {
+                    "tagId": 25927,
+                    "entityId": 652958,
+                    "value": "v2"
+                }
+            ]
+            api.image.tag.add_to_entities_json(project_id=12345, tag_list=tag_list)
+        """
+
+        result = []
+
+        if len(tags_list) == 0:
+            return result
+
+        if log_progress:
+            ds_progress = tqdm_sly(desc="Adding tags to entities", total=len(tags_list))
+
+        for batch in batched(tags_list, batch_size):
+            data = {ApiField.PROJECT_ID: project_id, ApiField.TAGS: batch}
+            response = self._api.post("tags.entities.bulk.add", data)
+            result.extend([obj[ApiField.ID] for obj in response.json()])
+            if log_progress:
+                ds_progress.update(len(batch))
+
+        return result
+
+    def add_tags_collection_to_objects(
+        self,
+        project_id: int,
+        tags_map: Dict[int, Any],
+        batch_size: int = 100,
+        log_progress: bool = False,
+    ) -> List[Dict[str, Union[str, int, None]]]:
+        """
+        For images project:
+            Add Tags to existing Annotation Figures (labels).
+            The `tags_map` example: {figure_id_1: TagCollection, ...}.
+        For video, pointcloud, volume and pointcloud episodes projects:
+            Add Tags to existing Annotation Objects.
+            The `frameRange` field is optional and is supported only for video and pointcloud episodes projects.
+            The `tags_map` example: {object_id_1: TagCollection, ...}.
+
+        All objects must belong to entities of the same project.
+
+        :param project_id: Project ID in Supervisely.
+        :type project_id: int
+        :param tags_map: Dictionary with mapping figure/object ID to tags collection.
+        :type tags_map: Dict[int, Any]
+        :param batch_size: Number of tags to add in one request.
+        :type batch_size: int
+        :param log_progress: If True, will display a progress bar.
+        :type log_progress: bool
+        :return: List of tags infos as dictionaries.
+        :rtype: List[Dit[str, Union[str, int, None]]]
+
+        Usage example:
+        .. code-block:: python
+
+            import supervisely as sly
+
+            api = sly.Api(server_address, token)
+
+            project_id = 12345
+
+            tag_meta = sly.TagMeta("tag_name", sly.TagValueType.ANY_STRING)
+            meta = sly.ProjectMeta(tag_metas=[tag_meta])
+            meta = sly.ProjectMeta.from_json(api.project.update_meta(project_id, meta))
+            tag_meta = meta.get_tag_meta("tag_name")
+
+            # for images project:
+            tag_map = {
+                652959: sly.TagCollection([sly.Tag(tag_meta, value="v1"), sly.Tag(tag_meta, value="v2"), ...]),
+                652958: sly.TagCollection([sly.Tag(tag_meta, value="v3"), sly.Tag(tag_meta, value="v4"), ...]),
+                ...
+            }
+            api.image.tag.add_tags_to_objects(project_id, tag_map)
+
+            # for videos projects (frameRange is optional):
+            tag_map = {
+                652959: sly.VideoTagCollection([sly.VideoTag(tag_meta, value="v1", frameRange=[1, 10]), ...]),
+                652958: sly.VideoTagCollection([sly.VideoTag(tag_meta, value="v2", frameRange=[4, 12]), ...]),
+                ...
+            }
+            api.video.tag.add_to_objects_json_batch(project_id, tag_map)
+        """
+
+        OBJ_ID_FIELD = ApiField.FIGURE_ID if type(self) is TagApi else ApiField.OBJECT_ID
+
+        data = []
+        for obj_id, tags in tags_map.items():
+            for tag in tags:
+
+                if tag.meta.sly_id is None:
+                    raise ValueError(f"Tag {tag.name} meta has no sly_id")
+
+                data.append(
+                    {
+                        ApiField.TAG_ID: tag.meta.sly_id,
+                        OBJ_ID_FIELD: obj_id,
+                        **tag.to_json()
+                    }
+                )
+
+        return self.add_to_objects(project_id, data, batch_size, log_progress)

supervisely/api/image_api.py

@@ -3601,7 +3601,87 @@ class ImageApi(RemoveableBulkModuleApi):
             if progress_cb is not None:
                 progress_cb(len(batch_ids))
 
-    def update_tag_value(self, tag_id: int, value: Union[str, float]) -> Dict:
+    def add_tags_batch(
+        self,
+        image_ids: List[int],
+        tag_ids: Union[int, List[int]],
+        values: Optional[Union[str, int, List[Union[str, int, None]]]] = None,
+        log_progress: bool = False,
+        batch_size: Optional[int] = 100,
+        tag_metas: Optional[Union[TagMeta, List[TagMeta]]] = None,
+    ) -> List[int]:
+        """
+        Add tag with given ID to Images by IDs with different values.
+
+        :param image_ids: List of Images IDs in Supervisely.
+        :type image_ids: List[int]
+        :param tag_ids: Tag IDs in Supervisely.
+        :type tag_ids: int or List[int]
+        :param values: List of tag values for each image or single value for all images.
+        :type values: List[str] or List[int] or str or int, optional
+        :param log_progress: If True, will log progress.
+        :type log_progress: bool, optional
+        :param batch_size: Batch size
+        :type batch_size: int, optional
+        :param tag_metas: Tag Metas. Needed for values validation, omit to skip validation
+        :type tag_metas: TagMeta or List[TagMeta], optional
+        :return: List of tags IDs.
+        :rtype: List[int]
+        :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()
+            image_ids = [2389126, 2389127]
+            tag_ids = 277083
+            values = ['value1', 'value2']
+            api.image.add_tags_batch(image_ids, tag_ids, values)
+        """
+        if len(image_ids) == 0:
+            return []
+
+        if isinstance(tag_ids, int):
+            tag_ids = [tag_ids] * len(image_ids)
+
+        if isinstance(tag_metas, TagMeta):
+            tag_metas = [tag_metas] * len(image_ids)
+
+        if values is None:
+            values = [None] * len(image_ids)
+        elif isinstance(values, (str, int)):
+            values = [values] * len(image_ids)
+
+        if len(values) != len(image_ids):
+            raise ValueError("Length of image_ids and values should be the same")
+
+        if len(tag_ids) != len(image_ids):
+            raise ValueError("Length of image_ids and tag_ids should be the same")
+
+        if tag_metas and len(tag_metas) != len(image_ids):
+            raise ValueError("Length of image_ids and tag_metas should be the same")
+
+        if tag_metas:
+            for tag_meta, tag_id, value in zip(tag_metas, tag_ids, values):
+                if not (tag_meta.sly_id == tag_id):
+                    raise ValueError(f"{tag_meta.name = } and {tag_id = } should be same")
+                if not tag_meta.is_valid_value(value):
+                    raise ValueError(f"{tag_meta.name = } can not have value {value = }")
+
+        project_id = self.get_project_id(image_ids[0])
+        data = [
+            {ApiField.ENTITY_ID: image_id, ApiField.TAG_ID: tag_id, ApiField.VALUE: value}
+            for image_id, tag_id, value in zip(image_ids, tag_ids, values)
+        ]
+
+        return self.tag.add_to_entities_json(project_id, data, batch_size, log_progress)
+
+    def update_tag_value(
+        self, tag_id: int, value: Union[str, float]
+    ) -> Dict:
         """
         Update tag value with given ID.
 

supervisely/convert/image/sly/sly_image_converter.py

@@ -17,7 +17,7 @@ from supervisely.api.api import Api
 from supervisely.convert.base_converter import AvailableImageConverters
 from supervisely.convert.image.image_converter import ImageConverter
 from supervisely.convert.image.image_helper import validate_image_bounds
-from supervisely.io.fs import dirs_filter, file_exists, get_file_ext
+from supervisely.io.fs import dirs_filter, file_exists, get_file_ext, get_file_name
 from supervisely.io.json import load_json_file
 from supervisely.project.project import find_project_dirs
 from supervisely.project.project import upload_project as upload_project_fs
@@ -122,17 +122,20 @@ class SLYImageConverter(ImageConverter):
         self._items = []
         for image_path in images_list:
             item = self.Item(image_path)
-            ann_name = f"{item.name}.json"
-            if ann_name in ann_dict:
-                ann_path = ann_dict[ann_name]
+            json_name, json_name_noext = f"{item.name}.json", f"{get_file_name(item.name)}.json"
+            ann_path = ann_dict.get(json_name, ann_dict.get(json_name_noext))
+            if ann_path:
                 if self._meta is None:
                     meta = self.generate_meta_from_annotation(ann_path, meta)
                 is_valid = self.validate_ann_file(ann_path, meta)
                 if is_valid:
                     item.ann_data = ann_path
-                    detected_ann_cnt += 1
-            if ann_name in img_meta_dict:
-                item.set_meta_data(img_meta_dict[ann_name])
+            
+            meta_path = img_meta_dict.get(json_name, img_meta_dict.get(json_name_noext))
+            if meta_path:
+                item.set_meta_data(meta_path)
+            if item.ann_data is not None or item.meta is not None:
+                detected_ann_cnt += 1
             self._items.append(item)
         self._meta = meta
         return detected_ann_cnt > 0

{supervisely-6.73.377.dist-info → supervisely-6.73.378.dist-info}/METADATA

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

{supervisely-6.73.377.dist-info → supervisely-6.73.378.dist-info}/RECORD

@@ -30,7 +30,7 @@ supervisely/api/entities_collection_api.py,sha256=6nbh5KxBzqGwtjV9tgzMFHBKVla2x-
 supervisely/api/file_api.py,sha256=gNXNsikocSYRojoZrVmXIqXycqXm0e320piAwaLN6JI,92978
 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=zwyHsphaclKFU2a5gpHy6Cas_kpitViSCMV6vcPqR0s,224592
+supervisely/api/image_api.py,sha256=mjKuX6jG5TK_V8EQyqcD6eSBAK1oJbVJZCDtflO00mg,227764
 supervisely/api/import_storage_api.py,sha256=BDCgmR0Hv6OoiRHLCVPKt3iDxSVlQp1WrnKhAK_Zl84,460
 supervisely/api/issues_api.py,sha256=BqDJXmNoTzwc3xe6_-mA7FDFC5QQ-ahGbXk_HmpkSeQ,17925
 supervisely/api/labeling_job_api.py,sha256=G2_BV_WtA2lAhfw_nAQmWmv1P-pwimD0ba9GVKoGjiA,55537
@@ -53,7 +53,7 @@ supervisely/api/entity_annotation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 supervisely/api/entity_annotation/entity_annotation_api.py,sha256=K79KdDyepQv4FiNQHBj9V4-zLIemxK9WG1ig1bfBKb8,3083
 supervisely/api/entity_annotation/figure_api.py,sha256=rmsE3L_JfqN94sLN637pQ0syiBAXPd8RyAwhl41j1xs,35318
 supervisely/api/entity_annotation/object_api.py,sha256=gbcNvN_KY6G80Me8fHKQgryc2Co7VU_kfFd1GYILZ4E,8875
-supervisely/api/entity_annotation/tag_api.py,sha256=h19YsJzJLDp0VIicQzoYCRyVhY149KY7pUysb4XX0RI,11114
+supervisely/api/entity_annotation/tag_api.py,sha256=IapvSZmakjdOn0yvqP2tQRY8gkZg0bcvIZBwWRcafrg,18996
 supervisely/api/nn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/api/nn/deploy_api.py,sha256=fA5yk3-Q66BL821iu68HpsGWWO2qHXCcWTmrXoHE4gE,37008
 supervisely/api/nn/neural_network_api.py,sha256=VYqpHb6xqCeEUofTNfOGUhvjI_5Di3T26qwVp5Z-0hE,10643
@@ -617,7 +617,7 @@ supervisely/convert/image/pdf/pdf_converter.py,sha256=LKvVng9jPp0cSIjYEjKLOb48wt
 supervisely/convert/image/pdf/pdf_helper.py,sha256=IDwLEvsVy8lu-KC1lXvSRkZZ9BCC6ylebnNEtLQU5L4,1288
 supervisely/convert/image/sly/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/image/sly/fast_sly_image_converter.py,sha256=wtiM-Dl4xivT60-79pj8XMdHQc2kPMi7DqGcEngiWRg,5669
-supervisely/convert/image/sly/sly_image_converter.py,sha256=_sTiPTeNwZ1qWdtecmusanzvApHN7TskB7slgI3mibs,14370
+supervisely/convert/image/sly/sly_image_converter.py,sha256=9nFDvyl19c-rY8_KRp-PpzAP6SYP7Z8Tz9KVJ8EXyYE,14594
 supervisely/convert/image/sly/sly_image_helper.py,sha256=5Ri8fKb5dzh5b3v8AJ5u8xVFOQfAtoWqZ7HktPsCjTI,7373
 supervisely/convert/image/yolo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 supervisely/convert/image/yolo/yolo_converter.py,sha256=Wn5dR05y4SEPONcaxWr9ofnbvbf-SbRZN0fkksk5Dps,11391
@@ -1103,9 +1103,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.377.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.377.dist-info/METADATA,sha256=Y1bgGmMc-pZxRfzhjnDNF8PVouW1YzI3nSEXXKbqQTk,35154
-supervisely-6.73.377.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-supervisely-6.73.377.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.377.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.377.dist-info/RECORD,,
+supervisely-6.73.378.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.378.dist-info/METADATA,sha256=bp_zmJ4eMthGiUG1RfSVjuMI0DZU-2TLMPXJ4y_dwQE,35154
+supervisely-6.73.378.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+supervisely-6.73.378.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.378.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.378.dist-info/RECORD,,