supervisely 6.73.291__tar.gz → 6.73.293__tar.gz

{supervisely-6.73.291/supervisely.egg-info → supervisely-6.73.293}/PKG-INFO

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

{supervisely-6.73.291 → supervisely-6.73.293}/supervisely/__init__.py

@@ -311,4 +311,4 @@ except Exception as e:
 # If new changes in Supervisely Python SDK require upgrade of the Supervisely instance
 # set a new value for the environment variable MINIMUM_INSTANCE_VERSION_FOR_SDK, otherwise
 # users can face compatibility issues, if the instance version is lower than the SDK version.
-os.environ["MINIMUM_INSTANCE_VERSION_FOR_SDK"] = "6.12.23"
+os.environ["MINIMUM_INSTANCE_VERSION_FOR_SDK"] = "6.12.28"

{supervisely-6.73.291 → supervisely-6.73.293}/supervisely/api/annotation_api.py

@@ -9,16 +9,21 @@ import json
 from collections import defaultdict
 from copy import deepcopy
 from typing import Any, Callable, Dict, List, Literal, NamedTuple, Optional, Union
+from uuid import uuid4
 
 from tqdm import tqdm
 
 from supervisely._utils import batched
 from supervisely.annotation.annotation import Annotation, AnnotationJsonFields
 from supervisely.annotation.label import Label, LabelJsonFields
+from supervisely.annotation.tag import Tag
+from supervisely.annotation.tag_meta import TagMeta, TagValueType
 from supervisely.api.module_api import ApiField, ModuleApi
 from supervisely.geometry.alpha_mask import AlphaMask
 from supervisely.geometry.constants import BITMAP
 from supervisely.project.project_meta import ProjectMeta
+from supervisely.project.project_type import _LABEL_GROUP_TAG_NAME
+from supervisely.sly_logger import logger
 
 
 class AnnotationInfo(NamedTuple):
@@ -1640,3 +1645,86 @@ class AnnotationApi(ModuleApi):
                 progress_cb(len(batch))
         ordered_results = [id_to_ann[image_id] for image_id in image_ids]
         return ordered_results
+
+    def append_labels_group(
+        self,
+        dataset_id: int,
+        image_ids: List[int],
+        labels: List[Label],
+        project_meta: Optional[ProjectMeta] = None,
+        group_name: Optional[str] = None,
+    ) -> None:
+        """
+        Append group of labels to corresponding multiview images.
+        This method will automatically add a tech tag to the labels to group them together.
+        Please note that grouped labels is supported only in images project with multiview setup.
+
+        :param dataset_id: Dataset ID in Supervisely.
+        :type dataset_id: int
+        :param image_ids: List of Images IDs in Supervisely.
+        :type image_ids: List[int]
+        :param labels: List of Labels in Supervisely.
+        :type labels: List[Label]
+        :param project_meta: Project meta. If not provided, will try to get it from the server.
+        :type project_meta: ProjectMeta, optional
+        :param group_name: Group name. Labels will be assigned by tag with this value.
+        :type group_name: str, optional
+        :return: :class:`None<None>`
+        :rtype: :class:`NoneType<NoneType>`
+        :raises ValueError: if number of images and labels are not the same
+
+        :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 = 123456
+            paths = ['path/to/audi_01.png', 'path/to/audi_02.png']
+            images_group_name = 'audi'
+
+            image_infos = api.image.upload_multiview_images(dataset_id, images_group_name, paths)
+
+            image_ids = [info.id for info in image_infos]
+            labels = [label1, label2]
+            labels_group_name = 'left_wheel'
+
+            # upload group of labels to corresponding multiview images
+            api.annotation.append_labels_group(image_ids, labels, labels_group_name)
+        """
+
+        if len(image_ids) != len(labels):
+            raise ValueError(
+                "Number of images and labels must be the same."
+                "If specific image does not have label, pass None instead."
+            )
+
+        if group_name is None:
+            group_name = str(uuid4().hex)
+
+        if project_meta is None:
+            logger.warning(
+                "Project meta is not provided. Will try to get it from the server. "
+                "It is recommended to provide project meta to avoid extra API requests."
+            )
+            dataset_info = self._api.dataset.get_info_by_id(dataset_id)
+            if dataset_info is None:
+                raise ValueError(f"Dataset with ID {dataset_id} not found")
+
+            project_id = dataset_info.project_id
+            project_meta = ProjectMeta.from_json(self._api.project.get_meta(project_id))
+
+        tag_meta = TagMeta(_LABEL_GROUP_TAG_NAME, TagValueType.ANY_STRING)
+        labels = [l.add_tag(Tag(tag_meta, group_name)) for l in labels if l is not None]
+
+        anns_json = self._api.annotation.download_json_batch(
+            dataset_id=dataset_id, image_ids=image_ids, force_metadata_for_links=False
+        )
+        anns = [Annotation.from_json(ann_json, project_meta) for ann_json in anns_json]
+        updated_anns = [ann.add_label(label) for ann, label in zip(anns, labels)]
+
+        self._api.annotation.upload_anns(image_ids, updated_anns)

