supervisely 6.73.310__tar.gz → 6.73.312__tar.gz

{supervisely-6.73.310/supervisely.egg-info → supervisely-6.73.312}/PKG-INFO

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

{supervisely-6.73.310 → supervisely-6.73.312}/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.28"
+os.environ["MINIMUM_INSTANCE_VERSION_FOR_SDK"] = "6.12.30"

{supervisely-6.73.310 → supervisely-6.73.312}/supervisely/annotation/tag.py

@@ -3,14 +3,13 @@
 
 # docs
 from __future__ import annotations
-from typing import List, Optional, Dict, Union
-from supervisely.annotation.tag_meta import TagMeta
-from supervisely.annotation.tag_meta_collection import TagMetaCollection
 
+from typing import Dict, List, Optional, Union
 
-from supervisely.annotation.tag_meta import TagValueType
-from supervisely.collection.key_indexed_collection import KeyObject
 from supervisely._utils import take_with_default
+from supervisely.annotation.tag_meta import TagMeta, TagValueType
+from supervisely.annotation.tag_meta_collection import TagMetaCollection
+from supervisely.collection.key_indexed_collection import KeyObject
 
 
 class TagJsonFields:
@@ -83,6 +82,8 @@ class Tag(KeyObject):
         # Output: ValueError: Tag coat color can not have value yellow
     """
 
+    _SUPPORT_UNFINISHED_TAGS = False
+
     def __init__(
         self,
         meta: TagMeta,
@@ -97,7 +98,8 @@ class Tag(KeyObject):
         self._meta = meta
         self._value = value
         if not self._meta.is_valid_value(value):
-            raise ValueError("Tag {} can not have value {}".format(self.meta.name, value))
+            if not (self._SUPPORT_UNFINISHED_TAGS and value is None):
+                raise ValueError(f"Tag {self.meta.name} can not have value {value}")
         self.labeler_login = labeler_login
         self.updated_at = updated_at
         self.created_at = created_at
@@ -219,9 +221,7 @@ class Tag(KeyObject):
             #  "createdAt": "2021-01-22T18:00:00.000Z"
             # }
         """
-        res = {
-            TagJsonFields.TAG_NAME: self.meta.name
-        }
+        res = {TagJsonFields.TAG_NAME: self.meta.name}
         if self.meta.value_type != TagValueType.NONE:
             res[TagJsonFields.VALUE] = self.value
         if self.labeler_login is not None:

{supervisely-6.73.310 → supervisely-6.73.312}/supervisely/api/module_api.py

@@ -621,6 +621,10 @@ class ApiField:
     """"""
     EXPERIMENT = "experiment"
     """"""
+    IS_FINISHED = "isFinished"
+    """"""
+    NON_FINAL_VALUE = "nonFinalValue"
+    """"""
 
 
 def _get_single_item(items):

{supervisely-6.73.310 → supervisely-6.73.312}/supervisely/api/video/video_api.py