{supervisely-6.73.291 → supervisely-6.73.293}/supervisely/api/project_api.py

@@ -52,6 +52,7 @@ from supervisely.project.project_settings import (
     ProjectSettingsJsonFields,
 )
 from supervisely.project.project_type import (
+    _LABEL_GROUP_TAG_NAME,
     _METADATA_SYSTEM_KEY,
     _METADATA_TIMESTAMP_KEY,
     _METADATA_VALIDATION_SCHEMA_KEY,
@@ -430,7 +431,9 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
         """
 
         fields = [
-            x for x in self.info_sequence() if x not in (ApiField.ITEMS_COUNT, ApiField.SETTINGS, ApiField.CREATED_BY_ID)
+            x
+            for x in self.info_sequence()
+            if x not in (ApiField.ITEMS_COUNT, ApiField.SETTINGS, ApiField.CREATED_BY_ID)
         ]
 
         info = super().get_info_by_name(parent_id, name, fields)
@@ -1795,7 +1798,9 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
         meta = meta.add_obj_classes(classes)
         self.update_meta(id, meta)
 
-    def _set_custom_grouping_settings(self, id: int, group_images: bool, tag_name: str, sync: bool):
+    def _set_custom_grouping_settings(
+        self, id: int, group_images: bool, tag_name: str, sync: bool, label_group_tag_name: str = None
+    ) -> None:
         """Sets the project settings for custom grouping.
 
         :param id: Project ID to set custom grouping settings.
@@ -1806,9 +1811,15 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
         :type tag_name: str
         :param sync: if True images will have synchronized view and labeling
         :type sync: bool
+        :param label_group_tag_name: Name of the tag. Labels will be grouped by this tag
+        :type label_group_tag_name: str
+        :raises ValueError: if tag value type is not 'any_string'
+        :return: None
+        :rtype: :class:`NoneType`
         """
         meta = ProjectMeta.from_json(self.get_meta(id, with_settings=True))
         existing_tag_meta = meta.get_tag_meta(tag_name)
+        need_update = False
         if existing_tag_meta is not None:
             if existing_tag_meta.value_type != TagValueType.ANY_STRING:
                 raise ValueError(
@@ -1817,8 +1828,23 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
                 )
         else:
             new_tag_meta = TagMeta(tag_name, TagValueType.ANY_STRING)
-            project_meta = meta.add_tag_meta(new_tag_meta)
-            self.update_meta(id, project_meta)
+            meta = meta.add_tag_meta(new_tag_meta)
+            need_update = True
+        if label_group_tag_name is not None:
+            label_group_tag_meta = meta.get_tag_meta(label_group_tag_name)
+            if label_group_tag_meta is not None:
+                if label_group_tag_meta.value_type != TagValueType.ANY_STRING:
+                    raise ValueError(
+                        f"Tag '{label_group_tag_name}' should have value type 'any_string', "
+                        f"but got '{label_group_tag_meta.value_type}' value type."
+                    )
+            else:
+                label_group_tag_meta = TagMeta(label_group_tag_name, TagValueType.ANY_STRING)
+                meta = meta.add_tag_meta(label_group_tag_meta)
+                need_update = True
+        if need_update:
+            self.update_meta(id, meta)
+
         self.images_grouping(id, enable=group_images, tag_name=tag_name, sync=sync)
 
     def set_multispectral_settings(self, project_id: int) -> None:
@@ -1885,6 +1911,7 @@ class ProjectApi(CloneableModuleApi, UpdateableModule, RemoveableModuleApi):
             group_images=True,
             tag_name=_MULTIVIEW_TAG_NAME,
             sync=False,
+            label_group_tag_name=_LABEL_GROUP_TAG_NAME,
         )
 
     def remove_permanently(

{supervisely-6.73.291 → supervisely-6.73.293}/supervisely/app/fastapi/templating.py

@@ -11,7 +11,7 @@ from supervisely.app.singleton import Singleton
 from supervisely.app.widgets_context import JinjaWidgets
 
 # https://github.com/supervisely/js-bundle
-js_bundle_version = "2.1.97"
+js_bundle_version = "2.1.98"
 
 # https://github.com/supervisely-ecosystem/supervisely-app-frontend-js
 js_frontend_version = "v0.0.54"

{supervisely-6.73.291 → supervisely-6.73.293}/supervisely/project/project_type.py

@@ -14,6 +14,7 @@ class ProjectType(StrEnum):
 # Constants for multispectral and multiview projects.
 _MULTISPECTRAL_TAG_NAME = "multispectral"
 _MULTIVIEW_TAG_NAME = "multiview"
+_LABEL_GROUP_TAG_NAME = "@label-group-id"
 
 _METADATA_SYSTEM_KEY = "sly_system"
 _METADATA_VALIDATION_SCHEMA_KEY = "validation_schema"

{supervisely-6.73.291 → supervisely-6.73.293/supervisely.egg-info}/PKG-INFO

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