@@ -44,6 +44,7 @@ from supervisely.io.fs import (
     ensure_base_path,
     get_file_ext,
     get_file_hash,
+    get_file_hash_chunked,
     get_file_hash_async,
     get_file_name_with_ext,
     get_file_size,
@@ -1516,7 +1517,7 @@ class VideoApi(RemoveableBulkModuleApi):
             self._api.add_header("x-skip-processing", "true")
 
         video_info_results = []
-        hashes = [get_file_hash(x) for x in paths]
+        hashes = [get_file_hash_chunked(x) for x in paths]
 
         self._upload_data_bulk(
             path_to_bytes_stream,

{supervisely-6.73.310 → supervisely-6.73.312}/supervisely/api/video/video_tag_api.py

@@ -6,7 +6,9 @@ from typing import List, Optional, Union
 from supervisely.annotation.tag_meta import TagMeta
 from supervisely.api.entity_annotation.tag_api import TagApi
 from supervisely.api.module_api import ApiField
+from supervisely.collection.key_indexed_collection import KeyIndexedCollection
 from supervisely.project.project_meta import ProjectMeta
+from supervisely.video_annotation.key_id_map import KeyIdMap
 from supervisely.video_annotation.video_tag import VideoTag
 from supervisely.video_annotation.video_tag_collection import VideoTagCollection
 
@@ -102,6 +104,8 @@ class VideoTagApi(TagApi):
         video_id: int,
         value: Optional[Union[str, int]] = None,
         frame_range: Optional[List[int]] = None,
+        is_finished: Optional[bool] = True,
+        non_final_value: Optional[bool] = False,
     ) -> int:
         """
         Add VideoTag to video.
@@ -114,6 +118,10 @@ class VideoTagApi(TagApi):
         :type value: str or int
         :param frame_range: New VideoTag frame range.
         :type frame_range: List[int]
+        :param is_finished: Specify if the tag is finished.
+        :type is_finished: bool
+        :param non_final_value: Specify if the tag value is non-final.
+        :type non_final_value: bool
         :return: None
         :rtype: dict
         :Usage example:
@@ -133,11 +141,17 @@ class VideoTagApi(TagApi):
         request_data = {ApiField.TAG_ID: project_meta_tag_id, ApiField.VIDEO_ID: video_id}
         if value:
             request_data[ApiField.VALUE] = value
+        if non_final_value is True:
+            is_finished = False
         if frame_range:
+            if is_finished is False and frame_range[0] != frame_range[1]:
+                raise ValueError("Start frame and end frame must be equal for unfinished tags")
             request_data[ApiField.FRAME_RANGE] = frame_range
+        request_data[ApiField.IS_FINISHED] = is_finished
+        request_data[ApiField.NON_FINAL_VALUE] = non_final_value
 
         resp = self._api.post("videos.tags.add", request_data)
-        # {'imageId': 3267369, 'tagId': 368985, 'id': 2296676, 'createdAt': '2022-09-20T11:52:33.829Z', 'updatedAt': '2022-09-20T11:52:33.829Z', 'labelerLogin': 'max'}
+        # {'imageId': 3267369, 'tagId': 368985, 'id': 2296676, 'createdAt': '2022-09-20T11:52:33.829Z', 'updatedAt': '2022-09-20T11:52:33.829Z', 'labelerLogin': 'max', isFinished: true, nonFinalValue: false}
         return resp.json()
 
     def add(self, video_id: int, tag: VideoTag, update_id_inplace=True) -> int:
@@ -186,7 +200,14 @@ class VideoTagApi(TagApi):
             else:
                 raise ValueError("tag_meta.sly_id is None, get updated project meta from server")
 
-        resp_json = self.add_tag(tag.meta.sly_id, video_id, tag.value, tag.frame_range)
+        resp_json = self.add_tag(
+            tag.meta.sly_id,
+            video_id,
+            tag.value,
+            tag.frame_range,
+            tag.is_finished,
+            tag.non_final_value,
+        )
         tag_id = resp_json.get("id")
         created_at = resp_json.get("createdAt")
         updated_at = resp_json.get("updatedAt")
@@ -275,7 +296,7 @@ class VideoTagApi(TagApi):
 
 
 class VideoObjectTagApi(TagApi):
-    _entity_id_field = ApiField.OBJECT_ID
+    _entity_id_field = ApiField.ENTITY_ID
     _method_bulk_add = "annotation-objects.tags.bulk.add"
 
     def add(
@@ -284,6 +305,8 @@ class VideoObjectTagApi(TagApi):
         object_id: int,
         value: Optional[Union[str, int]] = None,
         frame_range: Optional[List[int]] = None,
+        is_finished: Optional[bool] = True,
+        non_final_value: Optional[bool] = False,
     ) -> int:
         """Add a tag to an annotation object.
 
@@ -304,8 +327,14 @@ class VideoObjectTagApi(TagApi):
         }
         if value is not None:
             request_body[ApiField.VALUE] = value
+        if non_final_value is True:
+            is_finished = False
         if frame_range is not None:
+            if is_finished is False and frame_range[0] != frame_range[1]:
+                raise ValueError("Start frame and end frame must be equal for unfinished tags")
             request_body[ApiField.FRAME_RANGE] = frame_range
+        request_body[ApiField.IS_FINISHED] = is_finished
+        request_body[ApiField.NON_FINAL_VALUE] = non_final_value
 
         response = self._api.post("annotation-objects.tags.add", request_body)
         id = response.json()[ApiField.ID]
@@ -349,3 +378,40 @@ class VideoObjectTagApi(TagApi):
             ApiField.FRAME_RANGE: frame_range,
         }
         self._api.post("annotation-objects.tags.update", request_body)
+
+    def append_to_entity(
+        self,
+        entity_id: int,
+        project_id: int,
+        tags: KeyIndexedCollection,
+        object_id: int,
+        key_id_map: KeyIdMap = None,
+    ):
+        """
+        Add tags to entity in project with given ID.
+
+        :param entity_id: ID of the entity in Supervisely to add a tag to
+        :type entity_id: int
+        :param project_id: Project ID in Supervisely.
+        :type project_id: int
+        :param tags: Collection of tags
+        :type tags: KeyIndexedCollection
+        :param object_id: ID of the object in Supervisely to add a tag to
+        :type object_id: int, optional
+        :param key_id_map: KeyIdMap object.
+        :type key_id_map: KeyIdMap, optional
+        :return: List of tags IDs
+        :rtype: list
+        """
+
+        if len(tags) == 0:
+            return []
+        tags_json, tags_keys = self._tags_to_json(tags, project_id=project_id)
+        tags_to_add = []
+        for tag in tags_json:
+            if object_id is not None:
+                tag[ApiField.OBJECT_ID] = object_id
+            tags_to_add.append(tag)
+        ids = self._append_json(entity_id, tags_to_add)
+        KeyIdMap.add_tags_to(key_id_map, tags_keys, ids)
+        return ids

{supervisely-6.73.310 → supervisely-6.73.312}/supervisely/app/widgets/classes_list_selector/classes_list_selector.py

@@ -5,6 +5,7 @@ from supervisely.app import StateJson
 from supervisely.app.widgets import Button, NotificationBox, Widget, generate_id
 from supervisely.geometry.any_geometry import AnyGeometry
 from supervisely.geometry.bitmap import Bitmap
+from supervisely.geometry.alpha_mask import AlphaMask
 from supervisely.geometry.closed_surface_mesh import ClosedSurfaceMesh
 from supervisely.geometry.cuboid_2d import Cuboid2d
 from supervisely.geometry.cuboid_3d import Cuboid3d
@@ -22,6 +23,7 @@ type_to_shape_text = {
     AnyGeometry: "any shape",
     Rectangle: "rectangle",
     Polygon: "polygon",
+    AlphaMask: "alpha mask",
     Bitmap: "bitmap (mask)",
     Polyline: "polyline",
     Point: "point",

{supervisely-6.73.310 → supervisely-6.73.312}/supervisely/app/widgets/classes_mapping/classes_mapping.py

@@ -4,6 +4,7 @@ from supervisely import ObjClass, ObjClassCollection
 from supervisely.app import DataJson, StateJson
 
 from supervisely.geometry.bitmap import Bitmap
+from supervisely.geometry.alpha_mask import AlphaMask
 from supervisely.geometry.cuboid import Cuboid
 from supervisely.geometry.point import Point
 from supervisely.geometry.polygon import Polygon
@@ -23,6 +24,7 @@ type_to_shape_text = {
     Rectangle: "rectangle",
     Polygon: "polygon",
     Bitmap: "bitmap (mask)",
+    AlphaMask: "alpha mask",
     Polyline: "polyline",
     Point: "point",
     Cuboid: "cuboid",  #

{supervisely-6.73.310 → supervisely-6.73.312}/supervisely/app/widgets/object_class_view/object_class_view.py

@@ -4,6 +4,7 @@ from supervisely.annotation.obj_class import ObjClass
 
 
 from supervisely.geometry.bitmap import Bitmap
+from supervisely.geometry.alpha_mask import AlphaMask
 from supervisely.geometry.cuboid import Cuboid
 from supervisely.geometry.point import Point
 from supervisely.geometry.polygon import Polygon
@@ -23,6 +24,7 @@ type_to_zmdi_icon = {
     Rectangle: "zmdi zmdi-crop-din",  # "zmdi zmdi-square-o"
     # Polygon: "icons8-polygon",  # "zmdi zmdi-edit"
     Bitmap: "zmdi zmdi-brush",
+    AlphaMask: "zmdi zmdi-brush",
     Polyline: "zmdi zmdi-gesture",
     Point: "zmdi zmdi-dot-circle-alt",
     Cuboid: "zmdi zmdi-ungroup",  #
@@ -49,6 +51,7 @@ type_to_shape_text = {
     Rectangle: "rectangle",
     Polygon: "polygon",
     Bitmap: "bitmap (mask)",
+    AlphaMask: "alpha mask",
     Polyline: "polyline",
     Point: "point",
     Cuboid: "cuboid",  #

{supervisely-6.73.310 → supervisely-6.73.312}/supervisely/io/fs.py

@@ -8,6 +8,8 @@ import re
 import shutil
 import subprocess
 import tarfile
+import hashlib
+import base64
 from typing import Callable, Dict, Generator, List, Literal, Optional, Tuple, Union
 
 import aiofiles
@@ -880,6 +882,32 @@ def get_file_hash(path: str) -> str:
         return get_bytes_hash(file_bytes)
 
 
+def get_file_hash_chunked(path: str, chunk_size: Optional[int] = 1024 * 1024) -> str:
+    """
+    Get hash from target file by reading it in chunks.
+
+    :param path: Target file path.
+    :type path: str
+    :param chunk_size: Number of bytes to read per iteration. Default is 1 MB.
+    :type chunk_size: int, optional
+    :returns: File hash as a base64 encoded string.
+    :rtype: str
+
+    :Usage example:
+
+    .. code-block:: python
+
+       file_hash = sly.fs.get_file_hash_chunked('/home/admin/work/projects/examples/1.jpeg')
+       print(file_hash)  # Example output: rKLYA/p/P64dzidaQ/G7itxIz3ZCVnyUhEE9fSMGxU4=
+    """
+    hash_sha256 = hashlib.sha256()
+    with open(path, "rb") as f:
+        while chunk := f.read(chunk_size):
+            hash_sha256.update(chunk)
+    digest = hash_sha256.digest()
+    return base64.b64encode(digest).decode("utf-8")
+
+
 def tree(dir_path: str) -> str:
     """
     Get tree for target directory.

{supervisely-6.73.310 → supervisely-6.73.312}/supervisely/nn/__init__.py

@@ -4,12 +4,14 @@ import supervisely.nn.inference as inference
 from supervisely.nn.artifacts.artifacts import BaseTrainArtifacts, TrainInfo
 from supervisely.nn.prediction_dto import (
     Prediction,
+    PredictionAlphaMask,
     PredictionBBox,
     PredictionCuboid3d,
     PredictionKeypoints,
     PredictionMask,
     PredictionSegmentation,
+    ProbabilityMask,
 )
 from supervisely.nn.task_type import TaskType
 from supervisely.nn.utils import ModelSource, RuntimeType
-from supervisely.nn.experiments import ExperimentInfo, get_experiment_infos
+from supervisely.nn.experiments import ExperimentInfo, get_experiment_infos

{supervisely-6.73.310 → supervisely-6.73.312}/supervisely/nn/inference/__init__.py

@@ -27,4 +27,4 @@ from supervisely.nn.inference.tracking.mask_tracking import MaskTracking
 from supervisely.nn.inference.tracking.object_tracking_3d import ObjectTracking3D
 from supervisely.nn.inference.object_detection_3d import ObjectDetection3D
 from supervisely.nn.utils import CheckpointInfo, DeployInfo, RuntimeType, ModelSource, ModelPrecision
-from supervisely.nn.task_type import TaskType
+from supervisely.nn.task_type import TaskType

{supervisely-6.73.310 → supervisely-6.73.312}/supervisely/nn/prediction_dto.py

@@ -1,5 +1,7 @@
+from typing import List, Optional
+
 import numpy as np
-from typing import Optional, List, Dict, Union
+
 from supervisely.geometry.cuboid_3d import Cuboid3d
 
 
@@ -10,6 +12,12 @@ class Prediction:
 
 class PredictionMask(Prediction):
     def __init__(self, class_name: str, mask: np.ndarray, score: Optional[float] = None):
+        """
+        class_name: Name of the class.
+        mask:       Numpy array with bool or binary ([0, 1] or [0, 255]) values.
+                    Will be converted to sly.Bitmap geometry.
+        score:      Confidence score.
+        """
         super(PredictionMask, self).__init__(class_name=class_name)
         self.mask = mask
         self.score = score
@@ -27,6 +35,28 @@ class PredictionSegmentation(Prediction):
         self.mask = mask
 
 
+class PredictionAlphaMask(Prediction):
+    def __init__(self, class_name: str, mask: np.ndarray):
+        """
+        class_name: Name of the class.
+        mask:       Numpy array with values in range [0, 255].
+                    Will be converted to sly.AlphaMask geometry.
+        """
+        super(PredictionAlphaMask, self).__init__(class_name=class_name)
+        self.mask = mask
+
+
+class ProbabilityMask(Prediction):
+    def __init__(self, class_name: str, mask: np.ndarray):
+        """
+        class_name: Name of the class.
+        mask:       Numpy array with values in range [0, 255].
+                    Will be converted to sly.AlphaMask geometry.
+        """
+        super(ProbabilityMask, self).__init__(class_name=class_name)
+        self.mask = mask
+
+
 class PredictionKeypoints(Prediction):
     def __init__(self, class_name: str, labels: List[str], coordinates: List[float]):
         super(PredictionKeypoints, self).__init__(class_name=class_name)

{supervisely-6.73.310 → supervisely-6.73.312}/supervisely/pointcloud_annotation/pointcloud_episode_tag.py

@@ -1,6 +1,9 @@
 from __future__ import annotations
+
 import uuid
-from typing import Optional, Dict, Union, Tuple
+from typing import Dict, Optional, Tuple, Union
+
+from supervisely._utils import take_with_default
 from supervisely.annotation.tag_meta import TagMeta
 from supervisely.annotation.tag_meta_collection import TagMetaCollection
 from supervisely.video_annotation.key_id_map import KeyIdMap
@@ -57,6 +60,30 @@ class PointcloudEpisodeTag(VideoTag):
         # Output: ValueError: Tag car color can not have value yellow
     """
 
+    _SUPPORT_UNFINISHED_TAGS = False
+
+    def __init__(
+        self,
+        meta,
+        value=None,
+        frame_range=None,
+        key=None,
+        sly_id=None,
+        labeler_login=None,
+        updated_at=None,
+        created_at=None,
+    ):
+        super().__init__(
+            meta,
+            value,
+            frame_range,
+            key,
+            sly_id,
+            labeler_login,
+            updated_at,
+            created_at,
+        )
+
     @classmethod
     def from_json(
         cls,
@@ -95,7 +122,18 @@ class PointcloudEpisodeTag(VideoTag):
             tag_car_color = sly.PointcloudEpisodeTag.from_json(tag_car_color_json, meta_car_collection)
         """
 
-        return super().from_json(data, tag_meta_collection, key_id_map=key_id_map)
+        temp = super(PointcloudEpisodeTag, cls).from_json(data, tag_meta_collection, key_id_map)
+
+        return cls(
+            meta=temp.meta,
+            value=temp.value,
+            frame_range=temp.frame_range,
+            key=temp.key(),
+            sly_id=temp.sly_id,
+            labeler_login=temp.labeler_login,
+            updated_at=temp.updated_at,
+            created_at=temp.created_at,
+        )
 
     def __eq__(self, other: PointcloudEpisodeTag) -> bool:
         return super().__eq__(other)
@@ -154,13 +192,13 @@ class PointcloudEpisodeTag(VideoTag):
             # }
         """
 
-        return super().clone(
-            meta=meta,
-            value=value,
-            frame_range=frame_range,
-            key=key,
-            sly_id=sly_id,
-            labeler_login=labeler_login,
-            updated_at=updated_at,
-            created_at=created_at,
+        return self.__class__(
+            meta=take_with_default(meta, self.meta),
+            value=take_with_default(value, self.value),
+            frame_range=take_with_default(frame_range, self.frame_range),
+            key=take_with_default(key, self.key()),
+            sly_id=take_with_default(sly_id, self.sly_id),
+            labeler_login=take_with_default(labeler_login, self.labeler_login),
+            updated_at=take_with_default(updated_at, self.updated_at),
+            created_at=take_with_default(created_at, self.created_at),
         )